rename vattr to VertexAttribute
This commit is contained in:
parent
65287b3273
commit
5240fe6226
@ -11,7 +11,7 @@
|
|||||||
inline constexpr uint B2D_VERTEX_SIZE = 8;
|
inline constexpr uint B2D_VERTEX_SIZE = 8;
|
||||||
|
|
||||||
Batch2D::Batch2D(size_t capacity) : capacity(capacity), color(1.0f){
|
Batch2D::Batch2D(size_t capacity) : capacity(capacity), color(1.0f){
|
||||||
const vattr attrs[] = {
|
const VertexAttribute attrs[] = {
|
||||||
{2}, {2}, {4}, {0}
|
{2}, {2}, {4}, {0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -12,7 +12,7 @@ inline constexpr uint B3D_VERTEX_SIZE = 9;
|
|||||||
|
|
||||||
Batch3D::Batch3D(size_t capacity)
|
Batch3D::Batch3D(size_t capacity)
|
||||||
: capacity(capacity) {
|
: capacity(capacity) {
|
||||||
const vattr attrs[] = {
|
const VertexAttribute attrs[] = {
|
||||||
{3}, {2}, {4}, {0}
|
{3}, {2}, {4}, {0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
inline constexpr uint LB_VERTEX_SIZE = (3+4);
|
inline constexpr uint LB_VERTEX_SIZE = (3+4);
|
||||||
|
|
||||||
LineBatch::LineBatch(size_t capacity) : capacity(capacity) {
|
LineBatch::LineBatch(size_t capacity) : capacity(capacity) {
|
||||||
const vattr attrs[] = { {3},{4}, {0} };
|
const VertexAttribute attrs[] = { {3},{4}, {0} };
|
||||||
buffer = std::make_unique<float[]>(capacity * LB_VERTEX_SIZE * 2);
|
buffer = std::make_unique<float[]>(capacity * LB_VERTEX_SIZE * 2);
|
||||||
mesh = std::make_unique<Mesh>(buffer.get(), 0, attrs);
|
mesh = std::make_unique<Mesh>(buffer.get(), 0, attrs);
|
||||||
index = 0;
|
index = 0;
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
int Mesh::meshesCount = 0;
|
int Mesh::meshesCount = 0;
|
||||||
int Mesh::drawCalls = 0;
|
int Mesh::drawCalls = 0;
|
||||||
|
|
||||||
inline size_t calc_vertex_size(const vattr* attrs) {
|
inline size_t calc_vertex_size(const VertexAttribute* attrs) {
|
||||||
size_t vertexSize = 0;
|
size_t 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;
|
||||||
@ -19,7 +19,7 @@ Mesh::Mesh(const MeshData& data)
|
|||||||
data.indices.size(),
|
data.indices.size(),
|
||||||
data.attrs.data()) {}
|
data.attrs.data()) {}
|
||||||
|
|
||||||
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 VertexAttribute* attrs) :
|
||||||
ibo(0),
|
ibo(0),
|
||||||
vertices(0),
|
vertices(0),
|
||||||
indices(0)
|
indices(0)
|
||||||
|
|||||||
@ -14,8 +14,8 @@ class Mesh {
|
|||||||
size_t vertexSize;
|
size_t vertexSize;
|
||||||
public:
|
public:
|
||||||
Mesh(const MeshData& data);
|
Mesh(const MeshData& data);
|
||||||
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 VertexAttribute* attrs);
|
||||||
Mesh(const float* vertexBuffer, size_t vertices, const vattr* attrs) :
|
Mesh(const float* vertexBuffer, size_t vertices, const VertexAttribute* attrs) :
|
||||||
Mesh(vertexBuffer, vertices, nullptr, 0, attrs) {};
|
Mesh(vertexBuffer, vertices, nullptr, 0, attrs) {};
|
||||||
~Mesh();
|
~Mesh();
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
#include "util/Buffer.hpp"
|
#include "util/Buffer.hpp"
|
||||||
|
|
||||||
/// @brief Vertex attribute info
|
/// @brief Vertex attribute info
|
||||||
struct vattr {
|
struct VertexAttribute {
|
||||||
ubyte size;
|
ubyte size;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -14,7 +14,7 @@ struct vattr {
|
|||||||
struct MeshData {
|
struct MeshData {
|
||||||
util::Buffer<float> vertices;
|
util::Buffer<float> vertices;
|
||||||
util::Buffer<int> indices;
|
util::Buffer<int> indices;
|
||||||
util::Buffer<vattr> attrs;
|
util::Buffer<VertexAttribute> attrs;
|
||||||
|
|
||||||
MeshData() = default;
|
MeshData() = default;
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ struct MeshData {
|
|||||||
MeshData(
|
MeshData(
|
||||||
util::Buffer<float> vertices,
|
util::Buffer<float> vertices,
|
||||||
util::Buffer<int> indices,
|
util::Buffer<int> indices,
|
||||||
util::Buffer<vattr> attrs
|
util::Buffer<VertexAttribute> attrs
|
||||||
) : vertices(std::move(vertices)),
|
) : vertices(std::move(vertices)),
|
||||||
indices(std::move(indices)),
|
indices(std::move(indices)),
|
||||||
attrs(std::move(attrs)) {}
|
attrs(std::move(attrs)) {}
|
||||||
|
|||||||
@ -14,7 +14,7 @@ PostProcessing::PostProcessing() {
|
|||||||
-1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f,
|
-1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f,
|
||||||
-1.0f, -1.0f, 1.0f, 1.0f, 1.0f, -1.0f
|
-1.0f, -1.0f, 1.0f, 1.0f, 1.0f, -1.0f
|
||||||
};
|
};
|
||||||
vattr attrs[] {{2}, {0}};
|
VertexAttribute attrs[] {{2}, {0}};
|
||||||
quadMesh = std::make_unique<Mesh>(vertices, 6, attrs);
|
quadMesh = std::make_unique<Mesh>(vertices, 6, attrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -656,8 +656,8 @@ ChunkMeshData BlocksRenderer::createMesh() {
|
|||||||
MeshData(
|
MeshData(
|
||||||
util::Buffer<float>(vertexBuffer.get(), vertexOffset),
|
util::Buffer<float>(vertexBuffer.get(), vertexOffset),
|
||||||
util::Buffer<int>(indexBuffer.get(), indexSize),
|
util::Buffer<int>(indexBuffer.get(), indexSize),
|
||||||
util::Buffer<vattr>(
|
util::Buffer<VertexAttribute>(
|
||||||
CHUNK_VATTRS, sizeof(CHUNK_VATTRS) / sizeof(vattr)
|
CHUNK_VATTRS, sizeof(CHUNK_VATTRS) / sizeof(VertexAttribute)
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
std::move(sortingMesh)};
|
std::move(sortingMesh)};
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
#include "voxels/Chunks.hpp"
|
#include "voxels/Chunks.hpp"
|
||||||
#include "voxels/Chunk.hpp"
|
#include "voxels/Chunk.hpp"
|
||||||
|
|
||||||
static const vattr attrs[] = {
|
static const VertexAttribute attrs[] = {
|
||||||
{3}, {2}, {3}, {1}, {0}
|
{3}, {2}, {3}, {1}, {0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,7 @@ Skybox::Skybox(uint size, Shader& shader)
|
|||||||
-1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f,
|
-1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f,
|
||||||
-1.0f, -1.0f, 1.0f, 1.0f, 1.0f, -1.0f
|
-1.0f, -1.0f, 1.0f, 1.0f, 1.0f, -1.0f
|
||||||
};
|
};
|
||||||
vattr attrs[] {{2}, {0}};
|
VertexAttribute attrs[] {{2}, {0}};
|
||||||
mesh = std::make_unique<Mesh>(vertices, 6, attrs);
|
mesh = std::make_unique<Mesh>(vertices, 6, attrs);
|
||||||
|
|
||||||
sprites.push_back(skysprite {
|
sprites.push_back(skysprite {
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
#include "util/Buffer.hpp"
|
#include "util/Buffer.hpp"
|
||||||
|
|
||||||
/// @brief Chunk mesh vertex attributes
|
/// @brief Chunk mesh vertex attributes
|
||||||
inline const vattr CHUNK_VATTRS[]{ {3}, {2}, {1}, {0} };
|
inline const VertexAttribute CHUNK_VATTRS[]{ {3}, {2}, {1}, {0} };
|
||||||
/// @brief Chunk mesh vertex size divided by sizeof(float)
|
/// @brief Chunk mesh vertex size divided by sizeof(float)
|
||||||
inline constexpr int CHUNK_VERTEX_SIZE = 6;
|
inline constexpr int CHUNK_VERTEX_SIZE = 6;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user