From 1b487dd25826e51d53066ee114e0bd768a071114 Mon Sep 17 00:00:00 2001 From: Yoann Date: Thu, 22 Dec 2011 13:39:51 +0100 Subject: [PATCH 1/3] Les getBoundingBoxPoints vides sont remplis. --- rules/batiment/batimentquadmaisonblock.cpp | 27 ++++++++++++++-------- rules/batiment/batimentquadmaisonblock.hh | 5 +--- rules/batiment/batimentquadmaisonpont.cpp | 9 +++++++- rules/batiment/batimentquadpont.cpp | 9 +++++++- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/rules/batiment/batimentquadmaisonblock.cpp b/rules/batiment/batimentquadmaisonblock.cpp index 69beb49..3094949 100644 --- a/rules/batiment/batimentquadmaisonblock.cpp +++ b/rules/batiment/batimentquadmaisonblock.cpp @@ -3,10 +3,10 @@ BatimentQuadMaisonBlock::BatimentQuadMaisonBlock(Vertex ne, Vertex se, Vertex sw, Vertex nw, int height) : Chose() { addEntropy(ne, se, sw, nw); lctr = Vertex(ne.x-nw.x,se.y-ne.y,0.0f); - this->ne = ne-lctr; - this->se = se-lctr; - this-> sw = sw-lctr; - this->nw = nw-lctr; + c[NE] = ne; + c[SE] = se; + c[SW] = sw; + c[NW] = nw; this->height = height; } @@ -16,7 +16,14 @@ BatimentQuadMaisonBlock::~BatimentQuadMaisonBlock() { } void BatimentQuadMaisonBlock::getBoundingBoxPoints() { - // TODO + addBBPoint(c[NE]); + addBBPoint(c[SE]); + addBBPoint(c[SW]); + addBBPoint(c[NW]); + addBBPoint(c[NE] + Vertex(0,0,height)); // TODO + addBBPoint(c[SE] + Vertex(0,0,height)); + addBBPoint(c[SW] + Vertex(0,0,height)); + addBBPoint(c[NW] + Vertex(0,0,height));// TODO } bool BatimentQuadMaisonBlock::split() { @@ -25,10 +32,10 @@ bool BatimentQuadMaisonBlock::split() { void BatimentQuadMaisonBlock::triangulation() { //triangles.reserve(2); - Vertex seh = se + Vertex(0,0,height); - Vertex swh = sw + Vertex(0,0,height); - Vertex nwh = nw + Vertex(0,0,height); - Vertex neh = ne + Vertex(0,0,height); + Vertex seh = c[SE] + Vertex(0,0,height); + Vertex swh = c[SW] + Vertex(0,0,height); + Vertex nwh = c[NW] + Vertex(0,0,height); + Vertex neh = c[NE] + Vertex(0,0,height); - addOcto(lctr+se,lctr+sw,lctr+nw,lctr+ne,lctr+seh,lctr+swh,lctr+nwh,lctr+neh,0xFF,0x36,0x00); + addOcto(c[SE],c[SW],c[NW],c[NE],seh,swh,nwh,neh,0xFF,0x36,0x00); } diff --git a/rules/batiment/batimentquadmaisonblock.hh b/rules/batiment/batimentquadmaisonblock.hh index 91ef6f4..6bcd5e7 100644 --- a/rules/batiment/batimentquadmaisonblock.hh +++ b/rules/batiment/batimentquadmaisonblock.hh @@ -6,10 +6,7 @@ // RectangleRoutes est un quadrilatère de routes avec des angles aux coins égaux à 90°. class BatimentQuadMaisonBlock : public Chose { private : - Vertex ne; - Vertex se; - Vertex sw; - Vertex nw; + Vertex c[4]; int height; public : diff --git a/rules/batiment/batimentquadmaisonpont.cpp b/rules/batiment/batimentquadmaisonpont.cpp index c0be46a..07fde91 100644 --- a/rules/batiment/batimentquadmaisonpont.cpp +++ b/rules/batiment/batimentquadmaisonpont.cpp @@ -15,7 +15,14 @@ BatimentQuadMaisonPont::~BatimentQuadMaisonPont() { } void BatimentQuadMaisonPont::getBoundingBoxPoints() { - // TODO + addBBPoint(c[NE]); + addBBPoint(c[SE]); + addBBPoint(c[SW]); + addBBPoint(c[NW]); + addBBPoint(c[NE] + Vertex(0,0,height)); // TODO + addBBPoint(c[SE] + Vertex(0,0,height)); + addBBPoint(c[SW] + Vertex(0,0,height)); + addBBPoint(c[NW] + Vertex(0,0,height)); } bool BatimentQuadMaisonPont::split() { diff --git a/rules/batiment/batimentquadpont.cpp b/rules/batiment/batimentquadpont.cpp index ecb1270..8b7efab 100644 --- a/rules/batiment/batimentquadpont.cpp +++ b/rules/batiment/batimentquadpont.cpp @@ -15,7 +15,14 @@ BatimentQuadPont::~BatimentQuadPont() { } void BatimentQuadPont::getBoundingBoxPoints() { - // TODO ! + addBBPoint(c[NE]); + addBBPoint(c[SE]); + addBBPoint(c[SW]); + addBBPoint(c[NW]); + addBBPoint(c[NE] + Vertex(0,0,height)); // TODO + addBBPoint(c[SE] + Vertex(0,0,height)); + addBBPoint(c[SW] + Vertex(0,0,height)); + addBBPoint(c[NW] + Vertex(0,0,height)); } bool BatimentQuadPont::split() { From bb9bf3932d9e44286742e7c19fd5ba09d1a40723 Mon Sep 17 00:00:00 2001 From: Yoann Date: Thu, 22 Dec 2011 14:35:14 +0100 Subject: [PATCH 2/3] Exclusion de fichiers d'IDE. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4db89dd..512ffd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ city all.cpp all_includes.hh.gch -city-builder/* +.cbp/* From a47b8f9c025a3d1f37a0c7ed4c3162ff21f5cc6e Mon Sep 17 00:00:00 2001 From: Yoann Date: Thu, 22 Dec 2011 14:53:29 +0100 Subject: [PATCH 3/3] Re-modif sur .gitignore. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 512ffd7..50584cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ city all.cpp all_includes.hh.gch -.cbp/* +city-builder