voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-05 02:51:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "fix: optimization: Various PVS-Studio warnings"

Browse source
This commit is contained in:
MihailRis 2024-08-02 14:51:44 +03:00 • committed by GitHub
parent a7ef7bb365
commit ba046a52c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
90 changed files with 259 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/graphics/render/ModelBatch.cpp
View file

@ -35,7 +35,7 @@ struct DecomposedMat4 {
glm::vec4 perspective;
};
static glm::mat4 extract_rotation(const glm::mat4& matrix) {
static glm::mat4 extract_rotation(glm::mat4 matrix) {
DecomposedMat4 decomposed = {};
glm::quat rotation;
glm::decompose(
@ -64,12 +64,11 @@ ModelBatch::ModelBatch(size_t capacity, Assets* assets, Chunks* chunks)
blank = Texture::from(&image);
}
ModelBatch::~ModelBatch() = default;
ModelBatch::~ModelBatch() {
}
void ModelBatch::draw(const model::Mesh& mesh,
const glm::mat4& matrix,
const glm::mat3& rotation,
const glm::vec3& tint,
void ModelBatch::draw(const model::Mesh& mesh, const glm::mat4& matrix,
const glm::mat3& rotation, glm::vec3 tint,
const texture_names_map* varTextures) {
glm::vec3 gpos = matrix * glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
light_t light = chunks->getLight(floor(gpos.x), floor(gpos.y), floor(gpos.z));
@ -96,9 +95,8 @@ void ModelBatch::draw(const model::Mesh& mesh,
}
}
void ModelBatch::draw(
const glm::mat4& matrix,
const glm::vec3& tint,
void ModelBatch::draw(glm::mat4 matrix,
glm::vec3 tint,
const model::Model* model,
const texture_names_map* varTextures) {
for (const auto& mesh : model->meshes) {