www

commit 44fd5a64b8fdf6e64adbad8ace626fc12a23a3c6
parent 6b692b48a5ab67a713de68cf257880522d15c5b5
Author: Yoann <yoann.b87@voila.fr>
Date:   Thu, 19 Jan 2012 13:09:35 +0100

commit pour pull.

Diffstat:
M
all_includes.hh
 | 
2
++
M
rules/architecture/batiment.cpp
 | 
3
++-
M
view.cpp
 | 
2
+-

3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/all_includes.hh b/all_includes.hh
@@ -45,6 +45,8 @@ class Chose;
 #include "rules/architecture/routetrottoir.hh"
 #include "rules/architecture/terrain.hh"
 #include "rules/architecture/toit.hh"
+#include "rules/architecture/etage.hh"
+#include "rules/architecture/mur.hh"
 
 #include "rules/batiment/batimentquad.hh"
 #include "rules/batiment/batimentquadmaison.hh"
diff --git a/rules/architecture/batiment.cpp b/rules/architecture/batiment.cpp
@@ -25,9 +25,10 @@ bool BatimentQuad_::split() {
 	} else {
 		Quad ch = c.offsetNormal(Dimensions::hauteurEtage);
 		ch = ch.insetNESW(30);
+		c = c.insetNESW(30);
 		if(we || ws || ww || wn) {
             addChild(new ToitQuad(ch, Dimensions::hauteurToit));
-            addChild(new BatimentQuadBlock(c,ch));
+            addChild(new EtageQuad(c,ch));
 		}
         else
             addChild(new BatimentQuadJardin(ch));
diff --git a/view.cpp b/view.cpp
@@ -147,7 +147,7 @@ void View::renderScene(int lastTime, int currentTime) {
 	lod.setCamera(camera.cameraCenter);
 
 	setLight();
-	setSkybox();
+	//setSkybox();
 
 	glBegin(GL_TRIANGLES);
 	root->display();