Removed a bunch of unused (or barely used) dependencies between addons and features.

fLindahl · fLindahl · commit c1a0e471af72 · 2025-08-28T20:47:37.000+02:00
diff --git a/code/addons/nflatbuffer/CMakeLists.txt b/code/addons/nflatbuffer/CMakeLists.txt
@@ -14,5 +14,5 @@ fips_dir(.)
         flatbufferinterface.h
     )
 nebula_flatc(SYSTEM foundation/math.fbs)
-fips_deps(flatbuffers sqlite3 foundation)
+fips_deps(flatbuffers foundation)
 nebula_end_lib()
diff --git a/code/addons/physicsfeature/CMakeLists.txt b/code/addons/physicsfeature/CMakeLists.txt
@@ -1,5 +1,5 @@
 nebula_begin_module(physicsfeature)
-fips_deps(physics application graphicsfeature)
+fips_deps(physics application)
 target_precompile_headers(physicsfeature PRIVATE <application/stdneb.h>)
 fips_ide_group(features)
 fips_files(
diff --git a/code/addons/physicsfeature/components/physicsfeature.json b/code/addons/physicsfeature/components/physicsfeature.json
@@ -46,7 +46,7 @@
 			},
 			"resource": {
 				"type": "resource",
-				"default": "mdl:"
+				"default": "sysphys:box.actor"
 			},
 			"actorType": {
 				"type": "PhysicsFeature::ActorType",
diff --git a/code/addons/physicsfeature/managers/charactermanager.cc b/code/addons/physicsfeature/managers/charactermanager.cc
@@ -12,13 +12,11 @@
 #include "physics/actorcontext.h"
 #include "resources/resourceserver.h"
 #include "components/physicsfeature.h"
-#include "graphicsfeature/graphicsfeatureunit.h"
 #include "basegamefeature/components/basegamefeature.h"
 #include "basegamefeature/components/position.h"
 #include "basegamefeature/components/orientation.h"
 #include "basegamefeature/components/scale.h"
 #include "basegamefeature/components/velocity.h"
-#include "graphicsfeature/components/model.h"
 
 namespace PhysicsFeature
 {
diff --git a/code/addons/physicsfeature/managers/physicsmanager.cc b/code/addons/physicsfeature/managers/physicsmanager.cc
@@ -10,13 +10,11 @@
 #include "physics/actorcontext.h"
 #include "resources/resourceserver.h"
 #include "components/physicsfeature.h"
-#include "graphicsfeature/graphicsfeatureunit.h"
 #include "basegamefeature/components/basegamefeature.h"
 #include "basegamefeature/components/position.h"
 #include "basegamefeature/components/orientation.h"
 #include "basegamefeature/components/scale.h"
 #include "basegamefeature/components/velocity.h"
-#include "graphicsfeature/components/model.h"
 
 namespace PhysicsFeature
 {
@@ -52,26 +50,13 @@ PhysicsManager::InitPhysicsActor(Game::World* world, Game::Entity entity, Physic
         return;
     }
 
-    auto res = actor->resource;
-    if (res == "mdl:")
-    {
-        n_assert(world->HasComponent<GraphicsFeature::Model>(entity));
-        Util::String modelRes = world->GetComponent<GraphicsFeature::Model>(entity).resource.Value();
-        Util::String fileName = modelRes.ExtractFileName();
-        fileName.StripFileExtension();
-        res = Util::String::Sprintf(
-            "phys:%s/%s.actor", modelRes.ExtractLastDirName().AsCharPtr(), fileName.AsCharPtr()
-        );
-        actor->resource = res;
-    }
-
     Math::transform worldTransform = Math::transform(
         world->GetComponent<Game::Position>(entity),
         world->GetComponent<Game::Orientation>(entity),
         world->GetComponent<Game::Scale>(entity)
     );
 
-    Resources::ResourceId resId = Resources::CreateResource(res, "PHYS", nullptr, nullptr, true);
+    Resources::ResourceId resId = Resources::CreateResource(actor->resource, "PHYS", nullptr, nullptr, true);
     Physics::ActorId actorid =
         Physics::CreateActorInstance(resId, worldTransform, (Physics::ActorType)actor->actorType, Ids::Id64(entity));
     actor->actorId = actorid.id;
diff --git a/code/application/CMakeLists.txt b/code/application/CMakeLists.txt
@@ -5,7 +5,7 @@
 nebula_begin_module(application)
     nebula_add_blueprints()
     target_include_directories(application PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-    fips_deps(foundation audio resource scripting memdb imgui input options)
+    fips_deps(foundation resource memdb imgui input options)
     fips_dir(.)
     if (FIPS_WINDOWS)
         fips_files(application.natvis)
diff --git a/code/application/appgame/gameapplication.cc b/code/application/appgame/gameapplication.cc
@@ -6,6 +6,7 @@
 
 #include "appgame/gameapplication.h"
 
+#include "core/sysfunc.h"
 #include "options.h"
 #include "core/debug/corepagehandler.h"
 #include "threading/debug/threadpagehandler.h"
@@ -20,7 +21,6 @@
 #include "input/inputserver.h"
 #include "basegamefeature/basegamefeatureunit.h"
 #include "nflatbuffer/flatbufferinterface.h"
-
 #include "profiling/profiling.h"
 
 namespace App
@@ -222,6 +222,9 @@ GameApplication::Close()
     Application::Close();
 }
 
+
+
+
 //------------------------------------------------------------------------------
 /**
     Run the application. This method will return when the application wishes
diff --git a/code/physics/CMakeLists.txt b/code/physics/CMakeLists.txt
@@ -7,7 +7,7 @@ nebula_begin_lib(physics)
 target_include_directories(physics PUBLIC ${FIPS_DEPLOY_DIR}/physx/include ${CMAKE_CURRENT_SOURCE_DIR} ${CODE_ROOT}/physics)
 target_link_libraries(physics PxLibs) 
 target_precompile_headers(physics PRIVATE [["foundation/stdneb.h"]])
-fips_deps(foundation resource render nflatbuffer)
+fips_deps(foundation resource nflatbuffer render)
 fips_files(physicsinterface.h physicsinterface.cc)
 fips_dir(physics)
 fips_files( 
diff --git a/code/physics/physics/debugui.cc b/code/physics/physics/debugui.cc
@@ -12,7 +12,6 @@
 #include "dynui/im3d/im3dcontext.h"
 #include "physics/utils.h"
 #include "imgui.h"
-#include "graphics/cameracontext.h"
 #include "flat/physics/material.h"
 #include "nflatbuffer/flatbufferinterface.h"
 #include "io/safefilestream.h"
@@ -235,7 +234,7 @@ DrawPhysicsDebug()
 /**
 */
 void
-RenderUI(Graphics::GraphicsEntityId camera)
+RenderUI(Math::mat4 const& cameraViewTransform)
 {
     RenderMaterialsUI();
     ImGui::Separator();
@@ -250,7 +249,7 @@ RenderUI(Graphics::GraphicsEntityId camera)
         ImGui::PushItemWidth(100.0f);
         ImGui::DragFloat("Viewing Distance", &viewRange, 1.0f, 1.0f, 100.0f);
         ImGui::PopItemWidth();
-        Math::mat4 trans =  Math::inverse(Graphics::CameraContext::GetView(camera));
+        Math::mat4 trans =  Math::inverse(cameraViewTransform);
 
         Math::point center = trans.get_w() - trans.get_z() * viewRange;
         PxBounds3 bound = PxBounds3::centerExtents(Neb2PxPnt(center), PxVec3(viewRange));
diff --git a/code/physics/physics/debugui.h b/code/physics/physics/debugui.h
@@ -6,7 +6,6 @@
     @copyright
     (C) 2020-2025 Individual contributors, see AUTHORS file
 */
-#include "graphics/graphicsentity.h"
 #include "util/color.h"
 #include <functional>
 
@@ -24,7 +23,7 @@ void SetDebugDrawInterface(DebugDrawInterface const& drawInterface);
 
 void EnableDebugDrawing(bool enabled);
 
-void RenderUI(Graphics::GraphicsEntityId camera);
+void RenderUI(Math::mat4 const& cameraViewTransform);
 
 void RenderMaterialsUI();
 
diff --git a/fips-files/generators/IDLC/__init__.py b/fips-files/generators/IDLC/__init__.py
@@ -121,15 +121,6 @@ def GenerateSource(self, srcPath, hdrPath) :
                 
             IDLDocument.EndNamespaceOverride(f, self.document, "IO")
 
-        if hasMessages:
-            IDLDocument.AddInclude(f, "nanobind/nanobind.h")
-            IDLDocument.BeginNamespace(f, self.document)
-
-            if hasMessages:
-                IDLProtocol.WriteMessageImplementation(f, self.document)
-
-            IDLDocument.EndNamespace(f, self.document)
-
         f.Close()
 
     #------------------------------------------------------------------------------
diff --git a/fips-files/generators/NIDL.py b/fips-files/generators/NIDL.py
@@ -1,4 +1,4 @@
-Version = 151
+Version = 152
 
 import sys
 if __name__ == '__main__':
diff --git a/tests/testviewer/scenes/physicsscene.cc b/tests/testviewer/scenes/physicsscene.cc
@@ -24,6 +24,7 @@
 #include "graphics/graphicsserver.h"
 #include "physics/debugui.h"
 #include "viewerapp.h"
+#include "graphics/cameracontext.h"
 
 using namespace Graphics;
 using namespace Visibility;
@@ -302,7 +303,7 @@ void RenderUI()
     }
     ImGui::EndChild();
     ImGui::End();
-    Physics::RenderUI(camera);
+    Physics::RenderUI(CameraContext::GetView(camera));
 };
 
 } // namespace ExampleSceneData
diff --git a/toolkit/editor/editor/ui/windows/physics.cc b/toolkit/editor/editor/ui/windows/physics.cc
@@ -12,6 +12,7 @@
 #include "physics/debugui.h"
 #include "editor/ui/windowserver.h"
 #include "editor/ui/windows/scene.h"
+#include "graphics/cameracontext.h"
 
 using namespace Editor;
 
@@ -53,7 +54,7 @@ Physics::Run(SaveMode save)
     {
         return;
     }
-    ::Physics::RenderUI(this->defaultCamera);
+    ::Physics::RenderUI(Graphics::CameraContext::GetView(this->defaultCamera));
 }
 
 } // namespace Presentation

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ fips_dir(.)`
`14`	`14`	`flatbufferinterface.h`
`15`	`15`	`)`
`16`	`16`	`nebula_flatc(SYSTEM foundation/math.fbs)`
`17`		`-fips_deps(flatbuffers sqlite3 foundation)`
	`17`	`+fips_deps(flatbuffers foundation)`
`18`	`18`	`nebula_end_lib()`