RigsOfRods · ohlidalp · Aug 28, 2022 · Aug 5, 2022 · Aug 11, 2022 · Aug 10, 2022
diff --git a/doc/angelscript/Script2Game/GameScriptClass.h b/doc/angelscript/Script2Game/GameScriptClass.h
diff --git a/resources/scripts/races.as b/resources/scripts/races.as
@@ -1051,12 +1051,12 @@ class racesManager {
 		}
 
 		if( this.raceList[this.currentRace].laps == this.LAPS_NoLaps )
-			game.UpdateDirectionArrow(this.raceList[this.currentRace].raceName+" checkpoint "+position+" / "+(this.raceList[this.currentRace].checkPointsCount-1), vector3(v[0], v[1], v[2]));
+			game.updateDirectionArrow(this.raceList[this.currentRace].raceName+" checkpoint "+position+" / "+(this.raceList[this.currentRace].checkPointsCount-1), vector3(v[0], v[1], v[2]));
 		else
 		{
 			if( position == 0 )
 				position = this.raceList[this.currentRace].checkPointsCount;
-			game.UpdateDirectionArrow(this.raceList[this.currentRace].raceName+" checkpoint "+position+" / "+(this.raceList[this.currentRace].checkPointsCount), vector3(v[0], v[1], v[2]));
+			game.updateDirectionArrow(this.raceList[this.currentRace].raceName+" checkpoint "+position+" / "+(this.raceList[this.currentRace].checkPointsCount), vector3(v[0], v[1], v[2]));
 		}
 	}
 

diff --git a/source/main/Application.cpp b/source/main/Application.cpp
@@ -60,7 +60,7 @@ static GUIManager*      g_gui_manager;
 static InputEngine*     g_input_engine;
 static CacheSystem*     g_cache_system;
 static MumbleIntegration* g_mumble;
-static TerrainManager*  g_sim_terrain;
+static Terrain*  g_sim_terrain;
 static ThreadPool*      g_thread_pool;
 static CameraManager*   g_camera_manager;
 static GfxScene         g_gfx_scene;
@@ -238,7 +238,7 @@ CVar* gfx_reduce_shadows;
 CVar* gfx_enable_rtshaders;
 
 // Instance management
-void SetSimTerrain     (TerrainManager* obj)          { g_sim_terrain = obj;}
+void SetSimTerrain     (Terrain* obj)          { g_sim_terrain = obj;}
 void SetCacheSystem    (CacheSystem* obj)             { g_cache_system = obj; }
 
 // Instance access
@@ -250,7 +250,7 @@ Console*               GetConsole            () { return &g_console;}
 InputEngine*           GetInputEngine        () { return g_input_engine;}
 CacheSystem*           GetCacheSystem        () { return g_cache_system;}
 MumbleIntegration*     GetMumble             () { return g_mumble; }
-TerrainManager*        GetSimTerrain         () { return g_sim_terrain; }
+Terrain*        GetSimTerrain         () { return g_sim_terrain; }
 ThreadPool*            GetThreadPool         () { return g_thread_pool; }
 CameraManager*         GetCameraManager      () { return g_camera_manager; }
 GfxScene*              GetGfxScene           () { return &g_gfx_scene; }

diff --git a/source/main/Application.h b/source/main/Application.h
@@ -442,7 +442,7 @@ Console*             GetConsole();
 InputEngine*         GetInputEngine();
 CacheSystem*         GetCacheSystem();
 MumbleIntegration*   GetMumble();
-TerrainManager*      GetSimTerrain();
+Terrain*      GetSimTerrain();
 ThreadPool*          GetThreadPool();
 CameraManager*       GetCameraManager();
 GfxScene*            GetGfxScene();
@@ -466,7 +466,7 @@ void CreateSoundScriptManager();
 void CreateScriptEngine();
 
 // Setters
-void SetSimTerrain           (TerrainManager*    obj);
+void SetSimTerrain           (Terrain*    obj);
 void SetCacheSystem          (CacheSystem*       obj);
 
 // Cleanups

