Cleanning up Sprite class. More can be done, but it's already prettier.

[lugaru.git] / Source / Objects.cpp

diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index e5d26898ad07f01bad09545d65f1d0d5aaeb2ba6..3317992d97d8553b00fffbe3f2999a2450bdd048 100644 (file)
--- a/Source/Objects.cpp
+++ b/Source/Objects.cpp
@@ -1,3 +1,24 @@
+/*
+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.
+
+This program 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.
+
+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.
+*/
+
 #include "Objects.h"
 extern XYZ viewer;
 extern float viewdistance;
@@ -17,7 +38,6 @@ extern float blurness;
 extern float windvar;
 extern float playerdist;
 extern bool skyboxtexture;
-extern Sprites sprites;
 
 //Functions
 
@@ -97,26 +117,26 @@ void Objects::Draw()
                                                                if(type[i]==bushtype){
                                                                        messedwith[i]-=multiplier;
                                                                        if(rotxvel[i]||rotx[i]){
-                                                                               if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-                                                                               if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+                                                                               if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+                                                                               if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
                                                                                if(rotx[i]>0)rotxvel[i]-=multiplier*4;
                                                                                if(rotx[i]<0)rotxvel[i]+=multiplier*4;
                                                                                if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
                                                                                if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-                                                                               if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-                                                                               if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+                                                                               if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+                                                                               if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
                                                                                rotx[i]+=rotxvel[i]*multiplier*4;
                                                                        }
                                                                        if(rotyvel[i]||roty[i]){
-                                                                               if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-                                                                               if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+                                                                               if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+                                                                               if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
                                                                                if(roty[i]>0)rotyvel[i]-=multiplier*4;
                                                                                if(roty[i]<0)rotyvel[i]+=multiplier*4;
                                                                                if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
                                                                                if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-                                                                               if(abs(roty[i])<multiplier*4)roty[i]=0;
-                                                                               if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+                                                                               if(fabs(roty[i])<multiplier*4)roty[i]=0;
+                                                                               if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
                                                                                roty[i]+=rotyvel[i]*multiplier*4;
                                                                        }
@@ -135,26 +155,26 @@ void Objects::Draw()
                                                                        if(type[i]==treetrunktype||environment==2){
                                                                                messedwith[i]-=multiplier;
                                                                                if(rotxvel[i]||rotx[i]){
-                                                                                       if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-                                                                                       if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+                                                                                       if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+                                                                                       if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
                                                                                        if(rotx[i]>0)rotxvel[i]-=multiplier*4;
                                                                                        if(rotx[i]<0)rotxvel[i]+=multiplier*4;
                                                                                        if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
                                                                                        if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-                                                                                       if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-                                                                                       if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+                                                                                       if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+                                                                                       if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
                                                                                        rotx[i]+=rotxvel[i]*multiplier*4;
                                                                                }
                                                                                if(rotyvel[i]||roty[i]){
-                                                                                       if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-                                                                                       if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+                                                                                       if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+                                                                                       if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
                                                                                        if(roty[i]>0)rotyvel[i]-=multiplier*4;
                                                                                        if(roty[i]<0)rotyvel[i]+=multiplier*4;
                                                                                        if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
                                                                                        if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-                                                                                       if(abs(roty[i])<multiplier*4)roty[i]=0;
-                                                                                       if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+                                                                                       if(fabs(roty[i])<multiplier*4)roty[i]=0;
+                                                                                       if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
                                                                                        roty[i]+=rotyvel[i]*multiplier*4;
                                                                                }
@@ -173,26 +193,26 @@ void Objects::Draw()
                                                                        {
                                                                                messedwith[i]-=multiplier;
                                                                                if(rotxvel[i]||rotx[i]){
-                                                                                       if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-                                                                                       if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+                                                                                       if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+                                                                                       if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
                                                                                        if(rotx[i]>0)rotxvel[i]-=multiplier*4;
                                                                                        if(rotx[i]<0)rotxvel[i]+=multiplier*4;
                                                                                        if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
                                                                                        if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-                                                                                       if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-                                                                                       if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+                                                                                       if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+                                                                                       if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
                                                                                        rotx[i]+=rotxvel[i]*multiplier*4;
                                                                                }
                                                                                if(rotyvel[i]||roty[i]){
-                                                                                       if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-                                                                                       if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+                                                                                       if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+                                                                                       if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
                                                                                        if(roty[i]>0)rotyvel[i]-=multiplier*4;
                                                                                        if(roty[i]<0)rotyvel[i]+=multiplier*4;
                                                                                        if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
                                                                                        if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-                                                                                       if(abs(roty[i])<multiplier*4)roty[i]=0;
-                                                                                       if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+                                                                                       if(fabs(roty[i])<multiplier*4)roty[i]=0;
+                                                                                       if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
                                                                                        roty[i]+=rotyvel[i]*multiplier*4;
                                                                                }
@@ -324,26 +344,26 @@ void Objects::Draw()
                                                                if(type[i]==bushtype){
                                                                        messedwith[i]-=multiplier;
                                                                        if(rotxvel[i]||rotx[i]){
-                                                                               if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-                                                                               if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+                                                                               if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+                                                                               if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
                                                                                if(rotx[i]>0)rotxvel[i]-=multiplier*4;
                                                                                if(rotx[i]<0)rotxvel[i]+=multiplier*4;
                                                                                if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
                                                                                if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-                                                                               if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-                                                                               if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+                                                                               if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+                                                                               if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
                                                                                rotx[i]+=rotxvel[i]*multiplier*4;
                                                                        }
                                                                        if(rotyvel[i]||roty[i]){
-                                                                               if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-                                                                               if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+                                                                               if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+                                                                               if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
                                                                                if(roty[i]>0)rotyvel[i]-=multiplier*4;
                                                                                if(roty[i]<0)rotyvel[i]+=multiplier*4;
                                                                                if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
                                                                                if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-                                                                               if(abs(roty[i])<multiplier*4)roty[i]=0;
-                                                                               if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+                                                                               if(fabs(roty[i])<multiplier*4)roty[i]=0;
+                                                                               if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
                                                                                roty[i]+=rotyvel[i]*multiplier*4;
                                                                        }
@@ -361,26 +381,26 @@ void Objects::Draw()
                                                                if(type[i]==treetrunktype||type[i]==treeleavestype){
                                                                        messedwith[i]-=multiplier;
                                                                        if(rotxvel[i]||rotx[i]){
-                                                                               if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-                                                                               if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+                                                                               if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+                                                                               if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
                                                                                if(rotx[i]>0)rotxvel[i]-=multiplier*4;
                                                                                if(rotx[i]<0)rotxvel[i]+=multiplier*4;
                                                                                if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
                                                                                if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-                                                                               if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-                                                                               if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+                                                                               if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+                                                                               if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
                                                                                rotx[i]+=rotxvel[i]*multiplier*4;
                                                                        }
                                                                        if(rotyvel[i]||roty[i]){
-                                                                               if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-                                                                               if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+                                                                               if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+                                                                               if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
                                                                                if(roty[i]>0)rotyvel[i]-=multiplier*4;
                                                                                if(roty[i]<0)rotyvel[i]+=multiplier*4;
                                                                                if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
                                                                                if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-                                                                               if(abs(roty[i])<multiplier*4)roty[i]=0;
-                                                                               if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+                                                                               if(fabs(roty[i])<multiplier*4)roty[i]=0;
+                                                                               if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
                                                                                roty[i]+=rotyvel[i]*multiplier*4;
                                                                        }
@@ -467,7 +487,7 @@ void Objects::DeleteObject(int which)
 void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
        if((atype!=treeleavestype&&atype!=bushtype)||foliage==1){
                scale[numobjects]=ascale;
-               if(atype==treeleavestype)scale[numobjects]+=abs((float)(Random()%100)/900)*ascale;
+               if(atype==treeleavestype)scale[numobjects]+=fabs((float)(Random()%100)/900)*ascale;
 
                onfire[numobjects]=0;
                flamedelay[numobjects]=0;
@@ -550,7 +570,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
 void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2, float ascale){
        if((atype!=treeleavestype&&atype!=bushtype)||foliage==1){
                scale[numobjects]=ascale;
-               if(atype==treeleavestype)scale[numobjects]+=abs((float)(Random()%100)/900)*ascale;
+               if(atype==treeleavestype)scale[numobjects]+=fabs((float)(Random()%100)/900)*ascale;
 
                onfire[numobjects]=0;
                flamedelay[numobjects]=0;
@@ -597,7 +617,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2
                if(atype==treetrunktype)friction[numobjects]=.4;
                if(atype==treeleavestype)friction[numobjects]=0;
 
-               if(friction[numobjects]==1.5&&abs(arotation2)>5)friction[numobjects]=.5;
+               if(friction[numobjects]==1.5&&fabs(arotation2)>5)friction[numobjects]=.5;
 
                if(atype==platformtype){
                        model[numobjects].loaddecal((char *)":Data:Models:Platform.solid",0);
@@ -643,7 +663,7 @@ void Objects::DoStuff()
        XYZ spawnpoint;
        for(int i=0;i<numobjects;i++){
                /*if(type[i]==firetype){
-               sprites.MakeSprite(weaponshinesprite, position[i],position[i]*0, 1,1,1, 5, 1);
+               Sprite::MakeSprite(weaponshinesprite, position[i],position[i]*0, 1,1,1, 5, 1);
                }*/
 
                if(type[i]==firetype)onfire[i]=1;
@@ -659,7 +679,7 @@ void Objects::DoStuff()
                                        spawnpoint.z=0;
                                        spawnpoint=DoRotation(spawnpoint,0,Random()%360,0);
                                        spawnpoint+=position[i];
-                                       sprites.MakeSprite(flamesprite, spawnpoint,spawnpoint*0, 1,1,1, (.6+(float)abs(Random()%100)/200-.25)*5*scale[i], 1);
+                                       Sprite::MakeSprite(flamesprite, spawnpoint,spawnpoint*0, 1,1,1, (.6+(float)abs(Random()%100)/200-.25)*5*scale[i], 1);
                                }
                                if(type[i]==treeleavestype){
                                        spawnpoint.x=((float)(Random()%100))/80*scale[i];
@@ -667,7 +687,7 @@ void Objects::DoStuff()
                                        spawnpoint.z=0;
                                        spawnpoint=DoRotation(spawnpoint,0,Random()%360,0);
                                        spawnpoint+=position[i];
-                                       sprites.MakeSprite(flamesprite, spawnpoint,spawnpoint*0, 1,1,1, (.6+(float)abs(Random()%100)/200-.25)*6, 1);
+                                       Sprite::MakeSprite(flamesprite, spawnpoint,spawnpoint*0, 1,1,1, (.6+(float)abs(Random()%100)/200-.25)*6, 1);
                                }
                        }
 
@@ -770,9 +790,9 @@ Objects::Objects()
 
 Objects::~Objects()
 {
-       if (boxtextureptr) glDeleteTextures( 1, (const unsigned long *)&boxtextureptr );
-       if (treetextureptr) glDeleteTextures( 1, (const unsigned long *)&treetextureptr );
-       if (bushtextureptr) glDeleteTextures( 1, (const unsigned long *)&bushtextureptr );
-       if (rocktextureptr) glDeleteTextures( 1, (const unsigned long *)&rocktextureptr );
+       if (boxtextureptr) glDeleteTextures( 1, &boxtextureptr );
+       if (treetextureptr) glDeleteTextures( 1, &treetextureptr );
+       if (bushtextureptr) glDeleteTextures( 1, &bushtextureptr );
+       if (rocktextureptr) glDeleteTextures( 1, &rocktextureptr );
 };