Moved image loading/saving in TGALoader and renamed it accordingly

[lugaru.git] / Source / Terrain.h

diff --git a/Source/Terrain.h b/Source/Terrain.h
index f9a127be5d84da4b9e31d2f706e398dba1459647..9602ad593b9f988e4adfd9b5feeffd918bded175 100644 (file)
--- a/Source/Terrain.h
+++ b/Source/Terrain.h
@@ -3,20 +3,18 @@ Copyright (C) 2003, 2010 - Wolfire Games
 
 This file is part of Lugaru.
 
-Lugaru 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 2
-of the License, or (at your option) any later version.
+Lugaru 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 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru 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.
+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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _TERRAIN_H_
@@ -25,15 +23,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "gamegl.h"
 #include "Frustum.h"
 #include "Lights.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
 #include "Quaternions.h"
 #include "Quaternions.h"
 #include "Texture.h"
 
-#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
@@ -67,7 +65,7 @@ public:
     Texture bodyprinttexture;
     Texture breaktexture;
     Texture terraintexture;
-    short      size;
+    short size;
 
     int patchobjectnum[subdivision][subdivision];
     int patchobjects[subdivision][subdivision][300];
@@ -111,7 +109,6 @@ public:
     void MakeDecalLock(int 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 getHeightExtrude(float pointx, float pointz, float point2x, float point2z);
     float getOpacity(float pointx, float pointz);
     XYZ getLighting(float pointx, float pointz);
     XYZ getNormal(float pointx, float pointz);
@@ -126,7 +123,6 @@ public:
     void drawpatch(int whichx, int whichy, float opacity);
     void drawpatchother(int whichx, int whichy, float opacity);
     void drawpatchotherother(int whichx, int whichy, float opacity);
-    void DoLighting();
     void DoShadows();
 
     Terrain();