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

removed VertexColor2D.h

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-05-16 15:27:51 +08:00
parent 35844d52bc
commit c8dbd40333
7 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/Vulkan/first_triangle.cpp
View File

@ -8,7 +8,7 @@
#include<hgl/graph/SceneInfo.h>
#include<hgl/graph/VKVertexInputConfig.h>
#include<hgl/graph/VKRenderablePrimitiveCreater.h>
#include<hgl/graph/mtl/2d/VertexColor2D.h>
#include<hgl/graph/mtl/2d/Material2DConfig.h>
using namespace hgl;
using namespace hgl::graph;

2
example/Vulkan/second_triangle.cpp
View File

@ -6,7 +6,7 @@
#include<hgl/filesystem/FileSystem.h>
#include<hgl/graph/SceneInfo.h>
#include<hgl/graph/VKRenderablePrimitiveCreater.h>
#include<hgl/graph/mtl/2d/VertexColor2D.h>
#include<hgl/graph/mtl/2d/Material2DConfig.h>
using namespace hgl;
using namespace hgl::graph;

2
example/Vulkan/third_triangle.cpp
View File

@ -5,7 +5,7 @@
#include<hgl/math/Math.h>
#include<hgl/filesystem/FileSystem.h>
#include<hgl/graph/VKRenderablePrimitiveCreater.h>
#include<hgl/graph/mtl/2d/VertexColor2D.h>
#include<hgl/graph/mtl/2d/Material2DConfig.h>
#include<hgl/graph/RenderList.h>
using namespace hgl;

4
inc/hgl/graph/VKDeviceCreater.h
View File

@ -174,7 +174,7 @@ public:
const int Find(const VkFormat fmt)const
{
for(int i=0;i<count;i++)
for(uint i=0;i<count;i++)
if(fmt==formats[i])
return i;
@ -192,7 +192,7 @@ public:
const int Find(const VkColorSpaceKHR cs)const
{
for(int i=0;i<count;i++)
for(uint i=0;i<count;i++)
if(cs==colorspaces[i])
return i;

2
inc/hgl/graph/mtl/2d/Material2DConfig.h
View File

@ -23,5 +23,7 @@ public:
local_to_world=false;
}
};//struct Material2DConfig:public MaterialConfig
MaterialCreateInfo *CreateVertexColor2D(const Material2DConfig *);
STD_MTL_NAMESPACE_END
#endif//HGL_GRAPH_MTL_2D_CONFIG_INCLUDE

9
inc/hgl/graph/mtl/2d/VertexColor2D.h
View File

@ -1,9 +0,0 @@
#ifndef HGL_GRAPH_MTL_2D_VERTEX2D_INCLUDE
#define HGL_GRAPH_MTL_2D_VERTEX2D_INCLUDE
#include<hgl/graph/mtl/2d/Material2DConfig.h>
STD_MTL_NAMESPACE_BEGIN
MaterialCreateInfo *CreateVertexColor2D(const Material2DConfig *);
STD_MTL_NAMESPACE_END
#endif//HGL_GRAPH_MTL_2D_VERTEX2D_INCLUDE

1
src/ShaderGen/CMakeLists.txt
View File

@ -47,7 +47,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
SET(STD_MTL_2D_HEADER_PATH ${STD_MTL_HEADER_PATH}/2d)
SET(STD_MTL_2D_SOURCE_FILES ${STD_MTL_2D_HEADER_PATH}/Material2DConfig.h
${STD_MTL_2D_HEADER_PATH}/VertexColor2D.h
2d/Std2DMaterial.h
2d/Std2DMaterial.cpp
2d/VertexColor2D.cpp)