hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
hyzboy 2019-06-04 20:47:49 +08:00
parent a12e6cfb92
commit 2f8398b05d
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
example/Vulkan/CMakeLists.txt
View File

@ -1,14 +1,11 @@
macro(CreateProject name main_file) macro(CreateProject name)
add_executable(${name} ${main_file}.cpp) add_executable(${name} ${ARGN})
target_link_libraries(${name} ${ULRE}) target_link_libraries(${name} ${ULRE})
endmacro() endmacro()
add_library(TGATexture STATIC TGATexture.cpp) CreateProject(0.triangle main.cpp)
CreateProject(1.indices_rect indices_rect.cpp)
CreateProject(0.triangle main) CreateProject(2.texture_rect texture_rect.cpp TGATexture.cpp)
CreateProject(1.indices_rect indices_rect) CreateProject(3.Geometry2D Geometry2D.cpp)
CreateProject(2.texture_rect texture_rect) CreateProject(4.Geometry3D Geometry3D.cpp)
target_link_libraries(2.texture_rect TGATexture) CreateProject(5.LoadModel LoadModel.cpp)
CreateProject(3.Geometry2D Geometry2D)
CreateProject(4.Geometry3D Geometry3D)
CreateProject(5.LoadModel LoadModel)

1
inc/hgl/graph/Material.h
View File

@ -3,6 +3,7 @@
#include<hgl/graph/TextureType.h> #include<hgl/graph/TextureType.h>
#include<hgl/type/Color4f.h> #include<hgl/type/Color4f.h>
#include<hgl/type/Set.h>
namespace hgl namespace hgl
{ {
namespace graph namespace graph

8
src/SceneGraph/CMakeLists.txt
View File

@ -9,9 +9,10 @@
${ROOT_INCLUDE_PATH}/hgl/graph/VertexBufferCreater.h ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBufferCreater.h
${ROOT_INCLUDE_PATH}/hgl/graph/VertexBuffer.h ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBuffer.h
${ROOT_INCLUDE_PATH}/hgl/graph/InlineGeometry.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/Material.h
${ROOT_INCLUDE_PATH}/hgl/graph/TextureType.h ${ROOT_INCLUDE_PATH}/hgl/graph/TextureType.h
#${ROOT_INCLUDE_PATH}/hgl/graph/Spline.h
) )
SET(SCENE_GRAPH_SOURCE AABox.cpp SET(SCENE_GRAPH_SOURCE AABox.cpp
@ -22,8 +23,9 @@ SET(SCENE_GRAPH_SOURCE AABox.cpp
SceneOrient.cpp SceneOrient.cpp
InlineGeometry.cpp InlineGeometry.cpp
Material.cpp Material.cpp
Mesh.cpp #Mesh.cpp
SceneFile.cpp) #SceneFile.cpp
)
SOURCE_GROUP("Header Files" FILES ${SCENE_GRAPH_HEADER}) SOURCE_GROUP("Header Files" FILES ${SCENE_GRAPH_HEADER})
SOURCE_GROUP("Source Files" FILES ${SCENE_GRAPH_SOURCE}) SOURCE_GROUP("Source Files" FILES ${SCENE_GRAPH_SOURCE})

1
src/SceneGraph/Mesh.cpp
View File

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

6
src/Util/CMakeLists.txt
View File

@ -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/FieldType.h
${ROOT_INCLUDE_PATH}/hgl/db/Field.h) ${ROOT_INCLUDE_PATH}/hgl/db/Field.h)
SET(UTIL_SOURCE Field.cpp SET(UTIL_SOURCE #Field.cpp
FieldTypeConvert.h #FieldTypeConvert.h
FieldType.cpp #FieldType.cpp
JsonTool.cpp) JsonTool.cpp)
SOURCE_GROUP("Header Files" FILES ${UTIL_HEADER}) SOURCE_GROUP("Header Files" FILES ${UTIL_HEADER})