hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change names of shaders

Browse Source
This commit is contained in:
hyzboy 2020-06-20 15:25:57 +08:00
parent 70c7679690
commit ccec02c58b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example/Vulkan/LoadStaticMesh.cpp
View File

@ -214,6 +214,7 @@ private:
mp_line.material_instance->Update(); mp_line.material_instance->Update();
mp_solid.material_instance->BindUBO("world",GetCameraMatrixBuffer()); 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("color_material",ubo_color);
mp_solid.material_instance->BindUBO("sun",ubo_sun); mp_solid.material_instance->BindUBO("sun",ubo_sun);
@ -268,7 +269,7 @@ public:
camera.zfar=10240; camera.zfar=10240;
if(!InitMP(&mp_solid, PRIM_TRIANGLES, OS_TEXT("res/shader/LightPosition3D.vert"), 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); return(false);
if(!InitMP(&mp_line, PRIM_LINES, OS_TEXT("res/shader/PositionColor3D.vert"), if(!InitMP(&mp_line, PRIM_LINES, OS_TEXT("res/shader/PositionColor3D.vert"),

2
example/Vulkan/SceneTree.cpp
View File

@ -55,7 +55,7 @@ private:
bool InitMaterial() 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")); OS_TEXT("res/shader/VertexColor.frag"));
if(!material) if(!material)
return(false); return(false);

2
res

@ -1 +1 @@
Subproject commit 519871e43c903472282286746df5d3281037c297 Subproject commit 1c75bad0e6b2cada8fbaed04713d1fa619f96976