diff options
Diffstat (limited to 'src/old')
| -rw-r--r-- | src/old/README.txt | 6 | ||||
| -rw-r--r-- | src/old/blitz.cpp | 14 | ||||
| -rw-r--r-- | src/old/blitz.h | 2 | ||||
| -rw-r--r-- | src/old/camera.cpp | 12 | ||||
| -rw-r--r-- | src/old/camera.h | 2 | ||||
| -rw-r--r-- | src/old/cloud.cpp | 12 | ||||
| -rw-r--r-- | src/old/cloud.h | 2 | ||||
| -rw-r--r-- | src/old/d3dapp.cpp | 10 | ||||
| -rw-r--r-- | src/old/d3dapp.h | 8 | ||||
| -rw-r--r-- | src/old/d3dengine.cpp | 28 | ||||
| -rw-r--r-- | src/old/d3denum.cpp | 4 | ||||
| -rw-r--r-- | src/old/d3dframe.cpp | 4 | ||||
| -rw-r--r-- | src/old/d3dtextr.cpp | 4 | ||||
| -rw-r--r-- | src/old/d3dutil.cpp | 2 | ||||
| -rw-r--r-- | src/old/joystick.cpp | 2 | ||||
| -rw-r--r-- | src/old/light.cpp | 6 | ||||
| -rw-r--r-- | src/old/light.h | 89 | ||||
| -rw-r--r-- | src/old/math3d.cpp | 8 | ||||
| -rw-r--r-- | src/old/model.cpp | 10 | ||||
| -rw-r--r-- | src/old/particule.cpp | 16 | ||||
| -rw-r--r-- | src/old/particule.h | 2 | ||||
| -rw-r--r-- | src/old/planet.cpp | 8 | ||||
| -rw-r--r-- | src/old/pyro.cpp | 16 | ||||
| -rw-r--r-- | src/old/pyro.h | 2 | ||||
| -rw-r--r-- | src/old/terrain.cpp | 12 | ||||
| -rw-r--r-- | src/old/terrain.h | 2 | ||||
| -rw-r--r-- | src/old/text.cpp | 6 | ||||
| -rw-r--r-- | src/old/text.h | 2 | ||||
| -rw-r--r-- | src/old/water.cpp | 14 | ||||
| -rw-r--r-- | src/old/water.h | 4 |
30 files changed, 111 insertions, 198 deletions
diff --git a/src/old/README.txt b/src/old/README.txt index ec0443c..5ad59b4 100644 --- a/src/old/README.txt +++ b/src/old/README.txt @@ -1,3 +1,3 @@ -Contains files that are to be removed. - -The resources (cursors, etc.) cannot be included using windows rc files - they must be moved to .dat files. +Contains old files that will be removed: + - old code modules - will be replaced by new implementation + - resources (cursors, etc.) - will be included in .dat files diff --git a/src/old/blitz.cpp b/src/old/blitz.cpp index 10c78e5..b73bd3e 100644 --- a/src/old/blitz.cpp +++ b/src/old/blitz.cpp @@ -23,20 +23,20 @@ #include "math/const.h"
#include "math/geometry.h"
#include "math/conv.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
+#include "old/d3dutil.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "graphics/common/terrain.h"
-#include "math/old/math3d.h"
+#include "old/terrain.h"
+#include "old/math3d.h"
#include "object/object.h"
-#include "graphics/common/camera.h"
+#include "old/camera.h"
#include "object/auto/auto.h"
#include "object/auto/autopara.h"
#include "sound/sound.h"
-#include "graphics/common/blitz.h"
+#include "old/blitz.h"
diff --git a/src/old/blitz.h b/src/old/blitz.h index c2cfe6c..87e9a76 100644 --- a/src/old/blitz.h +++ b/src/old/blitz.h @@ -21,7 +21,7 @@ #include "common/misc.h"
#include "math/point.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
class CObject;
diff --git a/src/old/camera.cpp b/src/old/camera.cpp index 1de5d45..2c2ffef 100644 --- a/src/old/camera.cpp +++ b/src/old/camera.cpp @@ -22,18 +22,18 @@ #include "common/struct.h"
#include "math/const.h"
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
#include "common/language.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
+#include "old/math3d.h"
+#include "old/terrain.h"
+#include "old/water.h"
#include "object/object.h"
#include "physics/physics.h"
-#include "graphics/common/camera.h"
+#include "old/camera.h"
diff --git a/src/old/camera.h b/src/old/camera.h index 21ff2c9..f18f765 100644 --- a/src/old/camera.h +++ b/src/old/camera.h @@ -21,7 +21,7 @@ #include "common/event.h"
#include "math/point.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
class CInstanceManager;
diff --git a/src/old/cloud.cpp b/src/old/cloud.cpp index 67e2fe2..7c1518c 100644 --- a/src/old/cloud.cpp +++ b/src/old/cloud.cpp @@ -22,16 +22,16 @@ #include "common/struct.h"
#include "math/geometry.h"
#include "math/conv.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
+#include "old/d3dutil.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/terrain.h"
+#include "old/math3d.h"
+#include "old/terrain.h"
#include "object/object.h"
-#include "graphics/common/cloud.h"
+#include "old/cloud.h"
diff --git a/src/old/cloud.h b/src/old/cloud.h index 59d929c..6ff16bb 100644 --- a/src/old/cloud.h +++ b/src/old/cloud.h @@ -21,7 +21,7 @@ #include "common/event.h"
#include "math/point.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
class CInstanceManager;
diff --git a/src/old/d3dapp.cpp b/src/old/d3dapp.cpp index 4f29584..0614fc3 100644 --- a/src/old/d3dapp.cpp +++ b/src/old/d3dapp.cpp @@ -25,18 +25,18 @@ #include <dinput.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dtextr.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dtextr.h"
+#include "old/d3dengine.h"
#include "common/language.h"
#include "common/event.h"
#include "common/profile.h"
#include "common/iman.h"
#include "common/restext.h"
-#include "math/old/math3d.h"
-#include "app/joystick.h"
+#include "old/math3d.h"
+#include "old/joystick.h"
#include "object/robotmain.h"
#include "sound/sound.h"
-#include "app/d3dapp.h"
+#include "old/d3dapp.h"
// fix for "MSH_MOUSEWHEEL undefined" error
#ifdef UNICODE
diff --git a/src/old/d3dapp.h b/src/old/d3dapp.h index 2171057..1126d69 100644 --- a/src/old/d3dapp.h +++ b/src/old/d3dapp.h @@ -23,10 +23,10 @@ #include <d3d.h>
#include "math/vector.h"
-#include "graphics/d3d/d3dengine.h"
-#include "graphics/d3d/d3dframe.h"
-#include "graphics/d3d/d3denum.h"
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dengine.h"
+#include "old/d3dframe.h"
+#include "old/d3denum.h"
+#include "old/d3dutil.h"
#include "old/d3dres.h"
#include "common/misc.h"
#include "common/struct.h"
diff --git a/src/old/d3dengine.cpp b/src/old/d3dengine.cpp index 731a839..305adc2 100644 --- a/src/old/d3dengine.cpp +++ b/src/old/d3dengine.cpp @@ -24,26 +24,26 @@ #include "math/const.h"
#include "math/geometry.h"
#include "math/conv.h"
-#include "app/d3dapp.h"
-#include "graphics/d3d/d3dtextr.h"
-#include "graphics/d3d/d3dutil.h"
-#include "math/old/d3dmath.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dapp.h"
+#include "old/d3dtextr.h"
+#include "old/d3dutil.h"
+#include "old/d3dmath.h"
+#include "old/d3dengine.h"
#include "common/language.h"
#include "common/iman.h"
#include "common/event.h"
#include "common/profile.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "object/object.h"
#include "ui/interface.h"
-#include "graphics/common/light.h"
-#include "graphics/common/text.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
-#include "graphics/common/cloud.h"
-#include "graphics/common/blitz.h"
-#include "graphics/common/planet.h"
+#include "old/light.h"
+#include "old/text.h"
+#include "old/particule.h"
+#include "old/terrain.h"
+#include "old/water.h"
+#include "old/cloud.h"
+#include "old/blitz.h"
+#include "old/planet.h"
#include "sound/sound.h"
diff --git a/src/old/d3denum.cpp b/src/old/d3denum.cpp index 1081ff5..5bce9ab 100644 --- a/src/old/d3denum.cpp +++ b/src/old/d3denum.cpp @@ -24,8 +24,8 @@ #include <windowsx.h>
#include <stdio.h>
#include <tchar.h>
-#include "graphics/d3d/d3denum.h"
-#include "graphics/d3d/d3dutil.h" // For DEBUG_MSG
+#include "old/d3denum.h"
+#include "old/d3dutil.h" // For DEBUG_MSG
#include "old/d3dres.h" // For dialog controls
diff --git a/src/old/d3dframe.cpp b/src/old/d3dframe.cpp index e36296a..3f984bd 100644 --- a/src/old/d3dframe.cpp +++ b/src/old/d3dframe.cpp @@ -24,8 +24,8 @@ #include <windows.h>
#include <stdio.h>
#include <tchar.h>
-#include "graphics/d3d/d3dframe.h"
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dframe.h"
+#include "old/d3dutil.h"
diff --git a/src/old/d3dtextr.cpp b/src/old/d3dtextr.cpp index 4924860..39be603 100644 --- a/src/old/d3dtextr.cpp +++ b/src/old/d3dtextr.cpp @@ -30,8 +30,8 @@ #include <stdio.h>
#include <algorithm>
using std::min;
-#include "graphics/d3d/d3dtextr.h"
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dtextr.h"
+#include "old/d3dutil.h"
#include "common/language.h"
#include "common/misc.h"
diff --git a/src/old/d3dutil.cpp b/src/old/d3dutil.cpp index 5fd46b2..d8fd03e 100644 --- a/src/old/d3dutil.cpp +++ b/src/old/d3dutil.cpp @@ -25,7 +25,7 @@ #include <math.h>
#include <stdio.h>
#include <tchar.h>
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dutil.h"
diff --git a/src/old/joystick.cpp b/src/old/joystick.cpp index 47a0947..c08a252 100644 --- a/src/old/joystick.cpp +++ b/src/old/joystick.cpp @@ -22,7 +22,7 @@ #include <dinput.h>
#include <stdio.h>
-#include "app/joystick.h"
+#include "old/joystick.h"
diff --git a/src/old/light.cpp b/src/old/light.cpp index cc50f87..0589141 100644 --- a/src/old/light.cpp +++ b/src/old/light.cpp @@ -25,12 +25,12 @@ #include "math/const.h"
#include "math/geometry.h"
#include "math/conv.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/light.h"
+#include "old/math3d.h"
+#include "old/light.h"
diff --git a/src/old/light.h b/src/old/light.h index 26b4f0f..8291ca9 100644 --- a/src/old/light.h +++ b/src/old/light.h @@ -19,7 +19,7 @@ #pragma once
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "graphics/common/color.h"
@@ -57,93 +57,6 @@ struct Light };
-// temporary!
-namespace Gfx {
-
-/** \enum LightType Type of light */
-enum LightType
-{
- LT_Point,
- LT_Spot,
- LT_Directional
-};
-
-/**
- * \struct Light Light
- *
- * This structure was created as analog to DirectX's D3DLIGHT.
- *
- * It contains analogous fields as the D3DLIGHT struct.
- */
-struct Light
-{
- //! Type of light source
- Gfx::LightType type;
- //! Color of light
- Gfx::Color color;
- //! Position in world space
- Math::Vector position;
- //! Direction in world space
- Math::Vector direction;
- //! Cutoff range
- float range;
- //! Falloff
- float falloff;
- //! Constant attenuation
- float attenuation0;
- //! Linear attenuation
- float attenuation1;
- //! Quadratic attenuation
- float attenuation2;
- //! Inner angle of spotlight cone
- float theta;
- //! Outer angle of spotlight cone
- float phi;
-
- Light() : type(LT_Point), range(0.0f), falloff(0.0f),
- attenuation0(0.0f), attenuation1(0.0f), attenuation2(0.0f),
- theta(0.0f), phi(0.0f) {}
-};
-
-struct LightProg
-{
- float starting;
- float ending;
- float current;
- float progress;
- float speed;
-};
-
-/**
- * \struct SceneLight Dynamic light in 3D scene
- *
- * TODO documentation
- */
-struct SceneLight
-{
- //! true -> light exists
- bool used;
- //! true -> light turned on
- bool enable;
-
- //! Type of all objects included
- D3DTypeObj incluType;
- //! Type of all objects excluded
- D3DTypeObj excluType;
-
- //! Configuration of the light
- Gfx::Light light;
-
- //! intensity (0 .. 1)
- Gfx::LightProg intensity;
- Gfx::LightProg colorRed;
- Gfx::LightProg colorGreen;
- Gfx::LightProg colorBlue;
-};
-
-}; // namespace Gfx
-
-
class CLight
{
diff --git a/src/old/math3d.cpp b/src/old/math3d.cpp index a9d67f2..3b5f9dd 100644 --- a/src/old/math3d.cpp +++ b/src/old/math3d.cpp @@ -23,10 +23,10 @@ #include <stdio.h>
#include <d3d.h>
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "graphics/d3d/d3dutil.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
+#include "old/d3dutil.h"
+#include "old/math3d.h"
// Old defines
diff --git a/src/old/model.cpp b/src/old/model.cpp index b464244..3570df4 100644 --- a/src/old/model.cpp +++ b/src/old/model.cpp @@ -24,20 +24,20 @@ #include "common/struct.h"
#include "math/const.h"
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/water.h"
+#include "old/math3d.h"
+#include "old/water.h"
#include "object/robotmain.h"
#include "ui/interface.h"
#include "ui/edit.h"
#include "ui/button.h"
#include "script/cmdtoken.h"
#include "common/modfile.h"
-#include "graphics/common/model.h"
+#include "old/model.h"
diff --git a/src/old/particule.cpp b/src/old/particule.cpp index 0c63049..3fb7791 100644 --- a/src/old/particule.cpp +++ b/src/old/particule.cpp @@ -25,22 +25,22 @@ #include "math/const.h"
#include "math/geometry.h"
#include "math/conv.h"
-#include "math/old/d3dmath.h"
-#include "graphics/d3d/d3dtextr.h"
-#include "graphics/d3d/d3dengine.h"
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dmath.h"
+#include "old/d3dtextr.h"
+#include "old/d3dengine.h"
+#include "old/d3dutil.h"
#include "common/language.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/auto/auto.h"
#include "object/robotmain.h"
-#include "graphics/common/terrain.h"
+#include "old/terrain.h"
#include "sound/sound.h"
-#include "graphics/common/water.h"
-#include "graphics/common/particule.h"
+#include "old/water.h"
+#include "old/particule.h"
diff --git a/src/old/particule.h b/src/old/particule.h index d82e0a7..004dece 100644 --- a/src/old/particule.h +++ b/src/old/particule.h @@ -20,7 +20,7 @@ #include "math/point.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "sound/sound.h"
diff --git a/src/old/planet.cpp b/src/old/planet.cpp index 6be1d31..0733459 100644 --- a/src/old/planet.cpp +++ b/src/old/planet.cpp @@ -23,13 +23,13 @@ #include "common/struct.h"
#include "math/const.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/planet.h"
+#include "old/math3d.h"
+#include "old/planet.h"
diff --git a/src/old/pyro.cpp b/src/old/pyro.cpp index 443d428..72f370e 100644 --- a/src/old/pyro.cpp +++ b/src/old/pyro.cpp @@ -24,23 +24,23 @@ #include "common/struct.h"
#include "math/const.h"
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "object/robotmain.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
+#include "old/terrain.h"
+#include "old/camera.h"
+#include "old/particule.h"
+#include "old/light.h"
#include "object/object.h"
#include "object/motion/motion.h"
#include "object/motion/motionhuman.h"
#include "ui/displaytext.h"
#include "sound/sound.h"
-#include "graphics/common/pyro.h"
+#include "old/pyro.h"
diff --git a/src/old/pyro.h b/src/old/pyro.h index 9f35438..4b61356 100644 --- a/src/old/pyro.h +++ b/src/old/pyro.h @@ -19,7 +19,7 @@ #pragma once
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "object/object.h"
#include "common/misc.h"
diff --git a/src/old/terrain.cpp b/src/old/terrain.cpp index edc1611..c426883 100644 --- a/src/old/terrain.cpp +++ b/src/old/terrain.cpp @@ -24,17 +24,17 @@ #include "common/struct.h"
#include "math/const.h"
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
+#include "old/d3dutil.h"
#include "common/language.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "common/modfile.h"
-#include "graphics/common/water.h"
-#include "graphics/common/terrain.h"
+#include "old/water.h"
+#include "old/terrain.h"
const int BMPHEAD = 1078;
diff --git a/src/old/terrain.h b/src/old/terrain.h index d41cd15..e2ca566 100644 --- a/src/old/terrain.h +++ b/src/old/terrain.h @@ -21,7 +21,7 @@ #include "common/struct.h"
#include "math/point.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
class CInstanceManager;
diff --git a/src/old/text.cpp b/src/old/text.cpp index f8d3f49..a7faa95 100644 --- a/src/old/text.cpp +++ b/src/old/text.cpp @@ -22,13 +22,13 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/language.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/text.h"
+#include "old/math3d.h"
+#include "old/text.h"
diff --git a/src/old/text.h b/src/old/text.h index 976543a..6ba30a3 100644 --- a/src/old/text.h +++ b/src/old/text.h @@ -20,7 +20,7 @@ #include "math/point.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
class CInstanceManager;
diff --git a/src/old/water.cpp b/src/old/water.cpp index dd4b5f3..510d1fe 100644 --- a/src/old/water.cpp +++ b/src/old/water.cpp @@ -24,18 +24,18 @@ #include "common/struct.h"
#include "math/geometry.h"
#include "math/conv.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
+#include "old/d3dutil.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
+#include "old/math3d.h"
+#include "old/particule.h"
+#include "old/terrain.h"
#include "object/object.h"
#include "sound/sound.h"
-#include "graphics/common/water.h"
+#include "old/water.h"
diff --git a/src/old/water.h b/src/old/water.h index 45a545d..b2a596b 100644 --- a/src/old/water.h +++ b/src/old/water.h @@ -20,8 +20,8 @@ #include "common/event.h"
-#include "graphics/d3d/d3dengine.h"
-#include "graphics/common/particule.h"
+#include "old/d3dengine.h"
+#include "old/particule.h"
class CInstanceManager;
|