Clifford Wolf:

	Massive rename: s/polyeder/polyhedron/g



git-svn-id: http://svn.clifford.at/openscad/trunk@113 b57f626f-c46c-0410-a088-ec61d464b74c

5 files changed, 12 insertions, 12 deletions

diff --git a/dxftess.cc b/dxftess.cc
index 223ce1b..427c7e6 100644
--- a/dxftess.cc
+++ b/dxftess.cc
@@ -223,8 +223,8 @@ void dxf_tesselate(PolySet *ps, DxfData *dxf, double rot, bool up, double h)
 	}
 
 	// GLU tessing creates T-junctions. This is ok for GL displaying but creates
-	// invalid polyeders for CGAL. So we split this tirangles up again in order
-	// to create polyeders that are also accepted by CGAL..
+	// invalid polyhedrons for CGAL. So we split this tirangles up again in order
+	// to create polyhedrons that are also accepted by CGAL..
 	// All triangle edges are sorted by their atan2 and only edges with a simmilar atan2
 	// value are compared. This speeds up this code block dramatically (compared to the
 	// n^2 compares that are neccessary in the trivial implementation).
diff --git a/examples/example011.scad b/examples/example011.scad
index f35af05..891cf69 100644
--- a/examples/example011.scad
+++ b/examples/example011.scad
@@ -1,4 +1,4 @@
-polyeder(
+polyhedron(
 	points = [
 		[10, 0, 0],
 		[0, 10, 0],
diff --git a/mainwin.cc b/mainwin.cc
index 7631010..86411f7 100644
--- a/mainwin.cc
+++ b/mainwin.cc
@@ -814,7 +814,7 @@ void MainWindow::actionExportSTLorOFF(bool stl_mode)
 	}
 
 	if (!root_N->is_simple()) {
-		PRINT("Object isn't a single polyeder or otherwise invalid! Modify your design..");
+		PRINT("Object isn't a single polyhedron or otherwise invalid! Modify your design..");
 		current_win = NULL;
 		return;
 	}
diff --git a/primitives.cc b/primitives.cc
index 997b04f..b113c3b 100644
--- a/primitives.cc
+++ b/primitives.cc
@@ -26,7 +26,7 @@ enum primitive_type_e {
 	CUBE,
 	SPHERE,
 	CYLINDER,
-	POLYEDER
+	POLYHEDRON
 };
 
 class PrimitiveModule : public AbstractModule
@@ -69,7 +69,7 @@ AbstractNode *PrimitiveModule::evaluate(const Context *ctx, const ModuleInstanci
 	if (type == CYLINDER) {
 		argnames = QVector<QString>() << "h" << "r1" << "r2" << "center";
 	}
-	if (type == POLYEDER) {
+	if (type == POLYHEDRON) {
 		argnames = QVector<QString>() << "points" << "triangles";
 	}
 
@@ -125,7 +125,7 @@ AbstractNode *PrimitiveModule::evaluate(const Context *ctx, const ModuleInstanci
 		}
 	}
 
-	if (type == POLYEDER) {
+	if (type == POLYHEDRON) {
 		node->points = c.lookup_variable("points");
 		node->triangles = c.lookup_variable("triangles");
 	}
@@ -138,7 +138,7 @@ void register_builtin_primitives()
 	builtin_modules["cube"] = new PrimitiveModule(CUBE);
 	builtin_modules["sphere"] = new PrimitiveModule(SPHERE);
 	builtin_modules["cylinder"] = new PrimitiveModule(CYLINDER);
-	builtin_modules["polyeder"] = new PrimitiveModule(POLYEDER);
+	builtin_modules["polyhedron"] = new PrimitiveModule(POLYHEDRON);
 }
 
 int get_fragments_from_r(double r, double fn, double fs, double fa)
@@ -342,7 +342,7 @@ sphere_next_r2:
 		}
 	}
 
-	if (type == POLYEDER)
+	if (type == POLYHEDRON)
 	{
 		for (int i=0; i<triangles.vec.size(); i++)
 		{
@@ -370,8 +370,8 @@ QString PrimitiveNode::dump(QString indent) const
 			text.sprintf("sphere($fn = %f, $fa = %f, $fs = %f, r = %f);\n", fn, fa, fs, r1);
 		if (type == CYLINDER)
 			text.sprintf("cylinder($fn = %f, $fa = %f, $fs = %f, h = %f, r1 = %f, r2 = %f, center = %s);\n", fn, fa, fs, h, r1, r2, center ? "true" : "false");
-		if (type == POLYEDER)
-			text.sprintf("polyeder(points = %s, triangles = %s);\n", points.dump().toAscii().data(), triangles.dump().toAscii().data());
+		if (type == POLYHEDRON)
+			text.sprintf("polyhedron(points = %s, triangles = %s);\n", points.dump().toAscii().data(), triangles.dump().toAscii().data());
 		((AbstractNode*)this)->dump_cache = indent + QString("n%1: ").arg(idx) + text;
 	}
 	return dump_cache;
diff --git a/render.cc b/render.cc
index 9bf6e81..cfbd51e 100644
--- a/render.cc
+++ b/render.cc
@@ -152,7 +152,7 @@ CSGTerm *RenderNode::render_csg_term(double m[16], QVector<CSGTerm*> *highlights
 	}
 
 	if (!N.is_simple()) {
-		PRINTF("WARNING: Result of render() isn't a single polyeder or otherwise invalid! Modify your design..");
+		PRINTF("WARNING: Result of render() isn't a single polyhedron or otherwise invalid! Modify your design..");
 		return NULL;
 	}