x_ite 5.0.3 → 6.1.0

package/src/x_ite/Rendering/VertexArray.js

@@ -0,0 +1,103 @@
+/* -*- 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 (value = true)
+      {
+         this .tainted = this .tainted || value;
+
+         return this;
+      },
+      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;
+});

package/src/x_ite/Rendering/X3DRenderObject.js

@@ -290,7 +290,7 @@ function (TextureBuffer,
          {
             // Move.
 
-            const length = translation .abs ();
+            const length = translation .magnitude ();
 
             if (length > distance)
             {
@@ -324,57 +324,50 @@ function (TextureBuffer,
          {
             ///  Returns the distance to the closest object in @a direction.  The maximum determinable value is avatarHeight * 2.
 
-            try
-            {
-               const t0 = performance .now ();
+            const t0 = performance .now ();
 
-               const
-                  viewpoint       = this .getViewpoint (),
-                  navigationInfo  = this .getNavigationInfo (),
-                  collisionRadius = navigationInfo .getCollisionRadius (),
-                  bottom          = navigationInfo .getStepHeight () - navigationInfo .getAvatarHeight (),
-                  nearValue       = navigationInfo .getNearValue (),
-                  avatarHeight    = navigationInfo .getAvatarHeight ();
+            const
+               viewpoint       = this .getViewpoint (),
+               navigationInfo  = this .getNavigationInfo (),
+               collisionRadius = navigationInfo .getCollisionRadius (),
+               bottom          = navigationInfo .getStepHeight () - navigationInfo .getAvatarHeight (),
+               nearValue       = navigationInfo .getNearValue (),
+               avatarHeight    = navigationInfo .getAvatarHeight ();
 
-               // Determine width and height of camera
+            // Determine width and height of camera
 
-               // Reshape camera
+            // Reshape camera
 
-               Camera .ortho (-collisionRadius,
-                              collisionRadius,
-                              Math .min (bottom, -collisionRadius), /// TODO: bottom could be a positive value if stepHeight > avatarHeight.
-                              collisionRadius,
-                              nearValue,
-                              Math .max (collisionRadius * 2, avatarHeight * 2),
-                              projectionMatrix);
+            Camera .ortho (-collisionRadius,
+                           collisionRadius,
+                           Math .min (bottom, -collisionRadius), /// TODO: bottom could be a positive value if stepHeight > avatarHeight.
+                           collisionRadius,
+                           nearValue,
+                           Math .max (collisionRadius * 2, avatarHeight * 2),
+                           projectionMatrix);
 
-               // Translate camera to user position and to look in the direction of the direction.
+            // Translate camera to user position and to look in the direction of the direction.
 
-               localOrientation .assign (viewpoint ._orientation .getValue ()) .inverse () .multRight (viewpoint .getOrientation ());
-               rotation .setFromToVec (Vector3 .zAxis, vector .assign (direction) .negate ()) .multRight (localOrientation);
-               viewpoint .straightenHorizon (rotation);
+            localOrientation .assign (viewpoint ._orientation .getValue ()) .inverse () .multRight (viewpoint .getOrientation ());
+            rotation .setFromToVec (Vector3 .zAxis, vector .assign (direction) .negate ()) .multRight (localOrientation);
+            viewpoint .straightenHorizon (rotation);
 
-               cameraSpaceProjectionMatrix .assign (viewpoint .getModelMatrix ());
-               cameraSpaceProjectionMatrix .translate (viewpoint .getUserPosition ());
-               cameraSpaceProjectionMatrix .rotate (rotation);
-               cameraSpaceProjectionMatrix .inverse ();
+            cameraSpaceProjectionMatrix .assign (viewpoint .getModelMatrix ());
+            cameraSpaceProjectionMatrix .translate (viewpoint .getUserPosition ());
+            cameraSpaceProjectionMatrix .rotate (rotation);
+            cameraSpaceProjectionMatrix .inverse ();
 
-               cameraSpaceProjectionMatrix .multRight (projectionMatrix);
-               cameraSpaceProjectionMatrix .multLeft (viewpoint .getCameraSpaceMatrix ());
+            cameraSpaceProjectionMatrix .multRight (projectionMatrix);
+            cameraSpaceProjectionMatrix .multLeft (viewpoint .getCameraSpaceMatrix ());
 
-               this .getProjectionMatrix () .pushMatrix (cameraSpaceProjectionMatrix);
+            this .getProjectionMatrix () .pushMatrix (cameraSpaceProjectionMatrix);
 
-               const depth = this .getDepth (projectionMatrix);
+            const depth = this .getDepth (projectionMatrix);
 
-               this .getProjectionMatrix () .pop ();
+            this .getProjectionMatrix () .pop ();
 
-               this .collisionTime += performance .now () - t0;
-               return -depth;
-            }
-            catch (error)
-            {
-               console .error (error);
-            }
+            this .collisionTime += performance .now () - t0;
+            return -depth;
          };
       })(),
       getDepth: (function ()
@@ -452,7 +445,7 @@ function (TextureBuffer,
             modelViewMatrix .multVecMatrix (bboxCenter .assign (shapeNode .getBBoxCenter ()));
 
             const
-               radius     = bboxSize .abs () / 2,
+               radius     = bboxSize .magnitude () / 2,
                viewVolume = this .viewVolumes .at (-1);
 
             if (viewVolume .intersectsSphere (radius, bboxCenter))
@@ -498,7 +491,7 @@ function (TextureBuffer,
             modelViewMatrix .multVecMatrix (bboxCenter .assign (shapeNode .getBBoxCenter ()));
 
             const
-               radius     = bboxSize .abs () / 2,
+               radius     = bboxSize .magnitude () / 2,
                viewVolume = this .viewVolumes .at (-1);
 
             if (viewVolume .intersectsSphere (radius, bboxCenter))
@@ -540,7 +533,7 @@ function (TextureBuffer,
             modelViewMatrix .multVecMatrix (bboxCenter .assign (shapeNode .getBBoxCenter ()));
 
             const
-               radius     = bboxSize .abs () / 2,
+               radius     = bboxSize .magnitude () / 2,
                viewVolume = this .viewVolumes .at (-1);
 
             if (viewVolume .intersectsSphere (radius, bboxCenter))
@@ -613,28 +606,21 @@ function (TextureBuffer,
 
             for (let i = 0, length = this .numCollisionShapes; i < length; ++ i)
             {
-               try
+               const
+                  context    = this .collisionShapes [i],
+                  collisions = context .collisions;
+
+               if (collisions .length)
                {
-                  const
-                     context    = this .collisionShapes [i],
-                     collisions = context .collisions;
+                  collisionBox .set (collisionSize, Vector3 .Zero);
+                  collisionBox .multRight (invModelViewMatrix .assign (context .modelViewMatrix) .inverse ());
 
-                  if (collisions .length)
+                  if (context .shapeNode .intersectsBox (collisionBox, context .clipPlanes, modelViewMatrix .assign (context .modelViewMatrix)))
                   {
-                     collisionBox .set (collisionSize, Vector3 .Zero);
-                     collisionBox .multRight (invModelViewMatrix .assign (context .modelViewMatrix) .inverse ());
-
-                     if (context .shapeNode .intersectsBox (collisionBox, context .clipPlanes, modelViewMatrix .assign (context .modelViewMatrix)))
-                     {
-                        for (const collision of collisions)
-                           activeCollisions .add (collision);
-                     }
+                     for (const collision of collisions)
+                        activeCollisions .add (collision);
                   }
                }
-               catch (error)
-               {
-                  console .error (error);
-               }
             }
 
             // Set isActive to FALSE for affected nodes.
@@ -667,122 +653,115 @@ function (TextureBuffer,
 
          return function ()
          {
-            try
+            const
+               browser    = this .getBrowser (),
+               shaderNode = browser .getDepthShader ();
+
+            if (shaderNode .isValid ())
             {
-               const
-                  browser    = this .getBrowser (),
-                  shaderNode = browser .getDepthShader ();
+               // Terrain following and gravitation
 
-               if (shaderNode .getValid ())
+               if (browser .getActiveLayer () === this)
                {
-                  // Terrain following and gravitation
-
-                  if (browser .getActiveLayer () === this)
-                  {
-                     if (browser .getCurrentViewer () !== "WALK")
-                        return;
-                  }
-                  else if (this .getNavigationInfo () .getViewer () !== "WALK")
+                  if (browser .getCurrentViewer () !== "WALK")
                      return;
+               }
+               else if (this .getNavigationInfo () .getViewer () !== "WALK")
+                  return;
 
-                  // Get NavigationInfo values
-
-                  const
-                     navigationInfo  = this .getNavigationInfo (),
-                     viewpoint       = this .getViewpoint (),
-                     collisionRadius = navigationInfo .getCollisionRadius (),
-                     nearValue       = navigationInfo .getNearValue (),
-                     avatarHeight    = navigationInfo .getAvatarHeight (),
-                     stepHeight      = navigationInfo .getStepHeight ();
+               // Get NavigationInfo values
 
-                  // Reshape viewpoint for gravite.
+               const
+                  navigationInfo  = this .getNavigationInfo (),
+                  viewpoint       = this .getViewpoint (),
+                  collisionRadius = navigationInfo .getCollisionRadius (),
+                  nearValue       = navigationInfo .getNearValue (),
+                  avatarHeight    = navigationInfo .getAvatarHeight (),
+                  stepHeight      = navigationInfo .getStepHeight ();
 
-                  Camera .ortho (-collisionRadius,
-                                 collisionRadius,
-                                 -collisionRadius,
-                                 collisionRadius,
-                                 nearValue,
-                                 Math .max (collisionRadius * 2, avatarHeight * 2),
-                                 projectionMatrix);
+               // Reshape viewpoint for gravite.
 
-                  // Transform viewpoint to look down the up vector
+               Camera .ortho (-collisionRadius,
+                              collisionRadius,
+                              -collisionRadius,
+                              collisionRadius,
+                              nearValue,
+                              Math .max (collisionRadius * 2, avatarHeight * 2),
+                              projectionMatrix);
 
-                  const
-                     upVector = viewpoint .getUpVector (),
-                     down     = rotation .setFromToVec (Vector3 .zAxis, upVector);
+               // Transform viewpoint to look down the up vector
 
-                  cameraSpaceProjectionMatrix .assign (viewpoint .getModelMatrix ());
-                  cameraSpaceProjectionMatrix .translate (viewpoint .getUserPosition ());
-                  cameraSpaceProjectionMatrix .rotate (down);
-                  cameraSpaceProjectionMatrix .inverse ();
+               const
+                  upVector = viewpoint .getUpVector (),
+                  down     = rotation .setFromToVec (Vector3 .zAxis, upVector);
 
-                  cameraSpaceProjectionMatrix .multRight (projectionMatrix);
-                  cameraSpaceProjectionMatrix .multLeft (viewpoint .getCameraSpaceMatrix ());
+               cameraSpaceProjectionMatrix .assign (viewpoint .getModelMatrix ());
+               cameraSpaceProjectionMatrix .translate (viewpoint .getUserPosition ());
+               cameraSpaceProjectionMatrix .rotate (down);
+               cameraSpaceProjectionMatrix .inverse ();
 
-                  this .getProjectionMatrix () .pushMatrix (cameraSpaceProjectionMatrix);
+               cameraSpaceProjectionMatrix .multRight (projectionMatrix);
+               cameraSpaceProjectionMatrix .multLeft (viewpoint .getCameraSpaceMatrix ());
 
-                  let distance = -this .getDepth (projectionMatrix);
+               this .getProjectionMatrix () .pushMatrix (cameraSpaceProjectionMatrix);
 
-                  this .getProjectionMatrix () .pop ();
+               let distance = -this .getDepth (projectionMatrix);
 
-                  // Gravite or step up
+               this .getProjectionMatrix () .pop ();
 
-                  distance -= avatarHeight;
+               // Gravite or step up
 
-                  const up = rotation .setFromToVec (Vector3 .yAxis, upVector);
+               distance -= avatarHeight;
 
-                  if (distance > 0)
-                  {
-                     // Gravite and fall down the to the floor
+               const up = rotation .setFromToVec (Vector3 .yAxis, upVector);
 
-                     const currentFrameRate = this .speed ? browser .getCurrentFrameRate () : 1000000;
+               if (distance > 0)
+               {
+                  // Gravite and fall down the to the floor
 
-                     this .speed -= browser .getBrowserOptions () ._Gravity .getValue () / currentFrameRate;
+                  const currentFrameRate = this .speed ? browser .getCurrentFrameRate () : 1000000;
 
-                     let y = this .speed / currentFrameRate;
+                  this .speed -= browser .getBrowserOptions () ._Gravity .getValue () / currentFrameRate;
 
-                     if (y < -distance)
-                     {
-                        // The ground is reached.
-                        y = -distance;
-                        this .speed = 0;
-                     }
+                  let y = this .speed / currentFrameRate;
 
-                     viewpoint ._positionOffset = viewpoint ._positionOffset .getValue () .add (up .multVecRot (translation .set (0, y, 0)));
-                  }
-                  else
+                  if (y < -distance)
                   {
+                     // The ground is reached.
+                     y = -distance;
                      this .speed = 0;
+                  }
 
-                     distance = -distance;
-
-                     if (distance > 0.01 && distance < stepHeight)
-                     {
-                        // Step up
-                        this .constrainTranslation (up .multVecRot (translation .set (0, distance, 0)), false);
-
-                        //if (getBrowser () -> getBrowserOptions () -> animateStairWalks ())
-                        //{
-                        //	float step = getBrowser () -> getCurrentSpeed () / getBrowser () -> getCurrentFrameRate ();
-                        //	step = abs (getViewMatrix () .mult_matrix_dir (Vector3f (0, step, 0) * up));
-                        //
-                        //	Vector3f offset = Vector3f (0, step, 0) * up;
-                        //
-                        //	if (math::abs (offset) > math::abs (translation) or getBrowser () -> getCurrentSpeed () == 0)
-                        //		offset = translation;
-                        //
-                        //	getViewpoint () -> positionOffset () += offset;
-                        //}
-                        //else
-                           viewpoint ._positionOffset = translation .add (viewpoint ._positionOffset .getValue ());
-                     }
+                  viewpoint ._positionOffset = viewpoint ._positionOffset .getValue () .add (up .multVecRot (translation .set (0, y, 0)));
+               }
+               else
+               {
+                  this .speed = 0;
+
+                  distance = -distance;
+
+                  if (distance > 0.01 && distance < stepHeight)
+                  {
+                     // Step up
+                     this .constrainTranslation (up .multVecRot (translation .set (0, distance, 0)), false);
+
+                     //if (getBrowser () -> getBrowserOptions () -> animateStairWalks ())
+                     //{
+                     //	float step = getBrowser () -> getCurrentSpeed () / getBrowser () -> getCurrentFrameRate ();
+                     //	step = abs (getViewMatrix () .mult_matrix_dir (Vector3f (0, step, 0) * up));
+                     //
+                     //	Vector3f offset = Vector3f (0, step, 0) * up;
+                     //
+                     //	if (math::abs (offset) > math::abs (translation) or getBrowser () -> getCurrentSpeed () == 0)
+                     //		offset = translation;
+                     //
+                     //	getViewpoint () -> positionOffset () += offset;
+                     //}
+                     //else
+                        viewpoint ._positionOffset = translation .add (viewpoint ._positionOffset .getValue ());
                   }
                }
             }
-            catch (error)
-            {
-               console .error (error);
-            }
          };
       })(),
       depth: (function ()
@@ -799,7 +778,7 @@ function (TextureBuffer,
 
             // Configure depth shader.
 
-            if (shaderNode .getValid ())
+            if (shaderNode .isValid ())
             {
                shaderNode .enable (gl);
 

package/src/x_ite/X3D.js

@@ -126,35 +126,43 @@ function ($,
 
    function createBrowser (url, parameter)
    {
-      const element = $("<X3DCanvas></X3DCanvas>");
+      const element = $("<x3d-canvas></x3d-canvas>");
 
       if (url instanceof Fields .MFString)
           element .attr ("url", url .toString ())
 
-      createBrowserFromElement (element);
-
-      return element [0];
+      return element .get (0);
    }
 
-   function getBrowser (dom)
+   function getBrowser (element)
    {
-      return $(dom || "X3DCanvas") .data ("browser");
+      return $(element || "x3d-canvas, X3DCanvas") .data ("browser");
    }
 
-   function createBrowserFromElement (dom)
+   function createBrowserFromElement (element)
    {
-      dom = $(dom);
+      try
+      {
+         element = $(element);
 
-      if (dom .find (".x_ite-private-browser") .length)
-         return;
+         if (element .find (".x_ite-private-browser") .length)
+            return;
+
+         const browser = new X3DBrowser (element);
 
-      const browser = new X3DBrowser (dom);
+         element .data ("browser", browser);
 
-      dom .data ("browser", browser);
+         browser .setup ();
 
-      browser .setup ();
+         setTimeout (function () { callbacks .resolve (); }, 1);
 
-      return browser;
+         return browser;
+      }
+      catch (error)
+      {
+         Fallback .show ($("x3d-canvas, X3DCanvas"), error);
+         fallbacks .resolve (error);
+      }
    }
 
    const
@@ -180,18 +188,10 @@ function ($,
       {
          const elements = $("X3DCanvas");
 
-         elements .children () .hide ();
-
-         try
-         {
-            $.map (elements, createBrowserFromElement);
-            callbacks .resolve ();
-         }
-         catch (error)
-         {
-            Fallback .show (elements, error);
-            fallbacks .resolve (error);
-         }
+         if (elements .length)
+            console .warn ("Use of <X3DCanvas> element is depreciated, please use <x3d-canvas> element instead.");
+
+         $.map (elements, createBrowserFromElement);
       });
    }
 
@@ -199,11 +199,17 @@ function ($,
 
    Object .assign (X3D,
    {
+      hidden: [
+         "hidden",
+         "createBrowserFromElement",
+      ],
+
       require:                     require,
       define:                      define,
 
       getBrowser:                  getBrowser,
       createBrowser:               createBrowser,
+      createBrowserFromElement:    createBrowserFromElement,
 
       X3DConstants:                X3DConstants,
       X3DBrowser:                  X3DBrowser,

package/src/x_ite.config.js

@@ -36,11 +36,6 @@ require .config ({
          "location": "../node_modules/opentype.js",
          "main": "dist/opentype.js"
       },
-      {
-         "name": "contextMenu",
-         "location": "../node_modules/jquery-contextmenu",
-         "main": "dist/jquery.contextMenu.js"
-      },
       {
          "name": "nurbs",
          "location": "lib/nurbs",