Trim ShowDispatcher Shape

IonAgorria · Dec 30, 2023 · de3cb8a · de3cb8a
1 parent 4f20df6
commit de3cb8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/Source/Util/DebugUtil.cpp b/Source/Util/DebugUtil.cpp
@@ -107,18 +107,18 @@ void ShowDispatcher::Shape::show()
 {
 	switch(type){
 		case Point: {
-			Vect3f vs = G2S(point);
+			Vect3f vs = G2S(point1);
 			if(vs.z > 10)
 				clip_pixel(vs.xi(), vs.yi(), color, 1);
 			} break;
 
 		case Text: {
-			Vect3f vs = G2S(point);
+			Vect3f vs = G2S(point1);
 			terRenderDevice->OutText(vs.xi(), vs.yi(), text, sColor4f(color));
 			} break;
 
 		case Circle: 
-			clip_circle_3D(point, radius, color);
+			clip_circle_3D(point1, radius, color);
 			break;
 
 		case Delta: 

diff --git a/Source/Util/DebugUtil.h b/Source/Util/DebugUtil.h
@@ -29,28 +29,17 @@ class ShowDispatcher
 		enum Type { Point, Text, Circle, Delta, Line, Triangle, Quadrangle, ConvexArray };
 		Type type;
 		sColor4c color;
-#if defined(_MSC_VER) && (_MSC_VER < 1900)
-		union {
-			struct { Vect3f point; float radius; };
-			struct { Vect3f pointX; const char* text; };
-			struct { Vect3f point1, point2; };
-			struct { int n_points; Vect3f* points; };
-			};
-#else
-		//TODO there is another way to reproduce above code in GCC?
-		Vect3f point;
 		float radius;
 		const char* text;
         Vect3f point1;
         Vect3f point2;
 		int n_points;
 		Vect3f* points;
-#endif
 		static bool isArray(Type type) { return type == Triangle || type == Quadrangle || type == ConvexArray; }
 	public:	
-		Shape(const Vect3f& v, sColor4c color_) { type = Point; point = v; color = color_; }
-		Shape(const Vect3f& v, const char* text_, sColor4c color_) { type = Text; point = v; text = strdup(text_); color = color_; }
-		Shape(const Vect3f& v, float radius_, sColor4c color_) { type = Circle; point = v; radius = radius_; color = color_; }
+		Shape(const Vect3f& v, sColor4c color_) { type = Point; point1 = v; color = color_; }
+		Shape(const Vect3f& v, const char* text_, sColor4c color_) { type = Text; point1 = v; text = strdup(text_); color = color_; }
+		Shape(const Vect3f& v, float radius_, sColor4c color_) { type = Circle; point1 = v; radius = radius_; color = color_; }
 		Shape(const Vect3f& v0, const Vect3f& v1, sColor4c color_, int line) { type = line ? Line : Delta; point1 = v0; point2 = v1; color = color_; }
 		Shape(const Vect3f& v0, const Vect3f& v1, const Vect3f& v2, sColor4c color_) { type = Triangle; points = new Vect3f[n_points = 3]; points[0] = v0; points[1] = v1; points[2] = v2; color = color_; }
 		Shape(const Vect3f& v0, const Vect3f& v1, const Vect3f& v2, const Vect3f& v3, sColor4c color_) { type = Quadrangle; points = new Vect3f[n_points = 4]; points[0] = v0; points[1] = v1; points[2] = v2; points[3] = v3; color = color_; }