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

Detection des batiments entièrement entourés, mais pas encore au point.

Browse Source
This commit is contained in:
Yoann 2012-01-18 19:26:14 +01:00
parent e06a78df82
commit b4dc6432d0
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rules/architecture/batiment.cpp
View File

@ -6,26 +6,29 @@ BatimentQuad_::BatimentQuad_(Quad _c, bool _isSub, bool _we, bool _ws, bool _ww,
} }
bool BatimentQuad_::split() { bool BatimentQuad_::split() {
int minSurface = 100 * 100 * 100; int minSurface = 100 * 100 * 10;
Quad q = c; Quad q = c;
//Quad q = c << c.maxLengthSide(); //Quad q = c << c.maxLengthSide();
if(c.maxLengthNS() < c.maxLengthEW()) { if(c.maxLengthNS() < c.maxLengthEW()) {
q = c >> 1; q = c >> 1;
bool t = we; bool t = we;
we = wn; wn = ww; ww = ws; ws = t; we = ws; ws = ww; ww = wn; wn = t;
} }
std::cout << "w : " << we << " " << ws << " " << ww << " " << wn << std::endl; std::cout << "w : " << we << " " << ws << " " << ww << " " << wn << std::endl;
if((we || ws || ww || wn) && q.surface() > 2 * minSurface) { if((we || ws || ww || wn) && q.surface() > 2 * minSurface) {
Vertex n = Segment(q[NW], q[NE]).randomPos(seed, 0, 3.f/8.f, 5.f/8.f); Vertex n = Segment(q[NW], q[NE]).randomPos(seed, 0, 1.f/2.f, 1.f/2.f);
Vertex s = Segment(q[SE], q[SW]).randomPos(seed, 1, 3.f/8.f, 5.f/8.f); Vertex s = Segment(q[SE], q[SW]).randomPos(seed, 1, 1.f/2.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(q[NE], q[SE], s, n), true,we&&true,ws&&true,false,wn&&true));
addChild(new BatimentQuad_(Quad(q[SW], q[NW], n, s), true,false,ws&&true,ww&&true,wn&&true)); addChild(new BatimentQuad_(Quad(n, s,q[SW],q[NW]), true,false,ws&&true,ww&&true,wn&&true));
} else { } else {
Quad ch = c.offsetNormal(Dimensions::hauteurEtage); Quad ch = c.offsetNormal(Dimensions::hauteurEtage);
ch = ch.insetNESW(80); ch = ch.insetNESW(80);
addChild(new ToitQuad(ch, Dimensions::hauteurToit)); if(we || ws || ww || wn)
addChild(new ToitQuad(ch, Dimensions::hauteurToit));
else
addChild(new BatimentQuadJardin(ch));
} }
return true; return true;

2
rules/architecture/couleursDimensions.hh
View File

@ -20,7 +20,7 @@ public:
); );
}; };
static const unsigned int mur = 0xF1E3AD; static const unsigned int mur = 0xF1E3AD;
static const unsigned int toit = 0x961618; static const unsigned int toit = 0xF0F0F0;//0x961618;
static const unsigned int route = 0x363636; static const unsigned int route = 0x363636;
static const unsigned int trottoir = 0x666666; static const unsigned int trottoir = 0x666666;
static const unsigned int bordureTrottoir = 0xAAAAAA; static const unsigned int bordureTrottoir = 0xAAAAAA;