X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects.cpp;h=a01fc1193598d379c0cc390c5fc7d7d53372ffec;hb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;hp=e5d26898ad07f01bad09545d65f1d0d5aaeb2ba6;hpb=36cc3af3e5074215817ddee16defde754e2ad67f;p=lugaru.git

diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index e5d2689..a01fc11 100644
--- 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;
@@ -10,14 +31,12 @@ extern float multiplier;
 extern float gravity;
 extern FRUSTUM frustum;
 extern Terrain terrain;
-extern float terraindetail;
 extern bool foliage;
 extern int detail;
 extern float blurness;
 extern float windvar;
 extern float playerdist;
 extern bool skyboxtexture;
-extern Sprites sprites;
 
 //Functions
 
@@ -47,8 +66,8 @@ void Objects::SphereCheckPossible(XYZ *p1,float radius)
 	static int whichpatchx;
 	static int whichpatchz;
 
-	whichpatchx=p1->x/(terrain.size/subdivision*terrain.scale*terraindetail);
-	whichpatchz=p1->z/(terrain.size/subdivision*terrain.scale*terraindetail);
+	whichpatchx=p1->x/(terrain.size/subdivision*terrain.scale);
+	whichpatchz=p1->z/(terrain.size/subdivision*terrain.scale);
 
 	if(whichpatchx>=0&&whichpatchz>=0&&whichpatchx<subdivision&&whichpatchz<subdivision)
 		if(terrain.patchobjectnum[whichpatchx][whichpatchz]>0&&terrain.patchobjectnum[whichpatchx][whichpatchz]<500)
@@ -97,26 +116,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 +154,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 +192,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 +343,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 +380,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 +486,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 +569,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 +616,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 +662,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 +678,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 +686,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);
 				}
 			}
 
@@ -693,8 +712,8 @@ void Objects::DoShadows()
 					terrainpoint=position[i]+DoRotation(model[i].vertex[j]+model[i].normals[j]*.1,0,rotation[i],0);
 					//terrainpoint.y+=model[i].boundingsphereradius;
 					shadowed[i]=0;
-					patchx=terrainpoint.x/(terrain.size/subdivision*terrain.scale*terraindetail);
-					patchz=terrainpoint.z/(terrain.size/subdivision*terrain.scale*terraindetail);
+					patchx=terrainpoint.x/(terrain.size/subdivision*terrain.scale);
+					patchz=terrainpoint.z/(terrain.size/subdivision*terrain.scale);
 					if(patchx>=0&&patchz>=0&&patchx<subdivision&&patchz<subdivision)
 						if(terrain.patchobjectnum[patchx][patchz])
 							for(k=0;k<terrain.patchobjectnum[patchx][patchz];k++){
@@ -770,9 +789,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 );
 };