diff --git a/source/main/CMakeLists.txt b/source/main/CMakeLists.txt
@@ -135,6 +135,7 @@ set(SOURCE_FILES
         gui/panels/GUI_MultiplayerClientList.{h,cpp}
         gui/panels/GUI_NodeBeamUtils.{h,cpp}
         gui/panels/GUI_SimActorStats.{h,cpp}
+        gui/panels/GUI_ScriptMonitor.{h,cpp}
         gui/panels/GUI_SimPerfStats.{h,cpp}
         gui/panels/GUI_SurveyMap.{h,cpp}
         gui/panels/GUI_VehicleDescription.{h,cpp}
@@ -198,8 +199,8 @@ set(SOURCE_FILES
         terrain/OgreTerrainPSSMMaterialGenerator.{h,cpp}
         terrain/TerrainEditor.{h,cpp}
         terrain/TerrainGeometryManager.{h,cpp}
-        terrain/TerrainManager.{h,cpp}
-        terrain/TerrainObjectManager.{h,cpp}
+        terrain/Terrain.{h,cpp}
+        terrain/TerrainObjectManager.{h,cpp}        
         threadpool/ThreadPool.h
         utils/ConfigFile.{h,cpp}
         utils/ErrorUtils.{h,cpp}
@@ -220,11 +221,18 @@ if (USE_ANGELSCRIPT)
     list(APPEND SOURCE_FILES
             scripting/GameScript.{h,cpp}
             scripting/LocalStorage.{h,cpp}
-            scripting/OgreAngelscript.cpp
-            scripting/ImGuiAngelscript.cpp
-            scripting/InputEngineAngelscript.cpp
             scripting/OgreScriptBuilder.{h,cpp}
             scripting/ScriptEngine.{h,cpp}
+            scripting/bindings/AngelScriptBindings.h
+            scripting/bindings/ActorAngelscript.cpp
+            scripting/bindings/ConsoleAngelscript.cpp
+            scripting/bindings/GameScriptAngelscript.cpp
+            scripting/bindings/ImGuiAngelscript.cpp
+            scripting/bindings/InputEngineAngelscript.cpp
+            scripting/bindings/LocalStorageAngelscript.cpp
+            scripting/bindings/OgreAngelscript.cpp
+            scripting/bindings/ScriptEventsAngelscript.cpp
+            scripting/bindings/VehicleAiAngelscript.cpp
             )
 endif ()
 
@@ -310,7 +318,6 @@ target_include_directories(${BINNAME} PRIVATE
         gfx/camera
         gfx/hydrax
         gfx/particle
-        gfx/procedural
         gfx/skyx
         gui
         gui/imgui
@@ -321,8 +328,6 @@ target_include_directories(${BINNAME} PRIVATE
         physics/air
         physics/collision
         physics/flex
-        physics/mplatform
-        physics/threading
         physics/utils
         physics/water
         resources
@@ -333,9 +338,8 @@ target_include_directories(${BINNAME} PRIVATE
         resources/terrn2_fileformat
         resources/tobj_fileformat
         system
-        rig_editor
-        rig_editor/rig_data
         scripting
+        scripting/bindings
         terrain
         terrain/map
         threadpool

diff --git a/source/main/ForwardDeclarations.h b/source/main/ForwardDeclarations.h
@@ -106,7 +106,7 @@ namespace RoR
     class  Task;
     class  TerrainEditor;
     class  TerrainGeometryManager;
-    class  TerrainManager;
+    class  Terrain;
     class  TerrainObjectManager;
     struct Terrn2Author;
     struct Terrn2Def;

diff --git a/source/main/GameContext.cpp b/source/main/GameContext.cpp
@@ -41,7 +41,7 @@
 #include "SkyManager.h"
 #include "SkyXManager.h"
 #include "SoundScriptManager.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "Utils.h"
 #include "VehicleAI.h"
 #include "GUI_VehicleButtons.h"
@@ -112,7 +112,7 @@ bool GameContext::LoadTerrain(std::string const& filename_part)
     App::GetCacheSystem()->LoadResource(*terrn_entry);
 
     // Perform the loading and setup
-    App::SetSimTerrain(TerrainManager::LoadAndPrepareTerrain(terrn_entry));
+    App::SetSimTerrain(RoR::Terrain::LoadAndPrepareTerrain(terrn_entry));
     if (!App::GetSimTerrain())
     {
         return false; // Message box already displayed

diff --git a/source/main/GameContext.h b/source/main/GameContext.h
@@ -65,7 +65,7 @@ typedef std::queue < Message, std::list<Message>> GameMsgQueue;
 
 /// Central game state manager.
 /// RoR's gameplay is quite simple in structure, it consists of:
-///  - static terrain:  static elevation map, managed by `TerrainManager`.
+///  - static terrain:  static elevation map, managed by `Terrain`.
 ///                     this includes static collision objects (or intrusion detection objects), managed by `TerrainObjectManager`.
 ///  - softbody actors: a.k.a "trucks" or "vehicles" (local or remote), managed by `ActorManager`. They collide with static terrain and each other.
 ///                     this includes 'fixes' - actors with partially fixed position.

diff --git a/source/main/gameplay/AutoPilot.cpp b/source/main/gameplay/AutoPilot.cpp
@@ -23,7 +23,7 @@
 #include "Application.h"
 #include "SimData.h"
 #include "SoundScriptManager.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "Water.h"
 
 using namespace Ogre;

diff --git a/source/main/gameplay/Character.cpp b/source/main/gameplay/Character.cpp
@@ -31,7 +31,7 @@
 #include "InputEngine.h"
 #include "MovableText.h"
 #include "Network.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "Utils.h"
 #include "Water.h"
 

diff --git a/source/main/gameplay/Landusemap.cpp b/source/main/gameplay/Landusemap.cpp
@@ -25,7 +25,7 @@
 #include "Console.h"
 #include "ErrorUtils.h"
 #include "Language.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #ifdef USE_PAGED
 #include "PropertyMaps.h"
 #include "PagedGeometry.h"

diff --git a/source/main/gameplay/ProceduralRoad.cpp b/source/main/gameplay/ProceduralRoad.cpp
@@ -23,7 +23,7 @@
 #include "Application.h"
 #include "Collisions.h"
 #include "GfxScene.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 
 using namespace Ogre;
 using namespace RoR;

diff --git a/source/main/gfx/DustPool.cpp b/source/main/gfx/DustPool.cpp
@@ -23,7 +23,7 @@
 #include <Ogre.h>
 
 #include "Application.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "Water.h"
 
 using namespace Ogre;

diff --git a/source/main/gfx/EnvironmentMap.cpp b/source/main/gfx/EnvironmentMap.cpp
@@ -25,7 +25,7 @@
 #include "GfxActor.h"
 #include "GfxScene.h"
 #include "SkyManager.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 
 #include <OgreOverlaySystem.h>
 #include <OgreOverlayManager.h>

diff --git a/source/main/gfx/GfxActor.cpp b/source/main/gfx/GfxActor.cpp
@@ -44,7 +44,7 @@
 #include "SlideNode.h"
 #include "SkyManager.h"
 #include "SoundScriptManager.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "TurboJet.h"
 #include "TurboProp.h"
 #include "Utils.h"

diff --git a/source/main/gfx/GfxScene.cpp b/source/main/gfx/GfxScene.cpp
@@ -35,7 +35,7 @@
 #include "SkyManager.h"
 #include "SkyXManager.h"
 #include "TerrainGeometryManager.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "TerrainObjectManager.h"
 #include "Utils.h"
 
@@ -140,7 +140,7 @@ void GfxScene::UpdateScene(float dt_sec)
     // Terrain - animated meshes and paged geometry
     App::GetSimTerrain()->getObjectManager()->UpdateTerrainObjects(dt_sec);
 
-    // Terrain - lightmap; TODO: ported as-is from TerrainManager::update(), is it needed? ~ only_a_ptr, 05/2018
+    // Terrain - lightmap; TODO: ported as-is from Terrain::update(), is it needed? ~ only_a_ptr, 05/2018
     App::GetSimTerrain()->getGeometryManager()->UpdateMainLightPosition(); // TODO: Is this necessary? I'm leaving it here just in case ~ only_a_ptr, 04/2017
 
     // Terrain - water

diff --git a/source/main/gfx/HydraxWater.cpp b/source/main/gfx/HydraxWater.cpp
@@ -24,7 +24,7 @@
 #include "CameraManager.h"
 #include "GfxScene.h"
 #include "SkyManager.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 
 #ifdef USE_CAELUM
 #include <Caelum.h>

diff --git a/source/main/gfx/SkyManager.cpp b/source/main/gfx/SkyManager.cpp
@@ -26,7 +26,7 @@
 #include "AppContext.h"
 #include "CameraManager.h"
 #include "GfxScene.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "TerrainGeometryManager.h"
 
 #include <Caelum.h>

diff --git a/source/main/gfx/SkyXManager.cpp b/source/main/gfx/SkyXManager.cpp
@@ -25,7 +25,7 @@
 #include "CameraManager.h"
 #include "GfxScene.h"
 #include "HydraxWater.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "TerrainGeometryManager.h"
 
 using namespace Ogre;

diff --git a/source/main/gfx/SurveyMapTextureCreator.cpp b/source/main/gfx/SurveyMapTextureCreator.cpp
@@ -23,7 +23,7 @@
 #include "Application.h"
 #include "GfxScene.h"
 #include "IWater.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 
 using namespace Ogre;
 using namespace RoR;

diff --git a/source/main/gfx/Water.cpp b/source/main/gfx/Water.cpp
@@ -25,7 +25,7 @@
 #include "CameraManager.h"
 #include "GfxScene.h"
 #include "PlatformUtils.h" // PathCombine
-#include "TerrainManager.h"
+#include "Terrain.h"
 
 #include <Ogre.h>
 

diff --git a/source/main/gfx/camera/CameraManager.cpp b/source/main/gfx/camera/CameraManager.cpp
@@ -34,7 +34,7 @@
 #include "Language.h"
 #include "OverlayWrapper.h"
 #include "Replay.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "GUIManager.h"
 #include "PerVehicleCameraContext.h"
 #include "Water.h"

diff --git a/source/main/gui/GUIManager.cpp b/source/main/gui/GUIManager.cpp
@@ -37,7 +37,7 @@
 #include "OverlayWrapper.h"
 #include "PlatformUtils.h"
 #include "RTTLayer.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 
 #include <OgreOverlayElement.h>
 #include <OgreOverlayContainer.h>

diff --git a/source/main/gui/OverlayWrapper.cpp b/source/main/gui/OverlayWrapper.cpp
@@ -45,7 +45,7 @@
 #include "RoRVersion.h"
 #include "ScrewProp.h"
 #include "SoundScriptManager.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "TurboProp.h"
 #include "Utils.h"
 

diff --git a/source/main/gui/panels/GUI_ConsoleWindow.cpp b/source/main/gui/panels/GUI_ConsoleWindow.cpp
@@ -89,6 +89,14 @@ void ConsoleWindow::Draw()
             ImGui::Columns(1); // reset
             ImGui::EndMenu();
         }
+        ImGui::SetNextWindowSize(ImVec2(0.f, 0.f)); // reset to auto-fit
+
+        if (ImGui::BeginMenu(_LC("Console", "Script Monitor")))
+        {
+            ImGui::Dummy(ImVec2(340.f, 1.f)); // Manually resize width (DearIMGUI bug workaround)
+            m_script_monitor.Draw();
+            ImGui::EndMenu();
+        }
 #endif
         ImGui::EndMenuBar();
     }

diff --git a/source/main/gui/panels/GUI_ConsoleWindow.h b/source/main/gui/panels/GUI_ConsoleWindow.h
@@ -29,6 +29,7 @@
 #include "GUI_ConsoleView.h"
 #include "OgreImGui.h"
 #include "GUI_AngelScriptExamples.h"
+#include "GUI_ScriptMonitor.h"
 
 #include <vector>
 #include <string>
@@ -51,17 +52,22 @@ class ConsoleWindow
 
 private:
 
-    AngelScriptExamples m_angelscript_examples;
-
     static int TextEditCallback(ImGuiTextEditCallbackData *data);
     void TextEditCallbackProc(ImGuiTextEditCallbackData *data);
 
+    // Window state
+    bool                     m_is_visible = false;
+    bool                     m_is_hovered = false;
+
+    // Special panels
+    AngelScriptExamples      m_angelscript_examples;
+    ScriptMonitor            m_script_monitor;
+
+    // Console context
     ConsoleView              m_console_view;
     Str<500>                 m_cmd_buffer;
     std::vector<std::string> m_cmd_history;
     int                      m_cmd_history_cursor = -1;
-    bool                     m_is_visible = false;
-    bool                     m_is_hovered = false;
 };
 
 } // namespace GUI

diff --git a/source/main/gui/panels/GUI_FrictionSettings.cpp b/source/main/gui/panels/GUI_FrictionSettings.cpp
@@ -33,7 +33,7 @@
 #include "GameContext.h"
 #include "GUIManager.h"
 #include "Language.h"
-#include "TerrainManager.h"
+#include "Terrain.h"
 #include "Utils.h"
 
 using namespace RoR;