diff --git a/example/Gizmo/Gizmo.h b/example/Gizmo/Gizmo.h index 8a595dd8..fab5108b 100644 --- a/example/Gizmo/Gizmo.h +++ b/example/Gizmo/Gizmo.h @@ -20,14 +20,14 @@ enum class GizmoColor:uint enum class GizmoShape:uint { - Plane=0, //平面 + Square=0, //方块 Cube, //立方体 Sphere, //球 Cone, //圆锥 Cylinder, //圆柱 Torus, //圆环 - ENUM_CLASS_RANGE(Plane,Torus) + ENUM_CLASS_RANGE(Square,Torus) }; bool InitGizmoResource(RenderResource *); diff --git a/example/Gizmo/Gizmo3DMove.cpp b/example/Gizmo/Gizmo3DMove.cpp index 3a8c1903..ea3faf0b 100644 --- a/example/Gizmo/Gizmo3DMove.cpp +++ b/example/Gizmo/Gizmo3DMove.cpp @@ -61,9 +61,9 @@ bool InitGizmoMoveStaticMesh() Renderable *plane[3]= { - GetGizmoRenderable(GizmoShape::Plane,GizmoColor::Red), - GetGizmoRenderable(GizmoShape::Plane,GizmoColor::Green), - GetGizmoRenderable(GizmoShape::Plane,GizmoColor::Blue) + GetGizmoRenderable(GizmoShape::Square,GizmoColor::Red), + GetGizmoRenderable(GizmoShape::Square,GizmoColor::Green), + GetGizmoRenderable(GizmoShape::Square,GizmoColor::Blue) }; if(!sphere) diff --git a/example/Gizmo/Gizmo3DScale.cpp b/example/Gizmo/Gizmo3DScale.cpp index cfbf6669..2d604724 100644 --- a/example/Gizmo/Gizmo3DScale.cpp +++ b/example/Gizmo/Gizmo3DScale.cpp @@ -59,11 +59,11 @@ bool InitGizmoScaleStaticMesh() GetGizmoRenderable(GizmoShape::Cube,GizmoColor::Blue), }; - Renderable *plane[3]= + Renderable *square[3]= { - GetGizmoRenderable(GizmoShape::Plane,GizmoColor::Red), - GetGizmoRenderable(GizmoShape::Plane,GizmoColor::Green), - GetGizmoRenderable(GizmoShape::Plane,GizmoColor::Blue) + GetGizmoRenderable(GizmoShape::Square,GizmoColor::Red), + GetGizmoRenderable(GizmoShape::Square,GizmoColor::Green), + GetGizmoRenderable(GizmoShape::Square,GizmoColor::Blue) }; if(!center_cube) @@ -77,7 +77,7 @@ bool InitGizmoScaleStaticMesh() if(!cube[i]) return(false); - if(!plane[i]) + if(!square[i]) return(false); } @@ -104,7 +104,7 @@ bool InitGizmoScaleStaticMesh() tm.SetScale(plane_scale); tm.SetTranslation(GIZMO_TWO_AXIS_OFFSET,GIZMO_TWO_AXIS_OFFSET,0); - root_node->CreateSubNode(tm,plane[2]); + root_node->CreateSubNode(tm,square[2]); } { @@ -119,7 +119,7 @@ bool InitGizmoScaleStaticMesh() tm.SetScale(plane_scale); tm.SetTranslation(0,GIZMO_TWO_AXIS_OFFSET,GIZMO_TWO_AXIS_OFFSET); - root_node->CreateSubNode(tm,plane[0]); + root_node->CreateSubNode(tm,square[0]); } { @@ -135,7 +135,7 @@ bool InitGizmoScaleStaticMesh() tm.SetScale(plane_scale); tm.SetTranslation(GIZMO_TWO_AXIS_OFFSET,0,GIZMO_TWO_AXIS_OFFSET); - root_node->CreateSubNode(tm,plane[1]); + root_node->CreateSubNode(tm,square[1]); } } diff --git a/example/Gizmo/GizmoResource.cpp b/example/Gizmo/GizmoResource.cpp index 68e85448..734fe518 100644 --- a/example/Gizmo/GizmoResource.cpp +++ b/example/Gizmo/GizmoResource.cpp @@ -190,7 +190,7 @@ namespace using namespace inline_geometry; { - InitGizmoRenderable(GizmoShape::Plane,CreatePlane(gizmo_triangle.prim_creater),gizmo_triangle.pipeline); + InitGizmoRenderable(GizmoShape::Square,CreatePlaneSqaure(gizmo_triangle.prim_creater),gizmo_triangle.pipeline); } { diff --git a/example/Gizmo/MetricCellsGrid.cpp b/example/Gizmo/MetricCellsGrid.cpp index bf82df8e..57b47bd3 100644 --- a/example/Gizmo/MetricCellsGrid.cpp +++ b/example/Gizmo/MetricCellsGrid.cpp @@ -85,7 +85,7 @@ private: { PrimitiveCreater pc(device,material->GetDefaultVIL()); - ro_plane=inline_geometry::CreatePlane(&pc); + ro_plane=inline_geometry::CreatePlaneSqaure(&pc); if(ro_plane) db->Add(ro_plane); diff --git a/inc/hgl/graph/InlineGeometry.h b/inc/hgl/graph/InlineGeometry.h index 201be5f1..87cf4b54 100644 --- a/inc/hgl/graph/InlineGeometry.h +++ b/inc/hgl/graph/InlineGeometry.h @@ -83,9 +83,9 @@ namespace hgl Primitive *CreatePlaneGrid3D(PrimitiveCreater *pc,const PlaneGridCreateInfo *pgci); /** - * 创建一个平面(三角形) + * 创建一个平面正方形(三角形) */ - Primitive *CreatePlane(PrimitiveCreater *pc); + Primitive *CreatePlaneSqaure(PrimitiveCreater *pc); struct CubeCreateInfo { diff --git a/src/SceneGraph/InlineGeometry.cpp b/src/SceneGraph/InlineGeometry.cpp index 88456442..c9b4ac0c 100644 --- a/src/SceneGraph/InlineGeometry.cpp +++ b/src/SceneGraph/InlineGeometry.cpp @@ -268,7 +268,7 @@ namespace hgl return pc->Create(); } - Primitive *CreatePlane(PrimitiveCreater *pc) + Primitive *CreatePlaneSqaure(PrimitiveCreater *pc) { const float xy_vertices [] = { -0.5f,-0.5f,0.0f, +0.5f,-0.5f,0.0f, +0.5f,+0.5f,0.0f, -0.5f,+0.5f,0.0f }; float xy_tex_coord[] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f };