diff --git a/CMSceneGraph b/CMSceneGraph index 89d5cb4f..06a42e93 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 89d5cb4fd6e13f7017ac35aa2232d8851c4782ca +Subproject commit 06a42e93940fd2a377d5c4cbf5c4c8662d31ce3a diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index 26fd8397..a810136a 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -54,8 +54,8 @@ private: bool InitMaterial() { - material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition.vert.spv"), - OS_TEXT("res/shader/FragCoord.frag.spv")); + material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition.vert"), + OS_TEXT("res/shader/FragCoord.frag")); if(!material) return(false); @@ -68,8 +68,8 @@ private: { const VkExtent2D extent=sc_render_target->GetExtent(); - cam.width=extent.width; - cam.height=extent.height; + cam.vp_width=cam.width=extent.width; + cam.vp_height=cam.height=extent.height; cam.Refresh(); @@ -129,8 +129,8 @@ public: void Resize(int w,int h)override { - cam.width=w; - cam.height=h; + cam.vp_width=w; + cam.vp_height=h; cam.Refresh(); diff --git a/res b/res index a9754431..31bfc6df 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit a9754431037ebc7f8056b81c6d3e982c0ba341f9 +Subproject commit 31bfc6df93dc2b676b1fc912c42c87718ba007b8