X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects.cpp;h=06c8b8bdd360f41c9c8f754971a2c514ddde6e71;hb=8557e339c9a2d10afdf6465e02eca6b87efc961f;hp=d67044eee0923ea543436805384068352c0cf457;hpb=44146d06c780d3aaa283672fedb08b8870ebe1b9;p=lugaru.git

diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index d67044e..06c8b8b 100644
--- a/Source/Objects.cpp
+++ b/Source/Objects.cpp
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Objects.h"
 extern XYZ viewer;
 extern float viewdistance;
-extern float lightambient[3],lightbrightness[3];
 extern float fadestart;
 extern int environment;
 extern float texscale;
@@ -31,14 +30,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
 
@@ -55,7 +52,7 @@ bool 	Objects::checkcollide(XYZ startpoint,XYZ endpoint,int which){
 		if(type[i]!=treeleavestype&&type[i]!=treetrunktype&&type[i]!=bushtype&&type[i]!=firetype&&i!=which){
 			colviewer=startpoint;
 			coltarget=endpoint;
-			if(model[i].LineCheck(&colviewer,&coltarget,&colpoint,&position[i],&rotation[i])!=-1)return 1;	
+			if(model[i].LineCheck(&colviewer,&coltarget,&colpoint,&position[i],&yaw[i])!=-1)return 1;	
 		}
 	}
 
