More primitives converted to make use of new multi-block mesher features.

Author: SteveMaas1978

GeomLib/GObject.cpp

@@ -573,6 +573,8 @@ void GObject::BuildGMesh()
 				assert(false);
 			}
 		}
+
+		gmesh->Update();
 	}
 	else
 	{
@@ -816,7 +818,7 @@ void GObject::BuildFacePolygon(GLMesh* glmesh, GFace& f)
 	for (int i=0; i<pm->Faces(); ++i) pm->Face(i).pid = f.GetLocalID();
 
 	// attach this mesh to our mesh
-	glmesh->Attach(*pm);
+	glmesh->Attach(*pm, false);
 
 	// don't forget to delete this mesh
 	delete pm;
@@ -1161,9 +1163,7 @@ void GObject::BuildFaceExtrude(GLMesh* glmesh, GFace& f)
 		assert(false);
 	}
 
-	m.Update();
-	m.UpdateNormals();
-	glmesh->Attach(m);
+	glmesh->Attach(m, false);
 }
 
 //-----------------------------------------------------------------------------
@@ -1386,9 +1386,7 @@ void GObject::BuildFaceRevolve(GLMesh* glmesh, GFace& f)
 		assert(false);
 	}
 
-	m.Update();
-	m.UpdateNormals();
-	glmesh->Attach(m);
+	glmesh->Attach(m, false);
 }
 
 //-----------------------------------------------------------------------------
@@ -1508,9 +1506,7 @@ void GObject::BuildFaceRevolveWedge(GLMesh* glmesh, GFace& f)
 		assert(false);
 	}
 
-	m.Update();
-	m.UpdateNormals();
-	glmesh->Attach(m);
+	glmesh->Attach(m, false);
 }
 
 //-----------------------------------------------------------------------------
@@ -1604,10 +1600,7 @@ void GObject::BuildFaceQuad(GLMesh* glmesh, GFace &f)
 		e.n[1] = (M - i - 1)*(M+1);
 		e.pid = Edge(f.m_edge[3].nid)->GetLocalID();
 	}
-
-	m.Update();
-	m.UpdateNormals();
-	glmesh->Attach(m);
+	glmesh->Attach(m, false);
 }
 
 // get the mesh of an edge curve

GeomLib/geom.cpp

@@ -459,3 +459,28 @@ bool GM_ARC::Intersect(GM_CIRCLE_ARC &e, double &w)
 	assert(false);
 	return false;
 }
+
+//===============================================================================
+GM_CIRCLE_3P_ARC::GM_CIRCLE_3P_ARC(const vec3d& c, const vec3d& a, const vec3d& b, int nw)
+{
+	m_c = c;
+	m_a = a;
+	m_b = b;
+	m_winding = nw;
+}
+
+vec3d GM_CIRCLE_3P_ARC::Point(double l)
+{
+	vec3d r1 = m_a - m_c;
+	vec3d r2 = m_b - m_c;
+	vec3d n = r1 ^ r2; n.Normalize();
+	quatd q(n, vec3d(0, 0, 1)), qi = q.Inverse();
+	q.RotateVector(r1);
+	q.RotateVector(r2);
+	GM_CIRCLE_ARC c(vec2d(0, 0), vec2d(r1.x, r1.y), vec2d(r2.x, r2.y), m_winding);
+	vec2d a = c.Point(l);
+	vec3d p(a.x, a.y, 0);
+	qi.RotateVector(p);
+	vec3d r = p + m_c;
+	return r;
+}

GeomLib/geom.h

@@ -51,6 +51,7 @@ class GM_LINE
 };
 
 //-----------------------------------------------------------------------------
+// circular arc in 2D
 class GM_CIRCLE_ARC
 {
 public:
@@ -96,3 +97,19 @@ class GM_ARC
 	double	m_R0, m_R1;		// radii of ellipsoid
 	double	m_w0, m_w1;		// start/end parameter
 };
+
+//-----------------------------------------------------------------------------
+// circular arc in 3D
+// c = center
+// a,b = two points defining the circular arc
+class GM_CIRCLE_3P_ARC
+{
+public:
+	GM_CIRCLE_3P_ARC(const vec3d& c, const vec3d& a, const vec3d& b, int nw = 1);
+
+	vec3d Point(double l);
+
+public:
+	vec3d	m_c, m_a, m_b;
+	int		m_winding;
+};