X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FEnvironment%2FTerrain.hpp;h=f4876cf19f9c75ecdc52e363116ab05fdd45c16b;hb=032eb3ccf8e2ccc6a150ac2765eb56daef77942e;hp=f6525c4b0d286777f6d00ab1c5bd4a77b3cf340c;hpb=cd451341c5ee01374268559885871ca9d454cbd0;p=lugaru.git
diff --git a/Source/Environment/Terrain.hpp b/Source/Environment/Terrain.hpp
index f6525c4..f4876cf 100644
--- a/Source/Environment/Terrain.hpp
+++ b/Source/Environment/Terrain.hpp
@@ -1,6 +1,6 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
@@ -22,10 +22,11 @@ along with Lugaru. If not, see .
#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 .
#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 patchobjects[subdivision][subdivision];
float scale;
int type;
@@ -93,20 +84,13 @@ 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 decals;
void AddObject(XYZ where, float radius, int id);
+ void DeleteObject(unsigned 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 +102,7 @@ public:
void drawdecals();
void draw(int layer);
void DoShadows();
+ void deleteDeadDecals();
Terrain();