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

Correction d'un bug dans la subdivision des bâtiments.

Browse Source
This commit is contained in:
Georges Dupéron 2012-01-19 14:55:38 +01:00
parent d715079db2
commit 36554fdc9c
5 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
geometry/quad.hh
View File

@ -55,5 +55,30 @@ class Quad {
Vertex moyenne() const;
};
class QuadBool {
private:
bool c[4];
public :
QuadBool();
QuadBool(bool n, bool e, bool s, bool w) {
c[N] = n;
c[E] = e;
c[S] = s;
c[W] = w;
};
inline bool& operator[] (Cardinal x) {
return c[x];
}
inline const bool& operator[] (Cardinal x) const {
return c[x];
}
inline QuadBool operator>> (int rot) const {
return QuadBool(c[N - rot], c[E - rot], c[S - rot], c[N - rot]);
}
inline QuadBool operator<< (int rot) const {
return QuadBool(c[N + rot], c[E + rot], c[S + rot], c[W + rot]);
}
};
#endif

42
rules/architecture/batiment.cpp
View File

@ -1,37 +1,33 @@
#include "all_includes.hh"
BatimentQuad_::BatimentQuad_(Quad _c, bool _isSub, bool _we, bool _ws, bool _ww, bool _wn)
: Chose(), c(_c), isSub(_isSub), we(_we), ws(_ws), ww(_ww), wn(_wn) {
BatimentQuad_::BatimentQuad_(Quad _c, bool _isSub, QuadBool _w)
: Chose(), c(_c), isSub(_isSub), w(_w) {
addEntropy(c);
for (int i = 0; i < 4; i++)
addEntropy(w[N+i] ? 0 : 1);
}
bool BatimentQuad_::split() {
int minSurface = 100 * 100 * 100;
Quad q = c;
//Quad q = c << c.maxLengthSide();
if(c.maxLengthNS() < c.maxLengthEW()) {
q = c >> 1;
bool t = we;
we = ws; ws = ww; ww = wn; wn = t;
}
Quad q = c << c.maxLengthSide();
QuadBool qb = w << c.maxLengthSide();
//std::cout << "w : " << we << " " << ws << " " << ww << " " << wn << std::endl;
if((we || ws || ww || wn) && q.surface() > 2 * minSurface) {
Vertex n = Segment(q[NW], q[NE]).randomPos(seed, 0, 1.f/3.f, 1.f/2.f);
Vertex s = Segment(q[SE], q[SW]).randomPos(seed, 1, 1.f/3.f, 1.f/2.f);
if (qb[N] || qb[E] || qb[S] || qb[W]) {
if (q.surface() > 2 * minSurface) {
Vertex n = Segment(q[NW], q[NE]).randomPos(seed, 0, 1.f/3.f, 1.f/2.f);
Vertex s = Segment(q[SE], q[SW]).randomPos(seed, 1, 1.f/3.f, 1.f/2.f);
addChild(new BatimentQuad_(Quad(q[NE], q[SE], s, n), true,we&&true,ws&&true,false,wn&&true));
addChild(new BatimentQuad_(Quad(n, s,q[SW],q[NW]), true,false,ws&&true,ww&&true,wn&&true));
} else {
Quad ch = c.offsetNormal(Dimensions::hauteurEtage);
ch = ch.insetNESW(30);
c = c.insetNESW(30);
if(we || ws || ww || wn) {
addChild(new BatimentQuad_(Quad(q[SE], s, n, q[NE]), true, QuadBool(qb[E],qb[S],false,qb[N])));
addChild(new BatimentQuad_(Quad(q[NW], n, s, q[SW]), true, QuadBool(qb[W],qb[N],false,qb[S])));
} else {
Quad ch = c.offsetNormal(Dimensions::hauteurEtage);
ch = ch.insetNESW(30);
c = c.insetNESW(30);
addChild(new ToitQuad(ch, Dimensions::hauteurToit));
addChild(new EtageQuad(c,ch));
//addChild(new EtageQuad(c,ch));
}
else
addChild(new BatimentQuadJardin(ch));
} else {
addChild(new TerrainQuad(c));
}
return true;

4
rules/architecture/batiment.hh
View File

@ -6,10 +6,10 @@
class BatimentQuad_ : public Chose {
Quad c;
bool isSub;
bool we, ws, ww, wn;
QuadBool w;
public:
BatimentQuad_(Quad _c, bool _isSub=false, bool _we=true, bool _ws=true, bool _ww=true, bool _wn=true);
BatimentQuad_(Quad _c, bool _isSub=false, QuadBool _w = QuadBool(true, true, true, true));
virtual bool split();
virtual void triangulation();
virtual void getBoundingBoxPoints();

6
rules/architecture/etage.cpp
View File

@ -25,12 +25,10 @@ bool EtageQuad::split() {
MurQuad *mmn = new MurQuad(mn,mnh,wn);
MurQuad *mmw = new MurQuad(mw >> 1,mwh >> 1,ww);
MurQuad *mms = new MurQuad(ms >> 2,msh >> 2,ws);
mmw=mmw;
mms=mms;
addChild(mme);
//addChild(mmw);
addChild(mmw);
addChild(mmn);
//addChild(mms);
addChild(mms);
return true;
}

2
rules/architecture/terrain.cpp
View File

@ -9,7 +9,7 @@ bool TerrainQuad::split() {
addChild(new TerrainQuad(c, false));
int maxNArbres = 10;
int maxNArbres = std::min(10, (int)(c.surface() / (7.f*7.f*100.f*100.f)));
Vertex p[maxNArbres];
int pi = 0;
int nArbres = hash2(seed, -1) % (maxNArbres + 1);