www

commit b2afc35621894471fc5e510ebc9c8f604d40ea2e
parent 1301984f708a62985d74a7ac333724790201becd
Author: Yoann <yoann.b87@voila.fr>
Date:   Tue, 20 Dec 2011 17:10:41 +0100

Suite des ponts.

Diffstat:
M
rules/batiment/batimentquad.cpp
 | 
2
+-
M
rules/batiment/batimentquadpont.cpp
 | 
26
+++++++++++++-------------

2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/rules/batiment/batimentquad.cpp b/rules/batiment/batimentquad.cpp
@@ -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 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.
 }
 
diff --git a/rules/batiment/batimentquadpont.cpp b/rules/batiment/batimentquadpont.cpp
@@ -72,8 +72,8 @@ void BatimentQuadPont::triangulation() {
 
     std::cout << std::endl << l1.norm() << std::endl;
 
-    addTriangle(new Triangle(pb,sw,swh,0xFF,0xFF,0xFF));
-    addTriangle(new Triangle(pa,nw,nwh,0xFF,0xFF,0xFF));
+    addTriangle(new Triangle(pb,sw,swh,0x10,0xFF,0x10));
+    addTriangle(new Triangle(pa,nw,nwh,0x10,0xFF,0x10));
 
     for(var=-1.7,n=0; var <= 1.7; var+=pas,n++) {
         std::cout << var << std::endl;
@@ -82,26 +82,26 @@ void BatimentQuadPont::triangulation() {
         a = q.corner[3] + 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) {
-            addTriangle(new Triangle(pa,a,nwh,0xFF,0xFF,0xFF));
-            addTriangle(new Triangle(pb,b,swh,0xFF,0xFF,0xFF));
+            addTriangle(new Triangle(pa,a,nwh,0xFF,0x10,0xFF));
+            addTriangle(new Triangle(pb,b,swh,0xFF,0x10,0xFF));
         }
         else if(n == middle) {
-            addTriangle(new Triangle(pa,a,nwh,0xFF,0xFF,0xFF));
-            addTriangle(new Triangle(pb,b,swh,0xFF,0xFF,0xFF));
-            addTriangle(new Triangle(a,neh,nwh,0xFF,0xFF,0xFF));
-            addTriangle(new Triangle(b,seh,swh,0xFF,0xFF,0xFF));
+            addTriangle(new Triangle(pa,a,nwh,0x10,0x10,0xFF));
+            addTriangle(new Triangle(pb,b,swh,0x10,0x10,0xFF));
+            addTriangle(new Triangle(a,neh,nwh,0x10,0x10,0xFF));
+            addTriangle(new Triangle(b,seh,swh,0x10,0x10,0xFF));
         }
         else {
-            addTriangle(new Triangle(pa,a,neh,0xFF,0xFF,0xFF));
-            addTriangle(new Triangle(pb,b,seh,0xFF,0xFF,0xFF));
+            addTriangle(new Triangle(pa,a,neh,0x10,0xFF,0xFF));
+            addTriangle(new Triangle(pb,b,seh,0x10,0xFF,0xFF));
         }
 
         pa = a;
         pb = b;
     }
 
-    addTriangle(new Triangle(se,pb,seh,0xFF,0xFF,0xFF));
-    addTriangle(new Triangle(ne,pa,neh,0xFF,0xFF,0xFF));
+    addTriangle(new Triangle(se,pb,seh,0x10,0xFF,0x10));
+    addTriangle(new Triangle(ne,pa,neh,0x10,0xFF,0x10));
 }