Example/Vulkan的CMAKE中宏支持多个参数

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)

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

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})

src/SceneGraph/Mesh.cpp

@@ -111,6 +111,7 @@ namespace hgl
 
                 md.va->SetIndex(face);
             }
+         
             else
             {
                 VB4u16 *face=new VB4u16(mfh.faces_number*3);

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})