From 2e6a8e794fd47513c62415e7c43fcce0847b7b7c Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Wed, 12 Oct 2022 16:30:15 +0800 Subject: [PATCH] renamed to BaseColor instead Color in VAN. --- example/Vulkan/InstanceTriangle.cpp | 4 ++-- example/Vulkan/RayPicking.cpp | 4 ++-- example/Vulkan/first_triangle.cpp | 4 ++-- example/Vulkan/second_triangle.cpp | 4 ++-- example/Vulkan/third_triangle.cpp | 4 ++-- inc/hgl/graph/VertexAttribData.h | 2 +- src/SceneGraph/InlineGeometry.cpp | 10 +++++----- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/example/Vulkan/InstanceTriangle.cpp b/example/Vulkan/InstanceTriangle.cpp index 933c21a2..fb7d6f69 100644 --- a/example/Vulkan/InstanceTriangle.cpp +++ b/example/Vulkan/InstanceTriangle.cpp @@ -56,8 +56,8 @@ private: Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); if(!primitive)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::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_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); return(true); diff --git a/example/Vulkan/RayPicking.cpp b/example/Vulkan/RayPicking.cpp index 554f127f..3b550ee9 100644 --- a/example/Vulkan/RayPicking.cpp +++ b/example/Vulkan/RayPicking.cpp @@ -106,8 +106,8 @@ private: ro_line=db->CreatePrimitive(2); 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::Color, db->CreateVBO(VF_V4F,2,color_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::BaseColor, db->CreateVBO(VF_V4F,2,color_data )))return(false); } return(true); diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index d45528e1..c3aefaea 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -56,8 +56,8 @@ private: Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); if(!primitive)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::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_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); return(true); diff --git a/example/Vulkan/second_triangle.cpp b/example/Vulkan/second_triangle.cpp index 5ee0e69b..72adf512 100644 --- a/example/Vulkan/second_triangle.cpp +++ b/example/Vulkan/second_triangle.cpp @@ -58,8 +58,8 @@ private: Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); if(!primitive)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::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_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); return(true); diff --git a/example/Vulkan/third_triangle.cpp b/example/Vulkan/third_triangle.cpp index 4ab41f71..a210d2a3 100644 --- a/example/Vulkan/third_triangle.cpp +++ b/example/Vulkan/third_triangle.cpp @@ -60,8 +60,8 @@ private: Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); if(!primitive)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::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_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); diff --git a/inc/hgl/graph/VertexAttribData.h b/inc/hgl/graph/VertexAttribData.h index 64aee685..8af90276 100644 --- a/inc/hgl/graph/VertexAttribData.h +++ b/inc/hgl/graph/VertexAttribData.h @@ -14,7 +14,7 @@ namespace hgl #define VAN_DEFINE(name) constexpr char name[]=#name; VAN_DEFINE(Position) VAN_DEFINE(Normal) - VAN_DEFINE(Color) + VAN_DEFINE(BaseColor) VAN_DEFINE(Tangent) VAN_DEFINE(Bitangent) VAN_DEFINE(TexCoord) diff --git a/src/SceneGraph/InlineGeometry.cpp b/src/SceneGraph/InlineGeometry.cpp index 93ce1768..50841c61 100644 --- a/src/SceneGraph/InlineGeometry.cpp +++ b/src/SceneGraph/InlineGeometry.cpp @@ -132,7 +132,7 @@ namespace hgl } AutoDelete vertex=rc.CreateVADA(VAN::Position); - AutoDelete color=rc.CreateVADA(VAN::Color); + AutoDelete color=rc.CreateVADA(VAN::BaseColor); if(!vertex) return(nullptr); @@ -186,7 +186,7 @@ namespace hgl to(pgci->coord[0],pgci->coord[3],pos)); } - AutoDelete color=rc.CreateVADA(VAN::Color); + AutoDelete color=rc.CreateVADA(VAN::BaseColor); if(color) { for(uint row=0;row<=pgci->step.x;row++) @@ -323,7 +323,7 @@ namespace hgl { ENUM_CLASS_RANGE_ERROR_RETURN_NULLPTR(cci->color_type); - AutoDelete color=rc.CreateVADA(VAN::Color); + AutoDelete color=rc.CreateVADA(VAN::BaseColor); if(color) { @@ -1151,7 +1151,7 @@ namespace hgl return(nullptr); AutoDelete vertex=rc.CreateVADA(VAN::Position); - AutoDelete color=rc.CreateVADA(VAN::Color); + AutoDelete color=rc.CreateVADA(VAN::BaseColor); if(!vertex||!color) return(nullptr); @@ -1205,7 +1205,7 @@ namespace hgl { ENUM_CLASS_RANGE_ERROR_RETURN_NULLPTR(cci->color_type); - AutoDelete color=rc.CreateVADA(VAN::Color); + AutoDelete color=rc.CreateVADA(VAN::BaseColor); if(color) {