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

Suite des ponts.

Browse Source
This commit is contained in:
Yoann 2011-12-20 17:10:41 +01:00
parent 1301984f70
commit b2afc35621
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules/batiment/batimentquad.cpp
View File

@ -66,7 +66,7 @@ Chose* BatimentQuad::factory(int seed, int n, Vertex ne, Vertex se, Vertex sw, V
addChild(new BatimentQuadMaison(lctr+q.corner[0],lctr+q.corner[1],lctr+q.corner[2],lctr+q.corner[3])); addChild(new BatimentQuadMaison(lctr+q.corner[0],lctr+q.corner[1],lctr+q.corner[2],lctr+q.corner[3]));
*/ */
addChild(new BatimentQuadPont(q.corner[0],q.corner[1],q.corner[2],q.corner[3],300)); addChild(new BatimentQuadPont(lctr+q.corner[0],lctr+q.corner[1],lctr+q.corner[2],lctr+q.corner[3],300));
return NULL; // pour compilation, à virer. return NULL; // pour compilation, à virer.
} }

26
rules/batiment/batimentquadpont.cpp
View File

@ -72,8 +72,8 @@ void BatimentQuadPont::triangulation() {
std::cout << std::endl << l1.norm() << std::endl; std::cout << std::endl << l1.norm() << std::endl;
addTriangle(new Triangle(pb,sw,swh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(pb,sw,swh,0x10,0xFF,0x10));
addTriangle(new Triangle(pa,nw,nwh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(pa,nw,nwh,0x10,0xFF,0x10));
for(var=-1.7,n=0; var <= 1.7; var+=pas,n++) { for(var=-1.7,n=0; var <= 1.7; var+=pas,n++) {
std::cout << var << std::endl; std::cout << var << std::endl;
@ -82,26 +82,26 @@ void BatimentQuadPont::triangulation() {
a = q.corner[3] + Vertex(0,0,nt(var,height)); a = q.corner[3] + Vertex(0,0,nt(var,height));
b = q.corner[2] + Vertex(0,0,nt(var,height)); b = q.corner[2] + Vertex(0,0,nt(var,height));
addQuad(a,b,pb,pa,0xFF,0xFF,0xFF); addQuad(a,b,pb,pa,0xEE,0xEE,0xEE);
if( n < middle) { if( n < middle) {
addTriangle(new Triangle(pa,a,nwh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(pa,a,nwh,0xFF,0x10,0xFF));
addTriangle(new Triangle(pb,b,swh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(pb,b,swh,0xFF,0x10,0xFF));
} }
else if(n == middle) { else if(n == middle) {
addTriangle(new Triangle(pa,a,nwh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(pa,a,nwh,0x10,0x10,0xFF));
addTriangle(new Triangle(pb,b,swh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(pb,b,swh,0x10,0x10,0xFF));
addTriangle(new Triangle(a,neh,nwh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(a,neh,nwh,0x10,0x10,0xFF));
addTriangle(new Triangle(b,seh,swh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(b,seh,swh,0x10,0x10,0xFF));
} }
else { else {
addTriangle(new Triangle(pa,a,neh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(pa,a,neh,0x10,0xFF,0xFF));
addTriangle(new Triangle(pb,b,seh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(pb,b,seh,0x10,0xFF,0xFF));
} }
pa = a; pa = a;
pb = b; pb = b;
} }
addTriangle(new Triangle(se,pb,seh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(se,pb,seh,0x10,0xFF,0x10));
addTriangle(new Triangle(ne,pa,neh,0xFF,0xFF,0xFF)); addTriangle(new Triangle(ne,pa,neh,0x10,0xFF,0x10));
} }