From f8e2aa6d813420a787c6d8e608be70bccf72c399 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 12 Jun 2020 15:55:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9D=90=E8=B4=A8=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/Vulkan/Atomsphere.cpp | 4 ++-- example/Vulkan/SceneTree.cpp | 8 ++++---- res | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/example/Vulkan/Atomsphere.cpp b/example/Vulkan/Atomsphere.cpp index 8d14c9b1..dea8100b 100644 --- a/example/Vulkan/Atomsphere.cpp +++ b/example/Vulkan/Atomsphere.cpp @@ -42,8 +42,8 @@ private: bool InitMaterial() { - material=shader_manage->CreateMaterial(OS_TEXT("res/shader/Atomsphere.vert.spv"), - OS_TEXT("res/shader/Atomsphere.frag.spv")); + material=shader_manage->CreateMaterial(OS_TEXT("res/shader/Atomsphere.vert"), + OS_TEXT("res/shader/Atomsphere.frag")); if(!material) return(false); diff --git a/example/Vulkan/SceneTree.cpp b/example/Vulkan/SceneTree.cpp index 9a512743..123a0b13 100644 --- a/example/Vulkan/SceneTree.cpp +++ b/example/Vulkan/SceneTree.cpp @@ -12,8 +12,8 @@ using namespace hgl; using namespace hgl::graph; -constexpr uint32_t SCREEN_WIDTH=128; -constexpr uint32_t SCREEN_HEIGHT=128; +constexpr uint32_t SCREEN_WIDTH=1280; +constexpr uint32_t SCREEN_HEIGHT=720; class TestApp:public CameraAppFramework { @@ -48,8 +48,8 @@ private: bool InitMaterial() { - material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition3D.vert.spv"), - OS_TEXT("res/shader/FlatColor.frag.spv")); + material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition3D.vert"), + OS_TEXT("res/shader/FlatColor.frag")); if(!material) return(false); diff --git a/res b/res index 31bfc6df..23685cd8 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 31bfc6df93dc2b676b1fc912c42c87718ba007b8 +Subproject commit 23685cd868ff941da4f0974035c8f4aa23594e03