x_ite 4.2.17 → 4.7.7

package/src/x_ite/Components/Lighting/X3DLightNode.js

@@ -49,25 +49,17 @@
 
 define ([
 	"x_ite/Components/Core/X3DChildNode",
-	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Numbers/Matrix4",
 	"standard/Math/Algorithm",
 ],
 function (X3DChildNode,
-          TraverseType,
           X3DConstants,
           Matrix4,
           Algorithm)
 {
 "use strict";
 
-	// Transforms normalized coords from range (-1, 1) to (0, 1).
-	var biasMatrix = new Matrix4 (0.5, 0.0, 0.0, 0.0,
-		                           0.0, 0.5, 0.0, 0.0,
-		                           0.0, 0.0, 0.5, 0.0,
-		                           0.5, 0.5, 0.5, 1.0);
-
 	function X3DLightNode (executionContext)
 	{
 		X3DChildNode .call (this, executionContext);
@@ -78,6 +70,28 @@ function (X3DChildNode,
 	X3DLightNode .prototype = Object .assign (Object .create (X3DChildNode .prototype),
 	{
 		constructor: X3DLightNode,
+		initialize: function ()
+		{
+			X3DChildNode .prototype .initialize .call (this);
+
+			this .on_        .addInterest ("set_on__", this);
+			this .intensity_ .addInterest ("set_on__", this);
+
+			this .set_on__ ();
+		},
+		set_on__: function ()
+		{
+			if (this .on_ .getValue () && this .getIntensity () > 0)
+			{
+				delete this .push;
+				delete this .pop;
+			}
+			else
+			{
+				this .push = Function .prototype;
+				this .pop  = Function .prototype;
+			}
+		},
 		getGlobal: function ()
 		{
 			return this .global_ .getValue ();
@@ -88,7 +102,7 @@ function (X3DChildNode,
 		},
 		getIntensity: function ()
 		{
-			return Algorithm .clamp (this .intensity_ .getValue (), 0, 1);
+			return Math .max (this .intensity_ .getValue (), 0);
 		},
 		getAmbientIntensity: function ()
 		{
@@ -98,13 +112,17 @@ function (X3DChildNode,
 		{
 			return this .direction_ .getValue ();
 		},
+		getShadows: function ()
+		{
+			return this .shadows_ .getValue ();
+		},
 		getShadowColor: function ()
 		{
 			return this .shadowColor_ .getValue ();
 		},
 		getShadowIntensity: function ()
 		{
-			return Algorithm .clamp (this .shadowIntensity_ .getValue (), 0, 1);
+			return this .getShadows () ? Algorithm .clamp (this .shadowIntensity_ .getValue (), 0, 1) : 0;
 		},
 		getShadowBias: function ()
 		{
@@ -114,80 +132,81 @@ function (X3DChildNode,
 		{
 			return Math .min (this .shadowMapSize_ .getValue (), this .getBrowser () .getMaxTextureSize ());
 		},
-		getBiasMatrix: function ()
+		getBiasMatrix: (function ()
 		{
-			return biasMatrix;
-		},
+			// Transforms normalized coords from range (-1, 1) to (0, 1).
+			const biasMatrix = new Matrix4 (0.5, 0.0, 0.0, 0.0,
+			                                0.0, 0.5, 0.0, 0.0,
+			                                0.0, 0.0, 0.5, 0.0,
+			                                0.5, 0.5, 0.5, 1.0);
+
+			return function ()
+			{
+				return biasMatrix;
+			};
+		})(),
 		push: function (renderObject, group)
 		{
-			if (this .on_ .getValue ())
+			if (renderObject .isIndependent ())
 			{
-				if (renderObject .isIndependent ())
+				const lightContainer = this .getLights () .pop ();
+
+				if (this .global_ .getValue ())
 				{
-					var lightContainer = this .getLights () .pop ();
-
-					if (this .global_ .getValue ())
-					{
-						lightContainer .set (renderObject .getBrowser (),
-						                     this,
-						                     renderObject .getLayer () .getGroup (),
-						                     renderObject .getModelViewMatrix () .get ());
-
-						renderObject .getGlobalLights () .push (lightContainer);
-						renderObject .getLights ()       .push (lightContainer);
-					}
-					else
-					{
-						lightContainer .set (renderObject .getBrowser (),
-						                     this,
-						                     group,
-						                     renderObject .getModelViewMatrix () .get ());
-
-						renderObject .getShaderObjects () .push (lightContainer);
-						renderObject .getLights ()        .push (lightContainer);
-					}
+					lightContainer .set (renderObject .getBrowser (),
+												this,
+												renderObject .getLayer () .getGroup (),
+												renderObject .getModelViewMatrix () .get ());
+
+					renderObject .getGlobalObjects () .push (lightContainer);
+					renderObject .getLights ()        .push (lightContainer);
 				}
 				else
 				{
-					var lightContainer = renderObject .getLightContainer ();
-		
-					if (this .global_ .getValue ())
-					{
-						lightContainer .getModelViewMatrix () .pushMatrix (renderObject .getModelViewMatrix () .get ());
-
-						renderObject .getGlobalLights () .push (lightContainer);
-						renderObject .getLights ()       .push (lightContainer);
-					}
-					else
-					{
-						lightContainer .getModelViewMatrix () .pushMatrix (renderObject .getModelViewMatrix () .get ());
-	
-						renderObject .getShaderObjects () .push (lightContainer);
-						renderObject .getLights ()        .push (lightContainer);
-					}
-				}
+					lightContainer .set (renderObject .getBrowser (),
+												this,
+												group,
+												renderObject .getModelViewMatrix () .get ());
 
-				renderObject .pushShadow (this .shadowIntensity_ .getValue () > 0);
+					renderObject .getLocalObjects () .push (lightContainer);
+					renderObject .getLights ()       .push (lightContainer);
+				}
 			}
-		},
-		pop: function (renderObject)
-		{
-			if (this .on_ .getValue ())
+			else
 			{
+				const lightContainer = renderObject .getLightContainer ();
+
 				if (this .global_ .getValue ())
-				   return;
+				{
+					lightContainer .getModelViewMatrix () .pushMatrix (renderObject .getModelViewMatrix () .get ());
 
-				if (renderObject .isIndependent ())
-					renderObject .getBrowser () .getLocalLights () .push (renderObject .getShaderObjects () .pop ());
+					renderObject .getGlobalObjects () .push (lightContainer);
+					renderObject .getLights ()        .push (lightContainer);
+				}
 				else
-					renderObject .getShaderObjects () .pop ();
+				{
+					lightContainer .getModelViewMatrix () .pushMatrix (renderObject .getModelViewMatrix () .get ());
 
-				renderObject .popShadow ();
+					renderObject .getLocalObjects () .push (lightContainer);
+					renderObject .getLights ()       .push (lightContainer);
+				}
 			}
+
+			renderObject .pushShadow (this .getShadowIntensity ());
+		},
+		pop: function (renderObject)
+		{
+			if (this .global_ .getValue ())
+				return;
+
+			if (renderObject .isIndependent ())
+				renderObject .getBrowser () .getLocalObjects () .push (renderObject .getLocalObjects () .pop ());
+			else
+				renderObject .getLocalObjects () .pop ();
+
+			renderObject .popShadow ();
 		},
 	});
 
 	return X3DLightNode;
 });
-
-

package/src/x_ite/Components/Lighting.js

@@ -61,24 +61,21 @@ function (SupportedNodes,
 {
 "use strict";
 
-	var Types =
+	const Types =
 	{
 		DirectionalLight: DirectionalLight,
 		PointLight:       PointLight,
 		SpotLight:        SpotLight,
 	};
 
-	var AbstractTypes =
+	const AbstractTypes =
 	{
 		X3DLightNode: X3DLightNode,
 	};
-	
-	for (var typeName in Types)
-		SupportedNodes .addType (typeName, Types [typeName]); 
 
-	for (var typeName in AbstractTypes)
-		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]); 
+	for (const typeName in Types)
+		SupportedNodes .addType (typeName, Types [typeName]);
 
-	return Types;
+	for (const typeName in AbstractTypes)
+		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
 });
-

package/src/x_ite/Components/NURBS/Contour2D.js

@@ -53,12 +53,14 @@ define ([
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/Core/X3DNode",
 	"x_ite/Bits/X3DConstants",
+	"x_ite/Bits/X3DCast",
 ],
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DNode, 
-          X3DConstants)
+          X3DConstants, 
+          X3DCast)
 {
 "use strict";
 
@@ -67,6 +69,8 @@ function (Fields,
 		X3DNode .call (this, executionContext);
 
 		this .addType (X3DConstants .Contour2D);
+
+		this .childNodes = [ ];
 	}
 
 	Contour2D .prototype = Object .assign (Object .create (X3DNode .prototype),
@@ -90,6 +94,46 @@ function (Fields,
 		{
 			return "trimmingContour";
 		},
+		initialize: function ()
+		{
+			X3DNode .prototype .initialize .call (this);
+
+			this .children_ .addInterest ("set_children__", this);
+
+			this .set_children__ ();
+		},
+		set_children__: function ()
+		{
+			var childNodes = this .childNodes;
+
+			childNodes .length = 0;
+
+			for (var i = 0, length = this .children_ .length; i < length; ++ i)
+			{
+				var childNode = X3DCast (X3DConstants .NurbsCurve2D, this .children_ [i]);
+
+				if (childNode)
+				{
+					childNodes .push (childNode);
+					continue;
+				}
+
+				var childNode = X3DCast (X3DConstants .ContourPolyline2D, this .children_ [i]);
+
+				if (childNode)
+				{
+					childNodes .push (childNode);
+					continue;
+				}
+			}
+		},
+		addTrimmingContour: function (trimmingContours)
+		{
+			var childNodes = this .childNodes;
+
+			for (var i = 0, length = childNodes .length; i < length; ++ i)
+				trimmingContours .push (childNodes [i] .tessellate (2));
+		}
 	});
 
 	return Contour2D;

package/src/x_ite/Components/NURBS/ContourPolyline2D.js

@@ -53,12 +53,14 @@ define ([
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/NURBS/X3DNurbsControlCurveNode",
 	"x_ite/Bits/X3DConstants",
+	"standard/Math/Numbers/Vector3",
 ],
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DNurbsControlCurveNode, 
-          X3DConstants)
+          X3DConstants,
+          Vector3)
 {
 "use strict";
 
@@ -90,41 +92,67 @@ function (Fields,
 		{
 			return "children";
 		},
-		tessellate: function (spine)
+		tessellate: function (type)
 		{
-			var
-				controlPointArray = this .controlPoint_ .getValue (),
-				controlPoints     = this .controlPoints;
-
-			if (spine)
+			switch (type)
 			{
-				for (var i = 0, length = this .controlPoint_ .length; i < length; ++ i)
+				case 0:
 				{
 					var
-						i2 = i * 2,
-						i3 = i * 3;
+						controlPointArray = this .controlPoint_ .getValue (),
+						controlPoints     = this .controlPoints;
 
-					controlPoints [i3 + 0] = controlPointArray [i2 + 0];
-					controlPoints [i3 + 1] = 0;
-					controlPoints [i3 + 2] = controlPointArray [i2 + 1];
-				}
+					for (var i = 0, length = this .controlPoint_ .length; i < length; ++ i)
+					{
+						var i2 = i * 2;
+	
+						controlPoints [i2 + 0] = controlPointArray [i2 + 0];
+						controlPoints [i2 + 1] = controlPointArray [i2 + 1];
+					}
+	
+					controlPoints .length = length * 2;
 
-				controlPoints .length = length * 3;
-			}
-			else
-			{
-				for (var i = 0, length = this .controlPoint_ .length; i < length; ++ i)
+					return controlPoints;
+				}
+				case 1:
 				{
-					var i2 = i * 2;
+					var
+						controlPointArray = this .controlPoint_ .getValue (),
+						controlPoints     = this .controlPoints;
+
+					for (var i = 0, length = this .controlPoint_ .length; i < length; ++ i)
+					{
+						var
+							i2 = i * 2,
+							i3 = i * 3;
+	
+						controlPoints [i3 + 0] = controlPointArray [i2 + 0];
+						controlPoints [i3 + 1] = 0;
+						controlPoints [i3 + 2] = controlPointArray [i2 + 1];
+					}
+	
+					controlPoints .length = length * 3;
 
-					controlPoints [i2 + 0] = controlPointArray [i2 + 0];
-					controlPoints [i2 + 1] = controlPointArray [i2 + 1];
+					return controlPoints;
 				}
+				case 3:
+				{
+					var
+						controlPointArray = this .controlPoint_ .getValue (),
+						controlPoints     = this .controlPoints;
 
-				controlPoints .length = length * 2;
-			}
+					for (var i = 0, length = this .controlPoint_ .length; i < length; ++ i)
+					{
+						var i2 = i * 2;
 
-			return controlPoints;
+						controlPoints [i] = new Vector3 (controlPointArray [i2 + 0], controlPointArray [i2 + 1], 0);
+					}
+	
+					controlPoints .length = length;
+
+					return controlPoints;
+				}
+			}
 		},
 	});
 

