suzanne.soy/2011-m2s3-city-builder
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Quelques corrections.

Browse Source
This commit is contained in:
Georges Dupéron 2012-01-10 22:02:50 +01:00
parent a28b61c41f
commit a23b241fb0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
geometry/vertex.cpp
View File

@ -4,8 +4,8 @@ Vertex::Vertex() {}
Vertex::Vertex(float _x, float _y, float _z): x(_x), y(_y), z(_z) { Vertex::Vertex(float _x, float _y, float _z): x(_x), y(_y), z(_z) {
// TODO : DEBUG // TODO : DEBUG
//if (!(std::isfinite(x) && std::isfinite(y) && std::isfinite(z))) if (!(std::isfinite(x) && std::isfinite(y) && std::isfinite(z)))
// throw "Attempted to create vertex with bad data !"; std::cout << "Attempted to create vertex with bad data !" << std::endl;
} }
float Vertex::norm() const { return std::sqrt(x*x + y*y + z*z); } float Vertex::norm() const { return std::sqrt(x*x + y*y + z*z); }

2
rules/batiment/batimentquadmur.cpp
View File

@ -16,7 +16,7 @@ void BatimentQuadMur::setWindow(bool val) {
Quad q = Quad(ch[SE],c[SE],c[SW],ch[SW]); Quad q = Quad(ch[SE],c[SE],c[SW],ch[SW]);
int lr = (q.length(S) - 100)/40; int lr = (q.length(S) - 100)/40;
std::cout << q.inset(E,60).surface() << std::endl; 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); Quad wBack = wFront.offsetNormal(28);
windowPos = Quad(wBack[SE],wFront[SE],wFront[SW],wBack[SW]); windowPos = Quad(wBack[SE],wFront[SE],wFront[SW],wBack[SW]);
windowPosh = Quad(wBack[NE],wFront[NE],wFront[NW],wBack[NW]); windowPosh = Quad(wBack[NE],wFront[NE],wFront[NW],wBack[NW]);

2
rules/quartier/quartierquadconcave.cpp
View File

@ -11,6 +11,6 @@ bool QuartierQuadConcave::split() {
return true; return true;
} }
} }
throw "ERREUR : Ne devait jamais arriver ici !"; std::cout << "ERREUR : Ne devait jamais arriver ici !" << std::endl;
return true; return true;
} }