www

commit a23b241fb0215fb5eaa03c873e9901c4b17aacfa
parent a28b61c41fd3fff0757f3514b95535f726620d89
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date:   Tue, 10 Jan 2012 22:02:50 +0100

Quelques corrections.

Diffstat:
M
geometry/vertex.cpp
 | 
4
++--
M
rules/batiment/batimentquadmur.cpp
 | 
2
+-
M
rules/quartier/quartierquadconcave.cpp
 | 
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/geometry/vertex.cpp b/geometry/vertex.cpp
@@ -4,8 +4,8 @@ Vertex::Vertex() {}
 
 Vertex::Vertex(float _x, float _y, float _z): x(_x), y(_y), z(_z) {
 	// TODO : DEBUG
-	//if (!(std::isfinite(x) && std::isfinite(y) && std::isfinite(z)))
-	//	throw "Attempted to create vertex with bad data !";
+	if (!(std::isfinite(x) && std::isfinite(y) && std::isfinite(z)))
+		std::cout << "Attempted to create vertex with bad data !" << std::endl;
 }
 
 float Vertex::norm() const { return std::sqrt(x*x + y*y + z*z); }
diff --git a/rules/batiment/batimentquadmur.cpp b/rules/batiment/batimentquadmur.cpp
@@ -16,7 +16,7 @@ void BatimentQuadMur::setWindow(bool 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;
-    Quad wFront = q.inset(N,40).inset(S,100).inset(E,lr).inset(W,lr);
+    Quad wFront = q.insetNSEW(40,100,lr,lr);
     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]);
diff --git a/rules/quartier/quartierquadconcave.cpp b/rules/quartier/quartierquadconcave.cpp
@@ -11,6 +11,6 @@ bool QuartierQuadConcave::split() {
 			return true;
 		}
 	}
-	throw "ERREUR : Ne devait jamais arriver ici !";
+	std::cout << "ERREUR : Ne devait jamais arriver ici !" << std::endl;
 	return true;
 }