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

renamed to BaseColor instead Color in VAN.

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2022-10-12 16:30:15 +08:00
parent 1bc810d8e9
commit 2e6a8e794f
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/Vulkan/InstanceTriangle.cpp
View File

@ -57,7 +57,7 @@ private:
if(!primitive)return(false); if(!primitive)return(false);
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!primitive->Set(VAN::BaseColor, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data )))return(false);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline); render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(true); return(true);

2
example/Vulkan/RayPicking.cpp
View File

@ -107,7 +107,7 @@ private:
if(!ro_line)return(false); if(!ro_line)return(false);
if(!ro_line->Set(VAN::Position, vbo_pos=db->CreateVBO(VF_V3F,2,position_data )))return(false); if(!ro_line->Set(VAN::Position, vbo_pos=db->CreateVBO(VF_V3F,2,position_data )))return(false);
if(!ro_line->Set(VAN::Color, db->CreateVBO(VF_V4F,2,color_data)))return(false); if(!ro_line->Set(VAN::BaseColor, db->CreateVBO(VF_V4F,2,color_data )))return(false);
} }
return(true); return(true);

2
example/Vulkan/first_triangle.cpp
View File

@ -57,7 +57,7 @@ private:
if(!primitive)return(false); if(!primitive)return(false);
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!primitive->Set(VAN::BaseColor, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data )))return(false);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline); render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(true); return(true);

2
example/Vulkan/second_triangle.cpp
View File

@ -59,7 +59,7 @@ private:
if(!primitive)return(false); if(!primitive)return(false);
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!primitive->Set(VAN::BaseColor, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data )))return(false);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline); render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(true); return(true);

2
example/Vulkan/third_triangle.cpp
View File

@ -61,7 +61,7 @@ private:
if(!primitive)return(false); if(!primitive)return(false);
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!primitive->Set(VAN::BaseColor, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data )))return(false);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline); render_obj=db->CreateRenderable(primitive,material_instance,pipeline);

2
inc/hgl/graph/VertexAttribData.h
View File

@ -14,7 +14,7 @@ namespace hgl
#define VAN_DEFINE(name) constexpr char name[]=#name; #define VAN_DEFINE(name) constexpr char name[]=#name;
VAN_DEFINE(Position) VAN_DEFINE(Position)
VAN_DEFINE(Normal) VAN_DEFINE(Normal)
VAN_DEFINE(Color) VAN_DEFINE(BaseColor)
VAN_DEFINE(Tangent) VAN_DEFINE(Tangent)
VAN_DEFINE(Bitangent) VAN_DEFINE(Bitangent)
VAN_DEFINE(TexCoord) VAN_DEFINE(TexCoord)

10
src/SceneGraph/InlineGeometry.cpp
View File

@ -132,7 +132,7 @@ namespace hgl
} }
AutoDelete<VB2f> vertex=rc.CreateVADA<VB2f>(VAN::Position); AutoDelete<VB2f> vertex=rc.CreateVADA<VB2f>(VAN::Position);
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color); AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::BaseColor);
if(!vertex) if(!vertex)
return(nullptr); return(nullptr);
@ -186,7 +186,7 @@ namespace hgl
to(pgci->coord[0],pgci->coord[3],pos)); to(pgci->coord[0],pgci->coord[3],pos));
} }
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color); AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::BaseColor);
if(color) if(color)
{ {
for(uint row=0;row<=pgci->step.x;row++) for(uint row=0;row<=pgci->step.x;row++)
@ -323,7 +323,7 @@ namespace hgl
{ {
ENUM_CLASS_RANGE_ERROR_RETURN_NULLPTR(cci->color_type); ENUM_CLASS_RANGE_ERROR_RETURN_NULLPTR(cci->color_type);
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color); AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::BaseColor);
if(color) if(color)
{ {
@ -1151,7 +1151,7 @@ namespace hgl
return(nullptr); return(nullptr);
AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position); AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position);
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color); AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::BaseColor);
if(!vertex||!color) if(!vertex||!color)
return(nullptr); return(nullptr);
@ -1205,7 +1205,7 @@ namespace hgl
{ {
ENUM_CLASS_RANGE_ERROR_RETURN_NULLPTR(cci->color_type); ENUM_CLASS_RANGE_ERROR_RETURN_NULLPTR(cci->color_type);
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color); AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::BaseColor);
if(color) if(color)
{ {