unify component definition class naming style (#156)

BoomingTech · May 1, 2022 · 3bf4b10 · 3bf4b10
1 parent 949fe57
commit 3bf4b10
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 26 deletions.
diff --git a/engine/source/runtime/function/framework/component/motor/motor_component.cpp b/engine/source/runtime/function/framework/component/motor/motor_component.cpp
@@ -16,7 +16,7 @@
 
 namespace Pilot
 {
-    MotorComponent::MotorComponent(const MotorRes& motor_param, GObject* parent_object) :
+    MotorComponent::MotorComponent(const MotorComponentRes& motor_param, GObject* parent_object) :
         Component(parent_object), m_motor_res(motor_param)
     {
         if (motor_param.m_controller_config.getTypeName() == "PhysicsControllerConfig")

diff --git a/engine/source/runtime/function/framework/component/motor/motor_component.h b/engine/source/runtime/function/framework/component/motor/motor_component.h
@@ -26,7 +26,7 @@ namespace Pilot
         REFLECTION_BODY(MotorComponent)
     public:
         MotorComponent() {}
-        MotorComponent(const MotorRes& motor_param, GObject* parent_object);
+        MotorComponent(const MotorComponentRes& motor_param, GObject* parent_object);
 
         ~MotorComponent() override;
 
@@ -47,7 +47,7 @@ namespace Pilot
         void calculateTargetPosition(const Vector3&& current_position);
 
         META(Enable)
-        MotorRes m_motor_res;
+        MotorComponentRes m_motor_res;
 
         float m_move_speed_ratio {0.f};
         float m_vertical_move_speed {0.f};

diff --git a/engine/source/runtime/function/framework/component/rigidbody/rigidbody_component.cpp b/engine/source/runtime/function/framework/component/rigidbody/rigidbody_component.cpp
@@ -8,7 +8,7 @@
 
 namespace Pilot
 {
-    RigidBodyComponent::RigidBodyComponent(const RigidBodyActorRes& rigidbody_ast, GObject* parent_object) :
+    RigidBodyComponent::RigidBodyComponent(const RigidBodyComponentRes& rigidbody_ast, GObject* parent_object) :
         Component(parent_object)
     {
         const TransformComponent* parent_transform = m_parent_object->tryGetComponentConst(TransformComponent);

diff --git a/engine/source/runtime/function/framework/component/rigidbody/rigidbody_component.h b/engine/source/runtime/function/framework/component/rigidbody/rigidbody_component.h
@@ -15,7 +15,7 @@ namespace Pilot
         PhysicsActor* m_physics_actor {nullptr};
 
         RigidBodyComponent() {}
-        RigidBodyComponent(const RigidBodyActorRes& rigidbody_ast, GObject* parent_object);
+        RigidBodyComponent(const RigidBodyComponentRes& rigidbody_ast, GObject* parent_object);
         ~RigidBodyComponent() override;
 
         void tick(float delta_time) override {}

diff --git a/engine/source/runtime/function/physics/physics_system.cpp b/engine/source/runtime/function/physics/physics_system.cpp
@@ -51,7 +51,7 @@ namespace Pilot
 
     PhysicsActor* PhysicsSystem::createPhysicsActor(GObject*                 gobject,
                                                     const Transform&         global_transform,
-                                                    const RigidBodyActorRes& rigid_body_actor_res)
+                                                    const RigidBodyComponentRes& rigid_body_actor_res)
     {
         PhysicsActor* actor = new PhysicsActor(gobject, global_transform);
 

diff --git a/engine/source/runtime/function/physics/physics_system.h b/engine/source/runtime/function/physics/physics_system.h
@@ -22,7 +22,7 @@ namespace Pilot
 
         PhysicsActor* createPhysicsActor(GObject*                 gobject,
                                          const Transform&         global_transform,
-                                         const RigidBodyActorRes& rigid_body_actor_res);
+                                         const RigidBodyComponentRes& rigid_body_actor_res);
         void          removePhyicsActor(PhysicsActor* gobject);
 
         bool raycast(const Vector3& ray_start, const Vector3& ray_direction, Vector3& out_hit_position);

diff --git a/engine/source/runtime/resource/asset_manager/asset_manager.cpp b/engine/source/runtime/resource/asset_manager/asset_manager.cpp
@@ -20,9 +20,9 @@ namespace Pilot
         REGISTER_COMPONENT(AnimationComponent, AnimationComponentRes, false);
         REGISTER_COMPONENT(TransformComponent, Transform, false);
         REGISTER_COMPONENT(MeshComponent, MeshComponentRes, true);
-        REGISTER_COMPONENT(RigidBodyComponent, RigidBodyActorRes, false);
+        REGISTER_COMPONENT(RigidBodyComponent, RigidBodyComponentRes, false);
         REGISTER_COMPONENT(CameraComponent, CameraComponentRes, false);
-        REGISTER_COMPONENT(MotorComponent, MotorRes, false);
+        REGISTER_COMPONENT(MotorComponent, MotorComponentRes, false);
     }
 
     std::filesystem::path AssetManager::getFullPath(const std::string& relative_path) const

diff --git a/engine/source/runtime/resource/res_type/components/animation.h b/engine/source/runtime/resource/res_type/components/animation.h
@@ -41,14 +41,4 @@ namespace Pilot
         AnimationResult animation_result;
     };
 
-    REFLECTION_TYPE(AnimationComponents)
-    CLASS(AnimationComponents, Fields)
-    {
-        REFLECTION_BODY(AnimationComponents);
-
-    public:
-        std::string                        schemaFile;
-        std::vector<AnimationComponentRes> components;
-    };
-
 } // namespace Pilot
diff --git a/engine/source/runtime/resource/res_type/components/motor.h b/engine/source/runtime/resource/res_type/components/motor.h
@@ -33,13 +33,13 @@ namespace Pilot
         Capsule m_capsule_shape;
     };
 
-    REFLECTION_TYPE(MotorRes)
-    CLASS(MotorRes, WhiteListFields)
+    REFLECTION_TYPE(MotorComponentRes)
+    CLASS(MotorComponentRes, WhiteListFields)
     {
-        REFLECTION_BODY(MotorRes);
+        REFLECTION_BODY(MotorComponentRes);
 
     public:
-        ~MotorRes() { PILOT_REFLECTION_DELETE(m_controller_config); }
+        ~MotorComponentRes() { PILOT_REFLECTION_DELETE(m_controller_config); }
 
         ControllerType m_controller_type {ControllerType::none};
 

diff --git a/engine/source/runtime/resource/res_type/components/rigid_body.h b/engine/source/runtime/resource/res_type/components/rigid_body.h
@@ -34,10 +34,10 @@ namespace Pilot
         ~RigidBodyShape() { PILOT_REFLECTION_DELETE(m_geometry); }
     };
 
-    REFLECTION_TYPE(RigidBodyActorRes)
-    CLASS(RigidBodyActorRes, Fields)
+    REFLECTION_TYPE(RigidBodyComponentRes)
+    CLASS(RigidBodyComponentRes, Fields)
     {
-        REFLECTION_BODY(RigidBodyActorRes);
+        REFLECTION_BODY(RigidBodyComponentRes);
 
     public:
         std::vector<RigidBodyShape> m_shapes;