x_ite 4.0.5 → 4.7.5

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

@@ -48,19 +48,21 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
+	"x_ite/Components/Geometry3D/Extrusion",
 	"x_ite/Components/NURBS/X3DParametricGeometryNode",
 	"x_ite/Bits/X3DConstants",
+	"x_ite/Bits/X3DCast",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
+          Extrusion, 
           X3DParametricGeometryNode, 
-          X3DConstants)
+          X3DConstants,
+          X3DCast)
 {
 "use strict";
 
@@ -69,17 +71,19 @@ function ($,
 		X3DParametricGeometryNode .call (this, executionContext);
 
 		this .addType (X3DConstants .NurbsSwungSurface);
+
+		this .extrusion = new Extrusion (executionContext);
 	}
 
-	NurbsSwungSurface .prototype = $.extend (Object .create (X3DParametricGeometryNode .prototype),
+	NurbsSwungSurface .prototype = Object .assign (Object .create (X3DParametricGeometryNode .prototype),
 	{
 		constructor: NurbsSwungSurface,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",        new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "profileCurve",    new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "trajectoryCurve", new Fields .SFNode ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "solid",           new Fields .SFBool (true)),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "ccw",             new Fields .SFBool (true)),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "profileCurve",    new Fields .SFNode ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "trajectoryCurve", new Fields .SFNode ()),
 		]),
 		getTypeName: function ()
 		{
@@ -93,6 +97,83 @@ function ($,
 		{
 			return "geometry";
 		},
+		initialize: function ()
+		{
+			X3DParametricGeometryNode .prototype .initialize .call (this);
+
+			this .profileCurve_    .addInterest ("set_profileCurve__",    this);
+			this .trajectoryCurve_ .addInterest ("set_trajectoryCurve__", this);
+
+			var extrusion = this .extrusion;
+
+			extrusion .beginCap_     = false;
+			extrusion .endCap_       = false;
+			extrusion .solid_        = true;
+			extrusion .ccw_          = true;
+			extrusion .convex_       = true;
+			extrusion .creaseAngle_  = Math .PI;
+
+			extrusion .setup ();
+
+			extrusion .crossSection_ .setTainted (true);
+			extrusion .spine_        .setTainted (true);
+
+			this .set_profileCurve__ ();
+			this .set_trajectoryCurve__ ();
+		},
+		set_profileCurve__: function ()
+		{
+			if (this .profileCurveNode)
+				this .profileCurveNode .removeInterest ("requestRebuild", this);
+
+			this .profileCurveNode = X3DCast (X3DConstants .X3DNurbsControlCurveNode, this .profileCurve_);
+
+			if (this .profileCurveNode)
+				this .profileCurveNode .addInterest ("requestRebuild", this);
+		},
+		set_trajectoryCurve__: function ()
+		{
+			if (this .trajectoryCurveNode)
+				this .trajectoryCurveNode .removeInterest ("requestRebuild", this);
+
+			this .trajectoryCurveNode = X3DCast (X3DConstants .X3DNurbsControlCurveNode, this .trajectoryCurve_);
+
+			if (this .trajectoryCurveNode)
+				this .trajectoryCurveNode .addInterest ("requestRebuild", this);
+		},
+		build: function ()
+		{
+			if (! this .profileCurveNode)
+				return;
+		
+			if (! this .trajectoryCurveNode)
+				return;
+
+			var extrusion = this .extrusion;
+
+			extrusion .crossSection_ = this .profileCurveNode    .tessellate (0);
+			extrusion .spine_        = this .trajectoryCurveNode .tessellate (1);
+
+			extrusion .rebuild ();
+
+			this .getColors ()    .assign (extrusion .getColors ());
+			this .getTexCoords () .assign (extrusion .getTexCoords ());
+			this .getNormals ()   .assign (extrusion .getNormals ());
+			this .getVertices ()  .assign (extrusion .getVertices ());
+
+			this .getMultiTexCoords () .push (this .getTexCoords ());
+
+			if (! this .ccw_ .getValue ())
+			{
+				var normals = this .getNormals ();
+
+				for (var i = 0, length = normals .length; i < length; ++ i)
+					normals [i] = -normals [i];
+			}
+
+			this .setSolid (this .solid_ .getValue ());
+			this .setCCW (this .ccw_ .getValue ());
+		},
 	});
 
 	return NurbsSwungSurface;

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

@@ -48,19 +48,19 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/Core/X3DNode",
 	"x_ite/Bits/X3DConstants",
+	"standard/Math/Numbers/Vector4",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DNode, 
-          X3DConstants)
+          X3DNode,
+          X3DConstants,
+          Vector4)
 {
 "use strict";
 
@@ -69,21 +69,23 @@ function ($,
 		X3DNode .call (this, executionContext);
 
 		this .addType (X3DConstants .NurbsTextureCoordinate);
+
+		this .controlPoints = [ ];
 	}
 
-	NurbsTextureCoordinate .prototype = $.extend (Object .create (X3DNode .prototype),
+	NurbsTextureCoordinate .prototype = Object .assign (Object .create (X3DNode .prototype),
 	{
 		constructor: NurbsTextureCoordinate,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",     new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "controlPoint", new Fields .MFVec2f ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "weight",       new Fields .MFFloat ()),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "uDimension",   new Fields .SFInt32 ()),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "uKnot",        new Fields .MFDouble ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "uOrder",       new Fields .SFInt32 (3)),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "vOrder",       new Fields .SFInt32 (3)),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "uDimension",   new Fields .SFInt32 ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "vDimension",   new Fields .SFInt32 ()),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "uKnot",        new Fields .MFDouble ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "vKnot",        new Fields .MFDouble ()),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "vOrder",       new Fields .SFInt32 (3)),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "weight",       new Fields .MFFloat ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "controlPoint", new Fields .MFVec2f ()),
 		]),
 		getTypeName: function ()
 		{
@@ -97,9 +99,56 @@ function ($,
 		{
 			return "texCoord";
 		},
+		initialize: function ()
+		{
+			X3DNode .prototype .initialize .call (this);
+		},
+		getControlPoints: function (texWeights)
+		{
+			var
+				controlPointArray = this .controlPoint_ .getValue (),
+				controlPoints     = this .controlPoints;
+
+			for (var u = 0, uDimension = this .uDimension_ .getValue (); u < uDimension; ++ u)
+			{
+				var cp = controlPoints [u];
+
+				if (! cp)
+					cp = controlPoints [u] = [ ];
+
+				for (var v = 0, vDimension = this .vDimension_ .getValue (); v < vDimension; ++ v)
+				{
+					var
+						index = v * uDimension + u,
+						p     = cp [v] || new Vector4 (),
+						i     = index * 2;
+
+					cp [v] = p .set (controlPointArray [i], controlPointArray [i + 1], 0, texWeights ? texWeights [index] : 1);
+				}
+			}
+
+			return controlPoints;
+		},
+		isValid: function ()
+		{
+			if (this .uOrder_ .getValue () < 2)
+				return false;
+
+			if (this .vOrder_ .getValue () < 2)
+				return false;
+
+			if (this .uDimension_ .getValue () < this .uOrder_ .getValue ())
+				return false;
+
+			if (this .vDimension_ .getValue () < this .vOrder_ .getValue ())
+				return false;
+
+			if (this .controlPoint_ .length !== this .uDimension_ .getValue () * this .vDimension_ .getValue ())
+				return false;
+
+			return true;
+		}
 	});
 
 	return NurbsTextureCoordinate;
 });
