Isolate physics module

Update physics module, minor cleanups, remove unused code.
DescentDevelopers · Jul 28, 2024 · b9da6b5 · b9da6b5
1 parent b876716
commit b9da6b5
Show file tree

Hide file tree

Showing 27 changed files with 252 additions and 1,205 deletions.
diff --git a/Descent3/AImain.cpp b/Descent3/AImain.cpp
@@ -1534,7 +1534,7 @@
 #include "attach.h"
 #include "demofile.h"
 #include "matcen.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "difficulty.h"
 #include "osiris_dll.h"
 #include "multi.h"

diff --git a/Descent3/Game2DLL.cpp b/Descent3/Game2DLL.cpp
@@ -52,7 +52,7 @@
 #include "vclip.h"
 #include "osiris_dll.h"
 #include "manage.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "collide.h"
 #include "render.h"
 #include "audiotaunts.h"

diff --git a/Descent3/GameLoop.cpp b/Descent3/GameLoop.cpp
@@ -833,7 +833,7 @@
 #include "SmallViews.h"
 #include "newui.h"
 #include "Inventory.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "Controller.h"
 #include "controls.h"
 #include "gamesequence.h"

diff --git a/Descent3/LoadLevel.cpp b/Descent3/LoadLevel.cpp
@@ -1287,7 +1287,7 @@
 #include "ambient.h"
 #include "matcen.h"
 #include "dedicated_server.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "levelgoal.h"
 #include "aiambient.h"
 #include "args.h"

diff --git a/Descent3/ObjInit.cpp b/Descent3/ObjInit.cpp
@@ -602,7 +602,7 @@
 #include "player.h"
 #include "ship.h"
 #include "pserror.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "weapon.h"
 #include "AIMain.h"
 #include "fireball.h"

diff --git a/Descent3/Player.cpp b/Descent3/Player.cpp
@@ -1098,7 +1098,7 @@
 #include "findintersection.h"
 #include "hud.h"
 #include "splinter.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "viseffect.h"
 #include "damage.h"
 #include "multi.h"

diff --git a/Descent3/config.cpp b/Descent3/config.cpp
@@ -299,7 +299,7 @@
 #include "cfile.h"
 #include "mem.h"
 #include "lighting.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "pilot.h"
 #include "hud.h"
 #include "voice.h"

diff --git a/Descent3/config.h b/Descent3/config.h
@@ -114,16 +114,12 @@
  * $NoKeywords: $
  */
 
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
+#ifndef CONFIG_H_
+#define CONFIG_H_
+
+#include <cstdint>
 
 // Main menu configuration functions
-// ------------------------------------------------------
-// ConfigForceFeedback
-//	Purpose:
-//	Configures your Force Feedback device on your computer
-// ------------------------------------------------------
-void ConfigForceFeedback(void);
 
 // General option toggles
 struct tGameToggles {

diff --git a/Descent3/fireball.cpp b/Descent3/fireball.cpp
@@ -593,7 +593,7 @@
 #include "objinfo.h"
 #include "gametexture.h"
 #include "splinter.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "damage.h"
 #include "gameevent.h"
 #include "weapon.h"

diff --git a/Descent3/init.cpp b/Descent3/init.cpp
@@ -953,7 +953,7 @@
 #include "pilot.h"
 #include "gameloop.h"
 #include "trigger.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "special_face.h"
 #include "voice.h"
 #include "localization.h"

diff --git a/Descent3/matcen.cpp b/Descent3/matcen.cpp
@@ -165,7 +165,7 @@
 #include "viseffect.h"
 #include "viseffect_external.h"
 #include "damage.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "mem.h"
 #include "ObjScript.h"
 #ifndef NEWEDITOR

diff --git a/Descent3/multi.cpp b/Descent3/multi.cpp
@@ -1692,7 +1692,7 @@
 #include "doorway.h"
 #include "object_lighting.h"
 #include "spew.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "SmallViews.h"
 #include "demofile.h"
 #include "debuggraph.h"

diff --git a/Descent3/object.cpp b/Descent3/object.cpp
@@ -1144,7 +1144,7 @@
 #include "slew.h"
 #include "game.h"
 #include "trigger.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "collide.h"
 #include "door.h"
 #include "controls.h"

diff --git a/Descent3/osiris_predefs.cpp b/Descent3/osiris_predefs.cpp
@@ -460,7 +460,7 @@
 #include "polymodel.h"
 #include "multi.h"
 #include "viseffect.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "levelgoal.h"
 #include "BOA.h"
 #include "marker.h"

diff --git a/Descent3/robotfire.cpp b/Descent3/robotfire.cpp
@@ -32,7 +32,7 @@
 #include "player.h"
 #include "demofile.h"
 #include "SmallViews.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "AIMain.h"
 
 #include <stdlib.h>

diff --git a/Descent3/viseffect.cpp b/Descent3/viseffect.cpp
@@ -450,7 +450,7 @@
 #include "lighting.h"
 #include "mem.h"
 #include "object.h"
-#include "PHYSICS.H"
+#include "physics.h"
 #include "player.h"
 #include "polymodel.h"
 #include "psrand.h"

diff --git a/model/CMakeLists.txt b/model/CMakeLists.txt
@@ -8,6 +8,7 @@ target_link_libraries(model PRIVATE
   cfile
   mem
   misc
+  physics
 )
 target_include_directories(model PUBLIC
   $<BUILD_INTERFACE:

diff --git a/netgames/dmfc/CMakeLists.txt b/netgames/dmfc/CMakeLists.txt
@@ -30,4 +30,5 @@ add_library(dmfc STATIC ${HEADERS} ${CPPS})
 target_link_libraries(dmfc PUBLIC
   grtext
   misc
+  physics
 )
diff --git a/physics/CMakeLists.txt b/physics/CMakeLists.txt
@@ -1,15 +1,20 @@
-set(HEADERS)
 set(CPPS
-  Collide.cpp
-  FindIntersection.cpp
+  collide.cpp
+  findintersection.cpp
   newstyle_fi.cpp
-  physics.cpp)
+  physics.cpp
+)
 
-add_library(physics STATIC ${HEADERS} ${CPPS})
+add_library(physics STATIC ${CPPS})
 target_link_libraries(physics PRIVATE
   ddio
   mem
   misc
   model
   sndlib
 )
+target_include_directories(physics PUBLIC
+  $<BUILD_INTERFACE:
+    ${PROJECT_SOURCE_DIR}/physics
+  >
+)
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ target_link_libraries(model PRIVATE @@
       cfile
       mem
       misc
+      physics
     )
     target_include_directories(model PUBLIC
       $<BUILD_INTERFACE:
@@ Expand Down @@