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

Merge branch 'master' of github:jsmaniac/2011-m2s3-city-builder

Browse Source
This commit is contained in:
Georges Dupéron 2011-12-11 20:51:19 +01:00
commit d0672dbdd6
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
rules/route.cpp
View File

@ -26,15 +26,17 @@ void Route::triangulation() {
// Version avec trottoirs. // Version avec trottoirs.
void Route::triangulation() { void Route::triangulation() {
triangles.reserve(6); triangles.reserve(10);
Vertex nne, nnw, nse, nsw; // Nouvel emplacement de la route. Vertex nne, nnw, nse, nsw; // Nouvel emplacement de la route.
Vertex pvLne, pvLnw, pvLsw, pvLse; // Trottoir Nord (pv => pavement) Vertex pvLne, pvLnw, pvLsw, pvLse; // Trottoir Nord (pv => pavement)
Vertex pvRne, pvRnw, pvRsw, pvRse; // Trottoir Sud (pv => pavement) Vertex pvRne, pvRnw, pvRsw, pvRse; // Trottoir Sud (pv => pavement)
Vertex pvLCne, pvLCnw, pvLCsw, pvLCse; // Rebord du trottoir gauche.
Vertex pvRCne, pvRCnw, pvRCsw, pvRCse; // rebord du trottoir droit.
pvLnw = nw; pvLnw = nw + Vertex(0,0,20);
pvLsw = sw; pvLsw = sw + Vertex(0,0,20);
pvRne = ne; pvRne = ne + Vertex(0,0,20);
pvRse = se; pvRse = se + Vertex(0,0,20);
pvLne = nw + ((ne - nw)/6); pvLne = nw + ((ne - nw)/6);
pvLse = sw + ((se - sw)/6); pvLse = sw + ((se - sw)/6);
pvRnw = ne - ((ne - nw)/6); pvRnw = ne - ((ne - nw)/6);
@ -43,11 +45,29 @@ void Route::triangulation() {
nsw = pvLse; nsw = pvLse;
nne = pvRnw; nne = pvRnw;
nse = pvRsw; nse = pvRsw;
pvLne.z += 20;
pvLse.z += 20;
pvRnw.z += 20;
pvRsw.z += 20;
pvLCnw = pvLne;
pvLCsw = pvLse;
pvLCne = nnw;
pvLCse = nsw;
pvRCnw = nne;
pvRCsw = nse;
pvRCne = pvRnw;
pvRCse = pvRsw;
addTriangle(new Triangle(pvLne, pvLnw, pvLsw, 0xEE, 0xEE, 0x00)); addTriangle(new Triangle(pvLne, pvLnw, pvLsw, 0x66, 0x66, 0x66));
addTriangle(new Triangle(pvLsw, pvLse, pvLne, 0xEE, 0xEE, 0x00)); addTriangle(new Triangle(pvLsw, pvLse, pvLne, 0x66, 0x66, 0x66));
addTriangle(new Triangle(pvRne, pvRnw, pvRsw, 0xEE, 0xEE, 0x00)); addTriangle(new Triangle(pvRne, pvRnw, pvRsw, 0x66, 0x66, 0x66));
addTriangle(new Triangle(pvRsw, pvRse, pvRne, 0xEE, 0xEE, 0x00)); addTriangle(new Triangle(pvRsw, pvRse, pvRne, 0x66, 0x66, 0x66));
addTriangle(new Triangle(pvLCne, pvLCnw, pvLCsw, 0x66, 0x66, 0x66));
addTriangle(new Triangle(pvLCsw, pvLCse, pvLCne, 0x66, 0x66, 0x66));
addTriangle(new Triangle(pvRCne, pvRCnw, pvRCsw, 0x66, 0x66, 0x66));
addTriangle(new Triangle(pvRCsw, pvRCse, pvRCne, 0x66, 0x66, 0x66));
addTriangle(new Triangle(nne, nnw, nsw, 0x36, 0x36, 0x36)); addTriangle(new Triangle(nne, nnw, nsw, 0x36, 0x36, 0x36));
addTriangle(new Triangle(nsw, nse, nne, 0x36, 0x36, 0x36)); addTriangle(new Triangle(nsw, nse, nne, 0x36, 0x36, 0x36));