X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.cpp;h=d9c73b056b320ff90bfcc49f8cadd158cbbc74f3;hb=8afdcba610cded0e54b85069ba051268b29669a6;hp=1683dfc88c0426cd7d2ab8b79bfd903e565a2d0e;hpb=58aaf9dc190781f673fd5928277d3ade7434268a;p=lugaru.git

diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index 1683dfc..d9c73b0 100644
--- a/Source/Terrain.cpp
+++ b/Source/Terrain.cpp
@@ -31,7 +31,7 @@ extern float texscale;
 extern Light light;
 extern float multiplier;
 extern FRUSTUM frustum;
-extern float texdetail,terraindetail;
+extern float texdetail;
 extern int detail;
 extern bool decals;
 extern float blurness;
@@ -378,7 +378,6 @@ bool Terrain::load(const char *fileName)
 	static float patch_size;
 
 	float temptexdetail=texdetail;
-	texdetail=terraindetail;
 	//LoadTGA( fileName );
 
 	// Fixing filename so that it works with its own os
@@ -429,7 +428,7 @@ bool Terrain::load(const char *fileName)
 
 		for(i=0;i<size;i++){
 			for(j=0;j<size;j++){
-				heightmap[size-1-i][j]=(float)((texture.data[(i+(j*size))*texture.bpp/8]))/5/terraindetail;
+				heightmap[size-1-i][j]=(float)((texture.data[(i+(j*size))*texture.bpp/8]))/5;
 			}
 		}
 
@@ -979,7 +978,7 @@ void Terrain::draw(int layer)
 	endz=(viewer.z+viewdistance)/(patch_size)+1;
 	if(endz>subdivision)endz=subdivision;
 
-	if(!layer)
+	if(!layer) {
 		for(i=beginx;i<endx;i++){	
 			for(j=beginz;j<endz;j++){	
 				terrainpoint.x=i*patch_size+(patch_size)/2;
@@ -988,35 +987,48 @@ void Terrain::draw(int layer)
 				distance[i][j]=findDistancefast(&viewer,&terrainpoint);
 			}
 		}
-
-		for(i=beginx;i<endx;i++){	
-			for(j=beginz;j<endz;j++){	
-				if(distance[i][j]<(viewdistance+patch_size)*(viewdistance+patch_size)){
-					opacity=1;
-					if(distance[i][j]>viewdistsquared*fadestart-viewdistsquared)opacity=0;
-					if(opacity==1&&i!=subdivision)if(distance[i+1][j]>viewdistsquared*fadestart-viewdistsquared)opacity=0;
-					if(opacity==1&&j!=subdivision)if(distance[i][j+1]>viewdistsquared*fadestart-viewdistsquared)opacity=0;
-					if(opacity==1&&j!=subdivision&&i!=subdivision)if(distance[i+1][j+1]>viewdistsquared*fadestart-viewdistsquared)opacity=0;
-					glMatrixMode(GL_MODELVIEW);							// Select The Modelview Matrix
-					glPushMatrix();
-						if(frustum.CubeInFrustum(i*patch_size+patch_size*.5,avgypatch[i][j],j*patch_size+patch_size*.5,heightypatch[i][j]/2))
-						{   
-							if(environment==desertenvironment&&distance[i][j]>viewdistsquared/4)glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, blurness);
-							else if(environment==desertenvironment)glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0 );
-							if(!layer&&textureness[i][j]!=allsecond)drawpatch(i,j,opacity);
-							if(layer==1&&textureness[i][j]!=allfirst)drawpatchother(i,j,opacity);
-							if(layer==2&&textureness[i][j]!=allfirst)drawpatchotherother(i,j,opacity);
-						}
-					glPopMatrix();
-				}
+	}
+	for(i=beginx;i<endx;i++){
+		for(j=beginz;j<endz;j++){	
+			if(distance[i][j]<(viewdistance+patch_size)*(viewdistance+patch_size)){
+				opacity=1;
+				if(distance[i][j]>viewdistsquared*fadestart-viewdistsquared)
+					opacity=0;
+				if(opacity==1&&i!=subdivision)
+					if(distance[i+1][j]>viewdistsquared*fadestart-viewdistsquared)
+						opacity=0;
+				if(opacity==1&&j!=subdivision)
+					if(distance[i][j+1]>viewdistsquared*fadestart-viewdistsquared)
+						opacity=0;
+				if(opacity==1&&j!=subdivision&&i!=subdivision)
+					if(distance[i+1][j+1]>viewdistsquared*fadestart-viewdistsquared)
+						opacity=0;
+				glMatrixMode(GL_MODELVIEW);							// Select The Modelview Matrix
+				glPushMatrix();
+					if(frustum.CubeInFrustum(i*patch_size+patch_size*.5,avgypatch[i][j],j*patch_size+patch_size*.5,heightypatch[i][j]/2))
+					{   
+						if(environment==desertenvironment&&distance[i][j]>viewdistsquared/4)
+							glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, blurness);
+						else if(environment==desertenvironment)
+							glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0 );
+						if(!layer&&textureness[i][j]!=allsecond)
+							drawpatch(i,j,opacity);
+						if(layer==1&&textureness[i][j]!=allfirst)
+							drawpatchother(i,j,opacity);
+						if(layer==2&&textureness[i][j]!=allfirst)
+							drawpatchotherother(i,j,opacity);
+					}
+				glPopMatrix();
 			}
 		}
-		if(environment==desertenvironment)glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0 );
+	}
+	if(environment==desertenvironment)
+		glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0 );
 }
 
 void Terrain::drawdecals()
 {
-	if(decals){
+	if(decals) {
 		static int i,j;
 		static float distancemult;
 		static int lasttype;
@@ -1154,10 +1166,10 @@ void Terrain::AddObject(XYZ where, float radius, int id)
 					points[3].x=(size/subdivision)*i;
 					points[3].z=(size/subdivision)*(j+1);
 					points[3].y=heightmap[(int)points[3].x][(int)points[3].z];
-					points[0]*=scale*terraindetail;
-					points[1]*=scale*terraindetail;
-					points[2]*=scale*terraindetail;
-					points[3]*=scale*terraindetail;
+					points[0]*=scale;
+					points[1]*=scale;
+					points[2]*=scale;
+					points[3]*=scale;
 					if(!done&&where.x+radius>points[0].x&&where.x-radius<points[2].x&&where.z+radius>points[0].z&&where.z-radius<points[2].z){
 						patchobjects[i][j][patchobjectnum[i][j]]=id;
 						patchobjectnum[i][j]++;
@@ -1187,8 +1199,8 @@ void Terrain::DeleteDecal(int which)
 }
 
 void Terrain::MakeDecal(int type, XYZ where, float size, float opacity, float rotation){
-	if(decals){
-		if(opacity>0&&size>0){
+	if(decals) {
+		if(opacity>0&&size>0) {
 			static int patchx[4];
 			static int patchy[4];
 
@@ -1238,11 +1250,9 @@ void Terrain::MakeDecalLock(int type, XYZ where,int whichx, int whichy, float si
 		decalbrightness[numdecals]=(rot.x+rot.y+rot.z)/3;
 		if(decalbrightness[numdecals]<.4)decalbrightness[numdecals]=.4;
 
-		//if(type==blooddecal||type==blooddecalfast||type==blooddecalslow){
 		if(environment==grassyenvironment){
 			decalbrightness[numdecals]*=.6;
 		}
-		//}
 
 		if(decalbrightness[numdecals]>1)decalbrightness[numdecals]=1;
 		decalbright=decalbrightness[numdecals];