x_ite 4.2.17 → 4.7.7

package/src/x_ite/Prototype/X3DExternProtoDeclaration.js

@@ -62,21 +62,20 @@ function ($,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DUrlObject,
-          X3DProtoDeclarationNode, 
+          X3DProtoDeclarationNode,
           X3DConstants,
           Generator)
 {
 "use strict";
 
-	// Dummy callback function
-	function loadNowCallback () { }
-
 	function X3DExternProtoDeclaration (executionContext)
 	{
 		X3DProtoDeclarationNode .call (this, executionContext);
 		X3DUrlObject            .call (this, executionContext);
 
-		this .addChildObjects ("url", new Fields .MFString ());
+		this .addChildObjects ("url",                  new Fields .MFString (),
+		                       "autoRefresh",          new Fields .SFTime (),
+									  "autoRefreshTimeLimit", new Fields .SFTime (3600));
 
 		this .deferred = $.Deferred ();
 	}
@@ -85,9 +84,7 @@ function ($,
 		X3DUrlObject .prototype,
 	{
 		constructor: X3DExternProtoDeclaration,
-		fieldDefinitions: new FieldDefinitionArray ([
-			new X3DFieldDefinition (X3DConstants .inputOutput, "metadata", new Fields .SFNode ()),
-		]),
+		fieldDefinitions: new FieldDefinitionArray ([ ]),
 		getTypeName: function ()
 		{
 			return "EXTERNPROTO";
@@ -104,15 +101,15 @@ function ($,
 		{
 			X3DProtoDeclarationNode .prototype .initialize .call (this);
 			X3DUrlObject            .prototype .initialize .call (this);
-				
-			this .isLive () .addInterest ("set_live__", this);
 		},
 		set_live__: function ()
 		{
-			if (this .checkLoadState () === X3DConstants .COMPLETE_STATE)
-			{
-				this .scene .setLive (this .isLive () .getValue ());
-			}
+			X3DUrlObject .prototype .set_live__ .call (this);
+
+			if (this .checkLoadState () !== X3DConstants .COMPLETE_STATE)
+				return;
+
+			this .scene .setLive (this .isLive () .getValue ());
 		},
 		hasUserDefinedFields: function ()
 		{
@@ -122,21 +119,17 @@ function ($,
 		{
 			this .proto = proto;
 
-			if (this .proto)
+			if (!this .proto)
+				return
+
+			const fieldDefinitions = this .getFieldDefinitions ();
+
+			for (const protoFieldDefinition of proto .getFieldDefinitions ())
 			{
-				var
-					fieldDefinitions      = this .getFieldDefinitions (),
-					protoFieldDefinitions = proto .getFieldDefinitions ();
-	
-				for (var i = 0, length = protoFieldDefinitions .length; i < length; ++ i)
-				{
-					var
-						protoFieldDefinition = protoFieldDefinitions [i],
-						fieldDefinition      = fieldDefinitions .get (protoFieldDefinition .name);
-	
-					if (fieldDefinition)
-						fieldDefinition .value .setValue (protoFieldDefinition .value);
-				}
+				const fieldDefinition = fieldDefinitions .get (protoFieldDefinition .name);
+
+				if (fieldDefinition)
+					fieldDefinition .value .setValue (protoFieldDefinition .value);
 			}
 		},
 		getProtoDeclaration: function ()
@@ -146,20 +139,22 @@ function ($,
 		loadNow: function (callback)
 		{
 			// 7.73 — ExternProtoDeclaration function, added callback argument.
-			this .requestAsyncLoad (callback || loadNowCallback);
+			this .requestImmediateLoad (callback);
 		},
-		requestAsyncLoad: function (callback)
+		requestImmediateLoad: function (callback)
 		{
-			this .deferred .done (callback);
+			if ($.isFunction (callback))
+				this .deferred .done (callback);
 
 			if (this .checkLoadState () === X3DConstants .COMPLETE_STATE || this .checkLoadState () === X3DConstants .IN_PROGRESS_STATE)
 				return;
 
+			this .getScene () .addInitLoadCount (this);
 			this .setLoadState (X3DConstants .IN_PROGRESS_STATE);
 
 			// Don't create scene cache, due to possible default nodes in proto SFNode fields and complete scenes.
 
-			var FileLoader = require ("x_ite/InputOutput/FileLoader");
+			const FileLoader = require ("x_ite/InputOutput/FileLoader");
 
 			new FileLoader (this) .createX3DFromURL (this .url_, null, this .setInternalSceneAsync .bind (this));
 		},
@@ -170,13 +165,15 @@ function ($,
 
 			else
 				this .setError ();
+
+			this .getScene () .removeInitLoadCount (this);
 		},
 		setInternalScene: function (value)
 		{
 			this .scene = value;
 
-			var
-				protoName = this .scene .getURL () .fragment || 0,
+			const
+				protoName = new URL (this .scene .getWorldURL ()) .hash .substr (1) || 0,
 				proto     = this .scene .protos [protoName];
 
 			if (! proto)
@@ -184,11 +181,9 @@ function ($,
 
 			this .scene .setLive (this .isLive () .getValue ());
 			this .scene .setPrivate (this .getScene () .getPrivate ());
-			//this .scene .setExecutionContext (this .getExecutionContext ());
-			this .scene .setup ();
+			this .scene .setExecutionContext (this .getExecutionContext ());
 
 			this .setLoadState (X3DConstants .COMPLETE_STATE);
-
 			this .setProtoDeclaration (proto);
 
 			this .deferred .resolve ();
@@ -203,18 +198,84 @@ function ($,
 		{
 			console .error ("Error loading extern prototype:", error);
 
-			this .setLoadState (X3DConstants .FAILED_STATE);
-
 			this .scene = this .getBrowser () .getPrivateScene ();
 
+			this .setLoadState (X3DConstants .FAILED_STATE);
 			this .setProtoDeclaration (null);
 
 			this .deferred .resolve ();
 			this .deferred = $.Deferred ();
 		},
+		toStream: function (stream)
+		{
+			stream .string += Object .prototype .toString .call (this);
+		},
+		toVRMLStream: function (stream)
+		{
+			const generator = Generator .Get (stream);
+
+			stream .string += generator .Indent ();
+			stream .string += "EXTERNPROTO";
+			stream .string += " ";
+			stream .string += this .getName ();
+			stream .string += " ";
+			stream .string += "[";
+
+			const userDefinedFields = this .getUserDefinedFields ();
+
+			let
+				fieldTypeLength   = 0,
+				accessTypeLength  = 0;
+
+			if (userDefinedFields .size === 0)
+			{
+				stream .string += " ";
+			}
+			else
+			{
+				userDefinedFields .forEach (function (field)
+				{
+					fieldTypeLength  = Math .max (fieldTypeLength, field .getTypeName () .length);
+					accessTypeLength = Math .max (accessTypeLength, generator .AccessType (field .getAccessType ()) .length);
+				});
+
+				stream .string += "\n";
+
+				generator .IncIndent ();
+
+				userDefinedFields .forEach (function (field)
+				{
+					this .toVRMLStreamUserDefinedField (stream, field, fieldTypeLength, accessTypeLength);
+					stream .string += "\n";
+				},
+				this);
+
+				generator .DecIndent ();
+
+				stream .string += generator .Indent ();
+			}
+
+			stream .string += "]";
+			stream .string += "\n";
+
+			stream .string += generator .Indent ();
+
+			this .url_ .toVRMLStream (stream);
+		},
+		toVRMLStreamUserDefinedField: function (stream, field, fieldTypeLength, accessTypeLength)
+		{
+			const generator = Generator .Get (stream);
+
+			stream .string += generator .Indent ();
+			stream .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+			stream .string += " ";
+			stream .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+			stream .string += " ";
+			stream .string += field .getName ();
+		},
 		toXMLStream: function (stream)
 		{
-			var generator = Generator .Get (stream);
+			const generator = Generator .Get (stream);
 
 			stream .string += generator .Indent ();
 			stream .string += "<ExternProtoDeclare";
@@ -232,9 +293,9 @@ function ($,
 
 			generator .IncIndent ();
 
-			var userDefinedFields = this .getUserDefinedFields ();
+			const userDefinedFields = this .getUserDefinedFields ();
 
-			for (var field of userDefinedFields .values ())
+			userDefinedFields .forEach (function (field)
 			{
 				stream .string += generator .Indent ();
 				stream .string += "<field";
@@ -251,7 +312,7 @@ function ($,
 				stream .string += generator .XMLEncode (field .getName ());
 				stream .string += "'";
 				stream .string += "/>\n";
-			}
+			});
 
 			generator .DecIndent ();
 
@@ -297,4 +358,3 @@ function ($,
 
 	return X3DExternProtoDeclaration;
 });
-

package/src/x_ite/Prototype/X3DProtoDeclaration.js

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Fields",
 	"x_ite/Basic/X3DFieldDefinition",
 	"x_ite/Basic/FieldDefinitionArray",
@@ -57,12 +56,11 @@ define ([
 	"x_ite/Bits/X3DConstants",
 	"x_ite/InputOutput/Generator",
 ],
-function ($,
-          Fields,
+function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
           X3DExecutionContext,
-          X3DProtoDeclarationNode, 
+          X3DProtoDeclarationNode,
           X3DConstants,
           Generator)
 {
@@ -71,20 +69,19 @@ function ($,
 	function X3DProtoDeclaration (executionContext)
 	{
 		X3DProtoDeclarationNode .call (this, executionContext);
-		X3DExecutionContext     .call (this, executionContext);
 
 		this .addChildObjects ("loadState", new Fields .SFInt32 (X3DConstants .NOT_STARTED_STATE));
 
 		this .setLive (false);
+
+		this .body = new X3DExecutionContext (executionContext);
+		this .body .addParent (this);
 	}
 
-	X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DExecutionContext .prototype),
-		X3DProtoDeclarationNode .prototype,
+	X3DProtoDeclaration .prototype = Object .assign (Object .create (X3DProtoDeclarationNode .prototype),
 	{
 		constructor: X3DProtoDeclaration,
-		fieldDefinitions: new FieldDefinitionArray ([
-			new X3DFieldDefinition (X3DConstants .inputOutput, "metadata", new Fields .SFNode ()),
-		]),
+		fieldDefinitions: new FieldDefinitionArray ([ ]),
 		getTypeName: function ()
 		{
 			return "PROTO";
@@ -101,43 +98,116 @@ function ($,
 		{
 			X3DProtoDeclarationNode .prototype .initialize .call (this);
 
+			this .body .setup ();
+
 			this .loadState_ = X3DConstants .COMPLETE_STATE;
 		},
-		getSpecificationVersion: function ()
-		{
-			return this .getExecutionContext () .getSpecificationVersion ();
-		},
-		getEncoding: function ()
-		{
-			return this .getExecutionContext () .getEncoding ();
-		},
-		getURL: function ()
-		{
-			return this .getExecutionContext () .getURL ();
-		},
 		getProtoDeclaration: function ()
 		{
 			return this;
 		},
+		getBody: function ()
+		{
+			return this .body;
+		},
 		checkLoadState: function ()
 		{
 			return this .loadState_ .getValue ();
 		},
-		fromUnit: function (category, value)
+		hasUserDefinedFields: function ()
 		{
-			return this .getExecutionContext () .fromUnit (category, value);
+			return true;
 		},
-		toUnit: function (category, value)
+		toStream: function (stream)
 		{
-			return this .getExecutionContext () .toUnit (category, value);
+			stream .string += Object .prototype .toString .call (this);
 		},
-		hasUserDefinedFields: function ()
+		toVRMLStream: function (stream)
 		{
-			return true;
+			const generator = Generator .Get (stream);
+
+			stream .string += generator .Indent ();
+			stream .string += "PROTO";
+			stream .string += " ";
+			stream .string += this .getName ();
+			stream .string += " ";
+			stream .string += "[";
+
+			generator .EnterScope ();
+
+			const userDefinedFields = this .getUserDefinedFields ();
+
+			let
+				fieldTypeLength  = 0,
+				accessTypeLength = 0;
+
+			if (userDefinedFields .size === 0)
+			{
+				stream .string += " ";
+			}
+			else
+			{
+				userDefinedFields .forEach (function (field)
+				{
+					fieldTypeLength  = Math .max (fieldTypeLength, field .getTypeName () .length);
+					accessTypeLength = Math .max (accessTypeLength, generator .AccessType (field .getAccessType ()) .length);
+				});
+
+				stream .string += "\n";
+
+				generator .IncIndent ();
+
+				userDefinedFields .forEach (function (field)
+				{
+					this .toVRMLStreamUserDefinedField (stream, field, fieldTypeLength, accessTypeLength);
+					stream .string += "\n";
+				},
+				this);
+
+				generator .DecIndent ();
+
+				stream .string += generator .Indent ();
+			}
+
+			generator .LeaveScope ();
+
+			stream .string += "]";
+			stream .string += "\n";
+
+			stream .string += generator .Indent ();
+			stream .string += "{";
+			stream .string += "\n";
+
+			generator .IncIndent ();
+
+			this .body .toVRMLStream (stream);
+
+			generator .DecIndent ();
+
+			stream .string += generator .Indent ();
+			stream .string += "}";
+		},
+		toVRMLStreamUserDefinedField: function (stream, field, fieldTypeLength, accessTypeLength)
+		{
+			const generator = Generator .Get (stream);
+
+			stream .string += generator .Indent ();
+			stream .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+			stream .string += " ";
+			stream .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+			stream .string += " ";
+			stream .string += field .getName ();
+
+			if (field .isInitializable ())
+			{
+				stream .string += " ";
+
+				field .toVRMLStream (stream);
+			}
 		},
 		toXMLStream: function (stream)
 		{
-			var generator = Generator .Get (stream);
+			const generator = Generator .Get (stream);
 
 			stream .string += generator .Indent ();
 			stream .string += "<ProtoDeclare";
@@ -147,12 +217,12 @@ function ($,
 			stream .string += "'";
 			stream .string += ">";
 			stream .string += "\n";
-		
+
 			// <ProtoInterface>
 
 			generator .EnterScope ();
-		
-			var userDefinedFields = this .getUserDefinedFields ();
+
+			const userDefinedFields = this .getUserDefinedFields ();
 
 			if (userDefinedFields .size !== 0)
 			{
@@ -163,7 +233,7 @@ function ($,
 
 				generator .IncIndent ();
 
-				for (var field of userDefinedFields .values ())
+				userDefinedFields .forEach (function (field)
 				{
 					stream .string += generator .Indent ();
 					stream .string += "<field";
@@ -192,7 +262,7 @@ function ($,
 							case X3DConstants .MFNode:
 							{
 								generator .PushContainerField (field);
-		
+
 								stream .string += ">\n";
 
 								generator .IncIndent ();
@@ -222,8 +292,8 @@ function ($,
 							}
 						}
 					}
-				}
-		
+				});
+
 				generator .DecIndent ();
 
 				stream .string += generator .Indent ();
@@ -231,13 +301,13 @@ function ($,
 
 				generator .DecIndent ();
 			}
-		
+
 			generator .LeaveScope ();
-		
+
 			// </ProtoInterface>
 
 			// <ProtoBody>
-		
+
 			generator .IncIndent ();
 
 			stream .string += generator .Indent ();
@@ -245,7 +315,7 @@ function ($,
 
 			generator .IncIndent ();
 
-			X3DExecutionContext .prototype .toXMLStream .call (this, stream);
+			this .body .toXMLStream .call (stream);
 
 			generator .DecIndent ();
 
@@ -253,7 +323,7 @@ function ($,
 			stream .string += "</ProtoBody>\n";
 
 			generator .DecIndent ();
-		
+
 			// </ProtoBody>
 
 			stream .string += generator .Indent ();
@@ -284,4 +354,3 @@ function ($,
 
 	return X3DProtoDeclaration;
 });
-

package/src/x_ite/Prototype/X3DProtoDeclarationNode.js

@@ -48,40 +48,42 @@
 
 
 define ([
-	"x_ite/Fields",
-	"x_ite/Components/Core/X3DNode",
+	"x_ite/Basic/X3DBaseNode",
 	"x_ite/Components/Core/X3DPrototypeInstance",
-	"x_ite/Bits/X3DConstants",
+	"x_ite/Fields/SFNodeCache",
 ],
-function (Fields,
-          X3DNode,
+function (X3DBaseNode,
           X3DPrototypeInstance,
-          X3DConstants)
+          SFNodeCache)
 {
 "use strict";
 
 	function X3DProtoDeclarationNode (executionContext)
 	{
-		X3DNode .call (this, executionContext);
+		X3DBaseNode .call (this, executionContext);
 	}
 
-	X3DProtoDeclarationNode .prototype = Object .assign (Object .create (X3DNode .prototype),
+	X3DProtoDeclarationNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 	{
 		constructor: X3DProtoDeclarationNode,
 		hasUserDefinedFields: function ()
 		{
 			return true;
 		},
-		createInstance: function (executionContext, setup)
+		createInstance: function (executionContext, setup = true)
 		{
-			var instance = new X3DPrototypeInstance (executionContext, this);
-			
 			if (setup === false)
-				return instance;
+			{
+				return new X3DPrototypeInstance (executionContext, this);
+			}
+			else
+			{
+				const instance = new X3DPrototypeInstance (executionContext, this);
 
-			instance .setup ();
+				instance .setup ();
 
-			return new Fields .SFNode (instance);
+				return SFNodeCache .add (instance);
+			}
 		},
 		newInstance: function ()
 		{

package/src/x_ite/Rendering/DependentRenderer.js

@@ -111,30 +111,28 @@ function (X3DBaseNode,
 		{
 			return this .renderObject .getLights () [this .lightIndex ++];
 		},
-		render: function (type, group)
+		render: function (type, callback, group)
 		{
 			switch (type)
 			{
 				case TraverseType .COLLISION:
 				{
-					X3DRenderObject .prototype .render .call (this, type, group);
+					X3DRenderObject .prototype .render .call (this, type, callback, group);
 					break;
 				}
-				case TraverseType .DEPTH:
+				case TraverseType .SHADOW:
 				{
-					X3DRenderObject .prototype .render .call (this, type, group);
+					X3DRenderObject .prototype .render .call (this, type, callback, group);
 					break;
 				}
 				case TraverseType .DISPLAY:
 				{
 					this .lightIndex = 0;
 
-					X3DRenderObject .prototype .render .call (this, type, group);
+					X3DRenderObject .prototype .render .call (this, type, callback, group);
 
-					var lights = this .renderObject .getLights ();
-
-					for (var i = 0, length = lights .length; i < length; ++ i)
-						lights [i] .getModelViewMatrix () .pop ();
+					for (const light of this .renderObject .getLights ())
+						light .getModelViewMatrix () .pop ();
 
 					break;
 				}