-
-

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

@@ -48,19 +48,19 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/NURBS/X3DNurbsSurfaceGeometryNode",
 	"x_ite/Bits/X3DConstants",
+	"x_ite/Bits/X3DCast",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DNurbsSurfaceGeometryNode, 
-          X3DConstants)
+          X3DConstants, 
+          X3DCast)
 {
 "use strict";
 
@@ -69,18 +69,20 @@ function ($,
 		X3DNurbsSurfaceGeometryNode .call (this, executionContext);
 
 		this .addType (X3DConstants .NurbsTrimmedSurface);
+
+		this .trimmingContourNodes = [ ];
 	}
 
-	NurbsTrimmedSurface .prototype = $.extend (Object .create (X3DNurbsSurfaceGeometryNode .prototype),
+	NurbsTrimmedSurface .prototype = Object .assign (Object .create (X3DNurbsSurfaceGeometryNode .prototype),
 	{
 		constructor: NurbsTrimmedSurface,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",              new Fields .SFNode ()),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "solid",                 new Fields .SFBool (true)),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "uTessellation",         new Fields .SFInt32 ()),
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "vTessellation",         new Fields .SFInt32 ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "uClosed",               new Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "vClosed",               new Fields .SFBool ()),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "solid",                 new Fields .SFBool (true)),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "uOrder",                new Fields .SFInt32 (3)),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "vOrder",                new Fields .SFInt32 (3)),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "uDimension",            new Fields .SFInt32 ()),
@@ -106,6 +108,39 @@ function ($,
 		{
 			return "geometry";
 		},
+		initialize: function ()
+		{
+			X3DNurbsSurfaceGeometryNode .prototype .initialize .call (this);
+
+			this .trimmingContour_ .addInterest ("set_trimmingContour__", this);
+
+			this .set_trimmingContour__ ();
+		},
+		set_trimmingContour__: function ()
+		{
+			var trimmingContourNodes = this .trimmingContourNodes;
+
+			trimmingContourNodes .length = 0;
+
+			for (var i = 0, length = this .trimmingContour_ .length; i < length; ++ i)
+			{
+				var trimmingContourNode = X3DCast (X3DConstants .Contour2D, this .trimmingContour_ [i]);
+
+				if (trimmingContourNode)
+					trimmingContourNodes .push (trimmingContourNode);
+			}
+		},
+		getTrimmingContours: function ()
+		{
+			var
+				trimmingContourNodes = this .trimmingContourNodes,
+				trimmingContours     = [ ];
+
+			for (var i = 0, length = trimmingContourNodes .length; i < length; ++ i)
+				trimmingContourNodes [i] .addTrimmingContour (trimmingContours);
+
+			return trimmingContours;
+		},
 	});
 
 	return NurbsTrimmedSurface;

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

@@ -48,12 +48,10 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Components/Core/X3DNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          X3DNode, 
+function (X3DNode, 
           X3DConstants)
 {
 "use strict";
@@ -65,7 +63,7 @@ function ($,
 		this .addType (X3DConstants .X3DNurbsControlCurveNode);
 	}
 
-	X3DNurbsControlCurveNode .prototype = $.extend (Object .create (X3DNode .prototype),
+	X3DNurbsControlCurveNode .prototype = Object .assign (Object .create (X3DNode .prototype),
 	{
 		constructor: X3DNurbsControlCurveNode,
 	});