claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added flag to pre-multiply vertex colors by material base color

Browse source
This commit is contained in:
Sascha Willems 2020-04-25 10:50:24 +02:00
parent d28d9279f5
commit 5df36d7b19
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
base/VulkanglTFModel.hpp
View file

@ -541,6 +541,7 @@ namespace vkglTF
typedef enum FileLoadingFlags { typedef enum FileLoadingFlags {
None = 0, None = 0,
PreTransformVertices = 1, PreTransformVertices = 1,
PreMultiplyVertexColors = 2
}; };
/* /*
@ -1040,14 +1041,24 @@ namespace vkglTF
return; return;
} }
// Pre-transform all vertices by the node matrix hierarchy if requested // Pre-Calculations for requested features
if (fileLoadingFlags & FileLoadingFlags::PreTransformVertices) { if ((fileLoadingFlags & FileLoadingFlags::PreTransformVertices) || (fileLoadingFlags & FileLoadingFlags::PreMultiplyVertexColors)) {
const bool preTransform = fileLoadingFlags & FileLoadingFlags::PreTransformVertices;
const bool preMultiplyColor = fileLoadingFlags & FileLoadingFlags::PreMultiplyVertexColors;
for (Node* node : linearNodes) { for (Node* node : linearNodes) {
const glm::mat4 localMatrix = node->getMatrix();
if (node->mesh) { if (node->mesh) {
const glm::mat4 localMatrix = node->getMatrix();
for (Primitive* primitive : node->mesh->primitives) { for (Primitive* primitive : node->mesh->primitives) {
for (uint32_t i = 0; i < primitive->vertexCount; i++) { for (uint32_t i = 0; i < primitive->vertexCount; i++) {
vertexBuffer[primitive->firstVertex + i].pos = glm::vec3(localMatrix * glm::vec4(vertexBuffer[primitive->firstVertex + i].pos, 1.0f)); Vertex& vertex = vertexBuffer[primitive->firstVertex + i];
// Pre-transform vertex positions by node-hierarchy
if (preTransform) {
vertex.pos = glm::vec3(localMatrix * glm::vec4(vertex.pos, 1.0f));
}
// Pre-Multiply vertex colors with material base color
if (preMultiplyColor) {
vertex.color = primitive->material.baseColorFactor * vertex.color;
}
} }
} }
} }