www

commit c26325a9e67a96dcb65e7758f8bfc04faead0298
parent f0ad90f76bf5f7f08e61f03b4f1ff40770095e11
Author: Yoann <yoann.b87@voila.fr>
Date:   Wed, 11 Jan 2012 21:19:03 +0100

Petit correctif sur les fenêtres, mais c'est pas encore ça.

Diffstat:
M
rules/batiment/batimentquadmur.cpp
 | 
10
++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/rules/batiment/batimentquadmur.cpp b/rules/batiment/batimentquadmur.cpp
@@ -22,6 +22,11 @@ void BatimentQuadMur::setWindow(bool val) {
     windowPos = Quad(wBack[SE],wFront[SE],wFront[SW],wBack[SW]);
     windowPosh = Quad(wBack[NE],wFront[NE],wFront[NW],wBack[NW]);
 
+    //addGPUQuad(wFront,0xFF,0xFF,0x00);
+    //addGPUQuad(wBack,0xFF,0xFF,0x00);
+    //addGPUQuad(windowPos,0x90,0x90,0xFF);
+    //addGPUQuad(windowPosh,0x90,0x90,0xFF);
+
     //std::cout << "lr" << lr << std::endl;
     //std::cout << windowPos[NE] << std::endl;
     //std::cout << windowPos[SE] << std::endl;
@@ -34,7 +39,7 @@ bool BatimentQuadMur::split() {
         return false;
 
     Quad left = Quad(windowPos[NW],windowPos[SW],c[SW],c[NW]);
-    Quad lefth = Quad(windowPosh[NW],windowPosh[SE],ch[SW],ch[NW]);
+    Quad lefth = Quad(windowPosh[NW],windowPosh[SW],ch[SW],ch[NW]);
     Quad right = Quad(c[NE],c[SE],windowPos[SE],windowPos[NE]);
     Quad righth = Quad(ch[NE],ch[SE],windowPosh[SE],windowPosh[NE]);
 
@@ -50,5 +55,6 @@ void BatimentQuadMur::triangulation() {
     if(!window)
         addGPUOcto(c, ch, 0xf1,0xe3,0xad);
     else
-        addGPUOcto(c, ch, 0xFF,0x10,0x00);
+        //addGPUOcto(c, ch, 0xFF,0x10,0x00);
+        addGPUQuad(windowPosh,0xFF,0xFF,0x00);
 }