x_ite 5.0.2 → 6.0.0

package/src/x_ite/Components/Texturing3D/TextureCoordinate4D.js

@@ -91,27 +91,6 @@ function (Fields,
       {
          return "texCoord";
       },
-      initialize: function ()
-      {
-         X3DSingleTextureCoordinateNode .prototype .initialize .call (this);
-
-         this ._point .addInterest ("set_point__", this);
-
-         this .set_point__ ();
-      },
-      set_point__: function ()
-      {
-         this .point  = this ._point .getValue ();
-         this .length = this ._point .length;
-      },
-      isEmpty: function ()
-      {
-         return this .length === 0;
-      },
-      getSize: function ()
-      {
-         return this .length;
-      },
       get1Point: function (index, vector)
       {
          if (index >= 0 && index < this .length)
@@ -162,12 +141,12 @@ function (Fields,
       },
       getTexCoord: function (array)
       {
-         const point = this .point;
-
-         for (let i = 0, p = 0, length = this .length; i < length; ++ i, p += 4)
-            array [i] = new Vector4 (point [p], point [p + 1], point [p + 2], point [p + 3]);
+         const
+            point  = this .point,
+            length = this .length;
 
-         array .length = this .length;
+         for (let i = 0, p = 0; i < length; ++ i, p += 4)
+            array .push (point [p], point [p + 1], point [p + 2], point [p + 3]);
 
          return array;
       },

package/src/x_ite/Components/Texturing3D/X3DTexture3DNode.js

@@ -134,29 +134,22 @@ function (X3DSingleTextureNode,
       },
       setTexture: function (width, height, depth, transparent, format, data)
       {
-         try
-         {
-            this .width  = width;
-            this .height = height;
-            this .depth  = depth;
-            this .data   = data;
+         this .width  = width;
+         this .height = height;
+         this .depth  = depth;
+         this .data   = data;
 
-            const gl = this .getBrowser () .getContext ();
+         const gl = this .getBrowser () .getContext ();
 
-            if (gl .getVersion () < 2)
-               return;
+         if (gl .getVersion () < 2)
+            return;
 
-            gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, false);
-            gl .pixelStorei (gl .UNPACK_ALIGNMENT, 1);
-            gl .bindTexture (gl .TEXTURE_3D, this .getTexture ());
-            gl .texImage3D  (gl .TEXTURE_3D, 0, format, width, height, depth, 0, format, gl .UNSIGNED_BYTE, data);
+         gl .bindTexture (gl .TEXTURE_3D, this .getTexture ());
+         gl .texImage3D  (gl .TEXTURE_3D, 0, format, width, height, depth, 0, format, gl .UNSIGNED_BYTE, data);
 
-            this .setTransparent (transparent);
-            this .updateTextureProperties ();
-            this .addNodeEvent ();
-         }
-         catch (error)
-         { }
+         this .setTransparent (transparent);
+         this .updateTextureProperties ();
+         this .addNodeEvent ();
       },
       updateTextureProperties: function ()
       {

package/src/x_ite/Components/VolumeRendering/X3DVolumeDataNode.js

@@ -71,14 +71,14 @@ function (Fields,
 
       this .addType (X3DConstants .X3DVolumeDataNode);
 
-      this .proximitySensorNode   = executionContext .createNode ("ProximitySensor", false);
-      this .transformNode         = executionContext .createNode ("Transform", false);
-      this .shapeNode             = executionContext .createNode ("Shape", false);
-      this .appearanceNode        = executionContext .createNode ("Appearance", false);
-      this .textureTransformNode  = executionContext .createNode ("TextureTransform3D", false);
-      this .geometryNode          = executionContext .createNode ("QuadSet", false);
+      this .proximitySensorNode   = executionContext .createNode ("ProximitySensor",     false);
+      this .transformNode         = executionContext .createNode ("Transform",           false);
+      this .shapeNode             = executionContext .createNode ("Shape",               false);
+      this .appearanceNode        = executionContext .createNode ("Appearance",          false);
+      this .textureTransformNode  = executionContext .createNode ("TextureTransform3D",  false);
+      this .geometryNode          = executionContext .createNode ("QuadSet",             false);
       this .textureCoordinateNode = executionContext .createNode ("TextureCoordinate3D", false);
-      this .coordinateNode        = executionContext .createNode ("Coordinate", false);
+      this .coordinateNode        = executionContext .createNode ("Coordinate",          false);
 
       this .setCameraObject (true);
    }

package/src/x_ite/Components.js

@@ -95,8 +95,8 @@ function (DEBUG,
                SupportedNodes .addAbstractType (typeName, component .abstractTypes [typeName]);
          }
 
-         if (component .browser)
-            X3DBrowserContext .addContext (component .browser);
+         if (component .context)
+            X3DBrowserContext .addContext (component .context);
 
          if (component .name)
          {

package/src/x_ite/Fallback.js

@@ -62,7 +62,7 @@ function ($)
       {
          $(function ()
          {
-            const elements = $("X3DCanvas");
+            const elements = $("x3d-canvas, X3DCanvas");
 
             this .show (elements, error);
 
@@ -83,10 +83,16 @@ function ($)
          if (consoleElement .length)
             consoleElement .append (document .createTextNode (error));
 
-         elements .addClass ("x_ite-browser-fallback");
+         // X3DCanvas
          elements .children (".x_ite-private-browser") .hide ();
-         elements .children (":not(.x_ite-private-browser)") .addClass ("x_ite-fallback");
          elements .children (":not(.x_ite-private-browser)") .show ();
+
+         // x3d-canvas
+         elements .each (function (i, e)
+         {
+            if (e .shadowRoot)
+               e .shadowRoot .appendChild (document .createElement ("slot"));
+         });
       },
    };
 

package/src/x_ite/Fields/SFColor.js

@@ -80,6 +80,10 @@ function (Color3,
    SFColor .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       constructor: SFColor,
+      [Symbol .iterator]: function* ()
+      {
+         yield* this .getValue ();
+      },
       copy: function ()
       {
          return new SFColor (this .getValue () .copy ());

package/src/x_ite/Fields/SFColorRGBA.js

@@ -80,6 +80,10 @@ function (X3DField,
    SFColorRGBA .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       constructor: SFColorRGBA,
+      [Symbol .iterator]: function* ()
+      {
+         yield* this .getValue ();
+      },
       copy: function ()
       {
          return new SFColorRGBA (this .getValue () .copy ());

package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js

@@ -58,6 +58,10 @@ function (X3DField)
    {
       return Object .assign (Object .create (X3DField .prototype),
       {
+         [Symbol .iterator]: function* ()
+         {
+            yield* this .getValue ();
+         },
          copy: function ()
          {
             return new (this .constructor) (this .getValue () .copy ());

package/src/x_ite/Fields/SFRotation.js

@@ -90,6 +90,10 @@ function (SFVec3,
    SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       constructor: SFRotation,
+      [Symbol .iterator]: function* ()
+      {
+         yield* this .getValue ();
+      },
       copy: function ()
       {
          return new SFRotation (this .getValue () .copy ());

package/src/x_ite/Fields/SFString.js

@@ -82,6 +82,10 @@ function (X3DField,
    SFString .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       constructor: SFString,
+      [Symbol .iterator]: function* ()
+      {
+         yield* this .getValue ();
+      },
       copy: function ()
       {
          return new SFString (this .getValue ());

package/src/x_ite/Fields/SFVecPrototypeTemplate.js

@@ -60,6 +60,10 @@ function (X3DField,
    {
       return Object .assign (Object .create (X3DField .prototype),
       {
+         [Symbol .iterator]: function* ()
+         {
+            yield* this .getValue ();
+         },
          copy: function ()
          {
             return new (this .constructor) (this .getValue () .copy ());

package/src/x_ite/Parser/XMLParser.js

@@ -863,7 +863,7 @@ function ($,
                return;
             }
 
-            //console .error (error);
+            console .error (error);
 
             console .error ("XML Parser Error: " + error .message);
          }

package/src/x_ite/Rendering/TextureBuffer.js

@@ -67,14 +67,14 @@ function (ViewVolume,
       this .height  = height;
       this .array   = new Uint8Array (width * height * 4);
 
-      // The frame buffer.
+      // Create frame buffer.
 
       this .lastBuffer = gl .getParameter (gl .FRAMEBUFFER_BINDING);
       this .buffer     = gl .createFramebuffer ();
 
       gl .bindFramebuffer (gl .FRAMEBUFFER, this .buffer);
 
-      // The depth texture
+      // Create color texture.
 
       this .colorTexture = gl .createTexture ();
 
@@ -87,9 +87,9 @@ function (ViewVolume,
 
       gl .framebufferTexture2D (gl .FRAMEBUFFER, gl .COLOR_ATTACHMENT0, gl .TEXTURE_2D, this .colorTexture, 0);
 
-      // The depth buffer
+      // Create depth buffer.
 
-      if (gl .getVersion () >= 2 || browser .getExtension ("WEBGL_depth_texture"))
+      if (gl .getVersion () >= 2 || gl .getExtension ("WEBGL_depth_texture"))
       {
          this .depthTexture = gl .createTexture ();
 
@@ -103,7 +103,7 @@ function (ViewVolume,
          const internalFormat = gl .getVersion () >= 2 ? gl .DEPTH_COMPONENT24 : gl .DEPTH_COMPONENT;
 
          gl .texImage2D (gl .TEXTURE_2D, 0, internalFormat, width, height, 0, gl .DEPTH_COMPONENT, gl .UNSIGNED_INT, null);
-         gl.framebufferTexture2D (gl .FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.TEXTURE_2D, this .depthTexture, 0);
+         gl .framebufferTexture2D (gl .FRAMEBUFFER, gl .DEPTH_ATTACHMENT, gl .TEXTURE_2D, this .depthTexture, 0);
       }
       else
       {
@@ -114,10 +114,11 @@ function (ViewVolume,
          gl .framebufferRenderbuffer (gl .FRAMEBUFFER, gl .DEPTH_ATTACHMENT, gl .RENDERBUFFER, this .depthBuffer);
       }
 
-      // Always check that our framebuffer is ok
+      // Always check that our framebuffer is ok.
 
       const complete = gl .checkFramebufferStatus (gl .FRAMEBUFFER) === gl .FRAMEBUFFER_COMPLETE;
 
+      gl .bindTexture (gl .TEXTURE_2D, null);
       gl .bindFramebuffer (gl .FRAMEBUFFER, this .lastBuffer);
 
       if (complete)
@@ -165,46 +166,39 @@ function (ViewVolume,
 
          return function (projectionMatrix, viewport)
          {
-            try
-            {
-               const
-                  gl     = this .browser .getContext (),
-                  array  = this .array,
-                  width  = this .width,
-                  height = this .height;
+            const
+               gl     = this .browser .getContext (),
+               array  = this .array,
+               width  = this .width,
+               height = this .height;
 
-               let
-                  winx = 0,
-                  winy = 0,
-                  winz = Number .POSITIVE_INFINITY;
+            let
+               winx = 0,
+               winy = 0,
+               winz = Number .POSITIVE_INFINITY;
 
-               invProjectionMatrix .assign (projectionMatrix) .inverse ();
+            invProjectionMatrix .assign (projectionMatrix) .inverse ();
 
-               gl .readPixels (0, 0, width, height, gl .RGBA, gl .UNSIGNED_BYTE, array);
+            gl .readPixels (0, 0, width, height, gl .RGBA, gl .UNSIGNED_BYTE, array);
 
-               for (let wy = 0, i = 0; wy < height; ++ wy)
+            for (let wy = 0, i = 0; wy < height; ++ wy)
+            {
+               for (let wx = 0; wx < width; ++ wx, i += 4)
                {
-                  for (let wx = 0; wx < width; ++ wx, i += 4)
+                  const wz = array [i] / 255 + array [i + 1] / (255 * 255) + array [i + 2] / (255 * 255 * 255) + array [i + 3] / (255 * 255 * 255 * 255);
+
+                  if (wz < winz)
                   {
-                     const wz = array [i] / 255 + array [i + 1] / (255 * 255) + array [i + 2] / (255 * 255 * 255) + array [i + 3] / (255 * 255 * 255 * 255);
-
-                     if (wz < winz)
-                     {
-                        winx = wx;
-                        winy = wy;
-                        winz = wz;
-                     }
+                     winx = wx;
+                     winy = wy;
+                     winz = wz;
                   }
                }
+            }
 
-               ViewVolume .unProjectPointMatrix (winx, winy, winz, invProjectionMatrix, viewport, point);
+            ViewVolume .unProjectPointMatrix (winx, winy, winz, invProjectionMatrix, viewport, point);
 
-               return point .z;
-            }
-            catch (error)
-            {
-               return 0;
-            }
+            return point .z;
          };
       })(),
       bind: function ()
@@ -218,8 +212,21 @@ function (ViewVolume,
       unbind: function ()
       {
          const gl = this .browser .getContext ();
+
          gl .bindFramebuffer (gl .FRAMEBUFFER, this .lastBuffer);
       },
+      delete: function ()
+      {
+         const gl = this .browser .getContext ();
+
+         gl .deleteFramebuffer (this .buffer);
+         gl .deleteTexture (this .colorTexture);
+
+         if (gl .getVersion () >= 2 || gl .getExtension ("WEBGL_depth_texture"))
+            gl .deleteTexture (this .depthTexture);
+         else
+            gl .deleteRenderbuffer (this .depthBuffer);
+       },
    };
 
    for (const key of Reflect .ownKeys (TextureBuffer .prototype))

package/src/x_ite/Rendering/VertexArray.js

@@ -0,0 +1,101 @@
+/* -*- Mode: JavaScript; coding: utf-8; tab-width: 3; indent-tabs-mode: tab; c-basic-offset: 3 -*-
+ *******************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright create3000, Scheffelstraße 31a, Leipzig, Germany 2011.
+ *
+ * All rights reserved. Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * The copyright notice above does not evidence any actual of intended
+ * publication of such source code, and is an unpublished work by create3000.
+ * This material contains CONFIDENTIAL INFORMATION that is the property of
+ * create3000.
+ *
+ * No permission is granted to copy, distribute, or create derivative works from
+ * the contents of this software, in whole or in part, without the prior written
+ * permission of create3000.
+ *
+ * NON-MILITARY USE ONLY
+ *
+ * All create3000 software are effectively free software with a non-military use
+ * restriction. It is free. Well commented source is provided. You may reuse the
+ * source in any way you please with the exception anything that uses it must be
+ * marked to indicate is contains 'non-military use only' components.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2015, 2016 Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * This file is part of the X_ITE Project.
+ *
+ * X_ITE is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License version 3 only, as published by the
+ * Free Software Foundation.
+ *
+ * X_ITE is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License version 3 for more
+ * details (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version 3
+ * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * copy of the GPLv3 License.
+ *
+ * For Silvio, Joy and Adi.
+ *
+ ******************************************************************************/
+
+
+define (function ()
+{
+"use strict";
+
+   function VertexArray ()
+   {
+      this .vertexArray = null;
+      this .shaderNode  = null;
+      this .tainted     = true;
+   }
+
+   VertexArray .prototype =
+   {
+      update: function ()
+      {
+         this .tainted = true;
+      },
+      enable: function (gl, shaderNode)
+      {
+         if (this .tainted || this .shaderNode !== shaderNode)
+         {
+            gl .deleteVertexArray (this .vertexArray);
+
+            this .vertexArray = gl .createVertexArray ();
+            this .shaderNode  = shaderNode;
+            this .tainted     = false;
+
+            gl .bindVertexArray (this .vertexArray);
+
+            // console .log ("update vao");
+
+            return true;
+         }
+         else
+         {
+            gl .bindVertexArray (this .vertexArray);
+
+            return false;
+         }
+      },
+      disable: function (gl)
+      {
+         gl .bindVertexArray (null);
+      },
+      delete: function (gl)
+      {
+         gl .deleteVertexArray (this .vertexArray);
+      },
+   };
+
+   return VertexArray;
+});