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

Culling, base ambient light part

Browse source
This commit is contained in:
saschawillems 2016-06-12 17:38:06 +02:00
parent 2425797ca7
commit 14e327c353
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scenerendering/scenerendering.cpp
View file

@ -129,7 +129,7 @@ private:
// Properties // Properties
aiColor4D color; aiColor4D color;
aScene->mMaterials[i]->Get(AI_MATKEY_COLOR_AMBIENT, color); aScene->mMaterials[i]->Get(AI_MATKEY_COLOR_AMBIENT, color);
materials[i].properties.ambient = glm::make_vec4(&color.r); materials[i].properties.ambient = glm::make_vec4(&color.r) + glm::vec4(0.1f);
aScene->mMaterials[i]->Get(AI_MATKEY_COLOR_DIFFUSE, color); aScene->mMaterials[i]->Get(AI_MATKEY_COLOR_DIFFUSE, color);
materials[i].properties.diffuse = glm::make_vec4(&color.r); materials[i].properties.diffuse = glm::make_vec4(&color.r);
aScene->mMaterials[i]->Get(AI_MATKEY_COLOR_SPECULAR, color); aScene->mMaterials[i]->Get(AI_MATKEY_COLOR_SPECULAR, color);
@ -437,7 +437,7 @@ public:
glm::mat4 projection; glm::mat4 projection;
glm::mat4 view; glm::mat4 view;
glm::mat4 model; glm::mat4 model;
glm::vec4 lightPos = glm::vec4(8.15f, -1.8f, -0.0f, 0.0f); glm::vec4 lightPos = glm::vec4(1.25f, 8.35f, 0.0f, 0.0f);
} uniformData; } uniformData;
// Scene uses multiple pipelines // Scene uses multiple pipelines
@ -724,7 +724,7 @@ public:
VkPipelineRasterizationStateCreateInfo rasterizationState = VkPipelineRasterizationStateCreateInfo rasterizationState =
vkTools::initializers::pipelineRasterizationStateCreateInfo( vkTools::initializers::pipelineRasterizationStateCreateInfo(
VK_POLYGON_MODE_FILL, VK_POLYGON_MODE_FILL,
VK_CULL_MODE_NONE, VK_CULL_MODE_BACK_BIT,
VK_FRONT_FACE_COUNTER_CLOCKWISE, VK_FRONT_FACE_COUNTER_CLOCKWISE,
0); 0);