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

Merge pull request #338 from PistonMiner/master

Browse source 
Change 'SceneMaterialProperites' to 'SceneMaterialProperties'
This commit is contained in:
Sascha Willems 2017-05-30 18:20:24 +02:00 • committed by GitHub
commit 97c675de44
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scenerendering/scenerendering.cpp
View file

@ -59,7 +59,7 @@ struct Vertex {
// Shader properites for a material // Shader properites for a material
// Will be passed to the shaders using push constant // Will be passed to the shaders using push constant
struct SceneMaterialProperites struct SceneMaterialProperties
{ {
glm::vec4 ambient; glm::vec4 ambient;
glm::vec4 diffuse; glm::vec4 diffuse;
@ -72,7 +72,7 @@ struct SceneMaterial
{ {
std::string name; std::string name;
// Material properties // Material properties
SceneMaterialProperites properties; SceneMaterialProperties properties;
// The example only uses a diffuse channel // The example only uses a diffuse channel
vks::Texture2D diffuse; vks::Texture2D diffuse;
// The material's descriptor contains the material descriptors // The material's descriptor contains the material descriptors
@ -236,7 +236,7 @@ private:
// We will be using a push constant block to pass material properties to the fragment shaders // We will be using a push constant block to pass material properties to the fragment shaders
VkPushConstantRange pushConstantRange = vks::initializers::pushConstantRange( VkPushConstantRange pushConstantRange = vks::initializers::pushConstantRange(
VK_SHADER_STAGE_FRAGMENT_BIT, VK_SHADER_STAGE_FRAGMENT_BIT,
sizeof(SceneMaterialProperites), sizeof(SceneMaterialProperties),
0); 0);
pipelineLayoutCreateInfo.pushConstantRangeCount = 1; pipelineLayoutCreateInfo.pushConstantRangeCount = 1;
pipelineLayoutCreateInfo.pPushConstantRanges = &pushConstantRange; pipelineLayoutCreateInfo.pPushConstantRanges = &pushConstantRange;
@ -558,7 +558,7 @@ public:
pipelineLayout, pipelineLayout,
VK_SHADER_STAGE_FRAGMENT_BIT, VK_SHADER_STAGE_FRAGMENT_BIT,
0, 0,
sizeof(SceneMaterialProperites), sizeof(SceneMaterialProperties),
&meshes[i].material->properties); &meshes[i].material->properties);
// Render from the global scene vertex buffer using the mesh index offset // Render from the global scene vertex buffer using the mesh index offset