@@ -68,15 +65,15 @@ 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)
 			for(j=0;j<terrain.patchobjectnum[whichpatchx][whichpatchz];j++){
 				i=terrain.patchobjects[whichpatchx][whichpatchz][j];
 				possible[i]=0;
-				if(model[i].SphereCheckPossible(p1, radius, &position[i], &rotation[i])!=-1){
+				if(model[i].SphereCheckPossible(p1, radius, &position[i], &yaw[i])!=-1){
 					possible[i]=1;
 				}
 			}
@@ -91,11 +88,11 @@ void Objects::Draw()
 
 	for(i=0;i<numobjects;i++){
 		if(type[i]!=firetype){
-			moved=DoRotation(model[i].boundingspherecenter,0,rotation[i],0);
+			moved=DoRotation(model[i].boundingspherecenter,0,yaw[i],0);
 			if(type[i]==tunneltype||frustum.SphereInFrustum(position[i].x+moved.x,position[i].y+moved.y,position[i].z+moved.z,model[i].boundingsphereradius)){   
-				distance=findDistancefast(&viewer,&position[i]);
+				distance=distsq(&viewer,&position[i]);
 				distance*=1.2;
-				hidden=!(findDistancefastflat(&viewer,&position[i])>playerdist+3||(type[i]!=bushtype&&type[i]!=treeleavestype));
+				hidden=!(distsqflat(&viewer,&position[i])>playerdist+3||(type[i]!=bushtype&&type[i]!=treeleavestype));
 				if(!hidden){
 
 					if(detail==2&&distance>viewdistance*viewdistance/4&&environment==desertenvironment)glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, blurness );
@@ -104,7 +101,7 @@ void Objects::Draw()
 					if(distance>1)distance=1;
 					if(distance>0){
 
-						/*if(checkcollide(viewer,DoRotation(model[i].vertex[model[i].vertexNum],0,rotation[i],0)*scale[i]+position[i],i)){
+						/*if(checkcollide(viewer,DoRotation(model[i].vertex[model[i].vertexNum],0,yaw[i],0)*scale[i]+position[i],i)){
 						occluded[i]+=1;
 						}
 						else occluded[i]=0;*/
@@ -257,7 +254,7 @@ void Objects::Draw()
 										glRotatef((sin(windvar+position[i].x*.3)+.5)*4*.5*(sin(windvar*2+position[i].x*.3)+1)/2,1,0,0);
 									}
 								}
-								glRotatef(rotation[i],0,1,0);
+								glRotatef(yaw[i],0,1,0);
 								if(distance>1)distance=1;
 								glColor4f((1-shadowed[i])/2+.5,(1-shadowed[i])/2+.5,(1-shadowed[i])/2+.5,distance);
 								if(distance>=1){
@@ -330,9 +327,9 @@ void Objects::Draw()
 	glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0 );
 	for(i=0;i<numobjects;i++){
 		if(type[i]==treeleavestype||type[i]==bushtype){
-			moved=DoRotation(model[i].boundingspherecenter,0,rotation[i],0);
+			moved=DoRotation(model[i].boundingspherecenter,0,yaw[i],0);
 			if(frustum.SphereInFrustum(position[i].x+moved.x,position[i].y+moved.y,position[i].z+moved.z,model[i].boundingsphereradius)){   
-				hidden=findDistancefastflat(&viewer,&position[i])<=playerdist+3;
+				hidden=distsqflat(&viewer,&position[i])<=playerdist+3;
 				if(hidden){
 					distance=1;
 					if(distance>0){
@@ -438,7 +435,7 @@ void Objects::Draw()
 										glRotatef((sin(windvar+position[i].x*.3)+.5)*4*.5*(sin(windvar*2+position[i].x*.3)+1)/2,1,0,0);
 									}
 								}
-								glRotatef(rotation[i],0,1,0);
+								glRotatef(yaw[i],0,1,0);
 								glColor4f(1,1,1,distance);
 								if(type[i]==treeleavestype){
 									glDisable(GL_CULL_FACE);
@@ -477,7 +474,7 @@ void Objects::Draw()
 void Objects::DeleteObject(int which)
 {
 	type[numobjects-1]=0;
-	rotation[numobjects-1]=0;
+	yaw[numobjects-1]=0;
 	position[numobjects-1]=0;
 	scale[numobjects-1]=0;
 	friction[numobjects-1]=0;
@@ -485,7 +482,7 @@ void Objects::DeleteObject(int which)
 	numobjects--;
 }
 
-void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
+void Objects::MakeObject(int atype, XYZ where, float ayaw, float ascale){
 	if((atype!=treeleavestype&&atype!=bushtype)||foliage==1){
 		scale[numobjects]=ascale;
 		if(atype==treeleavestype)scale[numobjects]+=fabs((float)(Random()%100)/900)*ascale;
@@ -498,7 +495,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
 
 		position[numobjects]=where;
 		if(atype==bushtype)position[numobjects].y=terrain.getHeight(position[numobjects].x,position[numobjects].z)-.3;
-		rotation[numobjects]=arotation;
+		yaw[numobjects]=ayaw;
 
 		rotxvel[numobjects]=0;
 		rotyvel[numobjects]=0;
@@ -548,7 +545,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
 		model[numobjects].Scale(.3*scale[numobjects],.3*scale[numobjects],.3*scale[numobjects]);
 		model[numobjects].Rotate(90,1,1);
 		if(type[numobjects]==rocktype){
-			model[numobjects].Rotate(arotation*5,1,1);
+			model[numobjects].Rotate(ayaw*5,1,1);
 		}
 		model[numobjects].CalculateNormals(1);
 		model[numobjects].ScaleNormals(-1,-1,-1);
@@ -562,13 +559,13 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
 		}
 
 		if(atype!=treeleavestype&&atype!=bushtype&&atype!=firetype)
-			terrain.AddObject(where+DoRotation(model[numobjects].boundingspherecenter,0,arotation,0),model[numobjects].boundingsphereradius,numobjects);
+			terrain.AddObject(where+DoRotation(model[numobjects].boundingspherecenter,0,ayaw,0),model[numobjects].boundingsphereradius,numobjects);
 
 		numobjects++;
 	}	
 }
 
-void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2, float ascale){
+void Objects::MakeObject(int atype, XYZ where, float ayaw, float apitch, float ascale){
 	if((atype!=treeleavestype&&atype!=bushtype)||foliage==1){
 		scale[numobjects]=ascale;
 		if(atype==treeleavestype)scale[numobjects]+=fabs((float)(Random()%100)/900)*ascale;
@@ -585,8 +582,8 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2
 		if(position[numobjects].y<terrain.getHeight(position[numobjects].x,position[numobjects].z)-.3)
 		position[numobjects].y=terrain.getHeight(position[numobjects].x,position[numobjects].z)-.3;
 		}*/
-		rotation[numobjects]=arotation;
-		rotation2[numobjects]=arotation2;
+		yaw[numobjects]=ayaw;
+		pitch[numobjects]=apitch;
 
 		rotxvel[numobjects]=0;
 		rotyvel[numobjects]=0;
@@ -618,7 +615,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&&fabs(arotation2)>5)friction[numobjects]=.5;
+		if(friction[numobjects]==1.5&&fabs(apitch)>5)friction[numobjects]=.5;
 
 		if(atype==platformtype){
 			model[numobjects].loaddecal((char *)":Data:Models:Platform.solid",0);
@@ -637,9 +634,9 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2
 		}
 		model[numobjects].Scale(.3*scale[numobjects],.3*scale[numobjects],.3*scale[numobjects]);
 		model[numobjects].Rotate(90,1,1);
-		model[numobjects].Rotate(arotation2,0,0);
+		model[numobjects].Rotate(apitch,0,0);
 		if(type[numobjects]==rocktype){
-			model[numobjects].Rotate(arotation*5,0,0);
+			model[numobjects].Rotate(ayaw*5,0,0);
 		}
 		model[numobjects].CalculateNormals(1);
 		model[numobjects].ScaleNormals(-1,-1,-1);
@@ -653,7 +650,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2
 		}
 
 		if(atype!=treeleavestype&&atype!=bushtype&&atype!=firetype)
-			terrain.AddObject(where+DoRotation(model[numobjects].boundingspherecenter,0,arotation,0),model[numobjects].boundingsphereradius,numobjects);
+			terrain.AddObject(where+DoRotation(model[numobjects].boundingspherecenter,0,ayaw,0),model[numobjects].boundingsphereradius,numobjects);
 
 		numobjects++;
 	}	
@@ -664,7 +661,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;
@@ -680,7 +677,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];
@@ -688,7 +685,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);
 				}
 			}
 
