www

commit 2dafdf60dd23ac7abc962687eabc789fd7f5b5cc
parent c361c48433b73acb4c0283e69b3034d7a17709f0
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date:   Thu,  5 Jan 2012 19:42:05 +0100

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

Conflicts:
	all_includes.hh
	rules/batiment/batimentquadmaisonpont.cpp

Diffstat:
M
all_includes.hh
 | 
2
++
M
main.cpp
 | 
2
+-
A
rules/batiment/batimentquadfenetre.cpp
 | 
14
++++++++++++++
A
rules/batiment/batimentquadfenetre.hh
 | 
18
++++++++++++++++++
M
rules/batiment/batimentquadmaisonpont.cpp
 | 
12
++++++------
A
rules/batiment/batimentquadmur.cpp
 | 
14
++++++++++++++
A
rules/batiment/batimentquadmur.hh
 | 
18
++++++++++++++++++

7 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/all_includes.hh b/all_includes.hh
@@ -44,6 +44,8 @@ class Chose;
 #include "rules/batiment/batimentquadblock.hh"
 #include "rules/batiment/batimentquadtoit.hh"
 #include "rules/batiment/batimenttri.hh"
+#include "rules/batiment/batimentquadmur.hh"
+#include "rules/batiment/batimentquadfenetre.hh"
 
 #include "rules/quartier/quartierquad.hh"
 #include "rules/quartier/quartierquadangle.hh"
diff --git a/main.cpp b/main.cpp
@@ -11,7 +11,7 @@ int main() {
 	Chose* c = QuartierQuad::factory(Chose::initialSeed, 0, Quad(ne, se, sw, nw));
 	c->triangulation();
 	c->updateAABB();
-	
+
 	new View(c);
 	return 0;
 }
diff --git a/rules/batiment/batimentquadfenetre.cpp b/rules/batiment/batimentquadfenetre.cpp
@@ -0,0 +1,14 @@
+#include "all_includes.hh"
+
+BatimentQuadFenetre::BatimentQuadFenetre(Quad c, int height) : Chose(), c(c), height(height) {
+	addEntropy(c);
+}
+
+void BatimentQuadFenetre::getBoundingBoxPoints() {
+	addBBPoints(c);
+	addBBPoints(c + Vertex(0,0,height));
+}
+
+void BatimentQuadFenetre::triangulation() {
+    // Vide laisse un trou à la place de la fenêtre.
+}
diff --git a/rules/batiment/batimentquadfenetre.hh b/rules/batiment/batimentquadfenetre.hh
@@ -0,0 +1,18 @@
+#ifndef _RULES_BATIMENT_BATIMENTQUADFENETRE_HH_
+#define _RULES_BATIMENT_BATIMENTQUADFENETRE_HH_
+
+#include "all_includes.hh"
+
+class BatimentQuadFenetre: public Chose {
+    private :
+	Quad c;
+	int height;
+
+    public :
+
+	BatimentQuadFenetre(Quad c, int height);
+	virtual void triangulation();
+	virtual void getBoundingBoxPoints();
+};
+
+#endif
diff --git a/rules/batiment/batimentquadmaisonpont.cpp b/rules/batiment/batimentquadmaisonpont.cpp
@@ -10,9 +10,9 @@ void BatimentQuadMaisonPont::getBoundingBoxPoints() {
 }
 
 bool BatimentQuadMaisonPont::split() {
-    Quad q = Quad(c[NE],c[SE],c[SW],c[NW]);
+    Quad q = c;
     q.makeParallelogram();
-    if(Segment(q[NE],q[NW]).length() < Segment(q[NE],q[SE]).length())
+	if(Segment(q[NE],q[NW]).length() < Segment(q[NE],q[SE]).length())
         q = q << 1;
     float partLength = Segment(q[NE],q[NW]).length() / 3;
     int partHeight = 2.5*height/3.;
@@ -25,10 +25,10 @@ bool BatimentQuadMaisonPont::split() {
     qc.offset(E, -partLength);
     qc.offset(W, -partLength);
 
-    addChild(new BatimentQuadJardin(c << 1));
-    addChild(new BatimentQuadBlock(qa >> 1,partHeight));
-    addChild(new BatimentQuadBlock(qb >> 1,partHeight));
-    addChild(new BatimentQuadBlock((qh + Vertex(0,0,partHeight)) >> 1,partHeight));
+    addChild(new BatimentQuadJardin(c));
+    addChild(new BatimentQuadBlock(qa,partHeight));
+    addChild(new BatimentQuadBlock(qb,partHeight));
+    addChild(new BatimentQuadBlock((qh + Vertex(0,0,partHeight)),partHeight));
     addChild(new BatimentQuadPont(qc,partHeight));
     addChild(new BatimentQuadToit(qh + Vertex(0,0,2*partHeight),150));
 
diff --git a/rules/batiment/batimentquadmur.cpp b/rules/batiment/batimentquadmur.cpp
@@ -0,0 +1,14 @@
+#include "all_includes.hh"
+
+BatimentQuadMur::BatimentQuadMur(Quad c, int height) : Chose(), c(c), height(height) {
+	addEntropy(c);
+}
+
+void BatimentQuadMur::getBoundingBoxPoints() {
+	addBBPoints(c);
+	addBBPoints(c + Vertex(0,0,height));
+}
+
+void BatimentQuadMur::triangulation() {
+    addGPUOcto(c, c + Vertex(0,0,height), 0xF1, 0xE0, 0xE0);
+}
diff --git a/rules/batiment/batimentquadmur.hh b/rules/batiment/batimentquadmur.hh
@@ -0,0 +1,18 @@
+#ifndef _RULES_BATIMENT_BATIMENTQUADMUR_HH_
+#define _RULES_BATIMENT_BATIMENTQUADMUR_HH_
+
+#include "all_includes.hh"
+
+class BatimentQuadMur: public Chose {
+    private :
+	Quad c;
+	int height;
+
+    public :
+
+	BatimentQuadMur(Quad c, int height);
+	virtual void triangulation();
+	virtual void getBoundingBoxPoints();
+};
+
+#endif