diff --git a/example/Vulkan/LoadStaticMesh.cpp b/example/Vulkan/LoadStaticMesh.cpp index 8a0ece9f..dd5080f2 100644 --- a/example/Vulkan/LoadStaticMesh.cpp +++ b/example/Vulkan/LoadStaticMesh.cpp @@ -214,6 +214,7 @@ private: mp_line.material_instance->Update(); mp_solid.material_instance->BindUBO("world",GetCameraMatrixBuffer()); + mp_solid.material_instance->BindUBO("fs_world",GetCameraMatrixBuffer()); mp_solid.material_instance->BindUBO("color_material",ubo_color); mp_solid.material_instance->BindUBO("sun",ubo_sun); @@ -268,7 +269,7 @@ public: camera.zfar=10240; if(!InitMP(&mp_solid, PRIM_TRIANGLES, OS_TEXT("res/shader/LightPosition3D.vert"), - OS_TEXT("res/shader/VertexColor.frag"))) + OS_TEXT("res/shader/DirectionLight.frag"))) return(false); if(!InitMP(&mp_line, PRIM_LINES, OS_TEXT("res/shader/PositionColor3D.vert"), diff --git a/example/Vulkan/SceneTree.cpp b/example/Vulkan/SceneTree.cpp index 32afa385..cd1d5fe8 100644 --- a/example/Vulkan/SceneTree.cpp +++ b/example/Vulkan/SceneTree.cpp @@ -55,7 +55,7 @@ private: bool InitMaterial() { - material=shader_manage->CreateMaterial(OS_TEXT("res/shader/LightPosition3D.vert"), + material=shader_manage->CreateMaterial(OS_TEXT("res/shader/VertexLight.vert"), OS_TEXT("res/shader/VertexColor.frag")); if(!material) return(false); diff --git a/res b/res index 519871e4..1c75bad0 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 519871e43c903472282286746df5d3281037c297 +Subproject commit 1c75bad0e6b2cada8fbaed04713d1fa619f96976