various fixes - memory leaks & object cleanup

TheOpenSpaceProgram · Oct 3, 2024 · f1eaa18 · f1eaa18
1 parent 3e4a34a
commit f1eaa18
Show file tree

Hide file tree

Showing 10 changed files with 529 additions and 565 deletions.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -245,7 +245,7 @@ SET(CUSTOM_CONFIGURATION ON CACHE BOOL "" FORCE)
 SET(ENABLE_ALL_WARNINGS OFF CACHE BOOL "" FORCE)
 SET(BUILD_SHARED_LIBS      OFF CACHE BOOL "" FORCE)
 ADD_SUBDIRECTORY(JoltPhysics/Build EXCLUDE_FROM_ALL)
-target_compile_options(Jolt PRIVATE "-fPIC")
+set_property(TARGET Jolt PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 SET( GODOT_CPP_SYSTEM_HEADERS ON CACHE BOOL "" FORCE )
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -51,27 +51,6 @@ endif()
 # Set project name
 PROJECT(OSP-MAGNUM CXX)
 
-# From: https://crascit.com/2016/04/09/using-ccache-with-cmake/
-find_program( CCACHE_PROGRAM ccache )
-
-if ( CCACHE_PROGRAM )
-    # get version information
-    execute_process(
-        COMMAND "${CCACHE_PROGRAM}" --version
-        OUTPUT_VARIABLE CCACHE_VERSION
-    )
-
-    string( REGEX MATCH "[^\r\n]*" CCACHE_VERSION ${CCACHE_VERSION} )
-
-    message( STATUS "Using ccache: ${CCACHE_PROGRAM} (${CCACHE_VERSION})" )
-
-    # Turn on ccache for all targets
-    set( CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" )
-    set( CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" )
-
-    unset( CCACHE_VERSION )
-endif()
-
 # Setup things for the test subdir below
 # Has to be in toplevel CMakeLists.txt or ctest gets mad.
 enable_testing()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -32,7 +32,7 @@ if(NOT Threads_FOUND)
 endif()
 
 #compile as position-independant to avoid link errors on static link
-add_compile_options("-fPIC")
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 add_subdirectory(adera)
 add_subdirectory(adera_app)

diff --git a/src/adera_app/features/vehicles_machines.cpp b/src/adera_app/features/vehicles_machines.cpp
@@ -160,6 +160,7 @@ FeatureDef const ftrMagicRocketThrustIndicator = feature_def("MagicRocketThrustI
             if (thrustMag == 0.0f)
             {
                 rScnRender.m_visible.erase(drawEnt);
+                rMat.m_dirty.push_back(drawEnt);
                 continue;
             }
 

diff --git a/src/gdextension/feature_interfaces.h b/src/gdextension/feature_interfaces.h
@@ -47,7 +47,7 @@ struct FIGodot {
 
 struct FIGodotScene {
     struct DataIds {
-        DataId scnRenderGl;
+        DataId scnRenderGd;
         DataId camera;
     };