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

Correction sur la découp des bâtiments en sous-bâtiments.

Browse Source
This commit is contained in:
Georges Dupéron 2012-01-18 17:07:53 +01:00
parent 5bdeb93442
commit 1c2a7c4270
2 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
rules/architecture/batiment.cpp
View File

@ -4,36 +4,25 @@ BatimentQuad_::BatimentQuad_(Quad _c) : Chose(), c(_c) {
addEntropy(c);
}
bool BatimentQuad_::split() {
Quad q;
if(!isSub)
q = c >> ((c.maxLengthNS() < c.maxLengthEW()) ? 1 : 0);
else
q = c;
int minSurface = 1000000;
if(q.surface() > 2* minSurface) {
Vertex c1 = q[NW] + Vertex(q[NE] - q[NW])/2;
Vertex c2 = q[SW] + Vertex(q[SE] - q[SW])/2;
Quad q1 = Quad(c1,c2,q[SW],q[NW]).inset(E,30);
Quad q2 = Quad(q[NE],q[SE],c2,c1).inset(W,30);
addChild((new BatimentQuad_(q1))->isSubdivision(true));
addChild((new BatimentQuad_(q2))->isSubdivision(true));
}
else {
Quad ch = c.offsetNormal(Dimensions::hauteurEtage);
addChild(new ToitQuad(ch, Dimensions::hauteurToit));
}
return true;
BatimentQuad_::BatimentQuad_(Quad _c, bool _isSub) : Chose(), c(_c), isSub(_isSub) {
addEntropy(c);
}
BatimentQuad_* BatimentQuad_::isSubdivision(bool val) {
this->isSub = val;
return this;
bool BatimentQuad_::split() {
int minSurface = 100 * 100 * 100;
Quad q = c << c.maxLengthSide();
if(q.surface() > 2 * minSurface) {
Vertex n = Segment(q[NW], q[NE]).randomPos(seed, 0, 3.f/8.f, 5.f/8.f);
Vertex s = Segment(q[SE], q[SW]).randomPos(seed, 1, 3.f/8.f, 5.f/8.f);
addChild(new BatimentQuad_(Quad(q[NE], q[SE], s, n), true));
addChild(new BatimentQuad_(Quad(q[SW], q[NW], n, s), true));
} else {
Quad ch = c.offsetNormal(Dimensions::hauteurEtage);
addChild(new ToitQuad(ch, Dimensions::hauteurToit));
}
return true;
}
void BatimentQuad_::triangulation() {

1
rules/architecture/batiment.hh
View File

@ -9,6 +9,7 @@ class BatimentQuad_ : public Chose {
public:
BatimentQuad_(Quad _c);
BatimentQuad_(Quad _c, bool _isSub);
virtual bool split();
virtual void triangulation();
virtual void getBoundingBoxPoints();