feature(Things): change various variables in ::SetVariables/::GetVariables to be more intuitive

Also cleaned up some mistakes and whitespace stuff.

Author: Electron7-7

Editor/gui/imgui_editor.cpp

@@ -59,9 +59,8 @@ void ImGui_Editor::TheatreEntered()
         return;
     }
     TheatreFile::ThingData mat_dat{ThingType::Material, "ThingAdderSpawnLocation_Material"};
-    mat_dat.set_variable(true, "NoTexture");
     mat_dat.set_variable(glm::vec3{1.0f, 0.0f, 0.0f}, "Color");
-    mat_dat.set_variable(true, "mat_fullbright");
+    mat_dat.set_variable(true, "FullBright");
     sSpawnLocationMaterialID = g_pTheatreManager->CurrentTheatre()->CreateThing(mat_dat);
 
     TheatreFile::ThingData mesh_inst_dat{ThingType::MeshInstance3D,"ThingAdderSpawnLocation_MeshInstance"};

Nostalgia/core/bitmask.hpp

@@ -1,7 +1,6 @@
 #ifndef BIT_MASK_H
 #define BIT_MASK_H
 
-
 inline constinit const uint MaxBitMaskPlaces{30};
 
 struct BitMask

Nostalgia/theatre/things/resources/material.cpp

@@ -12,7 +12,7 @@ void Material::SetVariables(Farg<ThingData> data)
     data.get_variable(mAlpha, "Alpha");
     data.get_variable(mSpecularSharpness, "SpecularSharpness");
     data.get_variable(mSpecularStrength, "SpecularStrength");
-    data.get_variable(mFullBright, "FullBright", "mat_fullbright");
+    data.get_variable(mFullBright, "FullBright");
 }
 
 Shared<ThingData> Material::GetVariables() const

Nostalgia/theatre/things/thinkers/2d/camera_2d.cpp

@@ -26,8 +26,7 @@ void Camera2D::SetVariables(Farg<ThingData> data)
 
     if(int bitmask; data.get_variable(bitmask, "RenderLayersMask", "LayersMask") == OK)
         { mLayersMask.set(bitmask); }
-    data.get_variable(mZoom, "FOV");
-    data.get_variable(mViewportID, "Viewport", "ViewportID");
+    data.get_variable(mZoom, "Zoom");
     data.get_variable(mInitCurrent, "Current", "CurrentCamera", "IsCurrent");
 
     mVisible = mVisible and Settings::Engine::IsEditorHint;
@@ -38,8 +37,7 @@ Shared<ThingData> Camera2D::GetVariables() const
     Shared<ThingData> data{Actor2D::GetVariables()};
 
     data->set_variable(mLayersMask.get(), "RenderLayersMask");
-    data->set_variable(mZoom, "FOV");
-    data->set_variable(mViewportID, "Viewport");
+    data->set_variable(mZoom, "Zoom");
     data->set_variable(mInitCurrent, "Current");
     if(!mViewportID.invalid())
         { data->set_variable(mViewportID, "Parent"); }

Nostalgia/theatre/things/thinkers/3d/actor_3d.cpp

@@ -14,7 +14,8 @@ void Actor3D::SetVariables(Farg<ThingData> data)
         mLocalTransform.euler_rotation_radians = glm::radians(mLocalTransform.euler_rotation_degrees);
         mLocalTransform.quaternion = glm::normalize(glm::quat{mLocalTransform.euler_rotation_radians});
     }
-    if(data.get_variable(mLocalTransform.euler_rotation_radians, "Rotation", "Euler") == OK)
+    if(data.get_variable(mLocalTransform.euler_rotation_radians,
+        "Rotation", "RotationRadians", "Euler", "EulerRadians") == OK)
     {
         mLocalTransform.quaternion = glm::normalize(glm::quat{mLocalTransform.euler_rotation_radians});
         mLocalTransform.euler_rotation_degrees = glm::degrees(mLocalTransform.euler_rotation_radians);

Nostalgia/theatre/things/thinkers/3d/collider_3d.cpp

@@ -65,7 +65,6 @@ void Collider3D::SetVariables(Farg<ThingData> data)
     data.get_variable(mMotion, "Motion", "ColliderMotion", "BodyMotion");
     data.get_variable(mMass, "Mass", "ColliderMass", "BodyMass");
     data.get_variable(mMaterial.friction, "Friction", "ColliderFriction", "BodyFriction");
-    data.get_variable(mMaterial.friction, "Friction", "ColliderFriction", "BodyFriction");
     data.get_variable(mActivateOnNextChange, "StartActive", "Active");
     if(data.get_variable(mActivateOnNextChange, "StartInactive", "Inactive") == OK)
         { mActivateOnNextChange = true; }

Nostalgia/theatre/things/thinkers/3d/light_3d.cpp

@@ -69,9 +69,8 @@ void Light3D::SetVariables(Farg<ThingData> data)
     data.get_variable(mAttenuation, "FadeIntensity");
     data.get_variable(mAttenuation, "Attenuation");
     data.get_variable(mRange, "Range");
-    data.get_variable(mEnabled, "LightVisible");
-    data.get_variable(mEnabled, "Enabled");
-    if(data.get_variable(mEnabled, "Disabled") == OK)
+    data.get_variable(mEnabled, "LightVisible", "Enabled");
+    if(data.get_variable(mEnabled, "LightDisabled", "Disabled") == OK)
         { mEnabled = !mEnabled; }
 }
 