@@ -698,8 +695,7 @@ void Objects::DoStuff()
 
 void Objects::DoShadows()
 {
-	int i,j,k,l,todivide;
-	static float brightness, total;
+	int i,j,k,l;
 	static XYZ testpoint,testpoint2, terrainpoint,lightloc,col;
 	lightloc=light.location;
 	if(!skyboxtexture)lightloc=0;
@@ -711,11 +707,11 @@ void Objects::DoShadows()
 		for(i=0;i<numobjects;i++){
 			if(type[i]!=treeleavestype&&type[i]!=treetrunktype&&type[i]!=bushtype&&type[i]!=firetype){
 				for(j=0;j<model[i].vertexNum;j++){
-					terrainpoint=position[i]+DoRotation(model[i].vertex[j]+model[i].normals[j]*.1,0,rotation[i],0);
+					terrainpoint=position[i]+DoRotation(model[i].vertex[j]+model[i].normals[j]*.1,0,yaw[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++){
@@ -723,13 +719,13 @@ void Objects::DoShadows()
 								if(type[l]!=treetrunktype/*&&l!=i*/){
 									testpoint=terrainpoint;
 									testpoint2=terrainpoint+lightloc*50*(1-shadowed[i]);
-									if(model[l].LineCheck(&testpoint,&testpoint2,&col,&position[l],&rotation[l])!=-1){
+									if(model[l].LineCheck(&testpoint,&testpoint2,&col,&position[l],&yaw[l])!=-1){
 										shadowed[i]=1-(findDistance(&terrainpoint,&col)/50);	
 									}
 								}
 							}
 							if(shadowed[i]>0){
-								col=model[i].normals[j]-DoRotation(lightloc*shadowed[i],0,-rotation[i],0);
+								col=model[i].normals[j]-DoRotation(lightloc*shadowed[i],0,-yaw[i],0);
 								Normalise(&col);
 								for(k=0;k<model[i].TriangleNum;k++){
 									if(model[i].Triangles[k].vertex[0]==j){
@@ -763,15 +759,11 @@ Objects::Objects()
 	center = 0;
 	radius = 0;
 	numobjects = 0;
-	boxtextureptr = 0;
-	treetextureptr = 0;
-	bushtextureptr = 0;
-	rocktextureptr = 0;
 
 	memset(position, 0, sizeof(position));
 	memset(type, 0, sizeof(type));
-	memset(rotation, 0, sizeof(rotation));
-	memset(rotation2, 0, sizeof(rotation2));
+	memset(yaw, 0, sizeof(yaw));
+	memset(pitch, 0, sizeof(pitch));
 	memset(rotx, 0, sizeof(rotx));
 	memset(rotxvel, 0, sizeof(rotxvel));
 	memset(roty, 0, sizeof(roty));
@@ -791,9 +783,9 @@ Objects::Objects()
 
 Objects::~Objects()
 {
-	if (boxtextureptr) glDeleteTextures( 1, &boxtextureptr );
-	if (treetextureptr) glDeleteTextures( 1, &treetextureptr );
-	if (bushtextureptr) glDeleteTextures( 1, &bushtextureptr );
-	if (rocktextureptr) glDeleteTextures( 1, &rocktextureptr );
+    boxtextureptr.destroy();
+    treetextureptr.destroy();
+    bushtextureptr.destroy();
+    rocktextureptr.destroy();
 };