package/src/x_ite/Components/NURBS/NurbsCurve.js

@@ -62,8 +62,8 @@ function (X3DCast,
           Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DParametricGeometryNode, 
-          X3DLineGeometryNode, 
+          X3DParametricGeometryNode,
+          X3DLineGeometryNode,
           X3DConstants,
           NURBS,
           nurbs)
@@ -142,47 +142,47 @@ function (X3DCast,
 
 			return NURBS .getClosed (order, knot, weight, controlPointNode);
 		},
-		getWeights: function (result, closed, order, dimension, weight)
+		getWeights: function (result, dimension, weight)
 		{
-			return NURBS .getWeights (result, closed, order, dimension, weight);
+			return NURBS .getWeights (result, dimension, weight);
 		},
-		getControlPoints: function (result, closed, order, controlPointNode)
+		getControlPoints: function (result, closed, order, weights, controlPointNode)
 		{
-			return NURBS .getControlPoints (result, closed, order, controlPointNode);
+			return NURBS .getControlPoints (result, closed, order, weights, controlPointNode);
 		},
 		tessellate: function ()
 		{
 			if (this .order_ .getValue () < 2)
 				return [ ];
-		
+
 			if (! this .controlPointNode)
 				return [ ];
-		
+
 			if (this .controlPointNode .getSize () < this .order_ .getValue ())
 				return [ ];
 
 			var
 				vertexArray = this .getVertices (),
 				array       = [ ];
-			
+
 			if (vertexArray .length)
 			{
 				for (var i = 0, length = vertexArray .length; i < length; i += 8)
 					array .push (vertexArray [i], vertexArray [i + 1], vertexArray [i + 2]);
-				
+
 				array .push (vertexArray [length - 4], vertexArray [length - 3], vertexArray [length - 2]);
 			}
-			
+
 			return array;
 		},
 		build: function ()
 		{
 			if (this .order_ .getValue () < 2)
 				return;
-		
+
 			if (! this .controlPointNode)
 				return;
-		
+
 			if (this .controlPointNode .getSize () < this .order_ .getValue ())
 				return;
 
@@ -190,17 +190,16 @@ function (X3DCast,
 
 			var
 				closed        = this .getClosed (this .order_ .getValue (), this .knot_, this .weight_, this .controlPointNode),
-				controlPoints = this .getControlPoints (this .controlPoints, closed, this .order_ .getValue (), this .controlPointNode);
-		
+				weights       = this .getWeights (this .weights, this .controlPointNode .getSize (), this .weight_),
+				controlPoints = this .getControlPoints (this .controlPoints, closed, this .order_ .getValue (), weights, this .controlPointNode);
+
 			// Knots
-		
+
 			var
 				knots = this .getKnots (this .knots, closed, this .order_ .getValue (), this .controlPointNode .getSize (), this .knot_),
-				scale = knots [knots .length - 1] - knots [0];
+				scale = knots .at (-1) - knots [0];
 
-			var weights = this .getWeights (this .weights, closed, this .order_ .getValue (), this .controlPointNode .getSize (), this .weight_);
-
-			// Initialize NURBS tesselllator
+			// Initialize NURBS tessellator
 
 			var degree = this .order_ .getValue () - 1;
 
@@ -208,19 +207,19 @@ function (X3DCast,
 				boundary: ["open"],
 				degree: [degree],
 				knots: [knots],
-				weights: weights,
 				points: controlPoints,
 				debug: false,
 			});
 
 			this .sampleOptions .resolution [0] = this .getTessellation (knots .length);
+			this .sampleOptions .haveWeights    = Boolean (weights);
 
 			var
 				mesh        = nurbs .sample (this .mesh, surface, this .sampleOptions),
 				points      = mesh .points,
 				vertexArray = this .getVertices ();
 
-			for (var i2= 3, length = points .length; i2 < length; i2 += 3)
+			for (var i2 = 3, length = points .length; i2 < length; i2 += 3)
 			{
 				var i1 = i2 - 3;
 
@@ -232,5 +231,3 @@ function (X3DCast,
 
 	return NurbsCurve;
 });
-
-

package/src/x_ite/Components/NURBS/NurbsCurve2D.js

@@ -54,14 +54,16 @@ define ([
 	"x_ite/Components/NURBS/X3DNurbsControlCurveNode",
 	"x_ite/Bits/X3DConstants",
 	"x_ite/Browser/NURBS/NURBS",
+	"standard/Math/Numbers/Vector3",
 	"nurbs",
 ],
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DNurbsControlCurveNode, 
+          X3DNurbsControlCurveNode,
           X3DConstants,
           NURBS,
+          Vector3,
           nurbs)
 {
 "use strict";
@@ -119,15 +121,15 @@ function (Fields,
 		{
 			return NURBS .getKnots (result, closed, order, dimension, knot);
 		},
-		getWeights: function (result, closed, order, dimension, weight)
+		getWeights: function (result, dimension, weight)
 		{
-			return NURBS .getWeights (result, closed, order, dimension, weight);
+			return NURBS .getWeights (result, dimension, weight);
 		},
-		getControlPoints: function (result, closed, order, controlPoint)
+		getControlPoints: function (result, closed, order, weights, controlPoint)
 		{
-			return NURBS .getControlPoints2D (result, closed, order, controlPoint);
+			return NURBS .getControlPoints2D (result, closed, order, weights, controlPoint);
 		},
-		tessellate: function (spine)
+		tessellate: function (type)
 		{
 			var array = this .array;
 
@@ -135,7 +137,7 @@ function (Fields,
 
 			if (this .order_ .getValue () < 2)
 				return array;
-		
+
 			if (this .controlPoint_ .length < this .order_ .getValue ())
 				return array;
 
@@ -143,17 +145,16 @@ function (Fields,
 
 			var
 				closed        = this .getClosed (this .order_ .getValue (), this .knot_, this .weight_, this .controlPoint_),
-				controlPoints = this .getControlPoints (this .controlPoints, closed, this .order_ .getValue (), this .controlPoint_);
-		
+				weights       = this .getWeights (this .weights, this .controlPoint_ .length, this .weight_),
+				controlPoints = this .getControlPoints (this .controlPoints, closed, this .order_ .getValue (), weights, this .controlPoint_);
+
 			// Knots
-		
+
 			var
 				knots = this .getKnots (this .knots, closed, this .order_ .getValue (), this .controlPoint_ .length, this .knot_),
-				scale = knots [knots .length - 1] - knots [0];
-
-			var weights = this .getWeights (this .weights, closed, this .order_ .getValue (), this .controlPoint_ .length, this .weight_);
+				scale = knots .at (-1) - knots [0];
 
-			// Initialize NURBS tesselllator
+			// Initialize NURBS tessellator
 
 			var degree = this .order_ .getValue () - 1;
 
@@ -161,26 +162,46 @@ function (Fields,
 				boundary: ["open"],
 				degree: [degree],
 				knots: [knots],
-				weights: weights,
 				points: controlPoints,
 				debug: false,
 			});
 
 			this .sampleOptions .resolution [0] = this .getTessellation (knots .length);
+			this .sampleOptions .haveWeights    = Boolean (weights);
 
 			var
 				mesh   = nurbs .sample (this .mesh, surface, this .sampleOptions),
 				points = mesh .points;
 
-			if (spine)
+			switch (type)
 			{
-				for (var i = 0, length = points .length; i < length; i += 2)
-					array .push (points [i], 0, points [i + 1]);
-			}
-			else
-			{
-				for (var i = 0, length = points .length; i < length; i += 2)
-					array .push (points [i], points [i + 1]);
+				case 0:
+				{
+					for (var i = 0, length = points .length; i < length; i += 2)
+					{
+						array .push (points [i], points [i + 1]);
+					}
+
+					break;
+				}
+				case 1:
+				{
+					for (var i = 0, length = points .length; i < length; i += 2)
+					{
+						array .push (points [i], 0, points [i + 1]);
+					}
+
+					break;
+				}
+				case 2:
+				{
+					for (var i = 0, length = points .length; i < length; i += 2)
+					{
+						array .push (new Vector3 (points [i], points [i + 1], 0));
+					}
+
+					break;
+				}
 			}
 
 			return array;
@@ -189,5 +210,3 @@ function (Fields,
 
 	return NurbsCurve2D;
 });
-
-