x_ite 4.0.5 → 4.7.5

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 = $.extend (Object .create (X3DScriptNode .prototype),
+	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,17 +143,18 @@ function ($,
 			this .url_    .addInterest ("set_url__",    this);
 			this .buffer_ .addInterest ("set_buffer__", this);
 
+			this .getUserDefinedFields () .forEach (function (field)
+			{
+				field .setModificationTime (0);
+			});
+
 			this .set_url__ ();
 		},
 		set_url__: function ()
-		{
-			this .buffer_ .addEvent ();
-		},
-		set_buffer__: function ()
 		{
 			this .setLoadState (X3DConstants .NOT_STARTED_STATE);
 
-			this .requestAsyncLoad ();
+			this .requestImmediateLoad ();
 		},
 		getExtendedEventHandling: function ()
 		{
@@ -161,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;
@@ -169,14 +176,16 @@ function ($,
 			if (this .url_ .length === 0)
 				return;
 
+			this .setCache (cache);
 			this .setLoadState (X3DConstants .IN_PROGRESS_STATE);
-			this .getScene () .addInitLoadCount (this);
 
-			new FileLoader (this) .loadScript (this .url_,
+			this .buffer_ = this .url_;
+		},
+		set_buffer__: function ()
+		{
+			new FileLoader (this) .loadScript (this .buffer_,
 			function (data)
 			{
-				this .getScene () .removeInitLoadCount (this);
-
 				if (data === null)
 				{
 					// No URL could be loaded.
@@ -194,14 +203,10 @@ function ($,
 		{
 			try
 			{
-				var
-					callbacks         = ["initialize", "prepareEvents", "eventsProcessed", "shutdown"],
-					userDefinedFields = this .getUserDefinedFields ();
+				const callbacks = ["initialize", "prepareEvents", "eventsProcessed", "shutdown"];
 
-				for (var name in userDefinedFields)
+				this .getUserDefinedFields () .forEach (function (field)
 				{
-					var field = userDefinedFields [name];
-
 					switch (field .getAccessType ())
 					{
 						case X3DConstants .inputOnly:
@@ -211,59 +216,64 @@ function ($,
 							callbacks .push ("set_" + field .getName ());
 							break;
 					}
-				}
+				});
 
 				text += "\n;var " + callbacks .join (",") + ";";
-				text += "\n[" + callbacks .join (",") + "];"
+				text += "\n[" + callbacks .join (",") + "];";
 
-				var
+				const
 					global  = this .getGlobal (),
 					result  = evaluate (global, 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;
 			}
 			catch (error)
 			{
-				this .setError ("preprocessing", error);
+				this .setError ("while evaluating script source", error);
 
 				return { };
 			}
 		},
 		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 =
 			{
-				$: { value: $ },
-
 				NULL:  { value: null },
 				FALSE: { value: false },
 				TRUE:  { value: true },
-				print: { value: function () { this .print .apply (this, arguments); } .bind (browser) },
-				trace: { value: function () { this .print .apply (this, arguments); } .bind (browser) },
+				print: { value: function () { browser .println .apply (browser, arguments); }},
+				trace: { value: function () { browser .println .apply (browser, arguments); }},
 
 				Browser: { value: browser },
 
@@ -299,9 +309,9 @@ function ($,
 				SFMatrix4f:    { value: Fields .SFMatrix4f },
 				SFNode:        { value: SFNode },
 				SFRotation:    { value: Fields .SFRotation },
-				SFVec3d:       { value: Fields .SFVec2d },
+				SFVec2d:       { value: Fields .SFVec2d },
 				SFVec2f:       { value: Fields .SFVec2f },
-				SFVec2d:       { value: Fields .SFVec3d },
+				SFVec3d:       { value: Fields .SFVec3d },
 				SFVec3f:       { value: Fields .SFVec3f },
 				SFVec4d:       { value: Fields .SFVec4d },
 				SFVec4f:       { value: Fields .SFVec4f },
@@ -330,14 +340,12 @@ function ($,
 				MFVec4f:       { value: Fields .MFVec4f },
 			};
 
-			var userDefinedFields = this .getUserDefinedFields ();
-
-			for (var name in userDefinedFields)
+			this .getUserDefinedFields () .forEach (function (field)
 			{
-				var field = userDefinedFields [name];
+				const name = field .getName ();
 
 				if (field .getAccessType () === X3DConstants .inputOnly)
-					continue;
+					return;
 
 				if (! (name in global))
 				{
@@ -352,35 +360,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 name in userDefinedFields)
+				this .getUserDefinedFields () .forEach (function (field)
 				{
-					var field = userDefinedFields [name];
-					
 					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);
@@ -389,7 +463,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);
@@ -397,7 +471,10 @@ function ($,
 							break;
 						}
 					}
-				}
+				},
+				this);
+
+				this .processOutstandingEvents ();
 			}
 			else
 			{
@@ -407,10 +484,8 @@ function ($,
 				if (this .context .eventsProcessed)
 					this .removeInterest ("eventsProcessed__", this);
 
-				for (var name in userDefinedFields)
+				this .getUserDefinedFields () .forEach (function (field)
 				{
-					var field = userDefinedFields [name];
-
 					switch (field .getAccessType ())
 					{
 						case X3DConstants .inputOnly:
@@ -418,56 +493,34 @@ function ($,
 							field .removeInterest ("set_field__", this);
 							break;
 					}
-				}
-			}
-		},
-		initialize__: function (text)
-		{
-			this .context = this .getContext (text);
-
-			this .isLive () .addInterest ("set_live__", this);
-
-			this .set_live__ ();
-
-			if (this .context .initialize)
-			{
-				var browser = this .getBrowser ();
-
-				browser .getScriptStack () .push (this);
-
-				try
-				{
-					this .context .initialize ();
-				}
-				catch (error)
-				{
-					this .setError ("initialize", error);
-				}
+				},
+				this);
 
-				browser .getScriptStack () .pop ();
+				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)
 			{
-				this .setError ("prepareEvents", error);
+				this .setError ("in function 'prepareEvents'", error);
 			}
 
 			browser .getScriptStack () .pop ();
 		},
 		set_field__: function (field, callback)
 		{
-			var browser = this .getBrowser ();
+			const browser = this .getBrowser ();
 
 			field .setTainted (true);
 			browser .getScriptStack () .push (this);
@@ -478,7 +531,7 @@ function ($,
 			}
 			catch (error)
 			{
-				this .setError (field .getName (), error);
+				this .setError ("in function '" + field .getName () + "'", error);
 			}
 
 			browser .getScriptStack () .pop ();
@@ -486,7 +539,7 @@ function ($,
 		},
 		eventsProcessed__: function ()
 		{
-			var browser = this .getBrowser ();
+			const browser = this .getBrowser ();
 
 			browser .getScriptStack () .push (this);
 
@@ -496,14 +549,14 @@ function ($,
 			}
 			catch (error)
 			{
-				this .setError ("eventsProcessed", error);
+				this .setError ("in function 'eventsProcessed'", error);
 			}
 
 			browser .getScriptStack () .pop ();
 		},
 		shutdown__: function ()
 		{
-			var browser = this .getBrowser ();
+			const browser = this .getBrowser ();
 
 			browser .getScriptStack () .push (this);
 
@@ -513,19 +566,17 @@ function ($,
 			}
 			catch (error)
 			{
-				this .setError ("shutdown", error);
+				this .setError ("in function 'shutdown'", error);
 			}
 
 			browser .getScriptStack () .pop ();
 		},
-		setError: function (callback, error)
+		setError: function (reason, error)
 		{
-			console .error ("JavaScript Error in Script '" + this .getName () + "', function '" + callback + "'\nworld url is '" + this .getExecutionContext () .getURL () + "':");
+			console .error ("JavaScript Error in Script '" + this .getName () + "', " + reason + "\nworld url is '" + this .getExecutionContext () .getWorldURL () + "':");
 			console .error (error);
-			console .error (this .url_ .toString ());
 		},
 	});
 
 	return Script;
 });
-

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

@@ -48,14 +48,12 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Components/Core/X3DChildNode",
 	"x_ite/Components/Networking/X3DUrlObject",
 	"x_ite/Bits/X3DConstants",
 ],
-function ($,
-          X3DChildNode, 
-          X3DUrlObject, 
+function (X3DChildNode,
+          X3DUrlObject,
           X3DConstants)
 {
 "use strict";
@@ -68,7 +66,7 @@ function ($,
 		this .addType (X3DConstants .X3DScriptNode);
 	}
 
-	X3DScriptNode .prototype = $.extend (Object .create (X3DChildNode .prototype),
+	X3DScriptNode .prototype = Object .assign (Object .create (X3DChildNode .prototype),
 		X3DUrlObject .prototype,
 	{
 		constructor: X3DScriptNode,
@@ -76,5 +74,3 @@ function ($,
 
 	return X3DScriptNode;
 });
-
-