mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-06 03:21:49 +00:00
remove Mesh constructor 'attrs' argument & format Mesh.hpp
This commit is contained in:
parent
47b7472231
commit
e357a4eb9f
13 changed files with 46 additions and 42 deletions
|
|
@ -662,7 +662,7 @@ ChunkMesh BlocksRenderer::render(const Chunk *chunk, const Chunks *chunks) {
|
|||
build(chunk, chunks);
|
||||
|
||||
return ChunkMesh{std::make_unique<Mesh<ChunkVertex>>(
|
||||
vertexBuffer.get(), vertexCount, indexBuffer.get(), indexCount, ChunkVertex::ATTRIBUTES
|
||||
vertexBuffer.get(), vertexCount, indexBuffer.get(), indexCount
|
||||
), std::move(sortingMesh)};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -289,9 +289,7 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
|
|||
auto& entry = chunkEntries.at(0);
|
||||
if (found->second.sortedMesh == nullptr) {
|
||||
found->second.sortedMesh = std::make_unique<Mesh<ChunkVertex>>(
|
||||
entry.vertexData.data(),
|
||||
entry.vertexData.size(),
|
||||
ChunkVertex::ATTRIBUTES
|
||||
entry.vertexData.data(), entry.vertexData.size()
|
||||
);
|
||||
}
|
||||
found->second.sortedMesh->draw();
|
||||
|
|
@ -316,7 +314,7 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
|
|||
}
|
||||
write_sorting_mesh_entries(buffer.data(), chunkEntries);
|
||||
found->second.sortedMesh = std::make_unique<Mesh<ChunkVertex>>(
|
||||
buffer.data(), size, ChunkVertex::ATTRIBUTES
|
||||
buffer.data(), size
|
||||
);
|
||||
}
|
||||
found->second.sortedMesh->draw();
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ MainBatch::MainBatch(size_t capacity)
|
|||
: buffer(std::make_unique<MainBatchVertex[]>(capacity)),
|
||||
capacity(capacity),
|
||||
index(0),
|
||||
mesh(std::make_unique<Mesh<MainBatchVertex>>(buffer.get(), 0, MainBatchVertex::ATTRIBUTES)) {
|
||||
mesh(std::make_unique<Mesh<MainBatchVertex>>(buffer.get(), 0)) {
|
||||
|
||||
const ubyte pixels[] = {
|
||||
255, 255, 255, 255,
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ Skybox::Skybox(uint size, Shader& shader)
|
|||
{{1.0f, -1.0f}}
|
||||
};
|
||||
|
||||
mesh = std::make_unique<Mesh<SkyboxVertex>>(vertices, 6, SkyboxVertex::ATTRIBUTES);
|
||||
mesh = std::make_unique<Mesh<SkyboxVertex>>(vertices, 6);
|
||||
|
||||
sprites.push_back(skysprite {
|
||||
"misc/moon",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue