diff --git a/CMCore b/CMCore index 34eef8fd..6b4feef7 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 34eef8fdabd3fe392dcde0d07eab26538e096c77 +Subproject commit 6b4feef78efa3d185b6abeda049c6232d2da6a81 diff --git a/inc/hgl/graph/shader/ShaderResource.h b/inc/hgl/graph/shader/ShaderResource.h new file mode 100644 index 00000000..076dd0f3 --- /dev/null +++ b/inc/hgl/graph/shader/ShaderResource.h @@ -0,0 +1,15 @@ +#pragma once +#include + +namespace hgl +{ + namespace graph + { + class ShaderResource + { + public: + };//class ShaderResource + + ShaderResource *LoadShaderResoruce(const OSString &filename); + }//namespace graph +}//namespace hgl diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt index 03f8436d..b864ee9e 100644 --- a/src/SceneGraph/CMakeLists.txt +++ b/src/SceneGraph/CMakeLists.txt @@ -1,10 +1,17 @@ -file(GLOB SG_MATERIAL_HEADER ${ROOT_INCLUDE_PATH}/hgl/graph/material/*.*) +SET(SHADER_RESOURCE_FILES ${ROOT_INCLUDE_PATH}/hgl/graph/shader/ShaderResource.h + shader/ShaderResource.cpp) + + +file(GLOB SG_MATERIAL_HEADER ${ROOT_INCLUDE_PATH}/hgl/graph/material/*.*) file(GLOB SG_MATERIAL_SOURCE material/*.*) SOURCE_GROUP("Material" FILES ${SG_MATERIAL_HEADER} ${SG_MATERIAL_SOURCE}) +SOURCE_GROUP("Material\\Shader" FILES ${SHADER_RESOURCE_FILES}) + + SET(SG_VERTEX_SOURCE ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBufferCreater.h ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBuffer.h) @@ -39,6 +46,8 @@ SOURCE_GROUP("Source Files" FILES ${SCENE_GRAPH_SOURCE}) add_cm_library(ULRE.SceneGraph "ULRE" ${SCENE_GRAPH_HEADER} ${SCENE_GRAPH_SOURCE} + ${SHADER_RESOURCE_FILES} + ${SG_MATERIAL_HEADER} ${SG_MATERIAL_SOURCE} diff --git a/src/SceneGraph/shader/ShaderResource.cpp b/src/SceneGraph/shader/ShaderResource.cpp new file mode 100644 index 00000000..1f0f0435 --- /dev/null +++ b/src/SceneGraph/shader/ShaderResource.cpp @@ -0,0 +1,18 @@ +#include +#include + +namespace hgl +{ + namespace graph + { + ShaderResource *LoadShaderResoruce(const OSString &filename) + { + int64 filesize; + uint8 *filedata=(uint8 *)filesystem::LoadFileToMemory(filename,filesize); + + if(!filedata)return(nullptr); + + + } + }//namespace graph +}//namespace hgl