commit pour pull.

This commit is contained in:
Yoann 2012-01-19 13:09:35 +01:00
parent 6b692b48a5
commit 44fd5a64b8
3 changed files with 5 additions and 2 deletions

View File

@ -45,6 +45,8 @@ class Chose;
#include "rules/architecture/routetrottoir.hh" #include "rules/architecture/routetrottoir.hh"
#include "rules/architecture/terrain.hh" #include "rules/architecture/terrain.hh"
#include "rules/architecture/toit.hh" #include "rules/architecture/toit.hh"
#include "rules/architecture/etage.hh"
#include "rules/architecture/mur.hh"
#include "rules/batiment/batimentquad.hh" #include "rules/batiment/batimentquad.hh"
#include "rules/batiment/batimentquadmaison.hh" #include "rules/batiment/batimentquadmaison.hh"

View File

@ -25,9 +25,10 @@ bool BatimentQuad_::split() {
} else { } else {
Quad ch = c.offsetNormal(Dimensions::hauteurEtage); Quad ch = c.offsetNormal(Dimensions::hauteurEtage);
ch = ch.insetNESW(30); ch = ch.insetNESW(30);
c = c.insetNESW(30);
if(we || ws || ww || wn) { if(we || ws || ww || wn) {
addChild(new ToitQuad(ch, Dimensions::hauteurToit)); addChild(new ToitQuad(ch, Dimensions::hauteurToit));
addChild(new BatimentQuadBlock(c,ch)); addChild(new EtageQuad(c,ch));
} }
else else
addChild(new BatimentQuadJardin(ch)); addChild(new BatimentQuadJardin(ch));

View File

@ -147,7 +147,7 @@ void View::renderScene(int lastTime, int currentTime) {
lod.setCamera(camera.cameraCenter); lod.setCamera(camera.cameraCenter);
setLight(); setLight();
setSkybox(); //setSkybox();
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
root->display(); root->display();