From 2f8398b05dfada90fc0a3e8a6febf85d5aa4a25b Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Tue, 4 Jun 2019 20:47:49 +0800
Subject: [PATCH] =?UTF-8?q?Example/Vulkan=E7=9A=84CMAKE=E4=B8=AD=E5=AE=8F?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/Vulkan/CMakeLists.txt | 19 ++++++++-----------
 inc/hgl/graph/Material.h      |  1 +
 src/SceneGraph/CMakeLists.txt |  8 +++++---
 src/SceneGraph/Mesh.cpp       |  1 +
 src/Util/CMakeLists.txt       |  6 +++---
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/example/Vulkan/CMakeLists.txt b/example/Vulkan/CMakeLists.txt
index d4ff9dc4..b2918245 100644
--- a/example/Vulkan/CMakeLists.txt
+++ b/example/Vulkan/CMakeLists.txt
@@ -1,14 +1,11 @@
-macro(CreateProject name main_file)
-	add_executable(${name} ${main_file}.cpp)
+macro(CreateProject name)
+	add_executable(${name} ${ARGN})
 	target_link_libraries(${name} ${ULRE})
 endmacro()
 
-add_library(TGATexture STATIC TGATexture.cpp)
-
-CreateProject(0.triangle main)
-CreateProject(1.indices_rect indices_rect)
-CreateProject(2.texture_rect texture_rect)
-target_link_libraries(2.texture_rect TGATexture)
-CreateProject(3.Geometry2D Geometry2D)
-CreateProject(4.Geometry3D Geometry3D)
-CreateProject(5.LoadModel LoadModel)
+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.LoadModel LoadModel.cpp)
diff --git a/inc/hgl/graph/Material.h b/inc/hgl/graph/Material.h
index c67372fb..cfe39942 100644
--- a/inc/hgl/graph/Material.h
+++ b/inc/hgl/graph/Material.h
@@ -3,6 +3,7 @@
 
 #include<hgl/graph/TextureType.h>
 #include<hgl/type/Color4f.h>
+#include<hgl/type/Set.h>
 namespace hgl
 {
     namespace graph
diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt
index ecd127b2..4e4c5fe0 100644
--- a/src/SceneGraph/CMakeLists.txt
+++ b/src/SceneGraph/CMakeLists.txt
@@ -9,9 +9,10 @@
                         ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBufferCreater.h
                         ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBuffer.h
                         ${ROOT_INCLUDE_PATH}/hgl/graph/InlineGeometry.h
-                        ${ROOT_INCLUDE_PATH}/hgl/graph/Mesh.h
+                        #${ROOT_INCLUDE_PATH}/hgl/graph/Mesh.h
                         ${ROOT_INCLUDE_PATH}/hgl/graph/Material.h
                         ${ROOT_INCLUDE_PATH}/hgl/graph/TextureType.h
+						#${ROOT_INCLUDE_PATH}/hgl/graph/Spline.h
                         )
 
 SET(SCENE_GRAPH_SOURCE  AABox.cpp
@@ -22,8 +23,9 @@ SET(SCENE_GRAPH_SOURCE  AABox.cpp
                         SceneOrient.cpp
                         InlineGeometry.cpp
                         Material.cpp
-                        Mesh.cpp
-                        SceneFile.cpp)
+                        #Mesh.cpp
+                        #SceneFile.cpp
+						)
 
 SOURCE_GROUP("Header Files" FILES ${SCENE_GRAPH_HEADER})
 SOURCE_GROUP("Source Files" FILES ${SCENE_GRAPH_SOURCE})
diff --git a/src/SceneGraph/Mesh.cpp b/src/SceneGraph/Mesh.cpp
index e0679bac..adf6352e 100644
--- a/src/SceneGraph/Mesh.cpp
+++ b/src/SceneGraph/Mesh.cpp
@@ -111,6 +111,7 @@ namespace hgl
 
                 md.va->SetIndex(face);
             }
+         
             else
             {
                 VB4u16 *face=new VB4u16(mfh.faces_number*3);
diff --git a/src/Util/CMakeLists.txt b/src/Util/CMakeLists.txt
index 85a7ba3b..9d5712fb 100644
--- a/src/Util/CMakeLists.txt
+++ b/src/Util/CMakeLists.txt
@@ -2,9 +2,9 @@ SET(UTIL_HEADER ${ROOT_INCLUDE_PATH}/hgl/util/JsonTool.h
                 ${ROOT_INCLUDE_PATH}/hgl/db/FieldType.h
                 ${ROOT_INCLUDE_PATH}/hgl/db/Field.h)
 
-SET(UTIL_SOURCE Field.cpp
-                FieldTypeConvert.h
-                FieldType.cpp
+SET(UTIL_SOURCE #Field.cpp
+                #FieldTypeConvert.h
+                #FieldType.cpp
                 JsonTool.cpp)
 
 SOURCE_GROUP("Header Files" FILES ${UTIL_HEADER})