diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-22 16:31:55 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-22 16:31:55 +0200 |
commit | 8bb223e67955904c14e26a980927d313272ed22b (patch) | |
tree | aa59cbd36f30485af4720f1055ad6be92caf88ef /src/ui | |
parent | 4531ac88d3c022866d564be40c20593de4c70bfc (diff) | |
download | colobot-8bb223e67955904c14e26a980927d313272ed22b.tar.gz colobot-8bb223e67955904c14e26a980927d313272ed22b.tar.bz2 colobot-8bb223e67955904c14e26a980927d313272ed22b.zip |
Templates for new implementation
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/button.cpp | 4 | ||||
-rw-r--r-- | src/ui/check.cpp | 6 | ||||
-rw-r--r-- | src/ui/color.cpp | 4 | ||||
-rw-r--r-- | src/ui/color.h | 2 | ||||
-rw-r--r-- | src/ui/compass.cpp | 4 | ||||
-rw-r--r-- | src/ui/control.cpp | 8 | ||||
-rw-r--r-- | src/ui/control.h | 2 | ||||
-rw-r--r-- | src/ui/displayinfo.cpp | 14 | ||||
-rw-r--r-- | src/ui/displayinfo.h | 2 | ||||
-rw-r--r-- | src/ui/displaytext.cpp | 4 | ||||
-rw-r--r-- | src/ui/displaytext.h | 2 | ||||
-rw-r--r-- | src/ui/edit.cpp | 6 | ||||
-rw-r--r-- | src/ui/editvalue.cpp | 4 | ||||
-rw-r--r-- | src/ui/gauge.cpp | 4 | ||||
-rw-r--r-- | src/ui/group.cpp | 4 | ||||
-rw-r--r-- | src/ui/image.cpp | 4 | ||||
-rw-r--r-- | src/ui/interface.cpp | 6 | ||||
-rw-r--r-- | src/ui/key.cpp | 6 | ||||
-rw-r--r-- | src/ui/label.cpp | 6 | ||||
-rw-r--r-- | src/ui/list.cpp | 6 | ||||
-rw-r--r-- | src/ui/maindialog.cpp | 12 | ||||
-rw-r--r-- | src/ui/maindialog.h | 2 | ||||
-rw-r--r-- | src/ui/mainmap.cpp | 4 | ||||
-rw-r--r-- | src/ui/mainshort.cpp | 2 | ||||
-rw-r--r-- | src/ui/map.cpp | 8 | ||||
-rw-r--r-- | src/ui/scroll.cpp | 4 | ||||
-rw-r--r-- | src/ui/shortcut.cpp | 4 | ||||
-rw-r--r-- | src/ui/slider.cpp | 6 | ||||
-rw-r--r-- | src/ui/studio.cpp | 10 | ||||
-rw-r--r-- | src/ui/target.cpp | 4 | ||||
-rw-r--r-- | src/ui/window.cpp | 6 |
31 files changed, 80 insertions, 80 deletions
diff --git a/src/ui/button.cpp b/src/ui/button.cpp index 4f9e9cd..3c398c8 100644 --- a/src/ui/button.cpp +++ b/src/ui/button.cpp @@ -20,9 +20,9 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/language.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/check.cpp b/src/ui/check.cpp index c1ddcc2..2b0466d 100644 --- a/src/ui/check.cpp +++ b/src/ui/check.cpp @@ -20,13 +20,13 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "common/restext.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "ui/check.h"
diff --git a/src/ui/color.cpp b/src/ui/color.cpp index 2490b6c..69513af 100644 --- a/src/ui/color.cpp +++ b/src/ui/color.cpp @@ -20,9 +20,9 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/language.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/color.h b/src/ui/color.h index 041c7d2..8b912a9 100644 --- a/src/ui/color.h +++ b/src/ui/color.h @@ -20,7 +20,7 @@ #include "ui/control.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
class CD3DEngine;
diff --git a/src/ui/compass.cpp b/src/ui/compass.cpp index 94c2d1e..9d0ad2f 100644 --- a/src/ui/compass.cpp +++ b/src/ui/compass.cpp @@ -21,8 +21,8 @@ #include "common/struct.h"
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/control.cpp b/src/ui/control.cpp index 77fc9ab..330eacc 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -20,17 +20,17 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/language.h"
#include "common/restext.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "object/robotmain.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "sound/sound.h"
#include "ui/control.h"
diff --git a/src/ui/control.h b/src/ui/control.h index d6aeadc..60fdf22 100644 --- a/src/ui/control.h +++ b/src/ui/control.h @@ -19,7 +19,7 @@ #pragma once
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "common/struct.h"
#include "common/event.h"
diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index f788445..37719c1 100644 --- a/src/ui/displayinfo.cpp +++ b/src/ui/displayinfo.cpp @@ -22,16 +22,16 @@ #include <d3d.h>
#include "common/struct.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 "common/restext.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "object/robotmain.h"
-#include "graphics/common/camera.h"
+#include "old/camera.h"
#include "object/object.h"
#include "object/motion/motion.h"
#include "object/motion/motiontoto.h"
@@ -41,9 +41,9 @@ #include "ui/edit.h"
#include "ui/group.h"
#include "ui/window.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/text.h"
+#include "old/particule.h"
+#include "old/light.h"
+#include "old/text.h"
#include "script/cbottoken.h"
#include "ui/displayinfo.h"
diff --git a/src/ui/displayinfo.h b/src/ui/displayinfo.h index ebf38b1..6488309 100644 --- a/src/ui/displayinfo.h +++ b/src/ui/displayinfo.h @@ -20,7 +20,7 @@ #include "common/struct.h"
-#include "graphics/common/camera.h"
+#include "old/camera.h"
class CInstanceManager;
diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index f1dba43..df08c24 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -22,7 +22,7 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/restext.h"
@@ -35,7 +35,7 @@ #include "ui/label.h"
#include "ui/window.h"
#include "ui/group.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "sound/sound.h"
#include "ui/displaytext.h"
diff --git a/src/ui/displaytext.h b/src/ui/displaytext.h index f0c6992..fbff7c9 100644 --- a/src/ui/displaytext.h +++ b/src/ui/displaytext.h @@ -21,7 +21,7 @@ #include "common/event.h"
#include "common/misc.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
class CInstanceManager;
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp index e09ca9a..56e6dd8 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -24,15 +24,15 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/language.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "common/restext.h"
#include "ui/scroll.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "ui/edit.h"
diff --git a/src/ui/editvalue.cpp b/src/ui/editvalue.cpp index 285094b..7d92b37 100644 --- a/src/ui/editvalue.cpp +++ b/src/ui/editvalue.cpp @@ -22,8 +22,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/gauge.cpp b/src/ui/gauge.cpp index 072a923..84a804d 100644 --- a/src/ui/gauge.cpp +++ b/src/ui/gauge.cpp @@ -22,8 +22,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/group.cpp b/src/ui/group.cpp index c77e131..212064e 100644 --- a/src/ui/group.cpp +++ b/src/ui/group.cpp @@ -22,8 +22,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/image.cpp b/src/ui/image.cpp index 9019858..1803a1c 100644 --- a/src/ui/image.cpp +++ b/src/ui/image.cpp @@ -22,8 +22,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 8b8a888..a089dc3 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -22,8 +22,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
@@ -45,7 +45,7 @@ #include "ui/target.h"
#include "ui/map.h"
#include "ui/window.h"
-#include "graphics/common/camera.h"
+#include "old/camera.h"
#include "ui/interface.h"
diff --git a/src/ui/key.cpp b/src/ui/key.cpp index 1b8925d..a581674 100644 --- a/src/ui/key.cpp +++ b/src/ui/key.cpp @@ -22,14 +22,14 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "common/restext.h"
#include "sound/sound.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "ui/key.h"
diff --git a/src/ui/label.cpp b/src/ui/label.cpp index 5458d28..ef61cc5 100644 --- a/src/ui/label.cpp +++ b/src/ui/label.cpp @@ -22,12 +22,12 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "ui/label.h"
diff --git a/src/ui/list.cpp b/src/ui/list.cpp index f924fde..fd137eb 100644 --- a/src/ui/list.cpp +++ b/src/ui/list.cpp @@ -22,14 +22,14 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "ui/button.h"
#include "ui/scroll.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "ui/list.h"
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 7e80fcf..bc9f5b4 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -25,8 +25,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
#include "common/global.h"
#include "common/language.h"
#include "common/event.h"
@@ -34,8 +34,8 @@ #include "common/profile.h"
#include "common/iman.h"
#include "common/restext.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
+#include "old/math3d.h"
+#include "old/particule.h"
#include "ui/interface.h"
#include "ui/button.h"
#include "ui/color.h"
@@ -50,8 +50,8 @@ #include "ui/window.h"
#include "ui/edit.h"
#include "ui/editvalue.h"
-#include "graphics/common/text.h"
-#include "graphics/common/camera.h"
+#include "old/text.h"
+#include "old/camera.h"
#include "sound/sound.h"
#include "script/cmdtoken.h"
#include "object/robotmain.h"
diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index 5819cf8..cd017f5 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -20,7 +20,7 @@ #include "common/struct.h"
-#include "graphics/common/camera.h"
+#include "old/camera.h"
#include "object/robotmain.h"
diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp index 2b05775..ad0ed58 100644 --- a/src/ui/mainmap.cpp +++ b/src/ui/mainmap.cpp @@ -22,8 +22,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
#include "common/global.h"
#include "common/event.h"
#include "common/iman.h"
diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index 5d574e4..332fa2b 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -22,7 +22,7 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/global.h"
#include "common/event.h"
#include "common/iman.h"
diff --git a/src/ui/map.cpp b/src/ui/map.cpp index 7c62d3a..35e63d1 100644 --- a/src/ui/map.cpp +++ b/src/ui/map.cpp @@ -23,11 +23,11 @@ #include "common/struct.h"
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/event.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 "common/event.h"
#include "common/misc.h"
diff --git a/src/ui/scroll.cpp b/src/ui/scroll.cpp index 40b5545..59b3fbd 100644 --- a/src/ui/scroll.cpp +++ b/src/ui/scroll.cpp @@ -22,8 +22,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/shortcut.cpp b/src/ui/shortcut.cpp index 7651c63..1a5fc41 100644 --- a/src/ui/shortcut.cpp +++ b/src/ui/shortcut.cpp @@ -22,8 +22,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/slider.cpp b/src/ui/slider.cpp index 39c8f6b..d332ff4 100644 --- a/src/ui/slider.cpp +++ b/src/ui/slider.cpp @@ -22,12 +22,12 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "ui/button.h"
#include "ui/slider.h"
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index b4d196b..b9f8d95 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -27,17 +27,17 @@ #include <d3d.h>
#include "common/struct.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 "common/restext.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "object/robotmain.h"
#include "object/object.h"
-#include "graphics/common/camera.h"
+#include "old/camera.h"
#include "sound/sound.h"
#include "script/script.h"
#include "ui/interface.h"
@@ -49,7 +49,7 @@ #include "ui/label.h"
#include "ui/group.h"
#include "ui/window.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "script/cbottoken.h"
#include "ui/studio.h"
diff --git a/src/ui/target.cpp b/src/ui/target.cpp index 0f18efd..cf37a3d 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -22,8 +22,8 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "old/d3dengine.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
diff --git a/src/ui/window.cpp b/src/ui/window.cpp index 41998f1..d250ec9 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -22,9 +22,9 @@ #include <d3d.h>
#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "common/language.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/restext.h"
@@ -46,7 +46,7 @@ #include "ui/gauge.h"
#include "ui/compass.h"
#include "ui/target.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "ui/window.h"
|