x_ite 4.2.17 → 4.7.7

package/src/x_ite/Components/Shape.js

@@ -49,54 +49,60 @@
 define ([
 	"x_ite/Configuration/SupportedNodes",
 	"x_ite/Components/Shape/Appearance",
-//	"x_ite/Components/Shape/FillProperties",
+	"x_ite/Components/Shape/FillProperties",
 	"x_ite/Components/Shape/LineProperties",
 	"x_ite/Components/Shape/Material",
+	"x_ite/Components/Shape/PointProperties",
 	"x_ite/Components/Shape/Shape",
 	"x_ite/Components/Shape/TwoSidedMaterial",
+	"x_ite/Components/Shape/UnlitMaterial",
 	"x_ite/Components/Shape/X3DAppearanceChildNode",
 	"x_ite/Components/Shape/X3DAppearanceNode",
 	"x_ite/Components/Shape/X3DMaterialNode",
+	"x_ite/Components/Shape/X3DOneSidedMaterialNode",
 	"x_ite/Components/Shape/X3DShapeNode",
 ],
 function (SupportedNodes,
           Appearance,
-//          FillProperties,
+          FillProperties,
           LineProperties,
           Material,
+          PointProperties,
           Shape,
           TwoSidedMaterial,
+          UnlitMaterial,
           X3DAppearanceChildNode,
           X3DAppearanceNode,
           X3DMaterialNode,
+          X3DOneSidedMaterialNode,
           X3DShapeNode)
 {
 "use strict";
 
-	var Types =
+	const Types =
 	{
 		Appearance:       Appearance,
-//		FillProperties:   FillProperties,
+		FillProperties:   FillProperties,
 		LineProperties:   LineProperties,
 		Material:         Material,
+		PointProperties:  PointProperties,
 		Shape:            Shape,
 		TwoSidedMaterial: TwoSidedMaterial,
+		UnlitMaterial:    UnlitMaterial,
 	};
 
-	var AbstractTypes =
+	const AbstractTypes =
 	{
-		X3DAppearanceChildNode: X3DAppearanceChildNode,
-		X3DAppearanceNode:      X3DAppearanceNode,
-		X3DMaterialNode:        X3DMaterialNode,
-		X3DShapeNode:           X3DShapeNode,
+		X3DAppearanceChildNode:  X3DAppearanceChildNode,
+		X3DAppearanceNode:       X3DAppearanceNode,
+		X3DMaterialNode:         X3DMaterialNode,
+		X3DOneSidedMaterialNode: X3DOneSidedMaterialNode,
+		X3DShapeNode:            X3DShapeNode,
 	};
-	
-	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/Sound/AudioClip.js

@@ -55,19 +55,15 @@ define ([
 	"x_ite/Components/Sound/X3DSoundSourceNode",
 	"x_ite/Components/Networking/X3DUrlObject",
 	"x_ite/Bits/X3DConstants",
-	"x_ite/Browser/Networking/urls",
-	"standard/Networking/URI",
 	"x_ite/DEBUG",
 ],
 function ($,
           Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DSoundSourceNode, 
-          X3DUrlObject, 
+          X3DSoundSourceNode,
+          X3DUrlObject,
           X3DConstants,
-          urls,
-          URI,
           DEBUG)
 {
 "use strict";
@@ -78,8 +74,9 @@ function ($,
 		X3DUrlObject       .call (this, executionContext);
 
 		this .addType (X3DConstants .AudioClip);
-		
-		this .addChildObjects ("buffer", new Fields .SFTime ());
+
+		this .addChildObjects ("speed",  new Fields .SFFloat (1),
+		                       "buffer", new Fields .MFString ());
 
 		this .audio    = $("<audio></audio>");
 		this .urlStack = new Fields .MFString ();
@@ -90,22 +87,21 @@ function ($,
 	{
 		constructor: AudioClip,
 		fieldDefinitions: new FieldDefinitionArray ([
-			new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",         new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "enabled",          new Fields .SFBool (true)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "description",      new Fields .SFString ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "url",              new Fields .MFString ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "speed",            new Fields .SFFloat (1)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "pitch",            new Fields .SFFloat (1)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "loop",             new Fields .SFBool ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "startTime",        new Fields .SFTime ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "resumeTime",       new Fields .SFTime ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "pauseTime",        new Fields .SFTime ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "stopTime",         new Fields .SFTime ()),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "isPaused",         new Fields .SFBool ()),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "isActive",         new Fields .SFBool ()),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "cycleTime",        new Fields .SFTime ()),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "elapsedTime",      new Fields .SFTime ()),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "duration_changed", new Fields .SFTime (-1)),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",             new Fields .SFNode ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "description",          new Fields .SFString ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "url",                  new Fields .MFString ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "autoRefresh",          new Fields .SFTime ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "autoRefreshTimeLimit", new Fields .SFTime (3600)),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "pitch",                new Fields .SFFloat (1)),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "loop",                 new Fields .SFBool ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "startTime",            new Fields .SFTime ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "resumeTime",           new Fields .SFTime ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "pauseTime",            new Fields .SFTime ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "stopTime",             new Fields .SFTime ()),
+			new X3DFieldDefinition (X3DConstants .outputOnly,  "isPaused",             new Fields .SFBool ()),
+			new X3DFieldDefinition (X3DConstants .outputOnly,  "isActive",             new Fields .SFBool ()),
+			new X3DFieldDefinition (X3DConstants .outputOnly,  "elapsedTime",          new Fields .SFTime ()),
+			new X3DFieldDefinition (X3DConstants .outputOnly,  "duration_changed",     new Fields .SFTime (-1)),
 		]),
 		getTypeName: function ()
 		{
@@ -143,21 +139,22 @@ function ($,
 		{
 			this .setLoadState (X3DConstants .NOT_STARTED_STATE);
 
-			this .requestAsyncLoad ();
+			this .requestImmediateLoad ();
 		},
-		requestAsyncLoad: function ()
+		requestImmediateLoad: function (cache = true)
 		{
 			if (this .checkLoadState () === X3DConstants .COMPLETE_STATE || this .checkLoadState () === X3DConstants .IN_PROGRESS_STATE)
 				return;
 
+			this .setCache (cache);
 			this .setLoadState (X3DConstants .IN_PROGRESS_STATE);
 
-			this .buffer_ .addEvent ();
+			this .buffer_ = this .url_;
 		},
 		set_buffer__: function ()
 		{
 			this .setMedia (null);
-			this .urlStack .setValue (this .url_);
+			this .urlStack .setValue (this .buffer_);
 			this .audio .bind ("canplaythrough", this .setAudio .bind (this));
 			this .loadNext ();
 		},
@@ -168,32 +165,23 @@ function ($,
 				this .audio .unbind ("canplaythrough");
 				this .duration_changed_ = -1;
 				this .setLoadState (X3DConstants .FAILED_STATE);
-				this .stop ();
 				return;
 			}
 
 			// Get URL.
 
-			this .URL = new URI (this .urlStack .shift ());
-			this .URL = this .getExecutionContext () .getURL () .transform (this .URL);
-	
-			this .audio .attr ("src", this .URL);
+			this .URL = new URL (this .urlStack .shift (), this .getExecutionContext () .getWorldURL ());
+
+			if (!this .getBrowser () .getBrowserOptions () .getCache () || !this .getCache ())
+				this .URL .searchParams .set ("_", Date .now ());
+
+			this .audio .attr ("src", this .URL .href);
+			this .audio .get (0) .load ();
 		},
 		setError: function ()
 		{
-			var URL = this .URL .toString ();
-
-			if (DEBUG)
-			{
-				if (! (this .URL .isLocal () || this .URL .host === "localhost"))
-				{
-					if (! URL .match (urls .fallbackExpression))
-						this .urlStack .unshift (urls .fallbackUrl + URL);
-				}
-			}
-
-			if (this .URL .scheme !== "data")
-				console .warn ("Error loading audio:", this .URL .toString ());
+			if (this .URL .protocol !== "data:")
+				console .warn ("Error loading audio:", this .URL .href);
 
 			this .loadNext ();
 		},
@@ -201,8 +189,8 @@ function ($,
 		{
 			if (DEBUG)
 			{
-				if (this .URL .scheme !== "data")
-					console .info ("Done loading audio:", this .URL .toString ());
+				if (this .URL .protocol !== "data:")
+					console .info ("Done loading audio:", this .URL .href);
 			}
 
 			this .audio .unbind ("canplaythrough");
@@ -213,5 +201,3 @@ function ($,
 
 	return AudioClip;
 });
-
-

package/src/x_ite/Components/Sound/Sound.js

@@ -65,7 +65,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DSoundNode, 
+          X3DSoundNode,
           X3DCast,
           TraverseType,
           X3DConstants,
@@ -184,7 +184,7 @@ function (Fields,
 		},
 		traverse: (function ()
 		{
-			var
+			const
 				min = { distance: 0, intersection: new Vector3 (0, 0, 0) },
 				max = { distance: 0, intersection: new Vector3 (0, 0, 0) };
 
@@ -194,17 +194,17 @@ function (Fields,
 				{
 					if (type !== TraverseType .DISPLAY)
 						return;
-		
+
 					if (! this .sourceNode)
 						return;
-		
+
 					if (! this .sourceNode .isActive_ .getValue () || this .sourceNode .isPaused_ .getValue ())
 						return;
-		
+
 					this .setTraversed (true);
-	
-					var modelViewMatrix = renderObject .getModelViewMatrix () .get ();
-	
+
+					const modelViewMatrix = renderObject .getModelViewMatrix () .get ();
+
 					this .getEllipsoidParameter (modelViewMatrix,
 					                             Math .max (this .maxBack_  .getValue (), 0),
 					                             Math .max (this .maxFront_ .getValue (), 0),
@@ -223,15 +223,13 @@ function (Fields,
 						}
 						else
 						{
-							var
+							const
 								d1        = max .intersection .abs (), // Viewer is here at (0, 0, 0)
 								d2        = max .intersection .distance (min .intersection),
 								d         = Math .min (d1 / d2, 1),
 								intensity = Algorithm .clamp (this .intensity_ .getValue (), 0, 1),
 								volume    = intensity * d;
 
-							//console .log (d);
-
 							this .sourceNode .setVolume (volume);
 						}
 					}
@@ -251,17 +249,17 @@ function (Fields,
 		})(),
 		getEllipsoidParameter: (function ()
 		{
-			var
+			const
 				location        = new Vector3 (0, 0, 0),
 				sphereMatrix    = new Matrix4 (),
 				invSphereMatrix = new Matrix4 (),
-				translation     = new Vector3 (0, 0, 0),
 				rotation        = new Rotation4 (),
 				scale           = new Vector3 (1, 1, 1),
 				sphere          = new Sphere3 (1, Vector3 .Zero),
+				normal          = new Vector3 (0, 0, 0),
 				line            = new Line3 (Vector3 .Zero, Vector3 .zAxis),
-				intersection1   = new Vector3 (0, 0, 0),
-				intersection2   = new Vector3 (0, 0, 0);
+				enterPoint      = new Vector3 (0, 0, 0),
+				exitPoint       = new Vector3 (0, 0, 0);
 
 			return function (modelViewMatrix, back, front, value)
 			{
@@ -270,39 +268,43 @@ function (Fields,
 				 *
 				 * The ellipsoid is transformed to a sphere for easier calculation and then the viewer position is
 				 * transformed into this coordinate system. The radius and distance can then be obtained.
-				 * 
+				 *
 				 * throws Error
 				 */
 
-				var
+				if (back == 0 || front == 0)
+				{
+					sphereMatrix .multVecMatrix (value .intersection .assign (this .location_ .getValue ()));
+					value .distance = 1;
+					return;
+				}
+
+				const
 					a = (back + front) / 2,
 					e = a - back,
 					b = Math .sqrt (a * a - e * e);
-				
+
 				location .set (0, 0, e);
 				scale    .set (b, b, a);
-
 				rotation .setFromToVec (Vector3 .zAxis, this .direction_ .getValue ());
-				sphereMatrix .assign (modelViewMatrix);
-				sphereMatrix .translate (this .location_ .getValue ());
-				sphereMatrix .rotate (rotation);
-				sphereMatrix .translate (location);
-				sphereMatrix .scale (scale);
 
-				invSphereMatrix .assign (sphereMatrix);
-				invSphereMatrix .inverse ();
+				sphereMatrix
+					.assign (modelViewMatrix)
+					.translate (this .location_ .getValue ())
+					.rotate (rotation)
+					.translate (location)
+					.scale (scale);
 
-				var viewer = invSphereMatrix .origin;
-				location .negate () .divVec (scale);
+				invSphereMatrix .assign (sphereMatrix) .inverse ();
 
-				line .set (viewer, location .subtract (viewer) .normalize ());
-				sphere .intersectsLine (line, intersection1, intersection2);
+				const viewer = invSphereMatrix .origin;
+				location .negate () .divVec (scale);
 
-				if (viewer .distance (intersection1) < viewer .distance (intersection2))
-					value .intersection .assign (sphereMatrix .multVecMatrix (intersection1));
-				else
-					value .intersection .assign (sphereMatrix .multVecMatrix (intersection2));
+				normal .assign (location) .subtract (viewer) .normalize ();
+				line .set (viewer, normal);
+				sphere .intersectsLine (line, enterPoint, exitPoint);
 
+				value .intersection .assign (sphereMatrix .multVecMatrix (enterPoint));
 				value .distance = viewer .abs ();
 			};
 		})(),
@@ -310,5 +312,3 @@ function (Fields,
 
 	return Sound;
 });
-
-

package/src/x_ite/Components/Sound/X3DSoundSourceNode.js

@@ -48,12 +48,14 @@
 
 
 define ([
+	"x_ite/Fields",
 	"x_ite/Components/Core/X3DChildNode",
 	"x_ite/Components/Time/X3DTimeDependentNode",
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Algorithm",
 ],
-function (X3DChildNode,
+function (Fields,
+          X3DChildNode,
           X3DTimeDependentNode,
           X3DConstants,
           Algorithm)
@@ -67,6 +69,8 @@ function (X3DChildNode,
 
 		this .addType (X3DConstants .X3DSoundSourceNode);
 
+		this .addChildObjects ("enabled", new Fields .SFBool (true));
+
 		this .volume = 0;
 		this .media  = null;
 	}
@@ -107,7 +111,7 @@ function (X3DChildNode,
 			}
 
 			this .media = value;
-	
+
 			if (value)
 			{
 				var media = value [0];
@@ -115,12 +119,21 @@ function (X3DChildNode,
 				this .setVolume (0);
 				this .duration_changed_ = media .duration;
 
+				this .resetElapsedTime ();
+
 				if (this .isActive_ .getValue ())
 				{
 					if (this .isPaused_ .getValue ())
+					{
 						this .set_pause ();
+					}
 					else
-						this .set_start ();
+					{
+						if (this .getLiveState ())
+							this .set_start ();
+						else
+							this .set_pause ();
+					}
 				}
 				else
 				{
@@ -206,7 +219,6 @@ function (X3DChildNode,
 					// The event order below is very important.
 
 					this .elapsedTime_ = this .getElapsedTime ();
-					this .cycleTime_   = this .getBrowser () .getCurrentTime ();
 				}
 				else
 				{
@@ -218,10 +230,10 @@ function (X3DChildNode,
 		{
 			this .set_ended ();
 
-			this .elapsedTime_ = this .getElapsedTime ();
+			if (this .media)
+				this .elapsedTime_ = this .getElapsedTime ();
 		},
 	});
 
 	return X3DSoundSourceNode;
 });
-

package/src/x_ite/Components/Sound.js

@@ -61,24 +61,21 @@ function (SupportedNodes,
 {
 "use strict";
 
-	var Types =
+	const Types =
 	{
 		AudioClip: AudioClip,
 		Sound:     Sound,
 	};
 
-	var AbstractTypes =
+	const AbstractTypes =
 	{
 		X3DSoundNode:       X3DSoundNode,
 		X3DSoundSourceNode: X3DSoundSourceNode,
 	};
-	
-	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/Text/FontStyle.js

@@ -77,16 +77,16 @@ function (Fields,
 	{
 		constructor: FontStyle,
 		fieldDefinitions: new FieldDefinitionArray ([
-			new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",    new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "language",    new Fields .SFString ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "family",      new Fields .MFString ("SERIF")),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "style",       new Fields .SFString ("PLAIN")),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "size",        new Fields .SFFloat (1)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "spacing",     new Fields .SFFloat (1)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "horizontal",  new Fields .SFBool (true)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "leftToRight", new Fields .SFBool (true)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "topToBottom", new Fields .SFBool (true)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "justify",     new Fields .MFString ("BEGIN")),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",    new Fields .SFNode ()),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "language",    new Fields .SFString ()),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "family",      new Fields .MFString ("SERIF")),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "style",       new Fields .SFString ("PLAIN")),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "size",        new Fields .SFFloat (1)),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "spacing",     new Fields .SFFloat (1)),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "horizontal",  new Fields .SFBool (true)),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "leftToRight", new Fields .SFBool (true)),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "topToBottom", new Fields .SFBool (true)),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "justify",     new Fields .MFString ("BEGIN")),
 		]),
 		getTypeName: function ()
 		{
@@ -112,5 +112,3 @@ function (Fields,
 
 	return FontStyle;
 });
-
-

package/src/x_ite/Components/Text/Text.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DGeometryNode, 
+          X3DGeometryNode,
           X3DCast,
           X3DConstants)
 {
@@ -105,10 +105,10 @@ function (Fields,
 		},
 		initialize: function ()
 		{
-		   X3DGeometryNode .prototype .initialize .call (this);
+			X3DGeometryNode .prototype .initialize .call (this);
+
+			this .fontStyle_ .addInterest ("set_fontStyle__", this);
 
-		   this .fontStyle_ .addInterest ("set_fontStyle__", this);
-	
 			this .set_fontStyle__ ();
 		},
 		getMatrix: function ()
@@ -144,6 +144,8 @@ function (Fields,
 		   this .fontStyleNode .addInterest ("requestRebuild", this);
 
 		   this .textGeometry = this .fontStyleNode .getTextGeometry (this);
+
+		   this .setTransparent (this .textGeometry .getTransparent ());
 		},
 		build: function ()
 		{
@@ -192,5 +194,3 @@ function (Fields,
 
 	return Text;
 });
-
-