X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.h;h=c375687f4aa4f52ece092a7e85fcec5c10905d84;hb=bdabd9d4a53be2fa9d90f900f7e5949d2f0ef75c;hp=aa4a6f8483821cde911be27d674d111b77ce1eee;hpb=25e3d5e35a7fd7efdffc420efe3c41a91cefe43f;p=lugaru.git

diff --git a/Source/Terrain.h b/Source/Terrain.h
index aa4a6f8..c375687 100644
--- a/Source/Terrain.h
+++ b/Source/Terrain.h
@@ -1,22 +1,21 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 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,7 +24,7 @@ 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"
@@ -111,7 +110,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);
@@ -119,14 +117,13 @@ public:
     void UpdateTransparency(int whichx, int whichy);
     void UpdateTransparencyother(int whichx, int whichy);
     void UpdateTransparencyotherother(int whichx, int whichy);
-    bool load(const char *fileName);
+    bool load(const std::string& fileName);
     void CalculateNormals();
     void drawdecals();
     void draw(int layer);
     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();