x_ite 5.0.3 → 6.1.0

package/src/x_ite/Browser/Navigation/ExamineViewer.js

@@ -173,9 +173,6 @@ function ($,
       },
       mousedown: function (event)
       {
-         if (this .getBrowser () .getContextMenu () .getActive ())
-            return;
-
          if (this .button >= 0)
             return;
 
@@ -382,7 +379,7 @@ function ($,
             viewpoint .transitionStop ();
 
             step        = this .getDistanceToCenter (step) .multiply (event .zoomFactor || SCROLL_FACTOR),
-            translation = viewpoint .getUserOrientation () .multVecRot (translation .set (0, 0, step .abs ()));
+            translation = viewpoint .getUserOrientation () .multVecRot (translation .set (0, 0, step .magnitude ()));
 
             if (event .deltaY > 0)
                this .addMove (translation .negate (), Vector3 .Zero);
@@ -449,21 +446,24 @@ function ($,
                // End rotate (button 0).
 
                event .button = 0;
+               event .pageX  = this .touch1 .x;
+               event .pageY  = this .touch1 .y;
 
                this .mouseup (event);
 
                // Start dblclick (button 0).
 
-               if (this .getBrowser () .getCurrentTime () - this .tapStart < this .dblTapInterval)
+               if (this .tapedTwice)
                {
-                  event .button = 0;
-                  event .pageX  = this .touch1 .x;
-                  event .pageY  = this .touch1 .y;
-
                   this .dblclick (event);
                }
+               else
+               {
+                  this .tapedTwice = true;
+
+                  setTimeout (function () { this .tapedTwice = false; } .bind (this), 300);
+               }
 
-               this .tapStart = this .getBrowser () .getCurrentTime ();
                break;
             }
             case 1:
@@ -650,17 +650,10 @@ function ($,
 
          return function (rotationChange)
          {
-            try
-            {
-               this .disconnect ();
-               this .getBrowser () .prepareEvents () .addInterest ("spin", this);
+            this .disconnect ();
+            this .getBrowser () .prepareEvents () .addInterest ("spin", this);
 
-               this .rotation .assign (rotation .assign (Rotation4 .Identity) .slerp (rotationChange, SPIN_FACTOR));
-            }
-            catch (error)
-            {
-               console .error (error);
-            }
+            this .rotation .assign (rotation .assign (Rotation4 .Identity) .slerp (rotationChange, SPIN_FACTOR));
          };
       })(),
       addMove: (function ()

package/src/x_ite/Browser/Navigation/LookAtViewer.js

@@ -139,9 +139,6 @@ function ($,
       },
       mousedown: function (event)
       {
-         if (this .getBrowser () .getContextMenu () .getActive ())
-            return;
-
          if (this .button >= 0)
             return;
 
@@ -263,7 +260,7 @@ function ($,
             viewpoint .transitionStop ();
 
             step        = this .getDistanceToCenter (step) .multiply (event .zoomFactor || SCROLL_FACTOR),
-            translation = viewpoint .getUserOrientation () .multVecRot (translation .set (0, 0, step .abs ()));
+            translation = viewpoint .getUserOrientation () .multVecRot (translation .set (0, 0, step .magnitude ()));
 
             if (event .deltaY > 0)
                this .addMove (translation .negate (), Vector3 .Zero);

package/src/x_ite/Browser/Navigation/PlaneViewer.js

@@ -108,9 +108,6 @@ function ($,
       },
       mousedown: function (event)
       {
-         if (this .getBrowser () .getContextMenu () .getActive ())
-            return;
-
          if (this .button >= 0)
             return;
 

package/src/x_ite/Browser/Navigation/X3DFlyViewer.js

@@ -51,6 +51,7 @@ define ([
    "jquery",
    "x_ite/Browser/Navigation/X3DViewer",
    "x_ite/Components/Followers/OrientationChaser",
+   "x_ite/Rendering/VertexArray",
    "standard/Math/Numbers/Vector3",
    "standard/Math/Numbers/Rotation4",
    "standard/Math/Numbers/Matrix4",
@@ -60,6 +61,7 @@ define ([
 function ($,
           X3DViewer,
           OrientationChaser,
+          VertexArray,
           Vector3,
           Rotation4,
           Matrix4,
@@ -94,10 +96,11 @@ function ($,
       this .toVector          = new Vector3 (0, 0, 0);
       this .direction         = new Vector3 (0, 0, 0);
       this .startTime         = 0;
-      this .lineBuffer        = gl .createBuffer ();
       this .lineCount         = 2;
       this .lineVertices      = new Array (this .lineCount * 4);
       this .lineArray         = new Float32Array (this .lineVertices);
+      this .lineBuffer        = gl .createBuffer ();
+      this .lineArrayObject   = new VertexArray ();
       this .event             = null;
       this .lookAround        = false;
       this .orientationChaser = new OrientationChaser (executionContext);
@@ -156,9 +159,6 @@ function ($,
       },
       mousedown: function (event)
       {
-         if (this .getBrowser () .getContextMenu () .getActive ())
-            return;
-
          if (this .button >= 0)
             return;
 
@@ -453,7 +453,7 @@ function ($,
             else
                rubberBandRotation .setFromToVec (up .multVecRot (axis .set (0, 0, -1)), up .multVecRot (direction .assign (this .direction)));
 
-            var rubberBandLength = this .direction .abs ();
+            var rubberBandLength = this .direction .magnitude ();
 
             // Determine positionOffset.
 
@@ -691,10 +691,12 @@ function ($,
                shaderNode = browser .getLineShader (),
                lineWidth  = gl .getParameter (gl .LINE_WIDTH);
 
-            if (shaderNode .getValid ())
+            if (shaderNode .isValid ())
             {
                shaderNode .enable (gl);
-               shaderNode .enableVertexAttribute (gl, this .lineBuffer);
+
+               if (this .lineArrayObject .enable (gl, shaderNode))
+                  shaderNode .enableVertexAttribute (gl, this .lineBuffer, 0, 0);
 
                gl .uniform1i (shaderNode .x3d_NumClipPlanes,         0);
                gl .uniform1i (shaderNode .x3d_FogType,               0);
@@ -744,7 +746,7 @@ function ($,
          // Transfer line.
 
          gl .bindBuffer (gl .ARRAY_BUFFER, this .lineBuffer);
-         gl .bufferData (gl .ARRAY_BUFFER, this .lineArray, gl .STATIC_DRAW);
+         gl .bufferData (gl .ARRAY_BUFFER, this .lineArray, gl .DYNAMIC_DRAW);
       },
       disconnect: function ()
       {
@@ -762,6 +764,11 @@ function ($,
       },
       dispose: function ()
       {
+         const gl = this .getBrowser () .getContext ();
+
+         gl .deleteBuffer (this .lineBuffer);
+         this .lineArrayObject .delete (gl);
+
          this .disconnect ();
          this .getBrowser () ._controlKey .removeInterest ("set_controlKey__", this);
          this .getBrowser () .getSurface () .unbind (".X3DFlyViewer");

package/src/x_ite/Browser/Navigation/X3DViewer.js

@@ -122,29 +122,21 @@ function (X3DBaseNode,
 
          return function (x, y, result)
          {
-            try
-            {
-               const
-                  navigationInfo   = this .getNavigationInfo (),
-                  viewpoint        = this .getActiveViewpoint (),
-                  viewport         = this .getViewport () .getRectangle (this .getBrowser ()),
-                  projectionMatrix = viewpoint .getProjectionMatrixWithLimits (navigationInfo .getNearValue (), navigationInfo .getFarValue (viewpoint), viewport);
+            const
+               navigationInfo   = this .getNavigationInfo (),
+               viewpoint        = this .getActiveViewpoint (),
+               viewport         = this .getViewport () .getRectangle (this .getBrowser ()),
+               projectionMatrix = viewpoint .getProjectionMatrixWithLimits (navigationInfo .getNearValue (), navigationInfo .getFarValue (viewpoint), viewport);
 
-               // Far plane point
-               ViewVolume .unProjectPoint (x, this .getBrowser () .getViewport () [3] - y, 0.9, Matrix4 .Identity, projectionMatrix, viewport, far);
+            // Far plane point
+            ViewVolume .unProjectPoint (x, this .getBrowser () .getViewport () [3] - y, 0.9, Matrix4 .Identity, projectionMatrix, viewport, far);
 
-               if (viewpoint instanceof OrthoViewpoint)
-                  return result .set (far .x, far .y, -this .getDistanceToCenter (distance) .abs ());
+            if (viewpoint instanceof OrthoViewpoint)
+               return result .set (far .x, far .y, -this .getDistanceToCenter (distance) .magnitude ());
 
-               const direction = far .normalize ();
+            const direction = far .normalize ();
 
-               return result .assign (direction) .multiply (this .getDistanceToCenter (distance) .abs () / direction .dot (axis));
-            }
-            catch (error)
-            {
-               console .error (error);
-               return result .set (0, 0, 0);
-            }
+            return result .assign (direction) .multiply (this .getDistanceToCenter (distance) .magnitude () / direction .dot (axis));
          };
       })(),
       getDistanceToCenter: function (distance, positionOffset)
@@ -194,7 +186,7 @@ function (X3DBaseNode,
       })(),
       touch: function (x, y)
       {
-         this .getBrowser () .touch (x, y);
+         this .getBrowser () .touch (x, y, false);
 
          return this .getBrowser () .getHits () .length;
       },

package/src/x_ite/Browser/Networking/X3DNetworkingContext.js

@@ -85,10 +85,13 @@ function (Fields,
       this [_loading]        = false;
       this [_location]       = getBaseURI (this .getElement () [0]);
 
-      this .getCanvas () .fadeOut (0);
+      this .getCanvas () .hide ();
 
       if (this .getBrowserOptions () .getSplashScreen ())
-         this .getSplashScreen () .fadeIn (0);
+      {
+         this .getContextMenu () .hide ();
+         this .getSplashScreen () .show ();
+      }
    }
 
    X3DNetworkingContext .prototype =
@@ -127,28 +130,29 @@ function (Fields,
          {
             this .resetLoadCount ();
 
-            this .getElement () .find (".x_ite-private-world-info") .remove ();
+            this .getShadow () .find (".x_ite-private-world-info") .remove ();
 
             if (this .getBrowserOptions () .getSplashScreen ())
             {
+               this .getContextMenu ()  .hide ();
                this .getCanvas ()       .stop (true, true) .animate ({ "delay": 1 }, 1) .fadeOut (0);
                this .getSplashScreen () .stop (true, true) .animate ({ "delay": 1 }, 1) .fadeIn (0);
             }
             else
             {
-               this .getCanvas () .fadeOut (0);
+               this .getCanvas () .hide ();
             }
          }
          else
          {
             if (this .getBrowserOptions () .getSplashScreen ())
             {
-               this .getSplashScreen () .stop (true, true) .fadeIn  (0) .fadeOut (2000);
-               this .getCanvas ()       .stop (true, true) .fadeOut (0) .fadeIn  (2000);
+               this .getSplashScreen () .stop (true, true) .show () .fadeOut (2000);
+               this .getCanvas ()       .stop (true, true) .hide () .fadeIn  (2000);
             }
             else
             {
-               this .getCanvas () .fadeIn (0);
+               this .getCanvas () .show ();
             }
          }
       },

package/src/x_ite/Browser/ParticleSystems/BVH.glsl

@@ -0,0 +1,183 @@
+#define BVH_NODE        0
+#define BVH_TRIANGLE    1
+#define BVH_STACK_SIZE  32
+
+int bvhNodeIndex = 0;
+
+void
+setBVHIndex (const in int index)
+{
+   bvhNodeIndex = index;
+}
+
+int
+getBVHRoot (const in sampler2D volume, const in int hierarchyIndex, const in int rootIndex)
+{
+   return int (texelFetch (volume, rootIndex, 0) .x) + hierarchyIndex;
+}
+
+int
+getBVHType (const in sampler2D volume)
+{
+   return int (texelFetch (volume, bvhNodeIndex, 0) .x);
+}
+
+vec3
+getBVHMin (const in sampler2D volume)
+{
+   return texelFetch (volume, bvhNodeIndex + 1, 0) .xyz;
+}
+
+vec3
+getBVHMax (const in sampler2D volume)
+{
+   return texelFetch (volume, bvhNodeIndex + 2, 0) .xyz;
+}
+
+int
+getBVHLeft (const in sampler2D volume, const in int hierarchyIndex)
+{
+   return int (texelFetch (volume, bvhNodeIndex, 0) .y) + hierarchyIndex;
+}
+
+int
+getBVHRight (const in sampler2D volume, const in int hierarchyIndex)
+{
+   return int (texelFetch (volume, bvhNodeIndex, 0) .z) + hierarchyIndex;
+}
+
+int
+getBVHTriangle (const in sampler2D volume)
+{
+   return int (texelFetch (volume, bvhNodeIndex, 0) .y);
+}
+
+/* Ray triangle intersection test */
+
+int
+getIntersections (const in sampler2D volume, const in int verticesIndex, const in int hierarchyIndex, const in int rootIndex, const in Line3 line, out vec4 points [ARRAY_SIZE])
+{
+   int current    = getBVHRoot (volume, hierarchyIndex, rootIndex);
+   int count      = 0;
+   int stackIndex = -1;
+   int stack [BVH_STACK_SIZE];
+
+   while (stackIndex >= 0 || current >= 0)
+   {
+      if (current >= 0)
+      {
+         setBVHIndex (current);
+
+         if (getBVHType (volume) == BVH_NODE)
+         {
+            // Node
+
+            if (intersects (getBVHMin (volume), getBVHMax (volume), line))
+            {
+               stack [++ stackIndex] = current;
+
+               current = getBVHLeft (volume, hierarchyIndex);
+            }
+            else
+            {
+               current = -1;
+            }
+         }
+         else
+         {
+            // Triangle
+
+            int  t = getBVHTriangle (volume);
+            int  v = verticesIndex + t;
+            vec3 r = vec3 (0.0);
+
+            vec3 a = texelFetch (volume, v,     0) .xyz;
+            vec3 b = texelFetch (volume, v + 1, 0) .xyz;
+            vec3 c = texelFetch (volume, v + 2, 0) .xyz;
+
+            if (intersects (line, a, b, c, r))
+               points [count ++] = vec4 (r .z * a + r .x * b + r .y * c, 1.0);
+
+            current = -1;
+         }
+      }
+      else
+      {
+         setBVHIndex (stack [stackIndex --]);
+
+         current = getBVHRight (volume, hierarchyIndex);
+      }
+   }
+
+   return count;
+}
+
+int
+getIntersections (const in sampler2D volume, const in int verticesIndex, const in int normalsIndex, const in int hierarchyIndex, const in int rootIndex, const in Line3 line, out vec4 points [ARRAY_SIZE], out vec3 normals [ARRAY_SIZE])
+{
+   int current    = getBVHRoot (volume, hierarchyIndex, rootIndex);
+   int count      = 0;
+   int stackIndex = -1;
+   int stack [BVH_STACK_SIZE];
+
+   while (stackIndex >= 0 || current >= 0)
+   {
+      if (current >= 0)
+      {
+         setBVHIndex (current);
+
+         if (getBVHType (volume) == BVH_NODE)
+         {
+            // Node
+
+            if (intersects (getBVHMin (volume), getBVHMax (volume), line))
+            {
+               stack [++ stackIndex] = current;
+
+               current = getBVHLeft (volume, hierarchyIndex);
+            }
+            else
+            {
+               current = -1;
+            }
+         }
+         else
+         {
+            // Triangle
+
+            int  t = getBVHTriangle (volume);
+            int  v = verticesIndex + t;
+            vec3 r = vec3 (0.0);
+
+            vec3 a = texelFetch (volume, v,     0) .xyz;
+            vec3 b = texelFetch (volume, v + 1, 0) .xyz;
+            vec3 c = texelFetch (volume, v + 2, 0) .xyz;
+
+            if (intersects (line, a, b, c, r))
+            {
+               points [count] = vec4 (r .z * a + r .x * b + r .y * c, 1.0);
+
+               int n = normalsIndex + t;
+
+               vec3 n0 = texelFetch (volume, n,     0) .xyz;
+               vec3 n1 = texelFetch (volume, n + 1, 0) .xyz;
+               vec3 n2 = texelFetch (volume, n + 2, 0) .xyz;
+
+               normals [count] = save_normalize (r .z * n0 + r .x * n1 + r .y * n2);
+
+               ++ count;
+            }
+
+            current = -1;
+         }
+      }
+      else
+      {
+         setBVHIndex (stack [stackIndex --]);
+
+         current = getBVHRight (volume, hierarchyIndex);
+      }
+   }
+
+   return count;
+}

package/src/x_ite/Browser/ParticleSystems/Box3.glsl

@@ -0,0 +1,47 @@
+bool
+intersects (const in vec3 min, const in vec3 max, const in Line3 line)
+{
+   vec3 intersection;
+
+   // front
+
+   if (intersects (plane3 (max, vec3 (0.0, 0.0, 1.0)), line, intersection))
+   {
+      if (all (greaterThanEqual (vec4 (intersection .xy, max .xy), vec4 (min .xy, intersection .xy))))
+         return true;
+   }
+
+   // back
+
+   if (intersects (plane3 (min, vec3 (0.0, 0.0, -1.0)), line, intersection))
+   {
+      if (all (greaterThanEqual (vec4 (intersection .xy, max .xy), vec4 (min .xy, intersection .xy))))
+         return true;
+   }
+
+   // top
+
+   if (intersects (plane3 (max, vec3 (0.0, 1.0, 0.0)), line, intersection))
+   {
+      if (all (greaterThanEqual (vec4 (intersection .xz, max .xz), vec4 (min .xz, intersection .xz))))
+         return true;
+   }
+
+   // bottom
+
+   if (intersects (plane3 (min, vec3 (0.0, -1.0, 0.0)), line, intersection))
+   {
+      if (all (greaterThanEqual (vec4 (intersection .xz, max .xz), vec4 (min .xz, intersection .xz))))
+         return true;
+   }
+
+   // right
+
+   if (intersects (plane3 (max, vec3 (1.0, 0.0, 0.0)), line, intersection))
+   {
+      if (all (greaterThanEqual (vec4 (intersection .yz, max .yz), vec4 (min .yz, intersection .yz))))
+         return true;
+   }
+
+   return false;
+}

package/src/x_ite/Browser/ParticleSystems/GeometryTypes.js

@@ -0,0 +1,66 @@
+/* -*- 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";
+
+   let i = 0;
+
+   const GeometryTypes = {
+      POINT:    i ++,
+      LINE:     i ++,
+      TRIANGLE: i ++,
+      QUAD:     i ++,
+      SPRITE:   i ++,
+      GEOMETRY: i ++,
+   };
+
+   return GeometryTypes;
+});

package/src/x_ite/Browser/ParticleSystems/Line3.glsl

@@ -0,0 +1,55 @@
+struct Line3 {
+   vec3 point;
+   vec3 direction;
+};
+
+// Line3
+// line3 (const in vec3 point1, const in vec3 point2)
+// {
+//    return Line3 (point1, normalize (point2 - point1));
+// }
+
+/* Line intersect triangle */
+
+bool
+intersects (const in Line3 line, const in vec3 a, const in vec3 b, const in vec3 c, out vec3 r)
+{
+   // find vectors for two edges sharing vert0
+   vec3 edge1 = b - a;
+   vec3 edge2 = c - a;
+
+   // begin calculating determinant - also used to calculate U parameter
+   vec3 pvec = cross (line .direction, edge2);
+
+   // if determinant is near zero, ray lies in plane of triangle
+   float det = dot (edge1, pvec);
+
+   // Non culling intersection
+
+   if (det == 0.0)
+      return false;
+
+   float inv_det = 1.0 / det;
+
+   // calculate distance from vert0 to ray point
+   vec3 tvec = line .point - a;
+
+   // calculate U parameter and test bounds
+   float u = dot (tvec, pvec) * inv_det;
+
+   if (u < 0.0 || u > 1.0)
+      return false;
+
+   // prepare to test V parameter
+   vec3 qvec = cross (tvec, edge1);
+
+   // calculate V parameter and test bounds
+   float v = dot (line .direction, qvec) * inv_det;
+
+   if (v < 0.0 || u + v > 1.0)
+      return false;
+
+   r = vec3 (u, v, 1.0 - u - v);
+
+   return true;
+}