From 3596fcc89870fa0dfabd773c79cf2ebb4d68c43d Mon Sep 17 00:00:00 2001 From: Yoann Date: Fri, 23 Dec 2011 12:08:38 +0100 Subject: [PATCH] =?UTF-8?q?Renomage=20de=20batimentquadmaisonblock=20en=20?= =?UTF-8?q?batimentquadblock,=20c'est=20block=20pourront=20tout=20aussi=20?= =?UTF-8?q?bien=20=C3=AAtre=20tuilis=C3=A9s=20poru=20des=20immeubles.=20Co?= =?UTF-8?q?rrection=20d'un=20bug=20dans=20le=20dessin=20des=20maisons=20av?= =?UTF-8?q?ec=20passage.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all_includes.hh | 2 +- ...dmaisonblock.cpp => batimentquadblock.cpp} | 0 ...uadmaisonblock.hh => batimentquadblock.hh} | 0 rules/batiment/batimentquadmaisonpont.cpp | 41 +++++++++---------- 4 files changed, 21 insertions(+), 22 deletions(-) rename rules/batiment/{batimentquadmaisonblock.cpp => batimentquadblock.cpp} (100%) rename rules/batiment/{batimentquadmaisonblock.hh => batimentquadblock.hh} (100%) diff --git a/all_includes.hh b/all_includes.hh index a168688..787fcde 100644 --- a/all_includes.hh +++ b/all_includes.hh @@ -40,7 +40,7 @@ class Chose; #include "rules/batiment/batimentquadjardin.hh" #include "rules/batiment/batimentquadpont.hh" #include "rules/batiment/batimentquadmaisonpont.hh" -#include "rules/batiment/batimentquadmaisonblock.hh" +#include "rules/batiment/batimentquadblock.hh" #include "rules/quartier/quartierquad.hh" #include "rules/quartier/quartierquadangle.hh" diff --git a/rules/batiment/batimentquadmaisonblock.cpp b/rules/batiment/batimentquadblock.cpp similarity index 100% rename from rules/batiment/batimentquadmaisonblock.cpp rename to rules/batiment/batimentquadblock.cpp diff --git a/rules/batiment/batimentquadmaisonblock.hh b/rules/batiment/batimentquadblock.hh similarity index 100% rename from rules/batiment/batimentquadmaisonblock.hh rename to rules/batiment/batimentquadblock.hh diff --git a/rules/batiment/batimentquadmaisonpont.cpp b/rules/batiment/batimentquadmaisonpont.cpp index 07fde91..b917ec2 100644 --- a/rules/batiment/batimentquadmaisonpont.cpp +++ b/rules/batiment/batimentquadmaisonpont.cpp @@ -26,7 +26,6 @@ void BatimentQuadMaisonPont::getBoundingBoxPoints() { } bool BatimentQuadMaisonPont::split() { - Quad q = Quad(c[NE],c[SE],c[SW],c[NW]); q.makeParallelogram(); if(Segment(q.corner[0],q.corner[3]).length() < Segment(q.corner[0],q.corner[1]).length()) @@ -42,33 +41,33 @@ bool BatimentQuadMaisonPont::split() { qc.offset(E, -partLength); qc.offset(W, -partLength); - c[SE] = qa.corner[0]; - c[SW] = qa.corner[1]; - c[NW] = qa.corner[2]; - c[NE] = qa.corner[3]; + Vertex se = qa.corner[0]; + Vertex sw = qa.corner[1]; + Vertex nw = qa.corner[2]; + Vertex ne = qa.corner[3]; - addChild(new BatimentQuadMaisonBlock(c[NE],c[SE],c[SW],c[NW],partHeight)); + addChild(new BatimentQuadMaisonBlock(ne,se,sw,nw,partHeight)); - c[SE] = qb.corner[0]; - c[SW] = qb.corner[1]; - c[NW] = qb.corner[2]; - c[NE] = qb.corner[3]; + se = qb.corner[0]; + sw = qb.corner[1]; + nw = qb.corner[2]; + ne = qb.corner[3]; - addChild(new BatimentQuadMaisonBlock(c[NE],c[SE],c[SW],c[NW],partHeight)); + addChild(new BatimentQuadMaisonBlock(ne,se,sw,nw,partHeight)); - c[SE] = qh.corner[0] + Vertex(0,0,partHeight); - c[SW] = qh.corner[1] + Vertex(0,0,partHeight); - c[NW] = qh.corner[2] + Vertex(0,0,partHeight); - c[NE] = qh.corner[3] + Vertex(0,0,partHeight); + se = qh.corner[0] + Vertex(0,0,partHeight); + sw = qh.corner[1] + Vertex(0,0,partHeight); + nw = qh.corner[2] + Vertex(0,0,partHeight); + ne = qh.corner[3] + Vertex(0,0,partHeight); - addChild(new BatimentQuadMaisonBlock(c[NE],c[SE],c[SW],c[NW],partHeight)); + addChild(new BatimentQuadMaisonBlock(ne,se,sw,nw,partHeight)); - c[SE] = qc.corner[0]; - c[SW] = qc.corner[1]; - c[NW] = qc.corner[2]; - c[NE] = qc.corner[3]; + se = qc.corner[0]; + sw = qc.corner[1]; + nw = qc.corner[2]; + ne = qc.corner[3]; - addChild(new BatimentQuadPont(c[SE],c[SW],c[NW],c[NE],partHeight)); + addChild(new BatimentQuadPont(se,sw,nw,ne,partHeight)); /* Vertex seh = qh.corner[0] + Vertex(0,0,partHeight); Vertex swh = qh.corner[1] + Vertex(0,0,partHeight);