www

commit 12caee84708bf6bb650246ba653b2fc929bef2d5
parent ea5cc15c7ec5f5b20139d0f5ada56e14aa6bae70
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date:   Fri,  6 Jan 2012 20:34:57 +0100

Utilisation de Quad::length(), passage en const de quelques méthodes.

Diffstat:
M
geometry/quad.cpp
 | 
59
+++++++++++++++++++----------------------------------------
M
geometry/quad.hh
 | 
18
+++++++++---------

2 files changed, 28 insertions(+), 49 deletions(-)
diff --git a/geometry/quad.cpp b/geometry/quad.cpp
@@ -30,22 +30,22 @@ Quad Quad::insetNESW(float offset) const {
 Quad Quad::makeParallelogram() {
     int l1, l2;
 
-    if(Segment(c[NW],c[NE]).length() < Segment(c[SE],c[SW]).length()) {
-        if((l1 = Segment(c[NE],c[SE]).length()) < (l2 = Segment(c[SW],c[NW]).length())) {
+    if(length(N) < length(S)) {
+        if((l1 = length(E)) < (l2 = length(W))) {
             c[SW] = Segment(c[NW],c[SW]).reduce(l1).v;
             c[SE] = c[SW] + (c[NE] - c[NW]);
         }
-        else if((l1 = Segment(c[NE],c[SE]).length()) > (l2 = Segment(c[SW],c[NW]).length())) {
+        else if((l1 = length(E)) > (l2 = length(W))) {
             c[SE] = Segment(c[NE],c[SE]).reduce(l2).v;
             c[SW] = c[SE] + (c[NW] - c[NE]);
         }
     }
     else {
-        if((l1 = Segment(c[NE],c[SE]).length()) < (l2 = Segment(c[SW],c[NW]).length())) {
+        if((l1 = length(E)) < (l2 = length(W))) {
             c[NW] = Segment(c[SW],c[NW]).reduce(l1).v;
             c[NE] = c[NW] + (c[SE] - c[SW]);
         }
-        else if((l1 = Segment(c[NE],c[SE]).length()) > (l2 = Segment(c[SW],c[NW]).length())) {
+        else if((l1 = length(E)) > (l2 = length(W))) {
             c[NE] = Segment(c[SE],c[NE]).reduce(l2).v;
             c[NW] = c[NE] + (c[SW] - c[SE]);
         }
@@ -54,56 +54,35 @@ Quad Quad::makeParallelogram() {
     return Quad(c[0],c[1],c[2],c[3]);
 }
 
-float Quad::length(Cardinal cn) {
-    if(cn == N)
-        return Segment(c[NW],c[NE]).length();
-    else if(cn == S)
-        return Segment(c[SW],c[SE]).length();
-    else if(cn == E)
-        return Segment(c[NE],c[SE]).length();
-    else if(cn == W)
-        return Segment(c[SW],c[NW]).length();
-
-    return 0;
+float Quad::length(Cardinal side) const {
+	return Segment(c[NW+side],c[NE+side]).length();
 }
 
-float Quad::minLengthNS() {
-	return std::min(
-		Segment(c[NW],c[NE]).length(),
-		Segment(c[SE],c[SW]).length()
-	);
+float Quad::minLengthNS() const {
+	return std::min(length(N), length(S));
 }
 
-float Quad::minLengthEW() {
-	return std::min(
-		Segment(c[NE],c[SE]).length(),
-		Segment(c[SW],c[NW]).length()
-	);
+float Quad::minLengthEW() const {
+	return std::min(length(E), length(W));
 }
 
-float Quad::maxLengthNS() {
-	return std::max(
-		Segment(c[NW],c[NE]).length(),
-		Segment(c[SE],c[SW]).length()
-	);
+float Quad::maxLengthNS() const {
+	return std::max(length(N), length(S));
 }
 
-float Quad::maxLengthEW() {
-	return std::max(
-		Segment(c[NE],c[SE]).length(),
-		Segment(c[SW],c[NW]).length()
-	);
+float Quad::maxLengthEW() const {
+	return std::max(length(E), length(W));
 }
 
-float Quad::minLength() {
+float Quad::minLength() const {
 	return std::min(minLengthNS(), minLengthEW());
 }
 
-float Quad::maxLength() {
+float Quad::maxLength() const {
 	return std::max(maxLengthNS(), maxLengthEW());
 }
 
-float Quad::minAngle() {
+float Quad::minAngle() const {
 	float a = 370; // > 360.
 	for (int i = 0; i < 4; i++) {
 		a = std::min(a, Triangle(c[NE+i], c[SE+i], c[SW+i]).angle());
@@ -111,7 +90,7 @@ float Quad::minAngle() {
 	return a;
 }
 
-float Quad::maxAngle() {
+float Quad::maxAngle() const {
 	float a = 0;
 	for (int i = 0; i < 4; i++) {
 		a = std::max(a, Triangle(c[NE+i], c[SE+i], c[SW+i]).angle());
diff --git a/geometry/quad.hh b/geometry/quad.hh
@@ -27,15 +27,15 @@ class Quad {
 	Quad inset(Cardinal side, float offset) const;
 	Quad insetNESW(float offsetN, float offsetE, float offsetS, float offsetW) const;
 	Quad insetNESW(float offset) const;
-	float length(Cardinal c);
-	float minLengthNS();
-	float minLengthEW();
-	float maxLengthNS();
-	float maxLengthEW();
-	float minLength();
-	float maxLength();
-	float minAngle();
-	float maxAngle();
+	float length(Cardinal side) const;
+	float minLengthNS() const;
+	float minLengthEW() const;
+	float maxLengthNS() const;
+	float maxLengthEW() const;
+	float minLength() const;
+	float maxLength() const;
+	float minAngle() const;
+	float maxAngle() const;
 	void cutCornerCorner(Coin from) const;
 	Quad makeParallelogram();
 };