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

redefine folder tree of material

Browse Source
This commit is contained in:
hyzboy 2020-01-09 17:40:39 +08:00
parent 93d680926e
commit e77cb00e89
7 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/hgl/graph/material/ComboMaterial.h Normal file
View File

@ -0,0 +1,3 @@
#ifndef HGL_GRAPH_COMBO_MATERIAL_INCLUDE
#define HGL_GRAPH_COMBO_MATERIAL_INCLUDE
#endif//HGL_GRAPH_COMBO_MATERIAL_INCLUDE

7
inc/hgl/graph/MaterialComponent.h → inc/hgl/graph/material/Component.h
View File

@ -3,8 +3,11 @@
#include<hgl/type/DataType.h> #include<hgl/type/DataType.h>
#define BEGIN_MATERIAL_NAMESPACE namespace hgl{namespace graph{namespace material{ #define BEGIN_MATERIAL_NAMESPACE namespace hgl{namespace graph{namespace material{
#define END_MATERIAL_NAMESPACE }}} #define END_MATERIAL_NAMESPACE }}}
#define MATERIAL_NAMESPACE hgl::graph::material
#define USING_MATERIAL_NAMESPACE using namespace MATERIAL_NAMESPACE;
BEGIN_MATERIAL_NAMESPACE BEGIN_MATERIAL_NAMESPACE
enum class Component enum class Component

4
inc/hgl/graph/Material.h → inc/hgl/graph/material/Material.h
View File

@ -1,7 +1,7 @@
#ifndef HGL_GRAPH_MATERIAL_INCLUDE #ifndef HGL_GRAPH_MATERIAL_INCLUDE
#define HGL_GRAPH_MATERIAL_INCLUDE #define HGL_GRAPH_MATERIAL_INCLUDE
#include<hgl/graph/MaterialComponent.h> #include<hgl/graph/material/Component.h>
BEGIN_MATERIAL_NAMESPACE BEGIN_MATERIAL_NAMESPACE
enum class BlendMode enum class BlendMode
{ {
@ -15,7 +15,7 @@ BEGIN_MATERIAL_NAMESPACE
BEGIN_RANGE =Opaque, BEGIN_RANGE =Opaque,
END_RANGE =PreMultiAlpha, END_RANGE =PreMultiAlpha,
RANGE_SIZE =END_RANGE-BEGIN_RANGE+1 RANGE_SIZE =END_RANGE-BEGIN_RANGE+1
};// };//enum class BlendMode
class Material class Material
{ {

0
inc/hgl/graph/MaterialData.h → inc/hgl/graph/material/MaterialData.h
View File

11
src/SceneGraph/CMakeLists.txt
View File

@ -1,10 +1,9 @@
SET(SG_MATERIAL_SOURCE ${ROOT_INCLUDE_PATH}/hgl/graph/MaterialComponent.h file(GLOB SG_MATERIAL_HEADER ${ROOT_INCLUDE_PATH}/hgl/graph/material/*.*)
${ROOT_INCLUDE_PATH}/hgl/graph/Material.h
MaterialComponent.cpp file(GLOB SG_MATERIAL_SOURCE material/*.*)
Material.cpp)
SOURCE_GROUP("Material" FILES ${SG_MATERIAL_SOURCE}) SOURCE_GROUP("Material" FILES ${SG_MATERIAL_HEADER}
${SG_MATERIAL_SOURCE})
SET(SG_VERTEX_SOURCE ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBufferCreater.h SET(SG_VERTEX_SOURCE ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBufferCreater.h
${ROOT_INCLUDE_PATH}/hgl/graph/VertexBuffer.h) ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBuffer.h)
@ -46,5 +45,7 @@ SOURCE_GROUP("Source Files" FILES ${SCENE_GRAPH_SOURCE})
add_cm_library(ULRE.SceneGraph "ULRE" ${SCENE_GRAPH_HEADER} add_cm_library(ULRE.SceneGraph "ULRE" ${SCENE_GRAPH_HEADER}
${SCENE_GRAPH_SOURCE} ${SCENE_GRAPH_SOURCE}
${SG_MATERIAL_HEADER}
${SG_MATERIAL_SOURCE} ${SG_MATERIAL_SOURCE}
${SG_VERTEX_SOURCE}) ${SG_VERTEX_SOURCE})

2
src/SceneGraph/Material.cpp → src/SceneGraph/material/Material.cpp
View File

@ -1,4 +1,4 @@
#include<hgl/graph/Material.h> #include<hgl/graph/material/Material.h>
#include<hgl/io/FileInputStream.h> #include<hgl/io/FileInputStream.h>
#include<hgl/io/DataInputStream.h> #include<hgl/io/DataInputStream.h>
#include<hgl/log/LogInfo.h> #include<hgl/log/LogInfo.h>

4
src/SceneGraph/MaterialComponent.cpp → src/SceneGraph/material/MaterialComponent.cpp
View File

@ -1,4 +1,4 @@
#include<hgl/graph/MaterialComponent.h> #include<hgl/graph/material/Component.h>
BEGIN_MATERIAL_NAMESPACE BEGIN_MATERIAL_NAMESPACE
namespace namespace
@ -35,7 +35,7 @@ BEGIN_MATERIAL_NAMESPACE
const ComponentConfig *GetConfig(const enum class Component c) const ComponentConfig *GetConfig(const enum class Component c)
{ {
if(c<=Component::BEGIN_RANGE if(c<=Component::BEGIN_RANGE
||c>=Component::END_RANGE)return(nullptr); ||c>=Component::END_RANGE)return(nullptr);
return material_component_config_list+(uint)c; return material_component_config_list+(uint)c;
} }