@@ -87,7 +86,6 @@ Shared<ThingData> Light3D::GetVariables() const
     data->set_variable(mAttenuation, "Attenuation");
     data->set_variable(mRange, "Range");
     data->set_variable(mEnabled, "LightVisible");
-    data->set_variable(mEnabled, "Enabled");
     data->set_variable(mVisible, "Visible");
 
     return data;
@@ -113,18 +111,14 @@ int SpotLight3D::GetCount()
 void SpotLight3D::SetVariables(Farg<ThingData> data)
 {
     Light3D::SetVariables(data);
-    data.get_variable(mSpotAngle, "Angle");
     data.get_variable(mSpotAngle, "SpotAngle");
-    data.get_variable(mSpotAngleFade, "AngleFade");
     data.get_variable(mSpotAngleFade, "SpotAngleFade");
 }
 
 Shared<ThingData> SpotLight3D::GetVariables() const
 {
     Shared<ThingData> data{Light3D::GetVariables()};
-    data->set_variable(mSpotAngle, "Angle");
     data->set_variable(mSpotAngle, "SpotAngle");
-    data->set_variable(mSpotAngleFade, "AngleFade");
     data->set_variable(mSpotAngleFade, "SpotAngleFade");
     return data;
 }
@@ -145,12 +139,14 @@ void DirectionalLight3D::SetVariables(Farg<ThingData> data)
     SetRotationDegrees({-90.0f, 0.0f, 0.0f});
     Light3D::SetVariables(data);
     mVisible = false;
+    data.get_variable(mVisible, "ShowDirectionalLightDebugMesh", "ShowLightMeshOverride");
 }
 
 Shared<ThingData> DirectionalLight3D::GetVariables() const
 {
     Shared<ThingData> data{Light3D::GetVariables()};
-    data->set_variable(false, "Visible");
+    if(mVisible)
+        { data->set_variable(mVisible, "ShowDirectionalLightDebugMesh"); }
     return data;
 }
 

Nostalgia/theatre/things/thinkers/3d/mesh_instance_3d.hpp

@@ -23,5 +23,4 @@ class MeshInstance3D : public Visual3D
     bool mWireframe{false};
 };
 
-
 #endif // MESH_INSTANCE_3D_H

Nostalgia/theatre/things/thinkers/3d/nostalgia_player_3d.cpp

@@ -8,25 +8,27 @@ using namespace TheatreFile;
 void NostalgiaPlayer3D::SetVariables(Farg<ThingData> data)
 {
     Actor3D::SetVariables(data);
+    data.get_variable(mCreateDefaultCamera, "NoDefaultCamera", "NoCamera");
 }
 
 Shared<ThingData> NostalgiaPlayer3D::GetVariables() const
 {
     Shared<ThingData> data{Actor3D::GetVariables()};
+    data->set_variable(mCreateDefaultCamera, "NoDefaultCamera");
     return data;
 }
 
 void NostalgiaPlayer3D::Ready()
 {
     Actor3D::Ready();
 
-    bool _has_camera{false};
     for(ID child : Children())
     {
         if(ThingFactory::IsDerivedFrom(my_theatre()->TypeOf(child), ThingType::Camera3D))
-            { _has_camera = true; }
+            { mCreateDefaultCamera = false; }
     }
-    if(!_has_camera)
+
+    if(mCreateDefaultCamera)
     {
         std::string cam_name{"DefaultPlayerCam"};
         if(!my_theatre()->ThingExists(cam_name))

Nostalgia/theatre/things/thinkers/3d/nostalgia_player_3d.hpp

@@ -12,6 +12,7 @@ class NostalgiaPlayer3D : public Actor3D
 
 protected:
     ID mCameraID{};
+    bool mCreateDefaultCamera{true};
 };
 
 #endif // NOSTALGIA_PLAYER_3D_H