From eb76cbef2e648114e8615b559dc90ed4edd128ac Mon Sep 17 00:00:00 2001 From: hyzboy Date: Wed, 31 Jul 2019 21:58:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8C=83=E4=BE=8B=E4=BF=AE=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=BA=8F=E5=8F=B7=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/Vulkan/CMakeLists.txt | 22 +++++++++++----------- example/Vulkan/texture_rect.cpp | 2 +- res/shader/FlatTexture.vert | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/example/Vulkan/CMakeLists.txt b/example/Vulkan/CMakeLists.txt index c126892d..f624d6c8 100644 --- a/example/Vulkan/CMakeLists.txt +++ b/example/Vulkan/CMakeLists.txt @@ -7,20 +7,20 @@ ENDIF() endmacro() -CreateProject(0.triangle main.cpp) -CreateProject(1.indices_rect indices_rect.cpp) -CreateProject(2.texture_rect texture_rect.cpp TGATexture.cpp) -CreateProject(3.Geometry2D Geometry2D.cpp) -CreateProject(4.Geometry3D Geometry3D.cpp) -CreateProject(5.SceneTree SceneTree.cpp) +CreateProject(00.triangle main.cpp) +CreateProject(01.indices_rect indices_rect.cpp) +CreateProject(02.texture_rect texture_rect.cpp TGATexture.cpp) +CreateProject(03.Geometry2D Geometry2D.cpp) +CreateProject(04.Geometry3D Geometry3D.cpp) +CreateProject(05.SceneTree SceneTree.cpp) -CreateProject(6.LoadModel LoadModel.cpp TGATexture.cpp AssimpLoaderMesh.h AssimpLoaderMesh.cpp ViewModelFramework.h) -target_link_libraries(6.LoadModel assimp) +CreateProject(06.LoadModel LoadModel.cpp TGATexture.cpp AssimpLoaderMesh.h AssimpLoaderMesh.cpp ViewModelFramework.h) +target_link_libraries(06.LoadModel assimp) -CreateProject(7.InlineGeometryScene InlineGeometryScene.cpp) +CreateProject(07.InlineGeometryScene InlineGeometryScene.cpp) -CreateProject(8.Atomsphere Atomsphere.cpp) +CreateProject(08.Atomsphere Atomsphere.cpp) -CreateProject(9.Deferred Deferred.cpp TGATexture.cpp) +CreateProject(09.Deferred Deferred.cpp TGATexture.cpp) CreateProject(10.TextureFormat TextureFormat.cpp TGATexture.cpp) \ No newline at end of file diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index 8de08a7c..59155dd8 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -148,7 +148,7 @@ private: bool InitPipeline() { - AutoDelete + AutoDelete pipeline_creater=new vulkan::PipelineCreater(device,material,sc_render_target); pipeline_creater->CloseCullFace(); pipeline_creater->Set(PRIM_TRIANGLES); diff --git a/res/shader/FlatTexture.vert b/res/shader/FlatTexture.vert index 124bf17b..83b58341 100644 --- a/res/shader/FlatTexture.vert +++ b/res/shader/FlatTexture.vert @@ -18,5 +18,5 @@ void main() { FragmentTexCoord=TexCoord; - gl_Position=vec4(Vertex,0.0,1.0)*world.mvp; + gl_Position=vec4(Vertex,0.0,1.0)*world.ortho; }