Restored old script field names

Mag1str02 · Nov 22, 2024 · 8417c8f · 8417c8f
1 parent 939902b
commit 8417c8f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/DummyEditor/EditorLayer.cpp b/DummyEditor/EditorLayer.cpp
@@ -340,7 +340,7 @@ namespace DummyEngine {
             }
         }
         if (editor_camera_.Valid()) {
-            bool& active = editor_camera_.Get<ScriptComponent>()->GetField<bool>("active_");
+            bool& active = editor_camera_.Get<ScriptComponent>()->GetField<bool>("Active");
             if (input_state_ == InputState::ViewPort) {
                 active = true;
             } else {

diff --git a/DummyEditor/Scripts/EditorCameraController.cpp b/DummyEditor/Scripts/EditorCameraController.cpp
@@ -46,4 +46,4 @@ class EditorCameraController : public Script {
     bool active_ = false;
 };
 
-SCRIPT_BASE(EditorCameraController, FIELD(active_))
+SCRIPT_BASE(EditorCameraController, FIELD("Active", active_))
diff --git a/DummyEngine/Core/Scripting/Script.h b/DummyEngine/Core/Scripting/Script.h
@@ -147,9 +147,9 @@ namespace DummyEngine {
         m_Entity.Remove<T>();
     }
 
-#define FIELD(field)                                                                      \
+#define FIELD(field_name, field)                                                          \
     {                                                                                     \
-        #field, {                                                                         \
+        field_name, {                                                                     \
             TypeToScriptFieldType<decltype(field)>(), OffsetOf(&CurrentScriptType::field) \
         }                                                                                 \
     }

diff --git a/Sandbox/Assets/Scripts/BasicScripts/SquareMovement.cpp b/Sandbox/Assets/Scripts/BasicScripts/SquareMovement.cpp
@@ -31,4 +31,9 @@ class SquareMovement : public Script {
     Vec2  right_front_  = {0.0, 0.0};
 };
 
-SCRIPT_BASE(SquareMovement, FIELD(cycle_time_), FIELD(height_), FIELD(offset_), FIELD(left_back_), FIELD(right_front_))
+SCRIPT_BASE(SquareMovement,
+            FIELD("CycleTime", cycle_time_),
+            FIELD("Height", height_),
+            FIELD("Offset", offset_),
+            FIELD("LeftBack", left_back_),
+            FIELD("RightFront", right_front_))
diff --git a/Sandbox/Assets/Scripts/Gate/GateController.cpp b/Sandbox/Assets/Scripts/Gate/GateController.cpp
@@ -48,4 +48,9 @@ class GateController : public Script {
     Entity controller_;
 };
 
-SCRIPT_BASE(GateController, FIELD(speed_), FIELD(distance_), FIELD(open_height_), FIELD(close_height_), FIELD(controller_))
+SCRIPT_BASE(GateController,
+            FIELD("Speed", speed_),
+            FIELD("Distance", distance_),
+            FIELD("OpenHeight", open_height_),
+            FIELD("CloseHeight", close_height_),
+            FIELD("Controller", controller_))
diff --git a/Sandbox/Assets/Scripts/Gate/SinMovement.cpp b/Sandbox/Assets/Scripts/Gate/SinMovement.cpp
@@ -21,4 +21,4 @@ class SinMovement : public Script {
     float current_time_ = 0;
 };
 
-SCRIPT_BASE(SinMovement, FIELD(pos_a_), FIELD(pos_b_), FIELD(speed_))
+SCRIPT_BASE(SinMovement, FIELD("PosA", pos_a_), FIELD("PosB", pos_b_), FIELD("Speed", speed_))
diff --git a/Sandbox/Assets/Scripts/Grass/Grass.cpp b/Sandbox/Assets/Scripts/Grass/Grass.cpp
@@ -53,4 +53,4 @@ class Grass : public Script {
     Ref<Shader>      shader_;
 };
 
-SCRIPT_BASE(Grass, FIELD(camera_), FIELD(speed_))
+SCRIPT_BASE(Grass, FIELD("Camera", camera_), FIELD("Speed", speed_))
diff --git a/Sandbox/Assets/Scripts/Sky/SkyController.cpp b/Sandbox/Assets/Scripts/Sky/SkyController.cpp
@@ -32,4 +32,4 @@ class SkyContoller : public Script {
     float current_time_   = 0;
 };
 
-SCRIPT_BASE(SkyContoller, FIELD(rotation_speed_))
+SCRIPT_BASE(SkyContoller, FIELD("RotationSpeed", rotation_speed_))