x_ite 5.0.2 → 6.0.0

package/src/standard/Math/Numbers/Rotation4.js

@@ -117,6 +117,13 @@ function (Quaternion,
    {
       constructor: Rotation4,
       length: 4,
+      [Symbol .iterator]: function* ()
+      {
+         yield this [_x];
+         yield this [_y];
+         yield this [_z];
+         yield this [_angle];
+      },
       update: function ()
       {
          const rotation = this .get ();

package/src/standard/Math/Numbers/Vector2.js

@@ -64,6 +64,11 @@ function (Algorithm)
    {
       constructor: Vector2,
       length: 2,
+      [Symbol .iterator]: function* ()
+      {
+         yield this .x;
+         yield this .y;
+      },
       copy: function ()
       {
          const copy = Object .create (Vector2 .prototype);
@@ -132,14 +137,12 @@ function (Algorithm)
       },
       normalize: function ()
       {
-         let length = Math .hypot (this .x, this .y);
+         const length = Math .hypot (this .x, this .y);
 
          if (length)
          {
-            length = 1 / length;
-
-            this .x *= length;
-            this .y *= length;
+            this .x /= length;
+            this .y /= length;
          }
 
          return this;

package/src/standard/Math/Numbers/Vector3.js

@@ -65,6 +65,12 @@ function (Algorithm)
    {
       constructor: Vector3,
       length: 3,
+      [Symbol .iterator]: function* ()
+      {
+         yield this .x;
+         yield this .y;
+         yield this .z;
+      },
       copy: function ()
       {
          const copy = Object .create (Vector3 .prototype);
@@ -144,25 +150,25 @@ function (Algorithm)
       },
       cross: function (vector)
       {
-         const x = this .x, y = this .y, z = this .z;
+         const
+            ax = this   .x, ay = this   .y, az = this   .z,
+            bx = vector .x, by = vector .y, bz = vector .z;
 
-         this .x = y * vector .z - z * vector .y;
-         this .y = z * vector .x - x * vector .z;
-         this .z = x * vector .y - y * vector .x;
+         this .x = ay * bz - az * by;
+         this .y = az * bx - ax * bz;
+         this .z = ax * by - ay * bx;
 
          return this;
       },
       normalize: function ()
       {
-         let length = Math .hypot (this .x, this .y, this .z);
+         const length = Math .hypot (this .x, this .y, this .z);
 
          if (length)
          {
-            length = 1 / length;
-
-            this .x *= length;
-            this .y *= length;
-            this .z *= length;
+            this .x /= length;
+            this .y /= length;
+            this .z /= length;
          }
 
          return this;

package/src/standard/Math/Numbers/Vector4.js

@@ -66,6 +66,13 @@ function (Algorithm)
    {
       constructor: Vector4,
       length: 4,
+      [Symbol .iterator]: function* ()
+      {
+         yield this .x;
+         yield this .y;
+         yield this .z;
+         yield this .w;
+      },
       copy: function ()
       {
          const copy = Object .create (Vector4 .prototype);
@@ -162,16 +169,14 @@ function (Algorithm)
       },
       normalize: function ()
       {
-         let length = Math .hypot (this .x, this .y, this .z, this .w);
+         const length = Math .hypot (this .x, this .y, this .z, this .w);
 
          if (length)
          {
-            length = 1 / length;
-
-            this .x *= length;
-            this .y *= length;
-            this .z *= length;
-            this .w *= length;
+            this .x /= length;
+            this .y /= length;
+            this .z /= length;
+            this .w /= length;
          }
 
          return this;

package/src/standard/Math/Utility/BVH.js

@@ -74,28 +74,24 @@ function (Vector3,
       // left: We do not have to test for left.
    ];
 
+   const
+      NODE     = 0,
+      TRIANGLE = 1;
+
    function SortComparator (vertices, axis)
    {
-      function compare (a, b)
+      return function compare (a, b)
       {
-         const
-            vertices = compare .vertices;
-            axis     = compare .axis;
-
-         return Math .min (vertices [a + axis], vertices [a + 4 + axis], vertices [a + 8 + axis]) <
-                Math .min (vertices [b + axis], vertices [b + 4 + axis], vertices [b + 8 + axis]);
+          return Math .min (vertices [a + axis], vertices [a + 4 + axis], vertices [a + 8 + axis]) <
+                 Math .min (vertices [b + axis], vertices [b + 4 + axis], vertices [b + 8 + axis]);
       }
-
-      compare .vertices = vertices;
-      compare .axis     = axis;
-
-      return compare;
    }
 
    function Triangle (tree, triangle)
    {
       this .vertices = tree .vertices;
       this .normals  = tree .normals;
+      this .triangle = triangle;
       this .i4       = triangle * 12;
       this .i3       = triangle * 9;
    }
@@ -145,6 +141,14 @@ function (Vector3,
             }
          }
       },
+      toArray: function (array)
+      {
+         const index = array .length / 4;
+
+         array .push (TRIANGLE, this .triangle * 3, 0, 0);
+
+         return index;
+      },
    };
 
    function Node (tree, triangles, first, size)
@@ -303,15 +307,30 @@ function (Vector3,
             return 0;
          }
       },
+      toArray: function (array)
+      {
+         const
+            left  = this .left .toArray (array),
+            right = this .right .toArray (array),
+            min   = this .min,
+            max   = this .max,
+            index = array .length / 4;
+
+         array .push (NODE, left, right, 0,
+                      min .x, min .y, min .z, 0,
+                      max .x, max .y, max .z, 0);
+
+         return index;
+      },
    };
 
    function BVH (vertices, normals)
    {
+      const numTriangles = vertices .length / 12;
+
       this .vertices = vertices;
       this .normals  = normals;
 
-      const numTriangles = vertices .length / 12;
-
       switch (numTriangles)
       {
          case 0:
@@ -332,8 +351,7 @@ function (Vector3,
                triangles .push (i);
 
             this .sorter = new QuickSort (triangles, SortComparator (vertices, 0));
-
-            this .root = new Node (this, triangles, 0, numTriangles);
+            this .root   = new Node (this, triangles, 0, numTriangles);
             break;
          }
       }
@@ -342,7 +360,6 @@ function (Vector3,
    BVH .prototype =
    {
       constructor: BVH,
-
       intersectsLine: function (line, intersections, intersectionNormals)
       {
          intersections .size = 0;
@@ -355,6 +372,17 @@ function (Vector3,
 
          return 0;
       },
+      toArray: function (array)
+      {
+         if (this .root)
+         {
+            const root = this .root .toArray (array);
+
+            array .push (root, 0, 0, 0);
+         }
+
+         return array;
+      },
    };
 
    return BVH;

package/src/tests.js

@@ -1,4 +1,6 @@
 const X_ITE_TESTS = [
+   { component: "Examples" },
+   { path: "../../Examples/Rathaus/index.x3dv" },
    { component: "CADGeometry" },
    { path: "CADGeometry/CADGeometry.x3d" },
    { path: "CADGeometry/CADLayer.x3d" },
@@ -184,15 +186,18 @@ const X_ITE_TESTS = [
    { path: "ParticleSystems/DolphinSurfaceEmitter.x3d" },
    { path: "ParticleSystems/Earth.x3dz" },
    { path: "ParticleSystems/ExplosionEmitter.x3d" },
+   { path: "ParticleSystems/ExplosionEmitterGeometry.x3d" },
    { path: "ParticleSystems/Fire.x3d" },
    { path: "ParticleSystems/Geometry.x3d" },
-   { path: "ParticleSystems/GeometryLine.x3d" },
+   { path: "ParticleSystems/GeometryLineSet.x3d" },
+   { path: "ParticleSystems/GeometryPointSet.x3d" },
    { path: "ParticleSystems/GridTool.x3dv" },
    { path: "ParticleSystems/OpenVolume.x3d" },
    { path: "ParticleSystems/PointEmitter.x3d" },
    { path: "ParticleSystems/PolylineEmitter.x3d" },
    { path: "ParticleSystems/Smoke.x3d" },
    { path: "ParticleSystems/SurfaceEmitter.x3d" },
+   { path: "ParticleSystems/Tunnel.x3dv" },
    { path: "ParticleSystems/VolumeEmitter-U.x3d" },
    { path: "ParticleSystems/VolumeEmitter.x3d" },
    { path: "ParticleSystems/Waterfall.x3d" },

package/src/x_ite/Base/X3DBaseNode.js

@@ -118,13 +118,14 @@ function (X3DEventObject,
       {
          X3DEventObject .prototype .setName .call (this, value)
 
-         this ._name_changed = this .getBrowser () .getCurrentTime ();
+         if (this [_initialized])
+            this ._name_changed = this .getBrowser () .getCurrentTime ();
       },
       getMainScene: function ()
       {
          let scene = this [_executionContext] .getScene ();
 
-         while (!scene .isMainScene ())
+         while (! scene .isMainScene ())
             scene = scene .getScene ();
 
          return scene;
@@ -133,7 +134,7 @@ function (X3DEventObject,
       {
          let executionContext = this [_executionContext];
 
-         while (!executionContext .isScene ())
+         while (! executionContext .isScene ())
             executionContext = executionContext .getExecutionContext ();
 
          return executionContext;
@@ -344,7 +345,8 @@ function (X3DEventObject,
          if (!this .getPrivate ())
             field .addCloneCount (1);
 
-         this ._fields_changed = this .getBrowser () .getCurrentTime ();
+         if (this [_initialized])
+            this ._fields_changed = this .getBrowser () .getCurrentTime ();
       },
       getField: (function ()
       {
@@ -412,7 +414,8 @@ function (X3DEventObject,
             if (!this .getPrivate ())
                field .removeCloneCount (1);
 
-            this ._fields_changed = this .getBrowser () .getCurrentTime ();
+            if (this [_initialized])
+               this ._fields_changed = this .getBrowser () .getCurrentTime ();
          }
       },
       canUserDefinedFields: function ()
@@ -436,7 +439,8 @@ function (X3DEventObject,
          if (!this .getPrivate ())
             field .addCloneCount (1);
 
-         this ._fields_changed = this .getBrowser () .getCurrentTime ();
+         if (this [_initialized])
+            this ._fields_changed = this .getBrowser () .getCurrentTime ();
       },
       removeUserDefinedField: function (name)
       {
@@ -453,7 +457,8 @@ function (X3DEventObject,
             if (!this .getPrivate ())
                field .removeCloneCount (1);
 
-            this ._fields_changed = this .getBrowser () .getCurrentTime ();
+            if (this [_initialized])
+               this ._fields_changed = this .getBrowser () .getCurrentTime ();
          }
       },
       getUserDefinedFields: function ()
@@ -561,22 +566,28 @@ function (X3DEventObject,
          if (count === 0)
             return;
 
+         const time = this .getBrowser () .getCurrentTime ();
+
          this [_cloneCount] += count;
 
-         this ._cloneCount_changed = this .getBrowser () .getCurrentTime ();
+         this [_executionContext] ._sceneGraph_changed = time;
 
-         this [_executionContext] ._sceneGraph_changed = this .getBrowser () .getCurrentTime ();
+         if (this [_initialized])
+            this ._cloneCount_changed = time;
       },
       removeCloneCount: function (count)
       {
          if (count === 0)
             return;
 
+         const time = this .getBrowser () .getCurrentTime ();
+
          this [_cloneCount] -= count;
 
-         this ._cloneCount_changed = this .getBrowser () .getCurrentTime ();
+         this [_executionContext] ._sceneGraph_changed = time;
 
-         this [_executionContext] ._sceneGraph_changed = this .getBrowser () .getCurrentTime ();
+         if (this [_initialized])
+            this ._cloneCount_changed = time;
       },
       dispose: function ()
       {

package/src/x_ite/Base/X3DField.js

@@ -176,7 +176,7 @@ function ($,
          const references = this .getReferences ();
 
          if (references .has (reference))
-            return; // throw ???
+            return;
 
          references .add (reference);
 

package/src/x_ite/Browser/Core/BrowserOptions.js

@@ -343,7 +343,7 @@ function (Fields,
                this .textureQuality = TextureQuality .MEDIUM;
 
                textureProperties ._magnificationFilter = "NICEST";
-               textureProperties ._minificationFilter  = "AVG_PIXEL_AVG_MIPMAP";
+               textureProperties ._minificationFilter  = "NEAREST_PIXEL_AVG_MIPMAP";
                textureProperties ._textureCompression  = "NICEST";
                textureProperties ._generateMipMaps     = true;
 
@@ -399,7 +399,7 @@ function (Fields,
             browser = this .getBrowser (),
             gl      = browser .getContext ();
 
-         logarithmicDepthBuffer = logarithmicDepthBuffer .getValue () && (gl .getVersion () >= 2 || Boolean (browser .getExtension ("EXT_frag_depth")));
+         logarithmicDepthBuffer = logarithmicDepthBuffer .getValue () && (gl .getVersion () >= 2 || Boolean (gl .getExtension ("EXT_frag_depth")));
 
          if (logarithmicDepthBuffer === browser .getRenderingProperties () ._LogarithmicDepthBuffer .getValue ())
             return;

package/src/x_ite/Browser/Core/BrowserTimings.js

@@ -92,14 +92,16 @@ function ($,
          this .startTime     = 0;
          this .frames        = 0;
 
-         this .element = $("<div></div>") .addClass ("x_ite-private-browser-timings") .appendTo (this .getBrowser () .getSurface ());
+         this .element = $("<div></div>") .hide () .addClass ("x_ite-private-browser-timings") .appendTo (this .getBrowser () .getSurface ());
          this .table   = $("<table></table>") .appendTo (this .element);
          this .header  = $("<thead></thead>") .append ($("<tr></tr>") .append ($("<th colspan='2'></th>"))) .appendTo (this .table);
          this .body    = $("<tbody></tbody>") .appendTo (this .table);
          this .footer  = $("<tfoot></tfoot>") .append ($("<tr></tr>") .append ($("<td colspan='2'></td>"))) .appendTo (this .table);
-         this .button  = $("<button></button>") .attr ("type", "button") .click (this .set_type__ .bind (this)) .appendTo (this .footer .find ("td"));
+         this .button  = $("<button></button>") .attr ("type", "button") .appendTo (this .footer .find ("td"));
          this .rows    = [ ];
 
+         this .button .on ("click touchend", this .set_type__ .bind (this));
+
          this .set_button__ ();
       },
       getEnabled: function ()

package/src/x_ite/Browser/Core/Context.js

@@ -0,0 +1,185 @@
+/* -*- 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 ([
+   "x_ite/DEBUG",
+],
+function (DEBUG)
+{
+"use strict";
+
+   const extensions = [
+      "ANGLE_instanced_arrays",
+      "EXT_blend_minmax",
+      "EXT_frag_depth",
+      "EXT_shader_texture_lod",
+      "EXT_texture_filter_anisotropic",
+      "OES_element_index_uint",
+      "OES_standard_derivatives",
+      "OES_texture_float",
+      "OES_texture_float_linear",
+      "OES_texture_half_float",
+      "OES_texture_half_float_linear",
+      "OES_vertex_array_object",
+      "WEBGL_compressed_texture_s3tc",
+      //"WEBGL_debug_renderer_info",
+      "WEBGL_debug_shaders",
+      "WEBGL_depth_texture",
+      "WEBGL_draw_buffers",
+      "WEBGL_lose_context",
+
+      "EXT_color_buffer_float",
+      "EXT_color_buffer_half_float",
+      "EXT_disjoint_timer_query",
+      "EXT_disjoint_timer_query_webgl2",
+      "EXT_sRGB",
+      "WEBGL_color_buffer_float",
+      "WEBGL_compressed_texture_astc",
+      "WEBGL_compressed_texture_atc",
+      "WEBGL_compressed_texture_etc",
+      "WEBGL_compressed_texture_etc1",
+      "WEBGL_compressed_texture_pvrtc",
+      "WEBGL_compressed_texture_s3tc",
+      "WEBGL_compressed_texture_s3tc_srgb",
+
+      "EXT_float_blend",
+      "OES_fbo_render_mipmap",
+      "WEBGL_get_buffer_sub_data_async",
+      "WEBGL_multiview",
+      "WEBGL_security_sensitive_resources",
+      "WEBGL_shared_resources",
+
+      "EXT_clip_cull_distance",
+      "WEBGL_debug",
+      "WEBGL_dynamic_texture",
+      "WEBGL_subarray_uploads",
+      "WEBGL_texture_multisample",
+      "WEBGL_texture_source_iframe",
+      "WEBGL_video_texture",
+
+      "EXT_texture_storage",
+      "OES_depth24",
+      "WEBGL_debug_shader_precision",
+      "WEBGL_draw_elements_no_range_check",
+      "WEBGL_subscribe_uniform",
+      "WEBGL_texture_from_depth_video",
+   ];
+
+   const Context =
+   {
+      create: function (canvas, version, preserveDrawingBuffer)
+      {
+         const options = { preserveDrawingBuffer: preserveDrawingBuffer };
+
+         let gl = null;
+
+         if (version >= 2 && ! gl)
+         {
+            gl = canvas .getContext ("webgl2", options);
+
+            if (gl)
+               gl .getVersion = function () { return 2; };
+         }
+
+         if (version >= 1 && ! gl)
+         {
+            gl = canvas .getContext ("webgl",              options) ||
+                 canvas .getContext ("experimental-webgl", options);
+
+            if (gl)
+            {
+               gl .getVersion = function () { return 1; };
+
+               {
+                  const ext = gl .getExtension ("OES_vertex_array_object");
+
+                  gl .bindVertexArray   =  ext .bindVertexArrayOES   .bind (ext);
+                  gl .createVertexArray =  ext .createVertexArrayOES .bind (ext);
+                  gl .deleteVertexArray =  ext .deleteVertexArrayOES .bind (ext);
+                  gl .isVertexArray     =  ext .isVertexArrayOES     .bind (ext);
+               }
+            }
+          }
+
+         if (! gl)
+            throw new Error ("Couldn't create WebGL context.");
+
+         // Feature detection:
+
+         // If the aliased lineWidth ranges are both 1, gl .lineWidth is probably not possible,
+         // thus we disable it completely to prevent webgl errors.
+
+         const aliasedLineWidthRange = gl .getParameter (gl .ALIASED_LINE_WIDTH_RANGE);
+
+         if (aliasedLineWidthRange [0] === 1 && aliasedLineWidthRange [1] === 1)
+         {
+            gl .lineWidth            = Function .prototype;
+            gl .MUST_TRANSFORM_LINES = gl .getVersion () >= 2;
+
+            if (DEBUG)
+               console .info ("Lines are transformed if necessary to obtain thick lines.");
+         }
+         else
+         {
+            gl .MUST_TRANSFORM_LINES = false;
+         }
+
+         // Load extensions.
+
+         for (const extension of extensions)
+            gl .getExtension (extension);
+
+         // Return context.
+
+         return gl;
+      },
+   }
+
+   return Context;
+});