diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dea9d2ab..0be5de53 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,8 +2,27 @@ add_subdirectory(CBot) set(SOURCES -app/d3dapp.cpp -app/joystick.cpp +old/d3dapp.cpp +old/joystick.cpp +old/blitz.cpp +old/camera.cpp +old/cloud.cpp +old/light.cpp +old/model.cpp +old/particule.cpp +old/planet.cpp +old/pyro.cpp +old/terrain.cpp +old/text.cpp +old/water.cpp +old/d3dengine.cpp +old/d3denum.cpp +old/d3dframe.cpp +old/d3dtextr.cpp +old/d3dutil.cpp +old/d3dmath.cpp +old/math3d.cpp +app/app.cpp common/event.cpp common/iman.cpp common/metafile.cpp @@ -11,24 +30,19 @@ common/misc.cpp common/modfile.cpp common/profile.cpp common/restext.cpp -graphics/common/blitz.cpp graphics/common/camera.cpp graphics/common/cloud.cpp +graphics/common/color.cpp +graphics/common/engine.cpp graphics/common/light.cpp +graphics/common/lightning.cpp graphics/common/model.cpp -graphics/common/particule.cpp +graphics/common/particle.cpp graphics/common/planet.cpp graphics/common/pyro.cpp graphics/common/terrain.cpp graphics/common/text.cpp graphics/common/water.cpp -graphics/d3d/d3dengine.cpp -graphics/d3d/d3denum.cpp -graphics/d3d/d3dframe.cpp -graphics/d3d/d3dtextr.cpp -graphics/d3d/d3dutil.cpp -math/old/d3dmath.cpp -math/old/math3d.cpp object/auto/auto.cpp object/auto/autobase.cpp object/auto/autoconvert.cpp @@ -125,7 +139,7 @@ ui/window.cpp add_definitions(-DSTRICT -DD3D_OVERLOADS) # Change to DirectX SDK directory -set(DXSDK_DIR "/mnt/windows/dxsdk") +set(DXSDK_DIR "c:/dxsdk") include_directories(${DXSDK_DIR}/include .) diff --git a/src/app/README.txt b/src/app/README.txt index 50e273fb..1df1fcce 100644 --- a/src/app/README.txt +++ b/src/app/README.txt @@ -1,3 +1,3 @@ src/app -Contains the main class of the application and joystick module (to be incorporated into application module once using SDL). +Contains the main class of the application. diff --git a/src/app/app.cpp b/src/app/app.cpp new file mode 100644 index 00000000..0938f2aa --- /dev/null +++ b/src/app/app.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// app.cpp + +#include "app/app.h" + + +// TODO implementation diff --git a/src/app/app.h b/src/app/app.h new file mode 100644 index 00000000..7d1f358e --- /dev/null +++ b/src/app/app.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// app.h + +#pragma once + + +class CApplication +{ + // TODO +}; + diff --git a/src/common/misc.cpp b/src/common/misc.cpp index 65b8031d..65efe2da 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp @@ -26,9 +26,9 @@ #include #include "common/struct.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" diff --git a/src/common/modfile.cpp b/src/common/modfile.cpp index eb110658..f87df257 100644 --- a/src/common/modfile.cpp +++ b/src/common/modfile.cpp @@ -23,13 +23,13 @@ #include "common/struct.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 "old/math3d.h" #include "common/modfile.h" diff --git a/src/common/modfile.h b/src/common/modfile.h index fb85118a..5b2d4963 100644 --- a/src/common/modfile.h +++ b/src/common/modfile.h @@ -20,7 +20,7 @@ #include "math/vector.h" -#include "graphics/d3d/d3dengine.h" +#include "old/d3dengine.h" class CInstanceManager; diff --git a/src/common/restext.cpp b/src/common/restext.cpp index d8ac63f7..68b24e22 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -17,7 +17,7 @@ #include #include "common/struct.h" -#include "graphics/d3d/d3dengine.h" +#include "old/d3dengine.h" #include "common/language.h" #include "common/misc.h" #include "common/event.h" diff --git a/src/common/restext.h b/src/common/restext.h index ab48a122..019f67a8 100644 --- a/src/common/restext.h +++ b/src/common/restext.h @@ -21,7 +21,7 @@ -#include "graphics/d3d/d3dengine.h" +#include "old/d3dengine.h" #include "common/event.h" diff --git a/src/graphics/README.txt b/src/graphics/README.txt index 57bba376..3ec3871c 100644 --- a/src/graphics/README.txt +++ b/src/graphics/README.txt @@ -1,5 +1,3 @@ src/graphics -In the future, it will contain common interface to handling 3D graphics with concrete implementations for OpenGL and DirectX. - -Currently, there is only the D3D interface. +Graphics engine diff --git a/src/graphics/common/README.txt b/src/graphics/common/README.txt new file mode 100644 index 00000000..495a453a --- /dev/null +++ b/src/graphics/common/README.txt @@ -0,0 +1,5 @@ +src/graphics/common + +Universal structs and classes used in graphics engine + +Concrete implementation in OpenGL is in graphics/opengl directory. diff --git a/src/graphics/common/camera.cpp b/src/graphics/common/camera.cpp new file mode 100644 index 00000000..9990d01f --- /dev/null +++ b/src/graphics/common/camera.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// camera.cpp + +#include "graphics/common/camera.h" + + +// TODO implementation diff --git a/src/graphics/common/camera.h b/src/graphics/common/camera.h new file mode 100644 index 00000000..14838bac --- /dev/null +++ b/src/graphics/common/camera.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// camera.h + +#pragma once + + +namespace Gfx { + +// TODO CCamera + +}; // namespace Gfx diff --git a/src/graphics/common/cloud.cpp b/src/graphics/common/cloud.cpp new file mode 100644 index 00000000..707f6411 --- /dev/null +++ b/src/graphics/common/cloud.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// cloud.cpp + +#include "graphics/common/cloud.h" + + +// TODO implementation diff --git a/src/graphics/common/cloud.h b/src/graphics/common/cloud.h new file mode 100644 index 00000000..3e190ec4 --- /dev/null +++ b/src/graphics/common/cloud.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// cloud.h + +#pragma once + + +namespace Gfx { + +// TODO CCloud + +}; // namespace Gfx diff --git a/src/graphics/common/color.cpp b/src/graphics/common/color.cpp index 1741f043..dd502f9a 100644 --- a/src/graphics/common/color.cpp +++ b/src/graphics/common/color.cpp @@ -18,64 +18,66 @@ #include "graphics/common/color.h" +#include "math/func.h" + // Returns the color corresponding long. long Gfx::RetColor(float intensity) { long color; - + if ( intensity <= 0.0f ) return 0x00000000; if ( intensity >= 1.0f ) return 0xffffffff; - + color = (int)(intensity*255.0f)<<24; color |= (int)(intensity*255.0f)<<16; color |= (int)(intensity*255.0f)<<8; color |= (int)(intensity*255.0f); - + return color; } // Returns the color corresponding long. -long Gfx::RetColor(Color intensity) +long Gfx::RetColor(Gfx::Color intensity) { long color; - + color = (int)(intensity.a*255.0f)<<24; color |= (int)(intensity.r*255.0f)<<16; color |= (int)(intensity.g*255.0f)<<8; color |= (int)(intensity.b*255.0f); - + return color; } // Returns the color corresponding Color. -Color Gfx::RetColor(long intensity) +Gfx::Color Gfx::RetColor(long intensity) { - Color color; - + Gfx::Color color; + color.r = (float)((intensity>>16)&0xff)/256.0f; color.g = (float)((intensity>>8 )&0xff)/256.0f; color.b = (float)((intensity>>0 )&0xff)/256.0f; color.a = (float)((intensity>>24)&0xff)/256.0f; - + return color; } // RGB to HSV conversion. -void Gfx::RGB2HSV(Color src, ColorHSV &dest) +void Gfx::RGB2HSV(Gfx::Color src, Gfx::ColorHSV &dest) { float min, max, delta; - + min = Math::Min(src.r, src.g, src.b); max = Math::Max(src.r, src.g, src.b); - + dest.v = max; // intensity - + if ( max == 0.0f ) { dest.s = 0.0f; // saturation @@ -85,7 +87,7 @@ void Gfx::RGB2HSV(Color src, ColorHSV &dest) { delta = max-min; dest.s = delta/max; // saturation - + if ( src.r == max ) // between yellow & magenta { dest.h = (src.g-src.b)/delta; @@ -98,7 +100,7 @@ void Gfx::RGB2HSV(Color src, ColorHSV &dest) { dest.h = 4.0f+(src.r-src.g)/delta; } - + dest.h *= 60.0f; // in degrees if ( dest.h < 0.0f ) dest.h += 360.0f; dest.h /= 360.0f; // 0..1 @@ -107,15 +109,15 @@ void Gfx::RGB2HSV(Color src, ColorHSV &dest) // HSV to RGB conversion. -void Gfx::HSV2RGB(ColorHSV src, Color &dest) +void Gfx::HSV2RGB(Gfx::ColorHSV src, Gfx::Color &dest) { int i; float f,v,p,q,t; - + src.h = Math::Norm(src.h)*360.0f; src.s = Math::Norm(src.s); src.v = Math::Norm(src.v); - + if ( src.s == 0.0f ) // zero saturation? { dest.r = src.v; @@ -128,12 +130,12 @@ void Gfx::HSV2RGB(ColorHSV src, Color &dest) src.h /= 60.0f; i = (int)src.h; // integer part (0 .. 5) f = src.h-i; // fractional part - + v = src.v; p = src.v*(1.0f-src.s); q = src.v*(1.0f-(src.s*f)); t = src.v*(1.0f-(src.s*(1.0f-f))); - + switch (i) { case 0: dest.r=v; dest.g=t; dest.b=p; break; diff --git a/src/graphics/common/color.h b/src/graphics/common/color.h index 1f04594a..146e515f 100644 --- a/src/graphics/common/color.h +++ b/src/graphics/common/color.h @@ -19,20 +19,23 @@ #pragma once -// TODO namespace Gfx { struct Color { - - float r, g, b, a; - + float r, g, b, a; + + Color(float aR = 0.0f, float aG = 0.0f, float aB = 0.0f, float aA = 0.0f) + : r(aR), g(aG), b(aB), a(aA) {} }; struct ColorHSV { - float h,s,v; + float h, s, v; + + ColorHSV(float aH = 0.0f, float aS = 0.0f, float aV = 0.0f) + : h(aH), s(aS), v(aV) {} }; @@ -40,8 +43,8 @@ long RetColor(float intensity); long RetColor(Color intensity); Color RetColor(long intensity); -void RGB2HSV(Color src, ColorHSV &dest); -void HSV2RGB(ColorHSV src, Color &dest); +void RGB2HSV(Color src, ColorHSV &dest); +void HSV2RGB(ColorHSV src, Color &dest); -}; +}; // namespace Gfx diff --git a/src/graphics/common/engine.cpp b/src/graphics/common/engine.cpp new file mode 100644 index 00000000..acd09953 --- /dev/null +++ b/src/graphics/common/engine.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// engine.cpp + +#include "graphics/common/engine.h" + + +// TODO implementation diff --git a/src/graphics/common/engine.h b/src/graphics/common/engine.h new file mode 100644 index 00000000..724ec746 --- /dev/null +++ b/src/graphics/common/engine.h @@ -0,0 +1,712 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// engine.h + +#pragma once + + +#include "math/point.h" +#include "math/vector.h" +#include "math/matrix.h" + + +namespace Gfx { + +/* + +TODO + +class CApplication; +class CInstanceManager; +class CObject; +class CLight; +class CText; +class CParticule; +class CWater; +class CCloud; +class CBlitz; +class CPlanet; +class CSound; +class CTerrain; + + +//const int MAXOBJECT = 1200; +//const int MAXSHADOW = 500; +//const int MAXGROUNDSPOT = 100; + + +enum ObjectType +{ + //! Object doesn't exist + OBJTYPE_NULL = 0, + //! Terrain + OBJTYPE_TERRAIN = 1, + //! Fixed object + OBJTYPE_FIX = 2, + //! Moving object + OBJTYPE_VEHICULE = 3, + //! Part of a moving object + OBJTYPE_DESCENDANT = 4, + //! Fixed object type quartz + OBJTYPE_QUARTZ = 5, + //! Fixed object type metal + OBJTYPE_METAL = 6 +}; + +enum TriangleType +{ + //! triangles + TRIANGLE_TYPE_6T = 1, + //! surfaces + TRIANGLE_TYPE_6S = 2 +}; + +enum Mapping +{ + MAPPING_X = 1, + MAPPING_Y = 2, + MAPPING_Z = 3, + MAPPING_1X = 4, + MAPPING_1Y = 5, + MAPPING_1Z = 6 +}; + +enum MouseType +{ + MOUSE_HIDE = 0, // no mouse + MOUSE_NORM = 1, + MOUSE_WAIT = 2, + MOUSE_EDIT = 3, + MOUSE_HAND = 4, + MOUSE_CROSS = 5, + MOUSE_SHOW = 6, + MOUSE_NO = 7, + MOUSE_MOVE = 8, // + + MOUSE_MOVEH = 9, // - + MOUSE_MOVEV = 10, // | + MOUSE_MOVED = 11, // / + MOUSE_MOVEI = 12, // \ // + MOUSE_SCROLLL = 13, // << + MOUSE_SCROLLR = 14, // >> + MOUSE_SCROLLU = 15, // ^ + MOUSE_SCROLLD = 16, // v + MOUSE_TARGET = 17 +}; + +enum ShadowType +{ + SHADOW_NORM = 0, + SHADOW_WORM = 1 +}; + +enum RenderState +{ + //! Normal opaque materials + RSTATE_NORMAL = 0, + //! The transparent texture (black = no) + RSTATE_TTEXTURE_BLACK = (1<<0), + //! The transparent texture (white = no) + RSTATE_TTEXTURE_WHITE = (1<<1), + //! The transparent diffuse color + RSTATE_TDIFFUSE = (1<<2), + //! Texture wrap + RSTATE_WRAP = (1<<3), + //! Texture borders with solid color + RSTATE_CLAMP = (1<<4), + //! Light texture (ambient max) + RSTATE_LIGHT = (1<<5), + //! Double black texturing + RSTATE_DUAL_BLACK = (1<<6), + //! Double white texturing + RSTATE_DUAL_WHITE = (1<<7), + //! Part 1 (no change in. MOD!) + RSTATE_PART1 = (1<<8), + //! Part 2 + RSTATE_PART2 = (1<<9), + //! Part 3 + RSTATE_PART3 = (1<<10), + //! Part 4 + RSTATE_PART4 = (1<<11), + //! Double-sided face + RSTATE_2FACE = (1<<12), + //! Image using alpha channel + RSTATE_ALPHA = (1<<13), + //! Always use 2nd floor texturing + RSTATE_SECOND = (1<<14), + //! Causes the fog + RSTATE_FOG = (1<<15), + //! The transparent color (black = no) + RSTATE_TCOLOR_BLACK = (1<<16), + //! The transparent color (white = no) + RSTATE_TCOLOR_WHITE = (1<<17) +}; + + +struct Triangle +{ + Gfx::VertexTex2 triangle[3]; + Gfx::Material material; + int state; + char texName1[20]; + char texName2[20]; +}; + + +struct ObjLevel6 +{ + int totalPossible; + int totalUsed; + Gfx::Material material; + int state; + Gfx::TriangleType type; + Math::VertexTex2 vertex[1]; +}; + +struct ObjLevel5 +{ + int totalPossible; + int totalUsed; + int reserve; + Gfx::ObjLevel6* table[1]; +}; + +struct ObjLevel4 +{ + int totalPossible; + int totalUsed; + float min, max; + Gfx::ObjLevel5* table[1]; +}; + +struct ObjLevel3 +{ + int totalPossible; + int totalUsed; + int objRank; + Gfx::ObjLevel4* table[1]; +}; + +struct ObjLevel2 +{ + int totalPossible; + int totalUsed; + char texName1[20]; + char texName2[20]; + Gfx::ObjLevel3* table[1]; +}; + +struct ObjLevel1 +{ + int totalPossible; + int totalUsed; + Gfx::ObjLevel2* table[1]; +}; + + +struct Object +{ + bool used; // true -> object exists + bool visible; // true -> visible object + bool drawWorld; // true -> shape behind the interface + bool drawFront; // true -> shape before the interface + int totalTriangle; // number of triangles used + Gfx::ObjectType type; // type of the object (TYPE*) + Math::Matrix transform; // transformation matrix + float distance; // distance point of view - original + Math::Vector bboxMin; // bounding box of the object + Math::Vector bboxMax; // (the origin 0, 0, 0 is always included) + float radius; // radius of the sphere at the origin + int shadowRank; // rank of the associated shadow + float transparency; // transparency of the object (0 .. 1) +}; + +struct Shadow +{ + bool used; // true -> object exists + bool hide; // true -> invisible shadow (object carried by ex.) + int objRank; // rank of the object + Gfx::ShadowType type; // type of shadow + Math::Vector pos; // position for the shadow + Math::Vector normal; // normal terrain + float angle; // angle of the shadow + float radius; // radius of the shadow + float intensity; // intensity of the shadow + float height; // height from the ground +}; + +struct GroundSpot +{ + bool used; // true -> object exists + Gfx::Color color; // color of the shadow + float min, max; // altitudes min / max + float smooth; // transition area + Math::Vector pos; // position for the shadow + float radius; // radius of the shadow + Math::Vector drawPos; // drawn to position the shade + float drawRadius; // radius of the shadow drawn +}; + +struct GroundMark +{ + bool used; // true -> object exists + bool draw; // true -> drawn mark + int phase; // 1 = increase, 2 = fixed, 3 = decrease + float delay[3]; // time for 3 phases + float fix; // fixed time + Math::Vector pos; // position for marks + float radius; // radius of marks + float intensity; // color intensity + Math::Vector drawPos; // drawn in position marks + float drawRadius; // radius marks drawn + float drawIntensity; // current drawn + int dx, dy; // dimensions table + char* table; // pointer to the table +}; + + + +class CGfxEngine +{ +public: + CGfxEngine(CInstanceManager *iMan, CApplication *app); + ~CGfxEngine(); + + void SetDevice(Gfx::Device *device); + Gfx::Device* RetDevice(); + + void SetTerrain(Gfx::CTerrain* terrain); + + bool WriteProfile(); + + void SetPause(bool bPause); + bool RetPause(); + + void SetMovieLock(bool bLock); + bool RetMovieLock(); + + void SetShowStat(bool bShow); + bool RetShowStat(); + + void SetRenderEnable(bool bEnable); + + int OneTimeSceneInit(); + int InitDeviceObjects(); + int DeleteDeviceObjects(); + int RestoreSurfaces(); + int Render(); + int FrameMove(float rTime); + void StepSimul(float rTime); + int FinalCleanup(); + void AddStatisticTriangle(int nb); + int RetStatisticTriangle(); + void SetHiliteRank(int *rankList); + bool GetHilite(Math::Point &p1, Math::Point &p2); + bool GetSpriteCoord(int &x, int &y); + void SetInfoText(int line, char* text); + char * RetInfoText(int line); + //LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + void FirstExecuteAdapt(bool bFirst); + //int GetVidMemTotal(); + //bool IsVideo8MB(); + //bool IsVideo32MB(); + + bool EnumDevices(char *bufDevices, int lenDevices, char *bufModes, int lenModes, int &totalDevices, int &selectDevices, int &totalModes, int &selectModes); + bool RetFullScreen(); + bool ChangeDevice(char *device, char *mode, bool bFull); + + Math::Matrix* RetMatView(); + Math::Matrix* RetMatLeftView(); + Math::Matrix* RetMatRightView(); + + void TimeInit(); + void TimeEnterGel(); + void TimeExitGel(); + float TimeGet(); + + int RetRestCreate(); + int CreateObject(); + void FlushObject(); + bool DeleteObject(int objRank); + bool SetDrawWorld(int objRank, bool bDraw); + bool SetDrawFront(int objRank, bool bDraw); + bool AddTriangle(int objRank, Math::VertexTex2* vertex, int nb, const Gfx::Material &mat, int state, char* texName1, char* texName2, float min, float max, bool bGlobalUpdate); + bool AddSurface(int objRank, Math::VertexTex2* vertex, int nb, const Gfx::Material &mat, int state, char* texName1, char* texName2, float min, float max, bool bGlobalUpdate); + bool AddQuick(int objRank, Gfx::ObjLevel6* buffer, char* texName1, char* texName2, float min, float max, bool bGlobalUpdate); + Gfx::ObjLevel6* SearchTriangle(int objRank, const Gfx::Material &mat, int state, char* texName1, char* texName2, float min, float max); + void ChangeLOD(); + bool ChangeSecondTexture(int objRank, char* texName2); + int RetTotalTriangles(int objRank); + int GetTriangles(int objRank, float min, float max, Gfx::Triangle* buffer, int size, float percent); + bool GetBBox(int objRank, Math::Vector &min, Math::Vector &max); + bool ChangeTextureMapping(int objRank, const Gfx::Material &mat, int state, char* texName1, char* texName2, float min, float max, Gfx::Maping mode, float au, float bu, float av, float bv); + bool TrackTextureMapping(int objRank, const Gfx::Material &mat, int state, char* texName1, char* texName2, float min, float max, Gfx::Maping mode, float pos, float factor, float tl, float ts, float tt); + bool SetObjectTransform(int objRank, const Math::Matrix &transform); + bool GetObjectTransform(int objRank, Math::Matrix &transform); + bool SetObjectType(int objRank, Gfx::ObjectType type); + Gfx::ObjectType RetObjectType(int objRank); + bool SetObjectTransparency(int objRank, float value); + + bool ShadowCreate(int objRank); + void ShadowDelete(int objRank); + bool SetObjectShadowHide(int objRank, bool bHide); + bool SetObjectShadowType(int objRank, Gfx::ShadowType type); + bool SetObjectShadowPos(int objRank, const Math::Vector &pos); + bool SetObjectShadowNormal(int objRank, const Math::Vector &n); + bool SetObjectShadowAngle(int objRank, float angle); + bool SetObjectShadowRadius(int objRank, float radius); + bool SetObjectShadowIntensity(int objRank, float intensity); + bool SetObjectShadowHeight(int objRank, float h); + float RetObjectShadowRadius(int objRank); + + void GroundSpotFlush(); + int GroundSpotCreate(); + void GroundSpotDelete(int rank); + bool SetObjectGroundSpotPos(int rank, const Math::Vector &pos); + bool SetObjectGroundSpotRadius(int rank, float radius); + bool SetObjectGroundSpotColor(int rank, const Gfx::Color &color); + bool SetObjectGroundSpotMinMax(int rank, float min, float max); + bool SetObjectGroundSpotSmooth(int rank, float smooth); + + int GroundMarkCreate(Math::Vector pos, float radius, float delay1, float delay2, float delay3, int dx, int dy, char* table); + bool GroundMarkDelete(int rank); + + void Update(); + + void SetViewParams(const Math::Vector &vEyePt, const Math::Vector &vLookatPt, const Math::Vector &vUpVec, float fEyeDistance); + + bool FreeTexture(char* name); + bool LoadTexture(char* name, int stage=0); + bool LoadAllTexture(); + + void SetLimitLOD(int rank, float limit); + float RetLimitLOD(int rank, bool bLast=false); + + void SetTerrainVision(float vision); + + void SetGroundSpot(bool bMode); + bool RetGroundSpot(); + void SetShadow(bool bMode); + bool RetShadow(); + void SetDirty(bool bMode); + bool RetDirty(); + void SetFog(bool bMode); + bool RetFog(); + bool RetStateColor(); + + void SetSecondTexture(int texNum); + int RetSecondTexture(); + + void SetRankView(int rank); + int RetRankView(); + + void SetDrawWorld(bool bDraw); + void SetDrawFront(bool bDraw); + + void SetAmbiantColor(const Gfx::Color &color, int rank=0); + Gfx::Color RetAmbiantColor(int rank=0); + + void SetWaterAddColor(const Gfx::Color &color); + Gfx::Color RetWaterAddColor(); + + void SetFogColor(const Gfx::Color &color, int rank=0); + Gfx::Color RetFogColor(int rank=0); + + void SetDeepView(float length, int rank=0, bool bRef=false); + float RetDeepView(int rank=0); + + void SetFogStart(float start, int rank=0); + float RetFogStart(int rank=0); + + void SetBackground(char *name, Gfx::Color up=0, Gfx::Color down=0, Gfx::Color cloudUp=0, Gfx::Color cloudDown=0, bool bFull=false, bool bQuarter=false); + void RetBackground(char *name, Gfx::Color &up, Gfx::Color &down, Gfx::Color &cloudUp, Gfx::Color &cloudDown, bool &bFull, bool &bQuarter); + void SetFrontsizeName(char *name); + void SetOverFront(bool bFront); + void SetOverColor(const Gfx::Color &color=0, int mode=RSTATE_TCOLOR_BLACK); + + void SetParticuleDensity(float value); + float RetParticuleDensity(); + float ParticuleAdapt(float factor); + + void SetClippingDistance(float value); + float RetClippingDistance(); + + void SetObjectDetail(float value); + float RetObjectDetail(); + + void SetGadgetQuantity(float value); + float RetGadgetQuantity(); + + void SetTextureQuality(int value); + int RetTextureQuality(); + + void SetTotoMode(bool bPresent); + bool RetTotoMode(); + + void SetLensMode(bool bPresent); + bool RetLensMode(); + + void SetWaterMode(bool bPresent); + bool RetWaterMode(); + + void SetBlitzMode(bool bPresent); + bool RetBlitzMode(); + + void SetSkyMode(bool bPresent); + bool RetSkyMode(); + + void SetBackForce(bool bPresent); + bool RetBackForce(); + + void SetPlanetMode(bool bPresent); + bool RetPlanetMode(); + + void SetLightMode(bool bPresent); + bool RetLightMode(); + + void SetEditIndentMode(bool bAuto); + bool RetEditIndentMode(); + + void SetEditIndentValue(int value); + int RetEditIndentValue(); + + void SetSpeed(float speed); + float RetSpeed(); + + void SetTracePrecision(float factor); + float RetTracePrecision(); + + void SetFocus(float focus); + float RetFocus(); + Math::Vector RetEyePt(); + Math::Vector RetLookatPt(); + float RetEyeDirH(); + float RetEyeDirV(); + Math::Point RetDim(); + void UpdateMatProj(); + + void ApplyChange(); + + void FlushPressKey(); + void ResetKey(); + void SetKey(int keyRank, int option, int key); + int RetKey(int keyRank, int option); + + void SetJoystick(bool bEnable); + bool RetJoystick(); + + void SetDebugMode(bool bMode); + bool RetDebugMode(); + bool RetSetupMode(); + + bool IsVisiblePoint(const Math::Vector &pos); + + int DetectObject(Math::Point mouse); + void SetState(int state, Gfx::Color color=0xffffffff); + void SetTexture(char *name, int stage=0); + void SetMaterial(const Gfx::Material &mat); + + void MoveMousePos(Math::Point pos); + void SetMousePos(Math::Point pos); + Math::Point RetMousePos(); + void SetMouseType(Gfx::MouseType type); + Gfx::MouseType RetMouseType(); + void SetMouseHide(bool bHide); + bool RetMouseHide(); + void SetNiceMouse(bool bNice); + bool RetNiceMouse(); + bool RetNiceMouseCap(); + + CText* RetText(); + + bool ChangeColor(char *name, Gfx::Color colorRef1, Gfx::Color colorNew1, Gfx::Color colorRef2, Gfx::Color colorNew2, float tolerance1, float tolerance2, Math::Point ts, Math::Point ti, Math::Point *pExclu=0, float shift=0.0f, bool bHSV=false); + bool OpenImage(char *name); + bool CopyImage(); + bool LoadImage(); + bool ScrollImage(int dx, int dy); + bool SetDot(int x, int y, Gfx::Color color); + bool CloseImage(); + bool WriteScreenShot(char *filename, int width, int height); + //bool GetRenderDC(HDC &hDC); + //bool ReleaseRenderDC(HDC &hDC); + //PBITMAPINFO CreateBitmapInfoStruct(HBITMAP hBmp); + //bool CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBMP, HDC hDC); + +protected: + void MemSpace1(Gfx::ObjLevel1 *&p, int nb); + void MemSpace2(Gfx::ObjLevel2 *&p, int nb); + void MemSpace3(Gfx::ObjLevel3 *&p, int nb); + void MemSpace4(Gfx::ObjLevel4 *&p, int nb); + void MemSpace5(Gfx::ObjLevel5 *&p, int nb); + void MemSpace6(Gfx::ObjLevel6 *&p, int nb); + + Gfx::ObjLevel2* AddLevel1(Gfx::ObjLevel1 *&p1, char* texName1, char* texName2); + Gfx::ObjLevel3* AddLevel2(Gfx::ObjLevel2 *&p2, int objRank); + Gfx::ObjLevel4* AddLevel3(Gfx::ObjLevel3 *&p3, float min, float max); + Gfx::ObjLevel5* AddLevel4(Gfx::ObjLevel4 *&p4, int reserve); + Gfx::ObjLevel6* AddLevel5(Gfx::ObjLevel5 *&p5, Gfx::TriangleType type, const Gfx::Material &mat, int state, int nb); + + bool IsVisible(int objRank); + bool DetectBBox(int objRank, Math::Point mouse); + bool DetectTriangle(Math::Point mouse, Math::VertexTex2 *triangle, int objRank, float &dist); + bool TransformPoint(Math::Vector &p2D, int objRank, Math::Vector p3D); + void ComputeDistance(); + void UpdateGeometry(); + void RenderGroundSpot(); + void DrawShadow(); + void DrawBackground(); + void DrawBackgroundGradient(Gfx::Color up, Gfx::Color down); + void DrawBackgroundImageQuarter(Math::Point p1, Math::Point p2, char *name); + void DrawBackgroundImage(); + void DrawPlanet(); + void DrawFrontsize(); + void DrawOverColor(); + bool GetBBox2D(int objRank, Math::Point &min, Math::Point &max); + void DrawHilite(); + void DrawMouse(); + void DrawSprite(Math::Point pos, Math::Point dim, int icon); + +protected: + CInstanceManager* m_iMan; + CApplication* m_app; + Gfx::Device* m_device; + CText* m_text; + CLight* m_light; + CParticule* m_particule; + CWater* m_water; + CCloud* m_cloud; + CBlitz* m_blitz; + CPlanet* m_planet; + CSound* m_sound; + CTerrain* m_terrain; + + int m_blackSrcBlend[2]; + int m_blackDestBlend[2]; + int m_whiteSrcBlend[2]; + int m_whiteDestBlend[2]; + int m_diffuseSrcBlend[2]; + int m_diffuseDestBlend[2]; + int m_alphaSrcBlend[2]; + int m_alphaDestBlend[2]; + + Math::Matrix m_matProj; + Math::Matrix m_matLeftView; + Math::Matrix m_matRightView; + Math::Matrix m_matView; + float m_focus; + + Math::Matrix m_matWorldInterface; + Math::Matrix m_matProjInterface; + Math::Matrix m_matViewInterface; + + long m_baseTime; + long m_stopTime; + float m_absTime; + float m_lastTime; + float m_speed; + bool m_bPause; + bool m_bRender; + bool m_bMovieLock; + + POINT m_dim; + POINT m_lastDim; + Gfx::ObjLevel1* m_objectPointer; + int m_objectParamTotal; + Gfx::Object* m_objectParam; + int m_shadowTotal; + Gfx::Shadow* m_shadow; + Gfx::GroundSpot* m_groundSpot; + Gfx::GroundMark m_groundMark; + Math::Vector m_eyePt; + Math::Vector m_lookatPt; + float m_eyeDirH; + float m_eyeDirV; + int m_rankView; + Gfx::Color m_ambiantColor[2]; + Gfx::Color m_backColor[2]; + Gfx::Color m_fogColor[2]; + float m_deepView[2]; + float m_fogStart[2]; + Gfx::Color m_waterAddColor; + int m_statisticTriangle; + bool m_bUpdateGeometry; + char m_infoText[10][200]; + int m_alphaMode; + bool m_bStateColor; + bool m_bForceStateColor; + bool m_bGroundSpot; + bool m_bShadow; + bool m_bDirty; + bool m_bFog; + bool m_bFirstGroundSpot; + int m_secondTexNum; + char m_backgroundName[50]; + Gfx::Color m_backgroundColorUp; + Gfx::Color m_backgroundColorDown; + Gfx::Color m_backgroundCloudUp; + Gfx::Color m_backgroundCloudDown; + bool m_bBackgroundFull; + bool m_bBackgroundQuarter; + bool m_bOverFront; + Gfx::Color m_overColor; + int m_overMode; + char m_frontsizeName[50]; + bool m_bDrawWorld; + bool m_bDrawFront; + float m_limitLOD[2]; + float m_particuleDensity; + float m_clippingDistance; + float m_lastClippingDistance; + float m_objectDetail; + float m_lastObjectDetail; + float m_terrainVision; + float m_gadgetQuantity; + int m_textureQuality; + bool m_bTotoMode; + bool m_bLensMode; + bool m_bWaterMode; + bool m_bSkyMode; + bool m_bBackForce; + bool m_bPlanetMode; + bool m_bLightMode; + bool m_bEditIndentMode; + int m_editIndentValue; + float m_tracePrecision; + + int m_hiliteRank[100]; + bool m_bHilite; + Math::Point m_hiliteP1; + Math::Point m_hiliteP2; + + int m_lastState; + Gfx::Color m_lastColor; + char m_lastTexture[2][50]; + Gfx::Material m_lastMaterial; + + Math::Point m_mousePos; + Gfx::MouseType m_mouseType; + bool m_bMouseHide; + bool m_bNiceMouse; + + //LPDIRECTDRAWSURFACE7 m_imageSurface; + //DDSURFACEDESC2 m_imageDDSD; + //WORD* m_imageCopy; + //int m_imageDX; + //int m_imageDY; +};*/ + +}; // namespace Gfx diff --git a/src/graphics/common/light.cpp b/src/graphics/common/light.cpp new file mode 100644 index 00000000..d9382569 --- /dev/null +++ b/src/graphics/common/light.cpp @@ -0,0 +1,22 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// light.cpp + +#include "graphics/common/light.h" + +// TODO implementation \ No newline at end of file diff --git a/src/graphics/common/light.h b/src/graphics/common/light.h new file mode 100644 index 00000000..024ef585 --- /dev/null +++ b/src/graphics/common/light.h @@ -0,0 +1,108 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// light.h + +#pragma once + + +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; +}; + +// TODO CLight + +}; // namespace Gfx diff --git a/src/graphics/common/lightning.cpp b/src/graphics/common/lightning.cpp new file mode 100644 index 00000000..076fcb4c --- /dev/null +++ b/src/graphics/common/lightning.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// lightning.cpp (aka blitz.cpp) + +#include "graphics/common/lightning.h" + + +// TODO implementation diff --git a/src/graphics/common/lightning.h b/src/graphics/common/lightning.h new file mode 100644 index 00000000..a7fab45b --- /dev/null +++ b/src/graphics/common/lightning.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// lightning.h (aka blitz.h) + +#pragma once + + +namespace Gfx { + +// TODO CLightning (aka CBlitz) + +}; // namespace Gfx diff --git a/src/graphics/common/material.h b/src/graphics/common/material.h new file mode 100644 index 00000000..d6e2b41f --- /dev/null +++ b/src/graphics/common/material.h @@ -0,0 +1,26 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// material.h + +#pragma once + + +namespace Gfx { + +// TODO struct Material + +}; // namespace Gfx diff --git a/src/graphics/common/model.cpp b/src/graphics/common/model.cpp new file mode 100644 index 00000000..c415fb8b --- /dev/null +++ b/src/graphics/common/model.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// model.cpp + +#include "graphics/common/model.h" + + +// TODO implementation diff --git a/src/graphics/common/model.h b/src/graphics/common/model.h new file mode 100644 index 00000000..a086c73a --- /dev/null +++ b/src/graphics/common/model.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// model.h + +#pragma once + + +namespace Gfx { + +// TODO CModel + +}; // namespace Gfx diff --git a/src/graphics/common/particle.cpp b/src/graphics/common/particle.cpp new file mode 100644 index 00000000..322c2d03 --- /dev/null +++ b/src/graphics/common/particle.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// particle.cpp (aka particule.cpp) + +#include "graphics/common/particle.h" + + +// TODO implementation diff --git a/src/graphics/common/particle.h b/src/graphics/common/particle.h new file mode 100644 index 00000000..f550399c --- /dev/null +++ b/src/graphics/common/particle.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// particle.h (aka particule.h) + +#pragma once + + +namespace Gfx { + +// TODO CParticle (aka CParticule) + +}; // namespace Gfx diff --git a/src/graphics/common/planet.cpp b/src/graphics/common/planet.cpp new file mode 100644 index 00000000..4fa17a1f --- /dev/null +++ b/src/graphics/common/planet.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// planet.cpp + +#include "graphics/common/planet.h" + + +// TODO implementation diff --git a/src/graphics/common/planet.h b/src/graphics/common/planet.h new file mode 100644 index 00000000..537ca0ba --- /dev/null +++ b/src/graphics/common/planet.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// planet.h + +#pragma once + + +namespace Gfx { + +// TODO CPlanet + +}; // namespace Gfx diff --git a/src/graphics/common/pyro.cpp b/src/graphics/common/pyro.cpp new file mode 100644 index 00000000..6b5b1afe --- /dev/null +++ b/src/graphics/common/pyro.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// pyro.cpp + +#include "graphics/common/pyro.h" + + +// TODO implementation diff --git a/src/graphics/common/pyro.h b/src/graphics/common/pyro.h new file mode 100644 index 00000000..4c5c3189 --- /dev/null +++ b/src/graphics/common/pyro.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// pyro.h + +#pragma once + + +namespace Gfx { + +// TODO CPyro + +}; // namespace Gfx diff --git a/src/graphics/common/terrain.cpp b/src/graphics/common/terrain.cpp new file mode 100644 index 00000000..9b61dfc6 --- /dev/null +++ b/src/graphics/common/terrain.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// terrain.cpp + +#include "graphics/common/terrain.h" + + +// TODO implementation diff --git a/src/graphics/common/terrain.h b/src/graphics/common/terrain.h new file mode 100644 index 00000000..b5277350 --- /dev/null +++ b/src/graphics/common/terrain.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// terrain.h + +#pragma once + + +namespace Gfx { + +// TODO CTerrain + +}; // namespace Gfx diff --git a/src/graphics/common/text.cpp b/src/graphics/common/text.cpp new file mode 100644 index 00000000..0c5eb664 --- /dev/null +++ b/src/graphics/common/text.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// text.cpp + +#include "graphics/common/text.h" + + +// TODO implementation diff --git a/src/graphics/common/text.h b/src/graphics/common/text.h new file mode 100644 index 00000000..08fc6dde --- /dev/null +++ b/src/graphics/common/text.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// text.h + +#pragma once + + +namespace Gfx { + +// TODO CText + +}; // namespace Gfx diff --git a/src/graphics/common/vertex.h b/src/graphics/common/vertex.h index b54b56e2..9368b4b3 100644 --- a/src/graphics/common/vertex.h +++ b/src/graphics/common/vertex.h @@ -1,5 +1,24 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// vertex.h + #pragma once + #include "math/vector.h" #include "math/point.h" @@ -44,4 +63,4 @@ struct VertexTex2 : public Gfx::Vertex : Vertex(aCoord, aNormal, aTexCoord), texCoord2(aTexCoord2) {} }; -}; +}; // namespace Gfx diff --git a/src/graphics/common/water.cpp b/src/graphics/common/water.cpp new file mode 100644 index 00000000..5172b9ff --- /dev/null +++ b/src/graphics/common/water.cpp @@ -0,0 +1,23 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// water.cpp + +#include "graphics/common/water.h" + + +// TODO implementation diff --git a/src/graphics/common/water.h b/src/graphics/common/water.h new file mode 100644 index 00000000..239b1b22 --- /dev/null +++ b/src/graphics/common/water.h @@ -0,0 +1,27 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// water.h + +#pragma once + + +namespace Gfx { + +// TODO CWater + +}; // namespace Gfx diff --git a/src/graphics/d3d/README.txt b/src/graphics/d3d/README.txt new file mode 100644 index 00000000..8388120f --- /dev/null +++ b/src/graphics/d3d/README.txt @@ -0,0 +1,3 @@ +src/graphics/d3d + +Possible future DirectX implementation of graphics engine diff --git a/src/graphics/opengl/README.txt b/src/graphics/opengl/README.txt new file mode 100644 index 00000000..11aba8d0 --- /dev/null +++ b/src/graphics/opengl/README.txt @@ -0,0 +1,6 @@ +src/graphics/opengl + +OpenGL engine implementation + +Contains the concreate implementation using OpenGL of functions +of grahpics engine in graphics/common. diff --git a/src/graphics/opengl/glengine.h b/src/graphics/opengl/glengine.h new file mode 100644 index 00000000..fa67bfe2 --- /dev/null +++ b/src/graphics/opengl/glengine.h @@ -0,0 +1,32 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// glengine.h + +#pragma once + + +#include "graphics/common/engine.h" + +namespace Gfx +{ + +class CGLEngine : public Gfx::CEngine +{ + // TODO +}; + +}; diff --git a/src/math/test/CMakeLists.txt b/src/math/test/CMakeLists.txt index e94f7657..c7360221 100644 --- a/src/math/test/CMakeLists.txt +++ b/src/math/test/CMakeLists.txt @@ -13,7 +13,8 @@ add_test(matrix_test ./matrix_test) add_test(vector_test ./vector_test) add_test(geometry_test ./geometry_test) -include_directories(c:/dxsdk/include) +# Change to DirectX SDK directory +include_directories("c:/dxsdk/include") add_definitions(-DSTRICT -DD3D_OVERLOADS) diff --git a/src/math/test/geometry_test.cpp b/src/math/test/geometry_test.cpp index 4aef4144..d6dbd9b0 100644 --- a/src/math/test/geometry_test.cpp +++ b/src/math/test/geometry_test.cpp @@ -21,8 +21,8 @@ #include "../func.h" #include "../geometry.h" #include "../conv.h" -#include "../old/math3d.h" -#include "../../graphics/d3d/d3dutil.h" +#include "../../old/math3d.h" +#include "../../old/d3dutil.h" #include #include diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index 277ed714..a13232fe 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -20,10 +20,10 @@ #include "object/auto/autobase.h" #include "common/iman.h" -#include "graphics/common/terrain.h" -#include "graphics/common/cloud.h" -#include "graphics/common/planet.h" -#include "graphics/common/blitz.h" +#include "old/terrain.h" +#include "old/cloud.h" +#include "old/planet.h" +#include "old/blitz.h" #include "math/geometry.h" #include "object/robotmain.h" #include "physics/physics.h" diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index 83606399..fa7cff98 100644 --- a/src/object/auto/autoderrick.cpp +++ b/src/object/auto/autoderrick.cpp @@ -20,7 +20,7 @@ #include "object/auto/autoderrick.h" #include "common/iman.h" -#include "graphics/common/terrain.h" +#include "old/terrain.h" #include "math/geometry.h" #include "script/cmdtoken.h" #include "ui/interface.h" diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp index 90f19ba8..74db234a 100644 --- a/src/object/auto/autoenergy.cpp +++ b/src/object/auto/autoenergy.cpp @@ -20,7 +20,7 @@ #include "object/auto/autoenergy.h" #include "common/iman.h" -#include "graphics/common/terrain.h" +#include "old/terrain.h" #include "math/geometry.h" #include "script/cmdtoken.h" #include "ui/interface.h" diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp index c062d847..2c9ebdce 100644 --- a/src/object/auto/autoflag.cpp +++ b/src/object/auto/autoflag.cpp @@ -20,7 +20,7 @@ #include "object/auto/autoflag.h" #include "math/geometry.h" -#include "graphics/common/terrain.h" +#include "old/terrain.h" diff --git a/src/object/auto/autohuston.h b/src/object/auto/autohuston.h index 68c9cdf6..a12c4f2e 100644 --- a/src/object/auto/autohuston.h +++ b/src/object/auto/autohuston.h @@ -20,7 +20,7 @@ #include "object/auto/auto.h" -#include "graphics/common/particule.h" +#include "old/particule.h" diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp index c96cc44a..9177aa8c 100644 --- a/src/object/auto/autokid.cpp +++ b/src/object/auto/autokid.cpp @@ -19,8 +19,8 @@ #include "object/auto/autokid.h" -#include "graphics/common/particule.h" -#include "graphics/common/water.h" +#include "old/particule.h" +#include "old/water.h" diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 44053775..a1fdf674 100644 --- a/src/object/auto/autonest.cpp +++ b/src/object/auto/autonest.cpp @@ -20,7 +20,7 @@ #include "object/auto/autonest.h" #include "common/iman.h" -#include "graphics/common/terrain.h" +#include "old/terrain.h" #include "script/cmdtoken.h" diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp index ad87175c..cd3435e0 100644 --- a/src/object/auto/autoroot.cpp +++ b/src/object/auto/autoroot.cpp @@ -19,8 +19,8 @@ #include "object/auto/autoroot.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" +#include "old/particule.h" +#include "old/terrain.h" #include "math/geometry.h" diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp index 9858ba9d..ddd58883 100644 --- a/src/object/auto/autostation.cpp +++ b/src/object/auto/autostation.cpp @@ -20,8 +20,8 @@ #include "object/auto/autostation.h" #include "common/iman.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" +#include "old/particule.h" +#include "old/terrain.h" #include "math/geometry.h" #include "ui/interface.h" #include "ui/gauge.h" diff --git a/src/object/brain.cpp b/src/object/brain.cpp index e3bbfa89..1ffe1b51 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -23,24 +23,24 @@ #include "common/struct.h" #include "math/geometry.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/language.h" #include "common/global.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/terrain.h" -#include "graphics/common/water.h" -#include "graphics/common/camera.h" +#include "old/terrain.h" +#include "old/water.h" +#include "old/camera.h" #include "object/object.h" #include "physics/physics.h" #include "object/motion/motion.h" #include "object/motion/motionspider.h" -#include "graphics/common/pyro.h" +#include "old/pyro.h" #include "object/task/taskmanager.h" #include "object/task/task.h" #include "object/task/taskmanip.h" @@ -61,9 +61,9 @@ #include "ui/target.h" #include "ui/window.h" #include "ui/displaytext.h" -#include "graphics/common/text.h" +#include "old/text.h" #include "sound/sound.h" -#include "graphics/common/particule.h" +#include "old/particule.h" #include "script/cmdtoken.h" diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp index 47d2ccaf..7c01c8ae 100644 --- a/src/object/motion/motionant.cpp +++ b/src/object/motion/motionant.cpp @@ -22,7 +22,7 @@ #include "object/motion/motionant.h" #include "common/modfile.h" -#include "graphics/common/particule.h" +#include "old/particule.h" #include "physics/physics.h" diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index d60b1d4f..3b043787 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -22,8 +22,8 @@ #include "object/motion/motionhuman.h" #include "common/modfile.h" -#include "graphics/common/terrain.h" -#include "graphics/common/water.h" +#include "old/terrain.h" +#include "old/water.h" #include "math/geometry.h" #include "object/robotmain.h" #include "physics/physics.h" diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp index 2e0aa0f0..93ba7e60 100644 --- a/src/object/motion/motionspider.cpp +++ b/src/object/motion/motionspider.cpp @@ -22,7 +22,7 @@ #include "object/motion/motionspider.h" #include "common/modfile.h" -#include "graphics/common/particule.h" +#include "old/particule.h" #include "physics/physics.h" diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index 3fa3abac..d6a8f6b1 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -22,8 +22,8 @@ #include "object/motion/motiontoto.h" #include "math/geometry.h" -#include "graphics/common/terrain.h" -#include "graphics/common/water.h" +#include "old/terrain.h" +#include "old/water.h" #include "common/modfile.h" #include "object/robotmain.h" diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index 181426c5..d4e30074 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -22,8 +22,8 @@ #include "object/motion/motionvehicle.h" #include "common/modfile.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" +#include "old/particule.h" +#include "old/terrain.h" #include "math/geometry.h" #include "object/brain.h" #include "physics/physics.h" diff --git a/src/object/motion/motionworm.cpp b/src/object/motion/motionworm.cpp index bf1871f9..8409fc6e 100644 --- a/src/object/motion/motionworm.cpp +++ b/src/object/motion/motionworm.cpp @@ -22,8 +22,8 @@ #include "object/motion/motionworm.h" #include "common/modfile.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" +#include "old/particule.h" +#include "old/terrain.h" #include "math/geometry.h" #include "physics/physics.h" diff --git a/src/object/object.cpp b/src/object/object.cpp index 360224e9..e6c26634 100644 --- a/src/object/object.cpp +++ b/src/object/object.cpp @@ -25,23 +25,23 @@ #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/global.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/mainmovie.h" #include "object/robotmain.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/water.h" -#include "graphics/common/blitz.h" -#include "graphics/common/camera.h" -#include "graphics/common/particule.h" +#include "old/light.h" +#include "old/terrain.h" +#include "old/water.h" +#include "old/blitz.h" +#include "old/camera.h" +#include "old/particule.h" #include "physics/physics.h" #include "object/brain.h" #include "object/motion/motion.h" @@ -81,7 +81,7 @@ #include "object/auto/automush.h" #include "object/auto/autokid.h" #include "object/task/task.h" -#include "graphics/common/pyro.h" +#include "old/pyro.h" #include "ui/displaytext.h" #include "script/cmdtoken.h" #include "script/cbottoken.h" diff --git a/src/object/object.h b/src/object/object.h index 5b3cbf68..9d77ae16 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -19,8 +19,8 @@ #pragma once -#include "graphics/d3d/d3dengine.h" -#include "graphics/common/camera.h" +#include "old/d3dengine.h" +#include "old/camera.h" #include "sound/sound.h" diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 6b405707..66a613e4 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -26,8 +26,8 @@ #include "math/const.h" #include "math/geometry.h" #include "math/conv.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/global.h" #include "common/event.h" @@ -35,24 +35,24 @@ #include "common/profile.h" #include "common/iman.h" #include "common/restext.h" -#include "math/old/math3d.h" -#include "graphics/common/light.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/math3d.h" +#include "old/light.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 "object/object.h" #include "object/motion/motion.h" #include "object/motion/motiontoto.h" #include "object/motion/motionhuman.h" #include "physics/physics.h" #include "object/brain.h" -#include "graphics/common/pyro.h" +#include "old/pyro.h" #include "common/modfile.h" -#include "graphics/common/model.h" -#include "graphics/common/camera.h" +#include "old/model.h" +#include "old/camera.h" #include "object/task/task.h" #include "object/task/taskmanip.h" #include "object/task/taskbuild.h" @@ -68,7 +68,7 @@ #include "ui/window.h" #include "ui/edit.h" #include "ui/displaytext.h" -#include "graphics/common/text.h" +#include "old/text.h" #include "sound/sound.h" #include "script/cbottoken.h" #include "script/cmdtoken.h" diff --git a/src/object/robotmain.h b/src/object/robotmain.h index 5dde5c87..a4b04895 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -22,11 +22,11 @@ #include #include "common/misc.h" -#include "graphics/d3d/d3dengine.h" +#include "old/d3dengine.h" #include "object/object.h" #include "object/mainmovie.h" -#include "graphics/common/camera.h" -#include "graphics/common/particule.h" +#include "old/camera.h" +#include "old/particule.h" enum Phase diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index 6be78520..f9d6c576 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -22,9 +22,9 @@ #include "object/task/taskbuild.h" #include "common/iman.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/water.h" +#include "old/light.h" +#include "old/terrain.h" +#include "old/water.h" #include "math/geometry.h" #include "object/auto/auto.h" #include "object/motion/motionhuman.h" diff --git a/src/object/task/taskfire.cpp b/src/object/task/taskfire.cpp index c319dd1e..4bab31e8 100644 --- a/src/object/task/taskfire.cpp +++ b/src/object/task/taskfire.cpp @@ -21,7 +21,7 @@ #include "object/task/taskfire.h" -#include "graphics/common/particule.h" +#include "old/particule.h" #include "math/geometry.h" #include "physics/physics.h" diff --git a/src/object/task/taskfireant.cpp b/src/object/task/taskfireant.cpp index 1e508514..d4a8a618 100644 --- a/src/object/task/taskfireant.cpp +++ b/src/object/task/taskfireant.cpp @@ -21,7 +21,7 @@ #include "object/task/taskfireant.h" -#include "graphics/common/particule.h" +#include "old/particule.h" #include "math/geometry.h" #include "object/motion/motionant.h" #include "physics/physics.h" diff --git a/src/object/task/taskflag.cpp b/src/object/task/taskflag.cpp index fc28a6fe..f76fef68 100644 --- a/src/object/task/taskflag.cpp +++ b/src/object/task/taskflag.cpp @@ -23,8 +23,8 @@ #include "math/geometry.h" #include "common/iman.h" -#include "graphics/common/water.h" -#include "graphics/common/pyro.h" +#include "old/water.h" +#include "old/pyro.h" #include "physics/physics.h" #include "object/motion/motionhuman.h" diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index 6648f975..5ab248ce 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -23,8 +23,8 @@ #include "common/event.h" #include "common/iman.h" -#include "graphics/common/terrain.h" -#include "graphics/common/water.h" +#include "old/terrain.h" +#include "old/water.h" #include "math/geometry.h" #include "physics/physics.h" diff --git a/src/object/task/taskinfo.cpp b/src/object/task/taskinfo.cpp index 9e9cd246..cfcbe939 100644 --- a/src/object/task/taskinfo.cpp +++ b/src/object/task/taskinfo.cpp @@ -22,7 +22,7 @@ #include "object/task/taskinfo.h" #include "common/iman.h" -#include "graphics/common/particule.h" +#include "old/particule.h" #include "object/auto/autoinfo.h" diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index 827fb0fa..636031b4 100644 --- a/src/object/task/taskmanip.cpp +++ b/src/object/task/taskmanip.cpp @@ -22,8 +22,8 @@ #include "object/task/taskmanip.h" #include "common/iman.h" -#include "graphics/common/terrain.h" -#include "graphics/common/pyro.h" +#include "old/terrain.h" +#include "old/pyro.h" #include "math/geometry.h" #include "object/robotmain.h" #include "physics/physics.h" diff --git a/src/object/task/taskpen.cpp b/src/object/task/taskpen.cpp index 0e817d15..ff2f4e00 100644 --- a/src/object/task/taskpen.cpp +++ b/src/object/task/taskpen.cpp @@ -21,7 +21,7 @@ #include "object/task/taskpen.h" -#include "graphics/common/particule.h" +#include "old/particule.h" #include "math/geometry.h" #include "object/object.h" diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index 54f3f469..d91c45d5 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -23,7 +23,7 @@ #include "math/geometry.h" #include "common/iman.h" -#include "graphics/common/particule.h" +#include "old/particule.h" #include "physics/physics.h" #include "ui/displaytext.h" diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp index 09b54a07..cf038aa5 100644 --- a/src/object/task/tasksearch.cpp +++ b/src/object/task/tasksearch.cpp @@ -23,8 +23,8 @@ #include "math/geometry.h" #include "common/iman.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" +#include "old/particule.h" +#include "old/terrain.h" #include "physics/physics.h" #include "ui/displaytext.h" diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index 0358a311..7ceb03ba 100644 --- a/src/object/task/taskshield.cpp +++ b/src/object/task/taskshield.cpp @@ -22,8 +22,8 @@ #include "object/task/taskshield.h" #include "common/iman.h" -#include "graphics/common/light.h" -#include "graphics/common/particule.h" +#include "old/light.h" +#include "old/particule.h" #include "math/geometry.h" #include "object/brain.h" #include "physics/physics.h" diff --git a/src/object/task/taskspiderexplo.cpp b/src/object/task/taskspiderexplo.cpp index 24abe089..2d6c8464 100644 --- a/src/object/task/taskspiderexplo.cpp +++ b/src/object/task/taskspiderexplo.cpp @@ -21,7 +21,7 @@ #include "object/task/taskspiderexplo.h" -#include "graphics/common/pyro.h" +#include "old/pyro.h" #include "object/motion/motionspider.h" #include "physics/physics.h" diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index 6f1640ad..b6d9e0eb 100644 --- a/src/object/task/tasktake.cpp +++ b/src/object/task/tasktake.cpp @@ -22,8 +22,8 @@ #include "object/task/tasktake.h" #include "common/iman.h" -#include "graphics/common/terrain.h" -#include "graphics/common/water.h" +#include "old/terrain.h" +#include "old/water.h" #include "math/geometry.h" #include "object/motion/motionhuman.h" #include "object/robotmain.h" diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 4a7dacc2..58cf3479 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -23,10 +23,10 @@ #include "math/geometry.h" #include "common/iman.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" +#include "old/particule.h" +#include "old/terrain.h" #include "physics/physics.h" -#include "graphics/common/pyro.h" +#include "old/pyro.h" #include "object/brain.h" #include "object/motion/motionant.h" #include "object/motion/motionspider.h" diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index a1697009..d29cdaad 100644 --- a/src/object/task/taskturn.cpp +++ b/src/object/task/taskturn.cpp @@ -21,7 +21,7 @@ #include "object/task/taskturn.h" -#include "graphics/common/terrain.h" +#include "old/terrain.h" #include "physics/physics.h" diff --git a/src/object/task/taskwait.cpp b/src/object/task/taskwait.cpp index 6270b00a..f5014056 100644 --- a/src/object/task/taskwait.cpp +++ b/src/object/task/taskwait.cpp @@ -21,7 +21,7 @@ #include "object/task/taskwait.h" -#include "graphics/d3d/d3dengine.h" +#include "old/d3dengine.h" diff --git a/src/old/README.txt b/src/old/README.txt index ec0443cb..5ad59b4d 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 10c78e5f..b73bd3ef 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 c2cfe6ce..87e9a76f 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 1de5d451..2c2ffef6 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 21ff2c94..f18f7658 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 67e2fe25..7c1518c4 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 59d929c1..6ff16bba 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 4f29584c..0614fc35 100644 --- a/src/old/d3dapp.cpp +++ b/src/old/d3dapp.cpp @@ -25,18 +25,18 @@ #include #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 2171057d..1126d69f 100644 --- a/src/old/d3dapp.h +++ b/src/old/d3dapp.h @@ -23,10 +23,10 @@ #include #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 731a839c..305adc2f 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 1081ff5a..5bce9abc 100644 --- a/src/old/d3denum.cpp +++ b/src/old/d3denum.cpp @@ -24,8 +24,8 @@ #include #include #include -#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 e36296a7..3f984bd9 100644 --- a/src/old/d3dframe.cpp +++ b/src/old/d3dframe.cpp @@ -24,8 +24,8 @@ #include #include #include -#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 4924860b..39be6031 100644 --- a/src/old/d3dtextr.cpp +++ b/src/old/d3dtextr.cpp @@ -30,8 +30,8 @@ #include #include 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 5fd46b2e..d8fd03e4 100644 --- a/src/old/d3dutil.cpp +++ b/src/old/d3dutil.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "graphics/d3d/d3dutil.h" +#include "old/d3dutil.h" diff --git a/src/old/joystick.cpp b/src/old/joystick.cpp index 47a0947d..c08a2521 100644 --- a/src/old/joystick.cpp +++ b/src/old/joystick.cpp @@ -22,7 +22,7 @@ #include #include -#include "app/joystick.h" +#include "old/joystick.h" diff --git a/src/old/light.cpp b/src/old/light.cpp index cc50f873..05891410 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 26b4f0f7..8291ca98 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 a9d67f21..3b5f9dd4 100644 --- a/src/old/math3d.cpp +++ b/src/old/math3d.cpp @@ -23,10 +23,10 @@ #include #include -#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 b464244d..3570df4e 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 0c630494..3fb77919 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 d82e0a7f..004decee 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 6be1d314..0733459d 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 443d4285..72f370e3 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 9f354385..4b613563 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 edc1611b..c4268831 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 d41cd15d..e2ca5666 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 f8d3f49f..a7faa95d 100644 --- a/src/old/text.cpp +++ b/src/old/text.cpp @@ -22,13 +22,13 @@ #include #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 976543a6..6ba30a38 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 dd4b5f3c..510d1fef 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 45a545d1..b2a596b5 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; diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index f173c613..e4420a10 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -24,21 +24,21 @@ #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/global.h" #include "common/event.h" #include "common/misc.h" #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/light.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" -#include "graphics/common/water.h" -#include "graphics/common/camera.h" +#include "old/math3d.h" +#include "old/light.h" +#include "old/particule.h" +#include "old/terrain.h" +#include "old/water.h" +#include "old/camera.h" #include "object/object.h" -#include "graphics/common/pyro.h" +#include "old/pyro.h" #include "object/brain.h" #include "object/motion/motion.h" #include "object/motion/motionhuman.h" diff --git a/src/physics/physics.h b/src/physics/physics.h index cb6b5001..53aff8ad 100644 --- a/src/physics/physics.h +++ b/src/physics/physics.h @@ -19,7 +19,7 @@ #pragma once -#include "graphics/d3d/d3dengine.h" +#include "old/d3dengine.h" #include "common/misc.h" #include "object/object.h" diff --git a/src/script/cbottoken.cpp b/src/script/cbottoken.cpp index 3ffa13ca..568c870b 100644 --- a/src/script/cbottoken.cpp +++ b/src/script/cbottoken.cpp @@ -20,8 +20,8 @@ #include #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/global.h" #include "common/event.h" diff --git a/src/script/cmdtoken.cpp b/src/script/cmdtoken.cpp index 70d1a7bb..9559e427 100644 --- a/src/script/cmdtoken.cpp +++ b/src/script/cmdtoken.cpp @@ -20,14 +20,14 @@ #include #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/global.h" #include "common/event.h" -#include "graphics/common/water.h" -#include "graphics/common/pyro.h" -#include "graphics/common/camera.h" +#include "old/water.h" +#include "old/pyro.h" +#include "old/camera.h" #include "object/object.h" #include "script/cmdtoken.h" diff --git a/src/script/cmdtoken.h b/src/script/cmdtoken.h index e8cc812f..fa00921e 100644 --- a/src/script/cmdtoken.h +++ b/src/script/cmdtoken.h @@ -19,12 +19,12 @@ #pragma once -#include "graphics/d3d/d3denum.h" -#include "graphics/d3d/d3dengine.h" +#include "old/d3denum.h" +#include "old/d3dengine.h" #include "object/object.h" -#include "graphics/common/water.h" -#include "graphics/common/pyro.h" -#include "graphics/common/camera.h" +#include "old/water.h" +#include "old/pyro.h" +#include "old/camera.h" diff --git a/src/script/script.cpp b/src/script/script.cpp index 5d4dfcb9..266a943a 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -24,23 +24,23 @@ #include "CBot/CBotDll.h" #include "common/struct.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/global.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/terrain.h" -#include "graphics/common/water.h" +#include "old/terrain.h" +#include "old/water.h" #include "object/object.h" #include "physics/physics.h" #include "ui/interface.h" #include "ui/edit.h" #include "ui/list.h" -#include "graphics/common/text.h" +#include "old/text.h" #include "ui/displaytext.h" #include "object/task/taskmanager.h" #include "object/task/task.h" diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp index 04b71409..f3078389 100644 --- a/src/sound/sound.cpp +++ b/src/sound/sound.cpp @@ -28,7 +28,7 @@ #include "common/iman.h" #include "math/geometry.h" #include "math/conv.h" -#include "math/old/math3d.h" +#include "old/math3d.h" #include "sound/sound.h" diff --git a/src/ui/button.cpp b/src/ui/button.cpp index 4f9e9cd3..3c398c88 100644 --- a/src/ui/button.cpp +++ b/src/ui/button.cpp @@ -20,9 +20,9 @@ #include #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 c1ddcc28..2b0466dc 100644 --- a/src/ui/check.cpp +++ b/src/ui/check.cpp @@ -20,13 +20,13 @@ #include #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 2490b6c7..69513af2 100644 --- a/src/ui/color.cpp +++ b/src/ui/color.cpp @@ -20,9 +20,9 @@ #include #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 041c7d2a..8b912a90 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 94c2d1ec..9d0ad2fa 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 77fc9ab0..330eaccc 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -20,17 +20,17 @@ #include #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 d6aeadc7..60fdf22d 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 f788445a..37719c1d 100644 --- a/src/ui/displayinfo.cpp +++ b/src/ui/displayinfo.cpp @@ -22,16 +22,16 @@ #include #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 ebf38b15..6488309d 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 f1dba434..df08c247 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -22,7 +22,7 @@ #include #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 f0c69925..fbff7c90 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 e09ca9a8..56e6dd8b 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -24,15 +24,15 @@ #include #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 285094b8..7d92b377 100644 --- a/src/ui/editvalue.cpp +++ b/src/ui/editvalue.cpp @@ -22,8 +22,8 @@ #include #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 072a9239..84a804dc 100644 --- a/src/ui/gauge.cpp +++ b/src/ui/gauge.cpp @@ -22,8 +22,8 @@ #include #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 c77e1313..212064ee 100644 --- a/src/ui/group.cpp +++ b/src/ui/group.cpp @@ -22,8 +22,8 @@ #include #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 90198581..1803a1c3 100644 --- a/src/ui/image.cpp +++ b/src/ui/image.cpp @@ -22,8 +22,8 @@ #include #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 8b8a8880..a089dc32 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -22,8 +22,8 @@ #include #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 1b8925d9..a581674f 100644 --- a/src/ui/key.cpp +++ b/src/ui/key.cpp @@ -22,14 +22,14 @@ #include #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 5458d284..ef61cc51 100644 --- a/src/ui/label.cpp +++ b/src/ui/label.cpp @@ -22,12 +22,12 @@ #include #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 f924fdef..fd137ebf 100644 --- a/src/ui/list.cpp +++ b/src/ui/list.cpp @@ -22,14 +22,14 @@ #include #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 7e80fcfa..bc9f5b4c 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -25,8 +25,8 @@ #include #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 5819cf8e..cd017f5d 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 2b05775b..ad0ed580 100644 --- a/src/ui/mainmap.cpp +++ b/src/ui/mainmap.cpp @@ -22,8 +22,8 @@ #include #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 5d574e48..332fa2b4 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -22,7 +22,7 @@ #include #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 7c62d3a1..35e63d1a 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 40b5545d..59b3fbdc 100644 --- a/src/ui/scroll.cpp +++ b/src/ui/scroll.cpp @@ -22,8 +22,8 @@ #include #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 7651c639..1a5fc416 100644 --- a/src/ui/shortcut.cpp +++ b/src/ui/shortcut.cpp @@ -22,8 +22,8 @@ #include #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 39c8f6b6..d332ff46 100644 --- a/src/ui/slider.cpp +++ b/src/ui/slider.cpp @@ -22,12 +22,12 @@ #include #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 b4d196bb..b9f8d957 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -27,17 +27,17 @@ #include #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 0f18efd9..cf37a3d4 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -22,8 +22,8 @@ #include #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 41998f14..d250ec99 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -22,9 +22,9 @@ #include #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"