x_ite 4.0.5 → 4.7.5

package/src/x_ite/Components/Geometry3D.js

@@ -0,0 +1,90 @@
+/*******************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright create3000, Scheffelstraße 31a, Leipzig, Germany 2011.
+ *
+ * All rights reserved. Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * The copyright notice above does not evidence any actual of intended
+ * publication of such source code, and is an unpublished work by create3000.
+ * This material contains CONFIDENTIAL INFORMATION that is the property of
+ * create3000.
+ *
+ * No permission is granted to copy, distribute, or create derivative works from
+ * the contents of this software, in whole or in part, without the prior written
+ * permission of create3000.
+ *
+ * NON-MILITARY USE ONLY
+ *
+ * All create3000 software are effectively free software with a non-military use
+ * restriction. It is free. Well commented source is provided. You may reuse the
+ * source in any way you please with the exception anything that uses it must be
+ * marked to indicate is contains 'non-military use only' components.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2015, 2016 Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * This file is part of the X_ITE Project.
+ *
+ * X_ITE is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License version 3 only, as published by the
+ * Free Software Foundation.
+ *
+ * X_ITE is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License version 3 for more
+ * details (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version 3
+ * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * copy of the GPLv3 License.
+ *
+ * For Silvio, Joy and Adi.
+ *
+ ******************************************************************************/
+
+
+define ([
+	"x_ite/Configuration/SupportedNodes",
+	"x_ite/Components/Geometry3D/Box",
+	"x_ite/Components/Geometry3D/Cone",
+	"x_ite/Components/Geometry3D/Cylinder",
+	"x_ite/Components/Geometry3D/ElevationGrid",
+	"x_ite/Components/Geometry3D/Extrusion",
+	"x_ite/Components/Geometry3D/IndexedFaceSet",
+	"x_ite/Components/Geometry3D/Sphere",
+],
+function (SupportedNodes,
+          Box,
+          Cone,
+          Cylinder,
+          ElevationGrid,
+          Extrusion,
+          IndexedFaceSet,
+          Sphere)
+{
+"use strict";
+
+	const Types =
+	{
+		Box:            Box,
+		Cone:           Cone,
+		Cylinder:       Cylinder,
+		ElevationGrid:  ElevationGrid,
+		Extrusion:      Extrusion,
+		IndexedFaceSet: IndexedFaceSet,
+		Sphere:         Sphere,
+	};
+
+	const AbstractTypes =
+	{
+	};
+
+	for (const typeName in Types)
+		SupportedNodes .addType (typeName, Types [typeName]);
+
+	for (const typeName in AbstractTypes)
+		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+});

