commit 3f4674803e5c0c83d5b62da419f0a4db88d1b41a
parent 2b97bdd30982837f8e081095f02c58b75961bcb8
Author: Yoann <yoann.b87@voila.fr>
Date: Wed, 11 Jan 2012 09:48:20 +0100
Correction d'un passage de valeur non initialisée.
Diffstat:
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/rules/batiment/batimentquadmur.cpp b/rules/batiment/batimentquadmur.cpp
@@ -12,7 +12,8 @@ void BatimentQuadMur::getBoundingBoxPoints() {
}
void BatimentQuadMur::setWindow(bool val) {
- this->window = val;
+ val = val;
+ /*this->window = val;
Quad q = Quad(ch[SE],c[SE],c[SW],ch[SW]);
int lr = (q.length(S) - 100)/40;
std::cout << q.inset(E,60).surface() << std::endl;
@@ -20,7 +21,7 @@ void BatimentQuadMur::setWindow(bool val) {
Quad wBack = wFront.offsetNormal(28);
windowPos = Quad(wBack[SE],wFront[SE],wFront[SW],wBack[SW]);
windowPosh = Quad(wBack[NE],wFront[NE],wFront[NW],wBack[NW]);
-
+*/
//std::cout << "lr" << lr << std::endl;
//std::cout << wFront[NE] << std::endl;
//std::cout << q[SE] << std::endl;
@@ -38,9 +39,9 @@ bool BatimentQuadMur::split() {
Quad bottom = c;
- addChild(new BatimentQuadMur(c,windowPos));
+ /*addChild(new BatimentQuadMur(c,windowPos));
addChild(new BatimentQuadMur(windowPosh,ch));
-
+*/
return true;
}
diff --git a/rules/batiment/batimentquadtoit.cpp b/rules/batiment/batimentquadtoit.cpp
@@ -6,7 +6,7 @@ BatimentQuadToit::BatimentQuadToit(Quad _c, int _type) : Chose(), c(_c), type(_t
void BatimentQuadToit::getBoundingBoxPoints() {
addBBPoints(c);
- addBBPoints(c + Vertex(0,0,height)); // TODO
+ addBBPoints(c + Vertex(0,0,200)); // TODO
}
void BatimentQuadToit::triangulation() {