www

commit 7f12c99bbfb5a49ca92a4c4edd6afda3dfbdb16a
parent 5cd0ea382dd135b2716159c657a541fa0e355986
Author: Yoann <yoann.b87@voila.fr>
Date:   Thu, 12 Jan 2012 09:32:39 +0100

Corretion d'un problème de normale dans la fonction addGPUOcto.
Remise dest toits des maison simples enlevés pour le débug.

Diffstat:
M
rules/batiment/batimentquadmaison.cpp
 | 
2
+-
M
rules/chose.cpp
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/batiment/batimentquadmaison.cpp b/rules/batiment/batimentquadmaison.cpp
@@ -16,7 +16,7 @@ bool BatimentQuadMaison::split() {
 	Vertex toit = (ch[NE] + ch[SE] + ch[SW] + ch[NW]) / 4 + Vertex(0,0,htoit);
 
 	addChild(new BatimentQuadBlock(c,ch));
-	//addChild(new BatimentQuadToit(ch,1));
+	addChild(new BatimentQuadToit(ch,1));
     return true;
 }
 
diff --git a/rules/chose.cpp b/rules/chose.cpp
@@ -43,7 +43,7 @@ void Chose::addGPUOcto(Vertex ne, Vertex se, Vertex sw, Vertex nw,
 }
 
 void Chose::addGPUOcto(Quad q, Quad qh, unsigned char r, unsigned char g, unsigned char b) {
-    this->addGPUQuad(q[NE], q[SE], q[SW], q[NW], r, g, b);
+    this->addGPUQuad(q[SE], q[NE], q[NW], q[SW], r, g, b);
     this->addGPUQuad(qh[NE], qh[SE], qh[SW], qh[NW], r, g, b);
     for (int i = 0; i < 4; i++)
     	this->addGPUQuad(q[NE+i], q[SE+i], qh[SE+i], qh[NE+i], r, g, b);