package/src/x_ite/Components/Geospatial/GeoCoordinate.js

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -58,8 +57,7 @@ define ([
 	"standard/Math/Geometry/Triangle3",
 	"standard/Math/Numbers/Vector3",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DCoordinateNode, 
@@ -76,12 +74,9 @@ function ($,
 		X3DGeospatialObject .call (this, executionContext);
 
 		this .addType (X3DConstants .GeoCoordinate);
-
-		this .points = [ ];                   // Transformed points in GC.
-		this .origin = new Vector3 (0, 0, 0); // Origin of the reference frame.
 	}
 
-	GeoCoordinate .prototype = $.extend (Object .create (X3DCoordinateNode .prototype),
+	GeoCoordinate .prototype = Object .assign (Object .create (X3DCoordinateNode .prototype),
 		X3DGeospatialObject .prototype,
 	{
 		constructor: GeoCoordinate,
@@ -107,80 +102,148 @@ function ($,
 		{
 			X3DCoordinateNode   .prototype .initialize .call (this);
 			X3DGeospatialObject .prototype .initialize .call (this);
-		
-			this .addInterest ("eventsProcessed", this);
-		
-			this .eventsProcessed ();
-		},
-		eventsProcessed: function ()
-		{
-			var
-				point  = this .point_ .getValue (),
-				points = this .points;
-
-			for (var i = 0, length = Math .min (point .length, points .length); i < length; ++ i)
-				this .getCoord (point [i] .getValue (), points [i]);
 
-			for (var length = point .length; i < length; ++ i)
-			{
-				var p = points [i] = new Vector3 (0, 0, 0);
-				this .getCoord (point [i] .getValue (), p);
-			}
-		
-			points .length = length;
+			this .point_ .addInterest ("set_point__", this);
 
-			this .getCoord (Vector3 .Zero, this .origin);
+			this .set_point__ ();
+		},
+		set_point__: function ()
+		{
+			this .point  = this .point_ .getValue ();
+			this .length = this .point_ .length;
 		},
 		isEmpty: function ()
 		{
-			return this .point_ .length == 0;
+			return this .length === 0;
 		},
 		getSize: function ()
 		{
-			return this .point_ .length;
+			return this .length;
 		},
-		get1Point: function (index)
+		set1Point: (function ()
 		{
-			// The index cannot be less than 0.
-
-			if (index < this .points .length)
-				return this .points [index];
+			var result = new Vector3 (0, 0, 0);
 
-			return this .origin;
-		},
-		getNormal: function (index1, index2, index3)
+			return function (index, point)
+			{
+				this .point_ [index] = this .getGeoCoord (point, result);
+			};
+		})(),
+		get1Point: (function ()
 		{
-			// The index[1,2,3] cannot be less than 0.
+			var p = new Vector3 (0, 0, 0);
 
+			return function (index, result)
+			{
+				if (index < this .length)
+				{
+					const point = this .point;
+	
+					index *= 3;
+	
+					return this .getCoord (p .set (point [index], point [index + 1], point [index + 2]), result);
+				}
+				else
+				{
+					return result .set (0, 0, 0);
+				}
+			};
+		})(),
+		addPoint: (function ()
+		{
 			var
-				points = this .points,
-				length = points .length;
-
-			if (index1 < length && index2 < length && index3 < length)
-				return Triangle3 .normal (points [index1],
-				                          points [index2],
-				                          points [index3],
-				                          new Vector3 (0, 0, 0));
+				p = new Vector3 (0, 0, 0),
+				g = new Vector3 (0, 0, 0);
 
-			return new Vector3 (0, 0, 0);
-		},
-		getQuadNormal: function (index1, index2, index3, index4)
+			return function (index, array)
+			{
+				if (index < this .length)
+				{
+					const point = this .point;
+	
+					index *= 3;
+
+					this .getCoord (p .set (point [index], point [index + 1], point [index + 2]), g);
+	
+					array .push (g [0], g [1], g [2], 1);
+				}
+				else
+				{
+					array .push (0, 0, 0, 1);
+				}
+			};
+		})(),
+		addPoints: (function ()
 		{
-			// The index[1,2,3,4] cannot be less than 0.
+			var
+				p = new Vector3 (0, 0, 0),
+				g = new Vector3 (0, 0, 0);
 
+			return function (array, min)
+			{
+				const point = this .point;
+	
+				for (var index = 0, length = this .length * 3; index < length; index += 3)
+				{
+					this .getCoord (p .set (point [index], point [index + 1], point [index + 2]), g);
+	
+					array .push (g [0], g [1], g [2], 1);
+				}
+	
+				for (var index = length, length = min * 3; index < length; index += 3)
+					array .push (0, 0, 0, 1);
+			};
+		})(),
+		getNormal: (function ()
+		{
 			var
-				points = this .points,
-				length = points .length;
+				point1 = new Vector3 (0, 0, 0),
+				point2 = new Vector3 (0, 0, 0),
+				point3 = new Vector3 (0, 0, 0);
 
-			if (index1 < length && index2 < length && index3 < length && index4 < length)
-				return Triangle3 .quadNormal (points [index1],
-				                              points [index2],
-				                              points [index3],
-				                              points [index4],
-				                              new Vector3 (0, 0, 0));
+			return function (index1, index2, index3)
+			{
+				// The index[1,2,3] cannot be less than 0.
+	
+				var length = this .length;
+	
+				if (index1 < length && index2 < length && index3 < length)
+				{
+					return Triangle3 .normal (this .get1Point (index1, point1),
+					                          this .get1Point (index2, point2),
+					                          this .get1Point (index3, point3),
+					                          new Vector3 (0, 0, 0));
+				}
+	
+				return new Vector3 (0, 0, 0);
+			};
+		})(),
+		getQuadNormal: (function ()
+		{
+			var
+				point1 = new Vector3 (0, 0, 0),
+				point2 = new Vector3 (0, 0, 0),
+				point3 = new Vector3 (0, 0, 0),
+				point4 = new Vector3 (0, 0, 0);
 
-			return new Vector3 (0, 0, 0);
-		},
+			return function (index1, index2, index3, index4)
+			{
+				// The index[1,2,3,4] cannot be less than 0.
+	
+				var length = this .length;
+	
+				if (index1 < length && index2 < length && index3 < length && index4 < length)
+				{
+					return Triangle3 .quadNormal (this .get1Point (index1, point1),
+					                              this .get1Point (index2, point2),
+					                              this .get1Point (index3, point3),
+					                              this .get1Point (index4, point4),
+					                              new Vector3 (0, 0, 0));
+				}
+	
+				return new Vector3 (0, 0, 0);
+			};
+		})(),
 	});
 
 	return GeoCoordinate;

package/src/x_ite/Components/Geospatial/GeoElevationGrid.js

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -60,8 +59,7 @@ define ([
 	"standard/Math/Numbers/Vector2",
 	"standard/Math/Numbers/Vector3",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DGeometryNode, 
@@ -81,12 +79,15 @@ function ($,
 
 		this .addType (X3DConstants .GeoElevationGrid);
 
+		this .creaseAngle_ .setUnit ("angle");
+		this .height_      .setUnit ("length");
+
 		this .colorNode    = null;
 		this .texCoordNode = null;
 		this .normalNode   = null;
 	}
 
-	GeoElevationGrid .prototype = $.extend (Object .create (X3DGeometryNode .prototype),
+	GeoElevationGrid .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
 		X3DGeospatialObject .prototype,
 	{
 		constructor: GeoElevationGrid,
@@ -139,47 +140,47 @@ function ($,
 		{
 			if (this .colorNode)
 			{
-				this .colorNode .removeInterest ("addNodeEvent", this);
-				this .colorNode .removeInterest ("set_transparent__", this);
+				this .colorNode .removeInterest ("requestRebuild", this);
+				this .colorNode .transparent_ .removeInterest ("set_transparent__", this);
 			}
 
 			this .colorNode = X3DCast (X3DConstants .X3DColorNode, this .color_);
 
 			if (this .colorNode)
 			{
-				this .colorNode .addInterest ("addNodeEvent", this);
-				this .colorNode .addInterest ("set_transparent__", this);
+				this .colorNode .addInterest ("requestRebuild", this);
+				this .colorNode .transparent_ .addInterest ("set_transparent__", this);
 
 				this .set_transparent__ ();
 			}
 			else
-				this .transparent_ = false;
+				this .setTransparent (false);
 		},
 		set_transparent__: function ()
 		{
-			this .transparent_ = this .colorNode .isTransparent ();
+			this .setTransparent (this .colorNode .getTransparent ());
 		},
 		set_texCoord__: function ()
 		{
 			if (this .texCoordNode)
-				this .texCoordNode .removeInterest ("addNodeEvent", this);
+				this .texCoordNode .removeInterest ("requestRebuild", this);
 
 			this .texCoordNode = X3DCast (X3DConstants .X3DTextureCoordinateNode, this .texCoord_);
 
 			if (this .texCoordNode)
-				this .texCoordNode .addInterest ("addNodeEvent", this);
+				this .texCoordNode .addInterest ("requestRebuild", this);
 
-			this .setCurrentTexCoord (this .texCoordNode);
+			this .setTextureCoordinate (this .texCoordNode);
 		},
 		set_normal__: function ()
 		{
 			if (this .normalNode)
-				this .normalNode .removeInterest ("addNodeEvent", this);
+				this .normalNode .removeInterest ("requestRebuild", this);
 
 			this .normalNode = X3DCast (X3DConstants .X3DNormalNode, this .normal_);
 
 			if (this .normalNode)
-				this .normalNode .addInterest ("addNodeEvent", this);
+				this .normalNode .addInterest ("requestRebuild", this);
 		},
 		getColor: function ()
 		{
@@ -342,14 +343,18 @@ function ($,
 				return;
 
 			var
-				colorPerVertex  = this .colorPerVertex_ .getValue (),
-				normalPerVertex = this .normalPerVertex_ .getValue (),
-				coordIndex      = this .createCoordIndex (),
-				colorNode       = this .getColor (),
-				texCoordNode    = this .getTexCoord (),
-				normalNode      = this .getNormal (),
-				points          = this .createPoints (),
-				face            = 0;
+				colorPerVertex     = this .colorPerVertex_ .getValue (),
+				normalPerVertex    = this .normalPerVertex_ .getValue (),
+				coordIndex         = this .createCoordIndex (),
+				colorNode          = this .getColor (),
+				texCoordNode       = this .getTexCoord (),
+				normalNode         = this .getNormal (),
+				points             = this .createPoints (),
+				colorArray         = this .getColors (),
+				multiTexCoordArray = this .getMultiTexCoords (),
+				normalArray        = this .getNormals (),
+				vertexArray        = this .getVertices (),
+				face               = 0;
 
 			// Vertex attribute
 
@@ -359,11 +364,16 @@ function ($,
 			//	attribArrays [a] .reserve (coordIndex .size ());
 
 			if (texCoordNode)
-				texCoordNode .init (this .getTexCoords ());
+			{
+				texCoordNode .init (multiTexCoordArray);
+			}
 			else
 			{
-				var texCoords = this .createTexCoords ();
-				this .getTexCoords () .push ([ ]);
+				var
+					texCoords     = this .createTexCoords (),
+					texCoordArray = this .getTexCoords ();
+
+				multiTexCoordArray .push (texCoordArray);
 			}
 
 			// Build geometry
@@ -372,7 +382,9 @@ function ($,
 			{
 				for (var p = 0; p < 6; ++ p, ++ c)
 				{
-					var index = coordIndex [c];
+					var
+						index = coordIndex [c],
+						point = points [index];
 
 					//for (size_t a = 0, size = attribNodes .size (); a < size; ++ a)
 					//	attribNodes [a] -> addValue (attribArrays [a], i);
@@ -380,30 +392,32 @@ function ($,
 					if (colorNode)
 					{
 						if (colorPerVertex)
-							this .addColor (colorNode .get1Color (index));
+							colorNode .addColor (index, colorArray);
 						else
-							this .addColor (colorNode .get1Color (face));
+							colorNode .addColor (face, colorArray);
 					}
 						
 					if (texCoordNode)
-						texCoordNode .addTexCoord (this .getTexCoords (), index);
-
+					{
+						texCoordNode .addTexCoord (index, multiTexCoordArray);
+					}
 					else
 					{
 						var t = texCoords [index];
-						this .getTexCoords () [0] .push (t .x, t .y, 0, 1);
+
+						texCoordArray .push (t .x, t .y, 0, 1);
 					}
 
 					if (normalNode)
 					{
 						if (normalPerVertex)
-							this .addNormal (normalNode .get1Vector (index));
+							normalNode .addVector (index, normalArray);
 
 						else
-							this .addNormal (normalNode .get1Vector (face));
+							normalNode .addVector (face, normalArray);
 					}
 
-					this .addVertex (points [index]);
+					vertexArray .push (point .x, point .y, point .z, 1);
 				}
 			}
 
@@ -414,7 +428,11 @@ function ($,
 				var normals = this .createNormals (points, coordIndex);
 
 				for (var i = 0; i < normals .length; ++ i)
-					this .addNormal (normals [i]);
+				{
+					var normal = normals [i];
+
+					normalArray .push (normal .x, normal .y, normal .z);
+				}
 			}
 
 			this .setSolid (this .solid_ .getValue ());