From 16fd248babd866be5535bdc43ae21099580ee3eb Mon Sep 17 00:00:00 2001
From: neoraider <devnull@localhost>
Date: Sun, 19 Nov 2006 22:03:05 +0000
Subject: Render-Qualitaet durch neue Render()-Funktion erhoeht.

---
 render.c | 87 ++++++++++++++++++++++++++++++----------------------------------
 1 file changed, 41 insertions(+), 46 deletions(-)

(limited to 'render.c')

diff --git a/render.c b/render.c
index fd57ca7..d626a99 100644
--- a/render.c
+++ b/render.c
@@ -13,6 +13,7 @@ extern LEVEL level;
 extern GLuint sphere;
 extern int nLights;
 extern LIGHT *lights;
+extern COLOR ambient;
 extern GLuint lightmap;
 
 
@@ -47,79 +48,73 @@ void Render() {
 	
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	
-	glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+	glBlendFunc(GL_ONE, GL_ZERO);
 	
-	glBlendFunc(GL_ONE, GL_ONE);
-	
-	glColor3f(0.0, 0.0, 0.0);
-	glTexCoord2f(0.0, 0.0);
+	glColor3fv((GLfloat*)&ambient);
 	
-	glBegin(GL_TRIANGLES);
+	glActiveTexture(GL_TEXTURE1);
+	glDisable(GL_TEXTURE_2D);
+	glActiveTexture(GL_TEXTURE0);
 	
 	for(i = 0; i < room->nPolygons; i++) {
+		glBindTexture(GL_TEXTURE_2D, room->polygons[i].texture);
+		
+		glBegin(GL_TRIANGLES);
+		
+		glMultiTexCoord2fv(0, (GLfloat*)&room->polygons[i].texcoords[0]);
 		glVertex3fv((GLfloat*)&room->polygons[i].vertices[0]);
+		glMultiTexCoord2fv(0, (GLfloat*)&room->polygons[i].texcoords[1]);
 		glVertex3fv((GLfloat*)&room->polygons[i].vertices[1]);
+		glMultiTexCoord2fv(0, (GLfloat*)&room->polygons[i].texcoords[2]);
 		glVertex3fv((GLfloat*)&room->polygons[i].vertices[2]);
+		
+		glEnd();
 	}
 	
-	glEnd();
-	
 	glDepthFunc(GL_EQUAL);
 	glDepthMask(GL_FALSE);
 	
-	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+	glBlendFunc(GL_ONE, GL_ONE);
+	
+	glColor3f(1.0, 1.0, 1.0);
 	
 	glBindTexture(GL_TEXTURE_2D, lightmap);
+	glActiveTexture(GL_TEXTURE1);
+	glEnable(GL_TEXTURE_2D);
 	
 	for(i = 0; i < nLights; i++) {
-		glBegin(GL_TRIANGLES);
-		
 		for(j = 0; j < room->nPolygons; j++) {
-			d = VectorDot(room->polygons[j].normal, VectorSub(room->polygons[j].vertices[0], lights[i].pos));
-			
-			if(d >= 0) continue;
-			
-			c = VectorMul(lights[i].diffuse, 1.0/((nLights+1)*d*d));
-			glColor3fv((GLfloat*)&c);
+			glBindTexture(GL_TEXTURE_2D, room->polygons[j].texture);
 			
-			p = VectorAdd(lights[i].pos, VectorMul(room->polygons[j].normal, d));
+			glBegin(GL_TRIANGLES);
 			
-			v1 = VectorNormalize(VectorSub(room->polygons[j].vertices[0], room->polygons[j].vertices[1]));
-			v2 = VectorCross(v1, room->polygons[j].normal);
+			d = VectorDot(room->polygons[j].normal, VectorSub(room->polygons[j].vertices[0], lights[i].pos));
 			
-			for(k = 0; k < 3; k++) {
-				v = VectorSub(room->polygons[j].vertices[k], p);
+			if(d < 0) {
+				c = VectorMul(lights[i].diffuse, 1.0/((nLights+1)*d*d));
+				glColor3fv((GLfloat*)&c);
+				
+				p = VectorAdd(lights[i].pos, VectorMul(room->polygons[j].normal, d));
+				
+				v1 = VectorNormalize(VectorSub(room->polygons[j].vertices[0], room->polygons[j].vertices[1]));
+				v2 = VectorCross(v1, room->polygons[j].normal);
 				
-				glTexCoord2f(VectorDot(v, v1)*0.04 / d + 0.5, VectorDot(v, v2)*0.04 / d + 0.5);
-				glVertex3fv((GLfloat*)&room->polygons[j].vertices[k]);
+				for(k = 0; k < 3; k++) {
+					v = VectorSub(room->polygons[j].vertices[k], p);
+					
+					glMultiTexCoord2f(0, VectorDot(v, v1)*0.04 / d + 0.5, VectorDot(v, v2)*0.04 / d + 0.5);
+					glMultiTexCoord2fv(1, (GLfloat*)&room->polygons[j].texcoords[k]);
+					glVertex3fv((GLfloat*)&room->polygons[j].vertices[k]);
+				}
 			}
+			
+			glEnd();
 		}
-		
-		glEnd();
 	}
 	
-	glBlendFunc(GL_DST_COLOR, GL_ZERO);
-	
-	glColor3f(1.0, 1.0, 1.0);
-	
-	/*for(i = 0; i < room->nPolygons; i++) {
-		glBindTexture(GL_TEXTURE_2D, room->polygons[i].texture);
-		
-		glBegin(GL_TRIANGLES);
-		
-		glTexCoord2fv((GLfloat*)&room->polygons[i].texcoords[0]);
-		glVertex3fv((GLfloat*)&room->polygons[i].vertices[0]);
-		glTexCoord2fv((GLfloat*)&room->polygons[i].texcoords[1]);
-		glVertex3fv((GLfloat*)&room->polygons[i].vertices[1]);
-		glTexCoord2fv((GLfloat*)&room->polygons[i].texcoords[2]);
-		glVertex3fv((GLfloat*)&room->polygons[i].vertices[2]);
-		
-		glEnd();
-	}*/
-	
 	free(room);
 	
-	ApplyLightScale();
+	//ApplyLightScale();
 	
 	/*glPushMatrix();
 	glDisable(GL_TEXTURE_2D);
-- 
cgit v1.2.3