Replaced patchobjects arrays by vectors, cleaned code a bit

[lugaru.git] / Source / Environment / Terrain.hpp

diff --git a/Source/Environment/Terrain.hpp b/Source/Environment/Terrain.hpp
index f6525c4b0d286777f6d00ab1c5bd4a77b3cf340c..207c8fd341b652d56b38171dabace05785c01316 100644 (file)
--- a/Source/Environment/Terrain.hpp
+++ b/Source/Environment/Terrain.hpp
@@ -22,10 +22,11 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #define _TERRAIN_HPP_
 
 #include "Environment/Lights.hpp"
+#include "Graphic/Decal.hpp"
 #include "Graphic/gamegl.hpp"
 #include "Graphic/Texture.hpp"
 #include "Math/Frustum.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
 #include "Utils/ImageIO.hpp"
 
 #define max_terrain_size        256
@@ -39,15 +40,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #define max_decals 1000
 
-#define shadowdecal 0
-#define footprintdecal 1
-#define blooddecal 2
-#define blooddecalfast 3
-#define shadowdecalpermanent 4
-#define breakdecal 5
-#define blooddecalslow 6
-#define bodyprintdecal 7
-
 #define snowyenvironment 0
 #define grassyenvironment 1
 #define desertenvironment 2
@@ -67,8 +59,7 @@ public:
     Texture terraintexture;
     short size;
 
-    int patchobjectnum[subdivision][subdivision];
-    unsigned int patchobjects[subdivision][subdivision][300];
+    std::vector<unsigned int> patchobjects[subdivision][subdivision];
 
     float scale;
     int type;
@@ -93,20 +84,12 @@ public:
 
     int patch_elements;
 
-    float decaltexcoords[max_decals][3][2];
-    XYZ decalvertex[max_decals][3];
-    int decaltype[max_decals];
-    float decalopacity[max_decals];
-    float decalrotation[max_decals];
-    float decalalivetime[max_decals];
-    float decalbrightness[max_decals];
-    XYZ decalposition[max_decals];
-    int numdecals;
+    std::vector<Decal> decals;
 
     void AddObject(XYZ where, float radius, int id);
     void DeleteDecal(int which);
-    void MakeDecal(int type, XYZ where, float size, float opacity, float rotation);
-    void MakeDecalLock(int type, XYZ where, int whichx, int whichy, float size, float opacity, float rotation);
+    void MakeDecal(decal_type type, XYZ where, float size, float opacity, float rotation);
+    void MakeDecalLock(decal_type type, XYZ where, int whichx, int whichy, float size, float opacity, float rotation);
     int lineTerrain(XYZ p1, XYZ p2, XYZ *p);
     float getHeight(float pointx, float pointz);
     float getOpacity(float pointx, float pointz);
@@ -118,6 +101,7 @@ public:
     void drawdecals();
     void draw(int layer);
     void DoShadows();
+    void deleteDeadDecals();
 
     Terrain();