x_ite 5.0.2 → 6.0.0

package/src/x_ite/Browser/Texturing/X3DTexturingContext.js

@@ -66,9 +66,6 @@ function (TextureProperties,
       _maxCombinedTextureUnits  = Symbol (),
       _textureMemory            = Symbol (),
       _combinedTextureUnits     = Symbol (),
-      _texture2DUnit            = Symbol (),
-      _texture3DUnit            = Symbol (),
-      _textureCubeUnit          = Symbol (),
       _texture2DUnits           = Symbol (),
       _texture3DUnits           = Symbol (),
       _textureCubeUnits         = Symbol (),
@@ -102,6 +99,8 @@ function (TextureProperties,
       {
          const gl = this .getContext ();
 
+         gl .pixelStorei (gl .UNPACK_ALIGNMENT, 1);
+
          this [_maxTextureSize]          = gl .getParameter (gl .MAX_TEXTURE_SIZE);
          this [_maxCombinedTextureUnits] = gl .getParameter (gl .MAX_COMBINED_TEXTURE_IMAGE_UNITS);
          this [_textureMemory]           = NaN;
@@ -109,12 +108,9 @@ function (TextureProperties,
          // Get texture Units
 
          this [_combinedTextureUnits] = [...Array (this [_maxCombinedTextureUnits]) .keys ()];
-         this [_texture2DUnit]        = this [_combinedTextureUnits] .pop ();
-         this [_texture3DUnit]        = this [_combinedTextureUnits] .pop ();
-         this [_textureCubeUnit]      = this [_combinedTextureUnits] .pop ();
-         this [_texture2DUnits]       = [this [_texture2DUnit]];
-         this [_texture3DUnits]       = [this [_texture3DUnit]];
-         this [_textureCubeUnits]     = [this [_textureCubeUnit]];
+         this [_texture2DUnits]       = [this [_combinedTextureUnits] .pop ()];
+         this [_texture3DUnits]       = [this [_combinedTextureUnits] .pop ()];
+         this [_textureCubeUnits]     = [this [_combinedTextureUnits] .pop ()];
 
          // Default Texture 2D Unit
 
@@ -122,11 +118,9 @@ function (TextureProperties,
 
          this [_defaultTexture2D] = gl .createTexture ();
 
+         gl .activeTexture (gl .TEXTURE0 + this [_texture2DUnits] [0]);
          gl .bindTexture (gl .TEXTURE_2D, this [_defaultTexture2D]);
-         gl .texImage2D  (gl .TEXTURE_2D, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
-
-         gl .activeTexture (gl .TEXTURE0 + this [_texture2DUnit]);
-         gl .bindTexture (gl .TEXTURE_2D, this [_defaultTexture2D]);
+         gl .texImage2D (gl .TEXTURE_2D, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
 
          // Default Texture 3D Unit
 
@@ -134,27 +128,23 @@ function (TextureProperties,
          {
             this [_defaultTexture3D] = gl .createTexture ();
 
+            gl .activeTexture (gl .TEXTURE0 + this [_texture3DUnits] [0]);
             gl .bindTexture (gl .TEXTURE_3D, this [_defaultTexture3D]);
-            gl .texImage3D  (gl .TEXTURE_3D, 0, gl .RGBA, 1, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
-
-            gl .activeTexture (gl .TEXTURE0 + this [_texture3DUnit]);
-            gl .bindTexture (gl .TEXTURE_3D, this [_defaultTexture3D]);
+            gl .texImage3D (gl .TEXTURE_3D, 0, gl .RGBA, 1, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
          }
 
          // Default Texture Cube Unit
 
          this [_defaultTextureCube] = gl .createTexture ();
 
+         gl .activeTexture (gl .TEXTURE0 + this [_textureCubeUnits] [0]);
          gl .bindTexture (gl .TEXTURE_CUBE_MAP, this [_defaultTextureCube]);
-         gl .texImage2D  (gl .TEXTURE_CUBE_MAP_POSITIVE_Z, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
-         gl .texImage2D  (gl .TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
-         gl .texImage2D  (gl .TEXTURE_CUBE_MAP_NEGATIVE_X, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
-         gl .texImage2D  (gl .TEXTURE_CUBE_MAP_POSITIVE_X, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
-         gl .texImage2D  (gl .TEXTURE_CUBE_MAP_POSITIVE_Y, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
-         gl .texImage2D  (gl .TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
-
-         gl .activeTexture (gl .TEXTURE0 + this [_textureCubeUnit]);
-         gl .bindTexture (gl .TEXTURE_CUBE_MAP, this [_defaultTextureCube]);
+         gl .texImage2D (gl .TEXTURE_CUBE_MAP_POSITIVE_Z, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
+         gl .texImage2D (gl .TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
+         gl .texImage2D (gl .TEXTURE_CUBE_MAP_NEGATIVE_X, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
+         gl .texImage2D (gl .TEXTURE_CUBE_MAP_POSITIVE_X, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
+         gl .texImage2D (gl .TEXTURE_CUBE_MAP_POSITIVE_Y, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
+         gl .texImage2D (gl .TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
 
          // Init texture units.
 
@@ -182,7 +172,7 @@ function (TextureProperties,
          {
             -- this [_texture2DUnitIndex];
 
-            return this [_texture2DUnits] .shift ();
+            return this [_texture2DUnits] .pop ();
          }
          else
          {
@@ -194,9 +184,9 @@ function (TextureProperties,
          if (textureUnit === undefined)
             return;
 
-         this [_texture2DUnitIndex] = Math .max (this [_texture2DUnitIndex] + 1, 1);
+         ++ this [_texture2DUnitIndex];
 
-         this [_texture2DUnits] .unshift (textureUnit);
+         this [_texture2DUnits] .push (textureUnit);
       },
       getTexture2DUnit: function ()
       {
@@ -251,15 +241,15 @@ function (TextureProperties,
       },
       getDefaultTexture2DUnit: function ()
       {
-         return this [_texture2DUnit];
+         return this [_texture2DUnits] [0];
       },
       getDefaultTexture3DUnit: function ()
       {
-         return this [_texture3DUnit];
+         return this [_texture3DUnits] [0];
       },
       getDefaultTextureCubeUnit: function ()
       {
-         return this [_textureCubeUnit];
+         return this [_textureCubeUnits] [0];
       },
       getTextureMemory: function ()
       {
@@ -277,7 +267,7 @@ function (TextureProperties,
       {
          this [_defaultTextureProperties] = new TextureProperties (this .getPrivateScene ());
          this [_defaultTextureProperties] ._magnificationFilter = "NICEST";
-         this [_defaultTextureProperties] ._minificationFilter  = "AVG_PIXEL_AVG_MIPMAP";
+         this [_defaultTextureProperties] ._minificationFilter  = "NEAREST_PIXEL_AVG_MIPMAP";
          this [_defaultTextureProperties] ._textureCompression  = "NICEST";
          this [_defaultTextureProperties] ._generateMipMaps     = true;
 

package/src/x_ite/Browser/Texturing3D/DICOMParser.js

@@ -110,8 +110,8 @@ function (dicomParser,
          this .getTansferSyntax ();
          this .getPixelData ();
 
-         if (DEBUG)
-            console .log (this);
+         // if (DEBUG)
+         //    console .log (this);
 
          return this .dicom;
       },

package/src/x_ite/Browser/Time/X3DTimeContext.js

@@ -93,7 +93,7 @@ function (Vector3)
          return function (now)
          {
             const
-               time     = (now + performance .timeOrigin) / 1000,
+               time     = (performance .timeOrigin + now) / 1000,
                interval = time - this [_currentTime];
 
             this [_currentTime]      = time;
@@ -109,7 +109,9 @@ function (Vector3)
                this [_currentSpeed] = lastPosition .subtract (this [_currentPosition]) .abs () * this [_currentFrameRate];
             }
             else
+            {
                this [_currentSpeed] = 0;
+            }
          };
       })(),
    };

package/src/x_ite/Browser/VERSION.js

@@ -49,5 +49,5 @@
 
 define (function ()
 {
-   return "5.0.2";
+   return "6.0.0";
 });

package/src/x_ite/Browser/X3DBrowser.js

@@ -417,7 +417,7 @@ function ($,
 
          // arguments .length === 1
 
-         if (!(url instanceof Fields .MFString))
+         if (! (url instanceof Fields .MFString))
             throw new Error ("Browser.createX3DFromURL: url must be of type MFString.");
 
          const
@@ -465,12 +465,12 @@ function ($,
             {
                if (loader !== this [_loader])
                {
-                  reject ();
+                  reject ("Loading of X3D file aborted.");
                   return;
                }
 
                if (! this .getBrowserOptions () .getSplashScreen ())
-                  this .getCanvas () .fadeIn (0);
+                  this .getCanvas () .show ();
 
                if (scene)
                {
@@ -486,7 +486,7 @@ function ($,
 
                   setTimeout (function () { this .getSplashScreen () .find (".x_ite-private-spinner-text") .text (_ ("Failed loading world.")); } .bind (this), 31);
 
-                  reject ();
+                  reject ("Couldn't load X3D file.");
                }
             }
             .bind (this),
@@ -494,7 +494,7 @@ function ($,
             {
                if (loader !== this [_loader])
                {
-                  reject ();
+                  reject ("Change viewpoint aborted.");
                   return;
                }
 
@@ -509,7 +509,7 @@ function ($,
             {
                if (loader !== this [_loader])
                {
-                  reject ();
+                  reject ("Loading of file aborted.");
                   return;
                }
 
@@ -771,6 +771,7 @@ function ($,
          this .setLive (true);
          this .getExecutionContext () .setLive (true);
          this .advanceTime (performance .now ());
+         this .addBrowserEvent ();
       },
       endUpdate: function ()
       {

package/src/x_ite/Browser/X3DBrowserContext.js

@@ -104,6 +104,7 @@ function ($,
       _world           = Symbol (),
       _changedTime     = Symbol (),
       _renderCallback  = Symbol (),
+      _previousTime    = Symbol (),
       _systemTime      = Symbol (),
       _systemStartTime = Symbol (),
       _browserTime     = Symbol (),
@@ -147,6 +148,7 @@ function ($,
                              "finished",      new SFTime ());
 
       this [_changedTime]     = 0;
+      this [_previousTime]    = 0;
       this [_renderCallback]  = this .traverse .bind (this);
       this [_systemTime]      = 0;
       this [_systemStartTime] = 0;
@@ -255,14 +257,32 @@ function ($,
 
          this [_changedTime] = this .getCurrentTime ();
 
-         this .requestAnimationFrame ();
+         requestAnimationFrame (this [_renderCallback]);
       },
-      requestAnimationFrame: function ()
+      limitFrameRate: function (now)
       {
-         window .requestAnimationFrame (this [_renderCallback]);
+         if (now === this [_previousTime])
+         {
+            requestAnimationFrame (this [_renderCallback]);
+
+            return true;
+         }
+         else
+         {
+            this [_previousTime] = now;
+
+            return false;
+         }
       },
       traverse: function (now)
       {
+         // Limit frame rate.
+
+         if (this .limitFrameRate (now))
+            return;
+
+         // Start rendering.
+
          const gl = this .getContext ();
 
          const t0 = performance .now ();
@@ -287,9 +307,6 @@ function ($,
          this ._sensorEvents .processInterests ();
          this .processEvents ();
 
-         // XXX: The depth buffer must be cleared here, although it is cleared in each layer, otherwise there is a
-         // XXX: phantom image in the depth buffer at least in Firefox.
-
          const t3 = performance .now ();
          gl .clearColor (0, 0, 0, 0);
          gl .clear (gl .COLOR_BUFFER_BIT);
@@ -334,12 +351,20 @@ function ($,
 
          contexts .push (context);
 
-         Object .assign (X3DBrowserContext .prototype, context .prototype);
+         for (const key of Object .keys (context .prototype) .concat (Object .getOwnPropertySymbols (context .prototype)))
+         {
+            if (X3DBrowserContext .prototype .hasOwnProperty (key))
+               continue;
 
-         for (const key of Reflect .ownKeys (context .prototype))
-            Object .defineProperty (X3DBrowserContext .prototype, key, { enumerable: false });
+            Object .defineProperty (X3DBrowserContext .prototype, key,
+            {
+               value: context .prototype [key],
+               enumerable: false,
+               writable: true,
+            });
+         }
 
-         $("X3DCanvas") .each (function (i, canvas)
+         $("x3d-canvas, X3DCanvas") .each (function (i, canvas)
          {
             const browser = X3D .getBrowser (canvas);
 

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

@@ -140,6 +140,8 @@ function (Fields,
                         }
                      }
                   }
+
+                  destinationField .setModificationTime (sourceField .getModificationTime ());
                }
                catch (error)
                {
@@ -173,6 +175,8 @@ function (Fields,
                      }
                   }
                }
+
+               destinationField .setModificationTime (sourceField .getModificationTime ());
             }
 
             copy .setup ();

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

@@ -49,14 +49,12 @@
 
 define ([
    "x_ite/Base/X3DChildObject",
-   "x_ite/Base/FieldDefinitionArray",
    "x_ite/Components/Core/X3DNode",
    "x_ite/Execution/X3DExecutionContext",
    "x_ite/Base/X3DConstants",
    "x_ite/InputOutput/Generator",
 ],
 function (X3DChildObject,
-          FieldDefinitionArray,
           X3DNode,
           X3DExecutionContext,
           X3DConstants,

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

@@ -193,7 +193,6 @@ function (Fields,
          const gl = this .getBrowser () .getContext ();
 
          gl .bindTexture (this .getTarget (), this .getTexture ());
-         gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, false);
 
          if (this .isComplete ())
          {
@@ -202,14 +201,12 @@ function (Fields,
             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)
                {
@@ -217,10 +214,12 @@ function (Fields,
                }
                else
                {
-                  gl .texImage2D  (this .getTargets () [i], 0, gl .RGBA, gl .RGBA, gl .UNSIGNED_BYTE, data);
+                  gl .texImage2D (this .getTargets () [i], 0, gl .RGBA, gl .RGBA, gl .UNSIGNED_BYTE, data);
                }
             }
 
+            gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, false);
+
             this .updateTextureProperties ();
          }
          else

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

@@ -219,7 +219,6 @@ function (Fields,
             renderer .getProjectionMatrix () .pushMatrix (projectionMatrix);
 
             gl .bindTexture (this .getTarget (), this .getTexture ());
-            gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, false);
 
             for (let i = 0; i < 6; ++ i)
             {
@@ -231,17 +230,7 @@ function (Fields,
                renderer .getCameraSpaceMatrix () .rotate (rotations [i]);
                renderer .getCameraSpaceMatrix () .scale (scales [i]);
 
-               try
-               {
-                  renderer .getViewMatrix () .pushMatrix (invCameraSpaceMatrix .assign (renderer .getCameraSpaceMatrix () .get ()) .inverse ());
-               }
-               catch (error)
-               {
-                  console .error (error);
-
-                  renderer .getViewMatrix () .pushMatrix (Matrix4 .Identity);
-               }
-
+               renderer .getViewMatrix () .pushMatrix (invCameraSpaceMatrix .assign (renderer .getCameraSpaceMatrix () .get ()) .inverse ());
                renderer .getModelViewMatrix () .pushMatrix (invCameraSpaceMatrix);
 
                // Setup headlight if enabled.

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

@@ -232,7 +232,6 @@ function ($,
             let opaque = true;
 
             gl .bindTexture (this .getTarget (), this .getTexture ());
-            gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, false);
 
             for (let i = 0; i < 6; ++ i)
             {

package/src/x_ite/Components/EnvironmentalEffects/TextureBackground.js

@@ -78,7 +78,7 @@ function (Fields,
          new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",      new Fields .SFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOnly,   "set_bind",      new Fields .SFBool ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "skyAngle",      new Fields .MFFloat ()),
-         new X3DFieldDefinition (X3DConstants .inputOutput, "skyColor",      new Fields .MFColor (0, 0, 0)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "skyColor",      new Fields .MFColor (new Fields .SFColor ())),
          new X3DFieldDefinition (X3DConstants .inputOutput, "groundAngle",   new Fields .MFFloat ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "groundColor",   new Fields .MFColor ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "transparency",  new Fields .SFFloat ()),