x_ite 4.2.17 → 4.7.7

package/src/x_ite/Components/Scripting/Script.js

@@ -73,6 +73,7 @@ define ([
 	"x_ite/Components/Scripting/X3DScriptNode",
 	"x_ite/InputOutput/FileLoader",
 	"x_ite/Bits/X3DConstants",
+	"x_ite/Fields/SFNodeCache",
 ],
 function ($,
           X3DFieldDefinition,
@@ -96,27 +97,32 @@ function ($,
           RouteArray,
           X3DRoute,
           evaluate,
-          X3DScriptNode, 
+          X3DScriptNode,
           FileLoader,
-          X3DConstants)
+          X3DConstants,
+          SFNodeCache)
 {
 	function Script (executionContext)
 	{
 		X3DScriptNode .call (this, executionContext);
-		
-		this .addChildObjects ("buffer", new Fields .SFTime ());
+
+		this .addChildObjects ("buffer", new Fields .MFString ());
 
 		this .addType (X3DConstants .Script);
+
+		this .pauseTime = 0;
 	}
 
 	Script .prototype = Object .assign (Object .create (X3DScriptNode .prototype),
 	{
 		constructor: Script,
 		fieldDefinitions: new FieldDefinitionArray ([
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",     new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "url",          new Fields .MFString ()),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "directOutput", new Fields .SFBool ()),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "mustEvaluate", new Fields .SFBool ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",             new Fields .SFNode ()),
+			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 .initializeOnly, "directOutput",         new Fields .SFBool ()),
+			new X3DFieldDefinition (X3DConstants .initializeOnly, "mustEvaluate",         new Fields .SFBool ()),
 		]),
 		getTypeName: function ()
 		{
@@ -137,10 +143,10 @@ function ($,
 			this .url_    .addInterest ("set_url__",    this);
 			this .buffer_ .addInterest ("set_buffer__", this);
 
-			var userDefinedFields = this .getUserDefinedFields ();
-
-			for (var field of userDefinedFields .values ())
-				field .setSet (false);
+			this .getUserDefinedFields () .forEach (function (field)
+			{
+				field .setModificationTime (0);
+			});
 
 			this .set_url__ ();
 		},
@@ -148,7 +154,7 @@ function ($,
 		{
 			this .setLoadState (X3DConstants .NOT_STARTED_STATE);
 
-			this .requestAsyncLoad ();
+			this .requestImmediateLoad ();
 		},
 		getExtendedEventHandling: function ()
 		{
@@ -162,7 +168,7 @@ function ($,
 		{
 			return this .url_;
 		},
-		requestAsyncLoad: function ()
+		requestImmediateLoad: function (cache = true)
 		{
 			if (this .checkLoadState () === X3DConstants .COMPLETE_STATE || this .checkLoadState () === X3DConstants .IN_PROGRESS_STATE)
 				return;
@@ -170,13 +176,14 @@ function ($,
 			if (this .url_ .length === 0)
 				return;
 
+			this .setCache (cache);
 			this .setLoadState (X3DConstants .IN_PROGRESS_STATE);
 
-			this .buffer_ .addEvent ();
+			this .buffer_ = this .url_;
 		},
 		set_buffer__: function ()
 		{
-			new FileLoader (this) .loadScript (this .url_,
+			new FileLoader (this) .loadScript (this .buffer_,
 			function (data)
 			{
 				if (data === null)
@@ -196,11 +203,9 @@ function ($,
 		{
 			try
 			{
-				var
-					callbacks         = ["initialize", "prepareEvents", "eventsProcessed", "shutdown"],
-					userDefinedFields = this .getUserDefinedFields ();
+				const callbacks = ["initialize", "prepareEvents", "eventsProcessed", "shutdown"];
 
-				for (var field of userDefinedFields .values ())
+				this .getUserDefinedFields () .forEach (function (field)
 				{
 					switch (field .getAccessType ())
 					{
@@ -211,23 +216,19 @@ function ($,
 							callbacks .push ("set_" + field .getName ());
 							break;
 					}
-				}
+				});
 
 				text += "\n;var " + callbacks .join (",") + ";";
 				text += "\n[" + callbacks .join (",") + "];";
 
-				var
-					global  = this .getGlobal (),
-					result  = evaluate (global, text),
+				this .global = this .getGlobal ();
+
+				const
+					result  = this .evaluate (text),
 					context = { };
 
-				for (var i = 0; i < callbacks .length; ++ i)
-				{
-					if (typeof result [i] === "function")
-						context [callbacks [i]] = result [i];
-					else
-						context [callbacks [i]] = null;
-				}
+				for (let i = 0; i < callbacks .length; ++ i)
+					context [callbacks [i]] = result [i];
 
 				return context;
 			}
@@ -238,24 +239,40 @@ function ($,
 				return { };
 			}
 		},
+		evaluate: function (text)
+		{
+			return evaluate (this .global, text);
+		},
 		getGlobal: function ()
 		{
-			var browser = this .getBrowser ();
+			const
+				browser          = this .getBrowser (),
+				executionContext = this .getExecutionContext (),
+				live             = this .isLive ();
 
 			function SFNode (vrmlSyntax)
 			{
-				var scene = browser .createX3DFromString (String (vrmlSyntax));
+				const
+					scene     = browser .createX3DFromString (String (vrmlSyntax)),
+					rootNodes = scene .getRootNodes ();
+
+				live .addFieldInterest (scene .isLive ());
 
-				if (scene .getRootNodes () .length && scene .getRootNodes () [0])
-					return Fields .SFNode .call (this, scene .getRootNodes () [0] .getValue ());
+				scene .setLive (live .getValue ());
+				scene .setPrivate (executionContext .getPrivate ());
+				scene .setExecutionContext (executionContext);
+
+				if (rootNodes .length && rootNodes [0])
+				{
+					return SFNodeCache .add (rootNodes [0] .getValue (), this);
+				}
 
 				throw new Error ("SFNode.new: invalid argument, must be 'string' is 'undefined'.");
 			}
 
-			SFNode .prototype = Object .create (Fields .SFNode .prototype);
-			SFNode .prototype .constructor = SFNode;
+			SFNode .prototype = Fields .SFNode .prototype;
 
-			var global =
+			const global =
 			{
 				NULL:  { value: null },
 				FALSE: { value: false },
@@ -328,14 +345,12 @@ function ($,
 				MFVec4f:       { value: Fields .MFVec4f },
 			};
 
-			var userDefinedFields = this .getUserDefinedFields ();
-
-			for (var field of userDefinedFields .values ())
+			this .getUserDefinedFields () .forEach (function (field)
 			{
-				var name = field .getName ();
+				const name = field .getName ();
 
 				if (field .getAccessType () === X3DConstants .inputOnly)
-					continue;
+					return;
 
 				if (! (name in global))
 				{
@@ -350,33 +365,101 @@ function ($,
 				{
 					global [name + "_changed"] =
 					{
-						get: field .valueOf .bind (field),
+						get: field .valueOf  .bind (field),
 						set: field .setValue .bind (field),
 					};
 				}
-			}
+			});
 
 			return Object .create (Object .prototype, global);
 		},
+		processOutstandingEvents: function ()
+		{
+			this .getUserDefinedFields () .forEach (function (field)
+			{
+				if (field .getModificationTime () <= this .pauseTime)
+					return;
+
+				switch (field .getAccessType ())
+				{
+					case X3DConstants .inputOnly:
+					{
+						const callback = this .context [field .getName ()];
+
+						if ($.isFunction (callback))
+							this .set_field__ (field, callback);
+
+						break;
+					}
+					case X3DConstants .inputOutput:
+					{
+						const callback = this .context ["set_" + field .getName ()];
+
+						if ($.isFunction (callback))
+							this .set_field__ (field, callback);
+
+						break;
+					}
+				}
+			},
+			this);
+		},
+		initialize__: function (text)
+		{
+			this .context = this .getContext (text);
+
+			this .isLive () .addInterest ("set_live__", this);
+
+			this .set_live__ ();
+		},
 		set_live__: function ()
 		{
-			var userDefinedFields = this .getUserDefinedFields ();
+			if (!this .context)
+				return;
 
 			if (this .isLive () .getValue ())
 			{
+				if (!this .initialized)
+				{
+					this .initialized = true;
+
+					// Call initialize function.
+
+					if ($.isFunction (this .context .initialize))
+					{
+						const browser = this .getBrowser ();
+
+						browser .getScriptStack () .push (this);
+
+						try
+						{
+							this .context .initialize ();
+						}
+						catch (error)
+						{
+							this .setError ("in function 'initialize'", error);
+						}
+
+						browser .getScriptStack () .pop ();
+					}
+
+					if ($.isFunction (this .context .shutdown))
+						$(window) .on ("unload", this .shutdown__ .bind (this));
+				}
+
 				if ($.isFunction (this .context .prepareEvents))
 					this .getBrowser () .prepareEvents () .addInterest ("prepareEvents__", this);
 
 				if ($.isFunction (this .context .eventsProcessed))
 					this .addInterest ("eventsProcessed__", this);
 
-				for (var field of userDefinedFields .values ())
+				this .getUserDefinedFields () .forEach (function (field)
 				{
 					switch (field .getAccessType ())
 					{
 						case X3DConstants .inputOnly:
 						{
-							var callback = this .context [field .getName ()];
+							const callback = this .context [field .getName ()];
 
 							if ($.isFunction (callback))
 								field .addInterest ("set_field__", this, callback);
@@ -385,7 +468,7 @@ function ($,
 						}
 						case X3DConstants .inputOutput:
 						{
-							var callback = this .context ["set_" + field .getName ()];
+							const callback = this .context ["set_" + field .getName ()];
 
 							if ($.isFunction (callback))
 								field .addInterest ("set_field__", this, callback);
@@ -393,7 +476,10 @@ function ($,
 							break;
 						}
 					}
-				}
+				},
+				this);
+
+				this .processOutstandingEvents ();
 			}
 			else
 			{
@@ -403,7 +489,7 @@ function ($,
 				if (this .context .eventsProcessed)
 					this .removeInterest ("eventsProcessed__", this);
 
-				for (var field of userDefinedFields .values ())
+				this .getUserDefinedFields () .forEach (function (field)
 				{
 					switch (field .getAccessType ())
 					{
@@ -412,61 +498,22 @@ function ($,
 							field .removeInterest ("set_field__", this);
 							break;
 					}
-				}
-			}
-		},
-		initialize__: function (text)
-		{
-			this .context = this .getContext (text);
-
-			this .isLive () .addInterest ("set_live__", this);
-
-			this .set_live__ ();
-
-			// Call initialize function.
-
-			if (this .context .initialize)
-			{
-				var browser = this .getBrowser ();
+				},
+				this);
 
-				browser .getScriptStack () .push (this);
-
-				try
-				{
-					this .context .initialize ();
-				}
-				catch (error)
-				{
-					this .setError ("in function 'initialize'", error);
-				}
-
-				browser .getScriptStack () .pop ();
-			}
-
-			// Call outstanding events.
-
-			var userDefinedFields = this .getUserDefinedFields ();
-
-			for (var field of userDefinedFields .values ())
-			{
-				if (field .getSet ())
-				{
-					var callback = this .context [field .getName ()];
-
-					if ($.isFunction (callback))
-						this .set_field__ (field, callback);
-				}
+				if (this .initialized)
+					this .pauseTime = performance .now ();
 			}
 		},
 		prepareEvents__: function ()
 		{
-			var browser = this .getBrowser ();
+			const browser = this .getBrowser ();
 
 			browser .getScriptStack () .push (this);
 
 			try
 			{
-				this .context .prepareEvents ();
+				this .context .prepareEvents (browser .getCurrentTime ());
 				browser .addBrowserEvent ();
 			}
 			catch (error)
@@ -478,7 +525,7 @@ function ($,
 		},
 		set_field__: function (field, callback)
 		{
-			var browser = this .getBrowser ();
+			const browser = this .getBrowser ();
 
 			field .setTainted (true);
 			browser .getScriptStack () .push (this);
@@ -497,7 +544,7 @@ function ($,
 		},
 		eventsProcessed__: function ()
 		{
-			var browser = this .getBrowser ();
+			const browser = this .getBrowser ();
 
 			browser .getScriptStack () .push (this);
 
@@ -514,7 +561,7 @@ function ($,
 		},
 		shutdown__: function ()
 		{
-			var browser = this .getBrowser ();
+			const browser = this .getBrowser ();
 
 			browser .getScriptStack () .push (this);
 
@@ -531,11 +578,10 @@ function ($,
 		},
 		setError: function (reason, error)
 		{
-			console .error ("JavaScript Error in Script '" + this .getName () + "', " + reason + "\nworld url is '" + this .getExecutionContext () .getURL () + "':");
+			console .error ("JavaScript Error in Script '" + this .getName () + "', " + reason + "\nworld url is '" + this .getExecutionContext () .getWorldURL () + "':");
 			console .error (error);
 		},
 	});
 
 	return Script;
 });
-

package/src/x_ite/Components/Scripting/X3DScriptNode.js

@@ -52,8 +52,8 @@ define ([
 	"x_ite/Components/Networking/X3DUrlObject",
 	"x_ite/Bits/X3DConstants",
 ],
-function (X3DChildNode, 
-          X3DUrlObject, 
+function (X3DChildNode,
+          X3DUrlObject,
           X3DConstants)
 {
 "use strict";
@@ -74,5 +74,3 @@ function (X3DChildNode,
 
 	return X3DScriptNode;
 });
-
-

package/src/x_ite/Components/Shaders/ComposedShader.js

@@ -60,8 +60,8 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DShaderNode, 
-          X3DProgrammableShaderObject, 
+          X3DShaderNode,
+          X3DProgrammableShaderObject,
           LoadSensor,
           X3DCast,
           X3DConstants)
@@ -114,8 +114,7 @@ function (Fields,
 
 			this .isLive () .addInterest ("set_live__", this);
 
-			this .activate_ .addInterest ("set_activate__", this);
-			this .parts_    .addFieldInterest (this .loadSensor .watchList_);
+			this .parts_ .addFieldInterest (this .loadSensor .watchList_);
 
 			this .loadSensor .isLoaded_ .addInterest ("set_loaded__", this);
 			this .loadSensor .watchList_ = this .parts_;
@@ -134,7 +133,7 @@ function (Fields,
 
 			if (this .isLive () .getValue ())
 			{
-				if (this .isValid_ .getValue ())
+				if (this .getValid ())
 				{
 					this .enable (gl);
 					this .addShaderFields ();
@@ -143,7 +142,7 @@ function (Fields,
 			}
 			else
 			{
-				if (this .isValid_ .getValue ())
+				if (this .getValid ())
 				{
 					this .enable (gl);
 					this .removeShaderFields ();
@@ -151,11 +150,6 @@ function (Fields,
 				}
 			}
 		},
-		set_activate__: function ()
-		{
-			if (this .activate_ .getValue ())
-				this .set_loaded__ ();
-		},
 		set_loaded__: function ()
 		{
 			if (this .loadSensor .isLoaded_ .getValue ())
@@ -166,11 +160,11 @@ function (Fields,
 					parts   = this .parts_ .getValue (),
 					valid   = 0;
 
-				if (this .isValid_ .getValue ())
+				if (this .getValid ())
 					this .removeShaderFields ();
-	
+
 				this .program = program;
-	
+
 				for (var i = 0, length = parts .length; i < length; ++ i)
 				{
 					var partNode = X3DCast (X3DConstants .ShaderPart, parts [i]);
@@ -181,14 +175,14 @@ function (Fields,
 						gl .attachShader (program, partNode .getShader ());
 					}
 				}
-	
+
 				if (valid)
 				{
 					this .bindAttributeLocations (gl, program);
 
 					gl .linkProgram (program);
 
-					valid = valid && gl .getProgramParameter (program, gl .LINK_STATUS);
+					valid = gl .getProgramParameter (program, gl .LINK_STATUS);
 				}
 
 				if (valid)
@@ -198,23 +192,27 @@ function (Fields,
 					// Initialize uniform variables and attributes
 					if (this .getDefaultUniforms ())
 					{
-						// Setup user-defined fields. 
+						// Setup user-defined fields.
 						this .addShaderFields ();
 					}
 					else
+					{
 						valid = false;
+					}
 
 					// Debug, print complete shader info and statistics.
 					// this .printProgramInfo ();
 				}
 				else
+				{
 					console .warn ("Couldn't initialize " + this .getTypeName () + " '" + this .getName () + "': " + gl .getProgramInfoLog (program));
+				}
 
-				this .isValid_ = valid;
+				this .setValid (Boolean (valid));
 			}
 			else
 			{
-				this .isValid_ = false;
+				this .setValid (false);
 			}
 		},
 		set_field__: function (field)

package/src/x_ite/Components/Shaders/FloatVertexAttribute.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DVertexAttributeNode, 
+          X3DVertexAttributeNode,
           X3DConstants,
           Algorithm)
 {
@@ -123,6 +123,14 @@ function (Fields,
 				for (; first < last; ++ first)
 					array .push (value [first]);
 			}
+			else if (this .numComponents <= this .length)
+			{
+				last  = value .length;
+				first = last - this .numComponents;
+
+				for (; first < last; ++ first)
+					array .push (value [first]);
+			}
 			else
 			{
 				for (; first < last; ++ first)
@@ -141,5 +149,3 @@ function (Fields,
 
 	return FloatVertexAttribute;
 });
-
-

package/src/x_ite/Components/Shaders/Matrix3VertexAttribute.js

@@ -58,7 +58,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DVertexAttributeNode, 
+          X3DVertexAttributeNode,
           X3DConstants,
           Matrix3)
 {
@@ -113,6 +113,15 @@ function (Fields,
 				for (var i = index * 9, l = i + 9; i < l; ++ i)
 					array .push (value [i]);
 			}
+			else if (this .length)
+			{
+				var value = this .value;
+
+				index = this .length - 1;
+
+				for (var i = index * 9, l = i + 9; i < l; ++ i)
+					array .push (value [i]);
+			}
 			else
 			{
 				var value = Matrix3 .Identity;
@@ -133,5 +142,3 @@ function (Fields,
 
 	return Matrix3VertexAttribute;
 });
-
-

package/src/x_ite/Components/Shaders/Matrix4VertexAttribute.js

@@ -57,7 +57,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DVertexAttributeNode, 
+          X3DVertexAttributeNode,
           X3DConstants)
 {
 "use strict";
@@ -111,6 +111,15 @@ function (Fields,
 				for (var i = index * 16, l = i + 16; i < l; ++ i)
 					array .push (value [i]);
 			}
+			else if (this .length)
+			{
+				var value = this .value;
+
+				index = this .length - 1;
+
+				for (var i = index * 16, l = i + 16; i < l; ++ i)
+					array .push (value [i]);
+			}
 			else
 			{
 				var value = Matrix4 .Identity;
@@ -131,5 +140,3 @@ function (Fields,
 
 	return Matrix4VertexAttribute;
 });
-
-