idk
This commit is contained in:
parent
f5b3f3c33f
commit
a7a447552e
@ -12,6 +12,7 @@
|
|||||||
#include "../physics/Hitbox.h"
|
#include "../physics/Hitbox.h"
|
||||||
#include "../util/stringutil.h"
|
#include "../util/stringutil.h"
|
||||||
#include "../voxels/Block.h"
|
#include "../voxels/Block.h"
|
||||||
|
#include "../voxels/Chunk.h"
|
||||||
#include "../voxels/Chunks.h"
|
#include "../voxels/Chunks.h"
|
||||||
#include "../world/Level.h"
|
#include "../world/Level.h"
|
||||||
#include "../world/World.h"
|
#include "../world/World.h"
|
||||||
|
|||||||
@ -4,72 +4,72 @@
|
|||||||
int Mesh::meshesCount = 0;
|
int Mesh::meshesCount = 0;
|
||||||
|
|
||||||
Mesh::Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const vattr* attrs) :
|
Mesh::Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const vattr* attrs) :
|
||||||
ibo(0),
|
ibo(0),
|
||||||
vertices(vertices),
|
vertices(vertices),
|
||||||
indices(indices)
|
indices(indices)
|
||||||
{
|
{
|
||||||
meshesCount++;
|
meshesCount++;
|
||||||
vertexSize = 0;
|
vertexSize = 0;
|
||||||
for (int i = 0; attrs[i].size; i++) {
|
for (int i = 0; attrs[i].size; i++) {
|
||||||
vertexSize += attrs[i].size;
|
vertexSize += attrs[i].size;
|
||||||
}
|
}
|
||||||
|
|
||||||
glGenVertexArrays(1, &vao);
|
glGenVertexArrays(1, &vao);
|
||||||
glGenBuffers(1, &vbo);
|
glGenBuffers(1, &vbo);
|
||||||
|
|
||||||
reload(vertexBuffer, vertices, indexBuffer, indices);
|
reload(vertexBuffer, vertices, indexBuffer, indices);
|
||||||
|
|
||||||
// attributes
|
// attributes
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
for (int i = 0; attrs[i].size; i++) {
|
for (int i = 0; attrs[i].size; i++) {
|
||||||
int size = attrs[i].size;
|
int size = attrs[i].size;
|
||||||
glVertexAttribPointer(i, size, GL_FLOAT, GL_FALSE, vertexSize * sizeof(float), (GLvoid*)(offset * sizeof(float)));
|
glVertexAttribPointer(i, size, GL_FLOAT, GL_FALSE, vertexSize * sizeof(float), (GLvoid*)(offset * sizeof(float)));
|
||||||
glEnableVertexAttribArray(i);
|
glEnableVertexAttribArray(i);
|
||||||
offset += size;
|
offset += size;
|
||||||
}
|
}
|
||||||
|
|
||||||
glBindVertexArray(0);
|
glBindVertexArray(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
Mesh::~Mesh(){
|
Mesh::~Mesh(){
|
||||||
meshesCount--;
|
meshesCount--;
|
||||||
glDeleteVertexArrays(1, &vao);
|
glDeleteVertexArrays(1, &vao);
|
||||||
glDeleteBuffers(1, &vbo);
|
glDeleteBuffers(1, &vbo);
|
||||||
if (ibo != 0) glDeleteBuffers(1, &ibo);
|
if (ibo != 0) glDeleteBuffers(1, &ibo);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mesh::reload(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices){
|
void Mesh::reload(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices){
|
||||||
glBindVertexArray(vao);
|
glBindVertexArray(vao);
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, vbo);
|
glBindBuffer(GL_ARRAY_BUFFER, vbo);
|
||||||
if (vertexBuffer != nullptr && vertices != 0) {
|
if (vertexBuffer != nullptr && vertices != 0) {
|
||||||
glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertexSize * vertices, vertexBuffer, GL_STATIC_DRAW);
|
glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertexSize * vertices, vertexBuffer, GL_STATIC_DRAW);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
glBufferData(GL_ARRAY_BUFFER, 0, {}, GL_STATIC_DRAW);
|
glBufferData(GL_ARRAY_BUFFER, 0, {}, GL_STATIC_DRAW);
|
||||||
}
|
}
|
||||||
if (indexBuffer != nullptr && indices != 0) {
|
if (indexBuffer != nullptr && indices != 0) {
|
||||||
if (ibo == 0) glGenBuffers(1, &ibo);
|
if (ibo == 0) glGenBuffers(1, &ibo);
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo);
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo);
|
||||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(int) * indices, indexBuffer, GL_STATIC_DRAW);
|
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(int) * indices, indexBuffer, GL_STATIC_DRAW);
|
||||||
}
|
}
|
||||||
else if (ibo != 0) {
|
else if (ibo != 0) {
|
||||||
glDeleteBuffers(1, &ibo);
|
glDeleteBuffers(1, &ibo);
|
||||||
}
|
}
|
||||||
this->vertices = vertices;
|
this->vertices = vertices;
|
||||||
this->indices = indices;
|
this->indices = indices;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mesh::draw(unsigned int primitive){
|
void Mesh::draw(unsigned int primitive){
|
||||||
glBindVertexArray(vao);
|
glBindVertexArray(vao);
|
||||||
if (ibo != 0) {
|
if (ibo != 0) {
|
||||||
glDrawElements(primitive, indices, GL_UNSIGNED_INT, 0);
|
glDrawElements(primitive, indices, GL_UNSIGNED_INT, 0);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
glDrawArrays(primitive, 0, vertices);
|
glDrawArrays(primitive, 0, vertices);
|
||||||
}
|
}
|
||||||
glBindVertexArray(0);
|
glBindVertexArray(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mesh::draw() {
|
void Mesh::draw() {
|
||||||
draw(GL_TRIANGLES);
|
draw(GL_TRIANGLES);
|
||||||
}
|
}
|
||||||
@ -5,38 +5,38 @@
|
|||||||
#include "../../typedefs.h"
|
#include "../../typedefs.h"
|
||||||
|
|
||||||
struct vattr {
|
struct vattr {
|
||||||
ubyte size;
|
ubyte size;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Mesh {
|
class Mesh {
|
||||||
unsigned int vao;
|
unsigned int vao;
|
||||||
unsigned int vbo;
|
unsigned int vbo;
|
||||||
unsigned int ibo;
|
unsigned int ibo;
|
||||||
size_t vertices;
|
size_t vertices;
|
||||||
size_t indices;
|
size_t indices;
|
||||||
size_t vertexSize;
|
size_t vertexSize;
|
||||||
public:
|
public:
|
||||||
Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const vattr* attrs);
|
Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const vattr* attrs);
|
||||||
Mesh(const float* vertexBuffer, size_t vertices, const vattr* attrs) :
|
Mesh(const float* vertexBuffer, size_t vertices, const vattr* attrs) :
|
||||||
Mesh(vertexBuffer, vertices, nullptr, 0, attrs) {};
|
Mesh(vertexBuffer, vertices, nullptr, 0, attrs) {};
|
||||||
~Mesh();
|
~Mesh();
|
||||||
|
|
||||||
/// @brief Update GL vertex and index buffers data without changing VAO attributes
|
/// @brief Update GL vertex and index buffers data without changing VAO attributes
|
||||||
/// @param vertexBuffer vertex data buffer
|
/// @param vertexBuffer vertex data buffer
|
||||||
/// @param vertices number of vertices in new buffer
|
/// @param vertices number of vertices in new buffer
|
||||||
/// @param indexBuffer indices buffer
|
/// @param indexBuffer indices buffer
|
||||||
/// @param indices number of values in indices buffer
|
/// @param indices number of values in indices buffer
|
||||||
void reload(const float* vertexBuffer, size_t vertices, const int* indexBuffer = nullptr, size_t indices = 0);
|
void reload(const float* vertexBuffer, size_t vertices, const int* indexBuffer = nullptr, size_t indices = 0);
|
||||||
|
|
||||||
/// @brief Draw mesh with specified primitives type
|
/// @brief Draw mesh with specified primitives type
|
||||||
/// @param primitive primitives type
|
/// @param primitive primitives type
|
||||||
void draw(unsigned int primitive);
|
void draw(unsigned int primitive);
|
||||||
|
|
||||||
/// @brief Draw mesh as triangles
|
/// @brief Draw mesh as triangles
|
||||||
void draw();
|
void draw();
|
||||||
|
|
||||||
/// @brief Total numbers of alive mesh objects
|
/// @brief Total numbers of alive mesh objects
|
||||||
static int meshesCount;
|
static int meshesCount;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GRAPHICS_CORE_MESH_H_
|
#endif // GRAPHICS_CORE_MESH_H_
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
#include "stringutil.h"
|
#include "stringutil.h"
|
||||||
|
|
||||||
|
#include <cmath>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <locale>
|
#include <locale>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
@ -424,3 +425,22 @@ std::vector<std::wstring> util::split(const std::wstring& str, char delimiter) {
|
|||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string util::format_data_size(size_t size) {
|
||||||
|
if (size < 1024) {
|
||||||
|
return std::to_string(size)+" B";
|
||||||
|
}
|
||||||
|
const std::string postfixes[] {
|
||||||
|
" B", " KiB", " MiB", " GiB", " TiB", " EiB", " PiB"
|
||||||
|
};
|
||||||
|
int group = 0;
|
||||||
|
size_t remainder;
|
||||||
|
while (size >= 1024) {
|
||||||
|
group++;
|
||||||
|
remainder = size % 1024;
|
||||||
|
size /= 1024;
|
||||||
|
}
|
||||||
|
return std::to_string(size)+"."+
|
||||||
|
std::to_string(static_cast<int>(round(remainder/1024.0f)))+
|
||||||
|
postfixes[group];
|
||||||
|
}
|
||||||
|
|||||||
@ -54,6 +54,8 @@ namespace util {
|
|||||||
|
|
||||||
extern std::vector<std::string> split(const std::string& str, char delimiter);
|
extern std::vector<std::string> split(const std::string& str, char delimiter);
|
||||||
extern std::vector<std::wstring> split(const std::wstring& str, char delimiter);
|
extern std::vector<std::wstring> split(const std::wstring& str, char delimiter);
|
||||||
|
|
||||||
|
extern std::string format_data_size(size_t size);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // UTIL_STRINGUTIL_H_
|
#endif // UTIL_STRINGUTIL_H_
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user