[Scummvm-git-logs] scummvm master -> ea7fae7bca7bccfb3a2ed989a020c83167b78854
aquadran
noreply at scummvm.org
Wed Nov 20 07:05:53 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ea7fae7bca WINTERMUTE: Cleanup headers
Commit: ea7fae7bca7bccfb3a2ed989a020c83167b78854
https://github.com/scummvm/scummvm/commit/ea7fae7bca7bccfb3a2ed989a020c83167b78854
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-11-20T08:05:49+01:00
Commit Message:
WINTERMUTE: Cleanup headers
Changed paths:
engines/wintermute/ad/ad_object_3d.h
engines/wintermute/ad/ad_path3d.h
engines/wintermute/ad/ad_path_point3d.h
engines/wintermute/ad/ad_scene_geometry.cpp
engines/wintermute/ad/ad_scene_geometry.h
engines/wintermute/ad/ad_waypoint_group3d.h
engines/wintermute/base/base_object.h
engines/wintermute/base/gfx/3dlight.h
engines/wintermute/base/gfx/3dshadow_volume.h
engines/wintermute/base/gfx/base_renderer3d.h
engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
engines/wintermute/base/gfx/xmesh.cpp
engines/wintermute/base/gfx/xmesh.h
engines/wintermute/base/gfx/xmodel.h
engines/wintermute/base/particles/part_emitter.cpp
diff --git a/engines/wintermute/ad/ad_object_3d.h b/engines/wintermute/ad/ad_object_3d.h
index 547b225a8cb..eac39d2bdce 100644
--- a/engines/wintermute/ad/ad_object_3d.h
+++ b/engines/wintermute/ad/ad_object_3d.h
@@ -30,9 +30,6 @@
#include "engines/wintermute/ad/ad_object.h"
-#include "math/matrix4.h"
-#include "math/vector3d.h"
-
namespace Wintermute {
class ShadowVolume;
diff --git a/engines/wintermute/ad/ad_path3d.h b/engines/wintermute/ad/ad_path3d.h
index 3b98a9a0008..f18a21ea7ed 100644
--- a/engines/wintermute/ad/ad_path3d.h
+++ b/engines/wintermute/ad/ad_path3d.h
@@ -32,8 +32,6 @@
#include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/persistent.h"
-#include "math/vector3d.h"
-
namespace Wintermute {
class AdPath3D : public BaseClass {
diff --git a/engines/wintermute/ad/ad_path_point3d.h b/engines/wintermute/ad/ad_path_point3d.h
index 4f0157f8dc3..74f2202717b 100644
--- a/engines/wintermute/ad/ad_path_point3d.h
+++ b/engines/wintermute/ad/ad_path_point3d.h
@@ -33,8 +33,6 @@
#include "engines/wintermute/base/base.h"
#include "engines/wintermute/base/gfx/xmath.h"
-#include "math/vector3d.h"
-
namespace Wintermute {
class AdPathPoint3D: public BaseClass {
diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
index 5abff63155b..1d8e41610d7 100644
--- a/engines/wintermute/ad/ad_scene_geometry.cpp
+++ b/engines/wintermute/ad/ad_scene_geometry.cpp
@@ -26,6 +26,7 @@
*/
#include "common/util.h"
+#include "math/utils.h"
#include "engines/wintermute/ad/ad_block.h"
#include "engines/wintermute/ad/ad_game.h"
diff --git a/engines/wintermute/ad/ad_scene_geometry.h b/engines/wintermute/ad/ad_scene_geometry.h
index f315ed4ca06..a7a1491eda5 100644
--- a/engines/wintermute/ad/ad_scene_geometry.h
+++ b/engines/wintermute/ad/ad_scene_geometry.h
@@ -30,8 +30,6 @@
#include "engines/wintermute/base/base_object.h"
#include "engines/wintermute/math/rect32.h"
-#include "math/matrix4.h"
-#include "math/vector3d.h"
namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_waypoint_group3d.h b/engines/wintermute/ad/ad_waypoint_group3d.h
index 74f82f3ede7..445d510a30f 100644
--- a/engines/wintermute/ad/ad_waypoint_group3d.h
+++ b/engines/wintermute/ad/ad_waypoint_group3d.h
@@ -32,8 +32,6 @@
#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
-#include "math/vector3d.h"
-
namespace Wintermute {
class CAdSceneGeometry;
diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h
index dbdc223faa6..81120ad4975 100644
--- a/engines/wintermute/base/base_object.h
+++ b/engines/wintermute/base/base_object.h
@@ -35,12 +35,6 @@
#include "common/events.h"
#include "graphics/transform_struct.h"
-#ifdef ENABLE_WME3D
-#include "math/angle.h"
-#include "math/matrix4.h"
-#include "math/vector3d.h"
-#endif
-
namespace Wintermute {
class BaseSprite;
diff --git a/engines/wintermute/base/gfx/3dlight.h b/engines/wintermute/base/gfx/3dlight.h
index e8427f8d39e..3f8f131633f 100644
--- a/engines/wintermute/base/gfx/3dlight.h
+++ b/engines/wintermute/base/gfx/3dlight.h
@@ -33,9 +33,6 @@
#include "engines/wintermute/base/base_persistence_manager.h"
#include "engines/wintermute/base/base_scriptable.h"
-#include "math/matrix4.h"
-#include "math/vector3d.h"
-
namespace Wintermute {
class Light3D : public BaseScriptable {
diff --git a/engines/wintermute/base/gfx/3dshadow_volume.h b/engines/wintermute/base/gfx/3dshadow_volume.h
index 199fc4c4267..7d035e7da85 100644
--- a/engines/wintermute/base/gfx/3dshadow_volume.h
+++ b/engines/wintermute/base/gfx/3dshadow_volume.h
@@ -33,8 +33,6 @@
#include "engines/wintermute/base/gfx/xmesh.h"
#include "engines/wintermute/base/gfx/xmath.h"
#include "engines/wintermute/coll_templ.h"
-#include "math/matrix4.h"
-#include "math/vector3d.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index 3690bec3831..b034f83aef2 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -31,9 +31,6 @@
#include "graphics/transform_struct.h"
#include "graphics/surface.h"
-#include "math/matrix4.h"
-#include "math/ray.h"
-
#if defined(USE_OPENGL_SHADERS)
#include "graphics/opengl/system_headers.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index 201e44eb306..09dff73150c 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -29,9 +29,6 @@
#include "graphics/transform_struct.h"
-#include "math/matrix4.h"
-#include "math/ray.h"
-
#if defined(USE_OPENGL_GAME)
#include "graphics/opengl/system_headers.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
index b128ab13f01..14061b35c0f 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -30,9 +30,6 @@
#include "graphics/opengl/system_headers.h"
#include "graphics/transform_struct.h"
-#include "math/matrix4.h"
-#include "math/ray.h"
-
#if defined(USE_OPENGL_SHADERS)
#include "graphics/opengl/shader.h"
diff --git a/engines/wintermute/base/gfx/xmesh.cpp b/engines/wintermute/base/gfx/xmesh.cpp
index c26e7c60f66..747b1ad8fed 100644
--- a/engines/wintermute/base/gfx/xmesh.cpp
+++ b/engines/wintermute/base/gfx/xmesh.cpp
@@ -39,6 +39,8 @@
#include "engines/wintermute/base/base_engine.h"
#include "engines/wintermute/utils/path_util.h"
+#include "math/utils.h"
+
namespace Wintermute {
XMesh::XMesh(Wintermute::BaseGame *inGame) : BaseNamedObject(inGame) {
diff --git a/engines/wintermute/base/gfx/xmesh.h b/engines/wintermute/base/gfx/xmesh.h
index e7d45837e6c..07d4e11ec4e 100644
--- a/engines/wintermute/base/gfx/xmesh.h
+++ b/engines/wintermute/base/gfx/xmesh.h
@@ -32,9 +32,6 @@
#include "engines/wintermute/base/gfx/xmodel.h"
#include "engines/wintermute/coll_templ.h"
-#include "math/matrix4.h"
-#include "math/vector3d.h"
-
namespace Wintermute {
class BaseSprite;
diff --git a/engines/wintermute/base/gfx/xmodel.h b/engines/wintermute/base/gfx/xmodel.h
index b00b4f06930..76a2397f0e4 100644
--- a/engines/wintermute/base/gfx/xmodel.h
+++ b/engines/wintermute/base/gfx/xmodel.h
@@ -38,10 +38,6 @@
#include "engines/wintermute/video/video_theora_player.h"
#include "engines/wintermute/utils/utils.h"
-#include "math/matrix4.h"
-#include "math/vector3d.h"
-#include "math/vector4d.h"
-
namespace Wintermute {
class AnimationChannel;
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 997c2455933..d113720c396 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -38,6 +38,7 @@
#include "engines/wintermute/base/gfx/base_renderer.h"
#include "engines/wintermute/utils/utils.h"
#include "common/str.h"
+#include "math/utils.h"
namespace Wintermute {
More information about the Scummvm-git-logs
mailing list