X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FEnvironment%2FTerrain.hpp;h=cc1accce37eec8485e2ee2e23b41c40f723a90ca;hp=f4876cf19f9c75ecdc52e363116ab05fdd45c16b;hb=6a8cb464330e92163c8feaf101b8b5837c973bba;hpb=5fca41ab430df85d6dd620a7f4130df01bc1430f diff --git a/Source/Environment/Terrain.hpp b/Source/Environment/Terrain.hpp index f4876cf..cc1accc 100644 --- a/Source/Environment/Terrain.hpp +++ b/Source/Environment/Terrain.hpp @@ -23,16 +23,16 @@ along with Lugaru. If not, see . #include "Environment/Lights.hpp" #include "Graphic/Decal.hpp" -#include "Graphic/gamegl.hpp" #include "Graphic/Texture.hpp" +#include "Graphic/gamegl.hpp" #include "Math/Frustum.hpp" #include "Math/XYZ.hpp" #include "Utils/ImageIO.hpp" -#define max_terrain_size 256 -#define curr_terrain_size size -#define subdivision 64 -#define max_patch_elements (max_terrain_size/subdivision)*(max_terrain_size/subdivision)*54 +#define max_terrain_size 256 +#define curr_terrain_size size +#define subdivision 64 +#define max_patch_elements (max_terrain_size / subdivision) * (max_terrain_size / subdivision) * 54 #define allfirst 0 #define mixed 1 @@ -74,7 +74,7 @@ public: int numtris[subdivision][subdivision]; int textureness[subdivision][subdivision]; - GLfloat vArray[(max_patch_elements)*subdivision*subdivision]; + GLfloat vArray[(max_patch_elements)*subdivision * subdivision]; bool visible[subdivision][subdivision]; float avgypatch[subdivision][subdivision]; @@ -91,7 +91,7 @@ public: void DeleteDecal(int which); 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); + int lineTerrain(XYZ p1, XYZ p2, XYZ* p); float getHeight(float pointx, float pointz); float getOpacity(float pointx, float pointz); XYZ getLighting(float pointx, float pointz);