x_ite 4.7.12 → 5.0.0

package/src/x_ite/Components/Core/X3DSensorNode.js

@@ -48,27 +48,25 @@
 
 
 define ([
-	"x_ite/Components/Core/X3DChildNode",
-	"x_ite/Bits/X3DConstants",
+   "x_ite/Components/Core/X3DChildNode",
+   "x_ite/Base/X3DConstants",
 ],
-function (X3DChildNode, 
+function (X3DChildNode,
           X3DConstants)
 {
 "use strict";
 
-	function X3DSensorNode (executionContext)
-	{
-		X3DChildNode .call (this, executionContext);
+   function X3DSensorNode (executionContext)
+   {
+      X3DChildNode .call (this, executionContext);
 
-		this .addType (X3DConstants .X3DSensorNode);
-	}
+      this .addType (X3DConstants .X3DSensorNode);
+   }
 
-	X3DSensorNode .prototype = Object .assign (Object .create (X3DChildNode .prototype),
-	{
-		constructor: X3DSensorNode,
-	});
+   X3DSensorNode .prototype = Object .assign (Object .create (X3DChildNode .prototype),
+   {
+      constructor: X3DSensorNode,
+   });
 
-	return X3DSensorNode;
+   return X3DSensorNode;
 });
-
-

package/src/x_ite/Components/Core.js

@@ -47,21 +47,21 @@
 
 
 define ([
-	"x_ite/Configuration/SupportedNodes",
-	"x_ite/Components/Core/MetadataBoolean",
-	"x_ite/Components/Core/MetadataDouble",
-	"x_ite/Components/Core/MetadataFloat",
-	"x_ite/Components/Core/MetadataInteger",
-	"x_ite/Components/Core/MetadataSet",
-	"x_ite/Components/Core/MetadataString",
-	"x_ite/Components/Core/WorldInfo",
-	"x_ite/Components/Core/X3DBindableNode",
-	"x_ite/Components/Core/X3DChildNode",
-	"x_ite/Components/Core/X3DInfoNode",
-	"x_ite/Components/Core/X3DMetadataObject",
-	"x_ite/Components/Core/X3DNode",
-	"x_ite/Components/Core/X3DPrototypeInstance",
-	"x_ite/Components/Core/X3DSensorNode",
+   "x_ite/Configuration/SupportedNodes",
+   "x_ite/Components/Core/MetadataBoolean",
+   "x_ite/Components/Core/MetadataDouble",
+   "x_ite/Components/Core/MetadataFloat",
+   "x_ite/Components/Core/MetadataInteger",
+   "x_ite/Components/Core/MetadataSet",
+   "x_ite/Components/Core/MetadataString",
+   "x_ite/Components/Core/WorldInfo",
+   "x_ite/Components/Core/X3DBindableNode",
+   "x_ite/Components/Core/X3DChildNode",
+   "x_ite/Components/Core/X3DInfoNode",
+   "x_ite/Components/Core/X3DMetadataObject",
+   "x_ite/Components/Core/X3DNode",
+   "x_ite/Components/Core/X3DPrototypeInstance",
+   "x_ite/Components/Core/X3DSensorNode",
 ],
 function (SupportedNodes,
           MetadataBoolean,
@@ -81,31 +81,31 @@ function (SupportedNodes,
 {
 "use strict";
 
-	const Types =
-	{
-		MetadataBoolean: MetadataBoolean,
-		MetadataDouble:  MetadataDouble,
-		MetadataFloat:   MetadataFloat,
-		MetadataInteger: MetadataInteger,
-		MetadataSet:     MetadataSet,
-		MetadataString:  MetadataString,
-		WorldInfo:       WorldInfo,
-	};
+   const Types =
+   {
+      MetadataBoolean: MetadataBoolean,
+      MetadataDouble:  MetadataDouble,
+      MetadataFloat:   MetadataFloat,
+      MetadataInteger: MetadataInteger,
+      MetadataSet:     MetadataSet,
+      MetadataString:  MetadataString,
+      WorldInfo:       WorldInfo,
+   };
 
-	const AbstractTypes =
-	{
-		X3DBindableNode:      X3DBindableNode,
-		X3DChildNode:         X3DChildNode,
-		X3DInfoNode:          X3DInfoNode,
-		X3DMetadataObject:    X3DMetadataObject,
-		X3DNode:              X3DNode,
-		X3DPrototypeInstance: X3DPrototypeInstance,
-		X3DSensorNode:        X3DSensorNode,
-	};
+   const AbstractTypes =
+   {
+      X3DBindableNode:      X3DBindableNode,
+      X3DChildNode:         X3DChildNode,
+      X3DInfoNode:          X3DInfoNode,
+      X3DMetadataObject:    X3DMetadataObject,
+      X3DNode:              X3DNode,
+      X3DPrototypeInstance: X3DPrototypeInstance,
+      X3DSensorNode:        X3DSensorNode,
+   };
 
-	for (const typeName in Types)
-		SupportedNodes .addType (typeName, Types [typeName]);
+   for (const typeName in Types)
+      SupportedNodes .addType (typeName, Types [typeName]);
 
-	for (const typeName in AbstractTypes)
-		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
+   for (const typeName in AbstractTypes)
+      SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
 });

package/src/x_ite/Components/CubeMapTexturing/ComposedCubeMapTexture.js

@@ -48,12 +48,12 @@
 
 
 define ([
-	"x_ite/Fields",
-	"x_ite/Basic/X3DFieldDefinition",
-	"x_ite/Basic/FieldDefinitionArray",
-	"x_ite/Components/CubeMapTexturing/X3DEnvironmentTextureNode",
-	"x_ite/Bits/X3DCast",
-	"x_ite/Bits/X3DConstants",
+   "x_ite/Fields",
+   "x_ite/Base/X3DFieldDefinition",
+   "x_ite/Base/FieldDefinitionArray",
+   "x_ite/Components/CubeMapTexturing/X3DEnvironmentTextureNode",
+   "x_ite/Base/X3DCast",
+   "x_ite/Base/X3DConstants",
 ],
 function (Fields,
           X3DFieldDefinition,
@@ -64,198 +64,191 @@ function (Fields,
 {
 "use strict";
 
-	function ComposedCubeMapTexture (executionContext)
-	{
-		X3DEnvironmentTextureNode .call (this, executionContext);
-
-		this .addType (X3DConstants .ComposedCubeMapTexture);
-
-		this .addAlias ("front",  this .frontTexture_);
-		this .addAlias ("back",   this .backTexture_);
-		this .addAlias ("left",   this .leftTexture_);
-		this .addAlias ("right",  this .rightTexture_);
-		this .addAlias ("bottom", this .bottomTexture_);
-		this .addAlias ("top",    this .topTexture_);
-
-		this .textures   = [null, null, null, null, null, null];
-		this .loadStates = 0;
-	}
-
-	ComposedCubeMapTexture .prototype = Object .assign (Object .create (X3DEnvironmentTextureNode .prototype),
-	{
-		constructor: ComposedCubeMapTexture,
-		fieldDefinitions: new FieldDefinitionArray ([
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",          new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "description",       new Fields .SFString ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "frontTexture",      new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "backTexture",       new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "leftTexture",       new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "rightTexture",      new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "bottomTexture",     new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput,    "topTexture",        new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .initializeOnly, "textureProperties", new Fields .SFNode ()),
-		]),
-		getTypeName: function ()
-		{
-			return "ComposedCubeMapTexture";
-		},
-		getComponentName: function ()
-		{
-			return "CubeMapTexturing";
-		},
-		getContainerField: function ()
-		{
-			return "texture";
-		},
-		initialize: function ()
-		{
-			X3DEnvironmentTextureNode .prototype .initialize .call (this);
-
-			// Upload default data.
-
-			this .clearTexture ();
-
-			// Initialize.
-
-			this .frontTexture_  .addInterest ("set_texture__", this, 0);
-			this .backTexture_   .addInterest ("set_texture__", this, 1);
-			this .leftTexture_   .addInterest ("set_texture__", this, 2);
-			this .rightTexture_  .addInterest ("set_texture__", this, 3);
-			this .topTexture_    .addInterest ("set_texture__", this, 5);
-			this .bottomTexture_ .addInterest ("set_texture__", this, 4);
-
-			this .set_texture__ (this .frontTexture_,  0);
-			this .set_texture__ (this .backTexture_,   1);
-			this .set_texture__ (this .leftTexture_,   2);
-			this .set_texture__ (this .rightTexture_,  3);
-			this .set_texture__ (this .topTexture_,    4);
-			this .set_texture__ (this .bottomTexture_, 5);
-		},
-		set_texture__: function (node, index)
-		{
-			var texture = this .textures [index];
-
-			if (texture)
-			{
-				var callbackName = "set_loadState__" + texture .getId () + "_" + index;
-
-				texture .removeInterest ("set_loadState__", this);
-				texture .loadState_ .removeFieldCallback (callbackName);
-			}
-
-			var texture = this .textures [index] = X3DCast (X3DConstants .X3DTexture2DNode, node);
-
-			if (texture)
-			{
-				var callbackName = "set_loadState__" + texture .getId () + "_" + index;
-
-				texture .addInterest ("set_loadState__", this, texture, index);
-				texture .loadState_ .addFieldCallback (callbackName, this .set_loadState__ .bind (this, null, texture, index));
-			}
-
-			this .set_loadState__ (null, texture, index);
-		},
-		set_loadState__: function (output, texture, index)
-		{
-			if (texture)
-				this .setLoadStateBit (texture .checkLoadState (), texture .getData (), index);
-			else
-				this .setLoadStateBit (X3DConstants .NOT_STARTED, null, index);
-
-			this .setTextures ();
-		},
-		setLoadStateBit: function (loadState, data, bit)
-		{
-			if (loadState === X3DConstants .COMPLETE_STATE || data)
-				this .loadStates |= 1 << bit;
-			else
-				this .loadStates &= ~(1 << bit);
-		},
-		isComplete: function ()
-		{
-			if (this .loadStates !== 0x3f) // 0b111111
-				return false;
-
-			var
-				textures = this .textures,
-				size     = textures [0] .getWidth ();
-
-			for (var i = 0; i < 6; ++ i)
-			{
-				var texture = textures [i];
-
-				if (texture .getWidth () !== size)
-					return false;
-
-				if (texture .getHeight () !== size)
-					return false;
-			}
-
-			return true;
-		},
-		setTextures: function ()
-		{
-			var gl = this .getBrowser () .getContext ();
-
-			gl .bindTexture (this .getTarget (), this .getTexture ());
-			gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, false);
-
-			if (this .isComplete ())
-			{
-				var textures = this .textures;
-
-				for (var i = 0; i < 6; ++ i)
-				{
-					var
-						gl      = this .getBrowser () .getContext (),
-						texture = textures [i],
-						width   = texture .getWidth (),
-						height  = texture .getHeight (),
-						data    = texture .getData ();
-
-					gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, !texture .getFlipY ());
-					gl .pixelStorei (gl .UNPACK_ALIGNMENT, 1);
-
-					if (data instanceof Uint8Array)
-					{
-						gl .texImage2D (this .getTargets () [i], 0, gl .RGBA, width, height, false, gl .RGBA, gl .UNSIGNED_BYTE, data);
-					}
-					else
-					{
-						gl .texImage2D  (this .getTargets () [i], 0, gl .RGBA, gl .RGBA, gl .UNSIGNED_BYTE, data);
-					}
-				}
-
-				this .updateTextureProperties ();
-			}
-			else
-			{
-				this .clearTexture ();
-			}
-
-			this .set_transparent__ ();
-		},
-		set_transparent__: function ()
-		{
-			var
-				textures    = this .textures,
-				transparent = false;
-
-			if (this .isComplete ())
-			{
-				for (var i = 0; i < 6; ++ i)
-				{
-					if (textures [i] .transparent_ .getValue ())
-					{
-						transparent = true;
-						break;
-					}
-				}
-			}
-
-			this .setTransparent (transparent);
-		},
-	});
-
-	return ComposedCubeMapTexture;
+   function ComposedCubeMapTexture (executionContext)
+   {
+      X3DEnvironmentTextureNode .call (this, executionContext);
+
+      this .addType (X3DConstants .ComposedCubeMapTexture);
+
+      this .addAlias ("front",  this ._frontTexture);
+      this .addAlias ("back",   this ._backTexture);
+      this .addAlias ("left",   this ._leftTexture);
+      this .addAlias ("right",  this ._rightTexture);
+      this .addAlias ("bottom", this ._bottomTexture);
+      this .addAlias ("top",    this ._topTexture);
+
+      this .textures   = [null, null, null, null, null, null];
+      this .symbols    = [Symbol (), Symbol (), Symbol (), Symbol (), Symbol (), Symbol ()];
+      this .loadStates = 0;
+   }
+
+   ComposedCubeMapTexture .prototype = Object .assign (Object .create (X3DEnvironmentTextureNode .prototype),
+   {
+      constructor: ComposedCubeMapTexture,
+      [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",          new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "description",       new Fields .SFString ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "frontTexture",      new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "backTexture",       new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "leftTexture",       new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "rightTexture",      new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "bottomTexture",     new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "topTexture",        new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .initializeOnly, "textureProperties", new Fields .SFNode ()),
+      ]),
+      getTypeName: function ()
+      {
+         return "ComposedCubeMapTexture";
+      },
+      getComponentName: function ()
+      {
+         return "CubeMapTexturing";
+      },
+      getContainerField: function ()
+      {
+         return "texture";
+      },
+      initialize: function ()
+      {
+         X3DEnvironmentTextureNode .prototype .initialize .call (this);
+
+         // Upload default data.
+
+         this .clearTexture ();
+
+         // Initialize.
+
+         this ._frontTexture  .addInterest ("set_texture__", this, 0);
+         this ._backTexture   .addInterest ("set_texture__", this, 1);
+         this ._leftTexture   .addInterest ("set_texture__", this, 2);
+         this ._rightTexture  .addInterest ("set_texture__", this, 3);
+         this ._topTexture    .addInterest ("set_texture__", this, 5);
+         this ._bottomTexture .addInterest ("set_texture__", this, 4);
+
+         this .set_texture__ (this ._frontTexture,  0);
+         this .set_texture__ (this ._backTexture,   1);
+         this .set_texture__ (this ._leftTexture,   2);
+         this .set_texture__ (this ._rightTexture,  3);
+         this .set_texture__ (this ._topTexture,    4);
+         this .set_texture__ (this ._bottomTexture, 5);
+      },
+      set_texture__: function (node, index)
+      {
+         let texture = this .textures [index];
+
+         if (texture)
+         {
+            texture .removeInterest ("set_loadState__", this);
+            texture ._loadState .removeFieldCallback (this .symbols [index]);
+         }
+
+         texture = this .textures [index] = X3DCast (X3DConstants .X3DTexture2DNode, node);
+
+         if (texture)
+         {
+            texture .addInterest ("set_loadState__", this, texture, index);
+            texture ._loadState .addFieldCallback (this .symbols [index], this .set_loadState__ .bind (this, texture, index));
+         }
+
+         this .set_loadState__ (texture, index);
+      },
+      set_loadState__: function (texture, index)
+      {
+         if (texture)
+            this .setLoadStateBit (texture .checkLoadState (), texture .getData (), index);
+         else
+            this .setLoadStateBit (X3DConstants .NOT_STARTED, null, index);
+
+         this .setTextures ();
+      },
+      setLoadStateBit: function (loadState, data, bit)
+      {
+         if (loadState === X3DConstants .COMPLETE_STATE || data)
+            this .loadStates |= 1 << bit;
+         else
+            this .loadStates &= ~(1 << bit);
+      },
+      isComplete: function ()
+      {
+         if (this .loadStates !== 0b111111)
+            return false;
+
+         const
+            textures = this .textures,
+            size     = textures [0] .getWidth ();
+
+         for (const texture of textures)
+         {
+            if (texture .getWidth () !== size)
+               return false;
+
+            if (texture .getHeight () !== size)
+               return false;
+         }
+
+         return true;
+      },
+      setTextures: function ()
+      {
+         const gl = this .getBrowser () .getContext ();
+
+         gl .bindTexture (this .getTarget (), this .getTexture ());
+         gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, false);
+
+         if (this .isComplete ())
+         {
+            const textures = this .textures;
+
+            for (let i = 0; i < 6; ++ i)
+            {
+               const
+                  gl      = this .getBrowser () .getContext (),
+                  texture = textures [i],
+                  width   = texture .getWidth (),
+                  height  = texture .getHeight (),
+                  data    = texture .getData ();
+
+               gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, !texture .getFlipY ());
+               gl .pixelStorei (gl .UNPACK_ALIGNMENT, 1);
+
+               if (data instanceof Uint8Array)
+               {
+                  gl .texImage2D (this .getTargets () [i], 0, gl .RGBA, width, height, false, gl .RGBA, gl .UNSIGNED_BYTE, data);
+               }
+               else
+               {
+                  gl .texImage2D  (this .getTargets () [i], 0, gl .RGBA, gl .RGBA, gl .UNSIGNED_BYTE, data);
+               }
+            }
+
+            this .updateTextureProperties ();
+         }
+         else
+         {
+            this .clearTexture ();
+         }
+
+         this .set_transparent__ ();
+      },
+      set_transparent__: function ()
+      {
+         const transparent = false;
+
+         if (this .isComplete ())
+         {
+            for (const texture of this .textures)
+            {
+               if (texture ._transparent .getValue ())
+               {
+                  transparent = true;
+                  break;
+               }
+            }
+         }
+
+         this .setTransparent (transparent);
+      },
+   });
+
+   return ComposedCubeMapTexture;
 });