From f0512edb5aa46baff1321012d0af0fa50fb8a691 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 25 Mar 2025 02:19:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E5=AE=9A=E4=B9=89PrimitiveCo?= =?UTF-8?q?mponent=E7=94=A8=E4=BA=8E=E5=8F=96=E4=BB=A3=E5=8E=9F=E6=9C=ACSc?= =?UTF-8?q?eneNode=E4=B8=AD=E7=9A=84Renderable=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/hgl/component/Component.h | 11 ++++++++--- inc/hgl/component/PrimitiveComponent.h | 18 ++++++++++++++++++ inc/hgl/component/RenderComponent.h | 23 +++++++++++------------ inc/hgl/graph/VKRenderable.h | 1 + 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/inc/hgl/component/Component.h b/inc/hgl/component/Component.h index c2a3db5e..70982b57 100644 --- a/inc/hgl/component/Component.h +++ b/inc/hgl/component/Component.h @@ -4,8 +4,12 @@ #include #include -namespace hgl::graph -{ +#define COMPONENT_NAMESPACE hgl::graph +#define COMPONENT_NAMESPACE_BEGIN namespace COMPONENT_NAMESPACE { +#define COMPONENT_NAMESPACE_END } + +COMPONENT_NAMESPACE_BEGIN + class ComponentManager; class SceneNode; @@ -81,4 +85,5 @@ namespace hgl::graph virtual void OnFocusLost(){} ///<焦点丢失事件 virtual void OnFocusGained(){} ///<焦点获得事件 };//class ComponentManager -}//namespace hgl::graph + +COMPONENT_NAMESPACE_END diff --git a/inc/hgl/component/PrimitiveComponent.h b/inc/hgl/component/PrimitiveComponent.h index e69de29b..77b7543c 100644 --- a/inc/hgl/component/PrimitiveComponent.h +++ b/inc/hgl/component/PrimitiveComponent.h @@ -0,0 +1,18 @@ +#pragma once + +#include +#include + +COMPONENT_NAMESPACE_BEGIN + +class PrimitiveComponent:public RenderComponent +{ +public: + + PrimitiveComponent()=default; + virtual ~PrimitiveComponent()=default; + + Renderable *GetRenderable(); +};//class PrimitiveComponent + +COMPONENT_NAMESPACE_END diff --git a/inc/hgl/component/RenderComponent.h b/inc/hgl/component/RenderComponent.h index bf6a3cd4..98accf42 100644 --- a/inc/hgl/component/RenderComponent.h +++ b/inc/hgl/component/RenderComponent.h @@ -2,18 +2,17 @@ #include -namespace hgl::graph +COMPONENT_NAMESPACE_BEGIN + +/** +* 可渲染组件 +*/ +class RenderComponent: public Component { - /** - * 可渲染组件 - */ - class RenderComponent: public Component - { - public: +public: - RenderComponent()=default; - virtual ~RenderComponent()=default; + RenderComponent()=default; + virtual ~RenderComponent()=default; +};//class RenderComponent - virtual void Render()=0; - };//class RenderComponent -}//namespace hgl::graph +COMPONENT_NAMESPACE_END diff --git a/inc/hgl/graph/VKRenderable.h b/inc/hgl/graph/VKRenderable.h index 9d98b662..61f96d76 100644 --- a/inc/hgl/graph/VKRenderable.h +++ b/inc/hgl/graph/VKRenderable.h @@ -63,6 +63,7 @@ public: /** * 原始可渲染对象(即仅一个模型一个材质) +* 未来考虑改名StaticMesh哦! */ class Renderable ///可渲染对象实例 {