x_ite 8.0.0 → 8.3.0

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -639,7 +639,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
             userCenterOfRotation = viewpoint .getUserCenterOfRotation (),
             direction            = Vector3 .subtract (userPosition, userCenterOfRotation),
             rotation             = this .getHorizonRotation (rotationChange),
-            axis                 = this .getUpVector (viewpoint);
+            axis                 = viewpoint .getUpVector (true);
 
          this .axis .assign (axis);
 
@@ -649,7 +649,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
          this .timeSensor ._cycleInterval = Math .PI / (rotationChange .angle * SPIN_FACTOR * 30);
          this .timeSensor ._startTime     = this .getBrowser () .getCurrentTime ();
 
-         const lookAtRotation = this .lookAt (userPosition, userCenterOfRotation);
+         const lookAtRotation = viewpoint .getLookAtRotation (userPosition, userCenterOfRotation);
 
          this .direction .assign (direction);
          this .orientationOffset .assign (viewpoint .getUserOrientation ()) .multRight (lookAtRotation .inverse ());
@@ -679,7 +679,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
                fraction             = this .timeSensor ._fraction_changed .getValue (),
                rotation             = new Rotation4 (this .axis, 2 * Math .PI * fraction),
                userPosition         = rotation .multVecRot (direction .assign (this .direction)) .add (userCenterOfRotation),
-               lookAtRotation       = this .lookAt (userPosition, viewpoint .getUserCenterOfRotation ());
+               lookAtRotation       = viewpoint .getLookAtRotation (userPosition, viewpoint .getUserCenterOfRotation ());
 
             positionOffset .assign (userPosition) .subtract (viewpoint .getPosition ());
 
@@ -700,29 +700,6 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
          }
       };
    })(),
-   lookAt: (function ()
-   {
-      const
-         x = new Vector3 (0, 0, 0),
-         y = new Vector3 (0, 0, 0),
-         z = new Vector3 (0, 0, 0),
-         m = new Matrix3 (),
-         r = new Rotation4 ();
-
-      return function (fromPoint, toPoint)
-      {
-         const up = this .getUpVector (this .getActiveViewpoint ());
-
-         z .assign (fromPoint) .subtract (toPoint) .normalize ();
-         x .assign (up) .cross (z) .normalize ();
-         y .assign (z) .cross (x) .normalize ();
-
-         m .set (x.x, x.y, x.z, y.x, y.y, y.z, z.x, z.y, z.z);
-         r .setMatrix (m);
-
-         return r;
-      };
-   })(),
    addMove: (function ()
    {
       const
@@ -813,7 +790,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
             .multRight (orientationOffsetBefore);
 
          if (straightenHorizon)
-            viewpoint .straightenHorizon (userOrientation, this .getUpVector (viewpoint));
+            viewpoint .straightenHorizon (userOrientation, viewpoint .getUpVector (true));
 
          const orientationOffsetAfter = orientationOffset
             .assign (viewpoint .getOrientation ())
@@ -827,7 +804,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
 
             const userVector = userOrientation .multVecRot (zAxis .assign (Vector3 .zAxis));
 
-            if (Math .abs (this .getUpVector (viewpoint) .dot (userVector)) < CRITICAL_ANGLE)
+            if (Math .abs (viewpoint .getUpVector (true) .dot (userVector)) < CRITICAL_ANGLE)
                return orientationOffsetAfter;
 
             throw new Error ("Critical angle");
@@ -853,16 +830,6 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
          return r;
       };
    })(),
-   getUpVector: function (viewpoint)
-   {
-      if (viewpoint .getTypeName () !== "GeoViewpoint")
-         return viewpoint .getUpVector ();
-
-      if (viewpoint .getUserPosition () .magnitude () < 6.5e6)
-         return viewpoint .getUpVector ();
-
-      return Vector3 .zAxis;
-   },
    disconnect: function ()
    {
       const browser = this .getBrowser ();

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -207,9 +207,6 @@ PlaneViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
          this .constrainFieldOfViewScale ();
       }
 
-      if (viewpoint .set_fieldOfView___)
-         viewpoint .set_fieldOfView___ (); // XXX: Immediately apply fieldOfViewScale;
-
       const
          toPoint     = this .getPointOnCenterPlane (x, y, this .toPoint),
          translation = viewpoint .getUserOrientation () .multVecRot (vector .assign (fromPoint) .subtract (toPoint));

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -215,8 +215,9 @@ X3DNavigationContext .prototype =
             this [_viewerNode] = new FlyViewer (this, navigationInfo);
             break;
          case "PLANE":
+         case "PLANE_create3000.github.io":
          case "PLANE_create3000.de":
-            this [_viewerNode] = new PlaneViewer (this, navigationInfo);
+                  this [_viewerNode] = new PlaneViewer (this, navigationInfo);
             break;
          case "NONE":
             this [_viewerNode] = new NoneViewer (this, navigationInfo);

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -113,7 +113,7 @@ X3DViewer .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          const
             navigationInfo   = this .getNavigationInfo (),
             viewpoint        = this .getActiveViewpoint (),
-            viewport         = this .getViewport () .getRectangle (this .getBrowser ()),
+            viewport         = this .getViewport () .getRectangle (),
             projectionMatrix = viewpoint .getProjectionMatrixWithLimits (navigationInfo .getNearValue (), navigationInfo .getFarValue (viewpoint), viewport);
 
          // Far plane point
@@ -138,7 +138,7 @@ X3DViewer .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
    },
    trackballProjectToSphere: function (x, y, vector)
    {
-      const viewport = this .getViewport () .getRectangle (this .getBrowser ());
+      const viewport = this .getViewport () .getRectangle ();
 
       y = this .getBrowser () .getViewport () [3] - y;
 

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

@@ -0,0 +1,52 @@
+/*******************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright create3000, Scheffelstraße 31a, Leipzig, Germany 2011 - 2022.
+ *
+ * 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 2011 - 2022, 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 <https://www.gnu.org/licenses/gpl.html> for a
+ * copy of the GPLv3 License.
+ *
+ * For Silvio, Joy and Adi.
+ *
+ ******************************************************************************/
+
+const Features = {
+   NODE_ENV: (typeof process === "object") && (process .release .name .search (/node|io.js/) !== -1),
+};
+
+export default Features;

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

@@ -38,23 +38,22 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
  *
  ******************************************************************************/
 
-function URLs () { }
+import Features from "./Features.js";
 
-URLs .prototype =
-{
+const URLs = {
    getScriptUrl: (function ()
    {
-      if (document .currentScript)
-         var src = document .currentScript .src;
-      else if (typeof global === "object" && typeof global .require === "function" && typeof __filename === "string")
+      if (Features .NODE_ENV)
          var src = global .require ("url") .pathToFileURL (__filename) .href;
+      else if (document .currentScript)
+         var src = document .currentScript .src;
       else
          var src = document .location .href;
 
@@ -63,14 +62,14 @@ URLs .prototype =
          return src;
       };
    })(),
-   getProviderUrl: function (file)
+   getProviderUrl: function (component)
    {
-      if (file)
+      if (component)
       {
          if (this .getScriptUrl () .match (/\.min\.js$/))
-            file += ".min";
+            component += ".min";
 
-         return new URL ("assets/components/" + file + ".js", this .getScriptUrl ()) .href;
+         return new URL ("assets/components/" + component + ".js", this .getScriptUrl ()) .href;
       }
 
       return "https://create3000.github.io/x_ite/";
@@ -89,4 +88,4 @@ URLs .prototype =
    },
 };
 
-export default new URLs ();
+export default URLs;

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -75,14 +75,6 @@ function X3DNetworkingContext ()
    this [_loadingObjects] = new Set ();
    this [_loading]        = false;
    this [_location]       = getBaseURI (this .getElement () [0]);
-
-   this .getCanvas () .hide ();
-
-   if (this .getBrowserOptions () .getSplashScreen ())
-   {
-      this .getContextMenu () .hide ();
-      this .getSplashScreen () .show ();
-   }
 }
 
 X3DNetworkingContext .prototype =
@@ -127,25 +119,17 @@ X3DNetworkingContext .prototype =
 
          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 .getContextMenu () .hide ();
             this .getCanvas () .hide ();
+            this .getSplashScreen () .stop (true, true) .show ();
          }
       }
       else
       {
          if (this .getBrowserOptions () .getSplashScreen ())
-         {
-            this .getSplashScreen () .stop (true, true) .show () .fadeOut (2000);
-            this .getCanvas ()       .stop (true, true) .hide () .fadeIn  (2000);
-         }
-         else
          {
             this .getCanvas () .show ();
+            this .getSplashScreen () .stop (true, true) .show () .fadeOut (2000);
          }
       }
    },
@@ -153,7 +137,7 @@ X3DNetworkingContext .prototype =
    {
       return this [_loading];
    },
-   addLoadCount: function (object)
+   addLoadingObject: function (object)
    {
       if (this [_loadingObjects] .has (object))
          return;
@@ -165,7 +149,7 @@ X3DNetworkingContext .prototype =
       this .setLoadCount (this [_loadingObjects] .size);
       this .setCursor ("DEFAULT");
    },
-   removeLoadCount: function (object)
+   removeLoadingObject: function (object)
    {
       if (! this [_loadingObjects] .has (object))
          return;
@@ -207,6 +191,9 @@ X3DNetworkingContext .prototype =
       this [_loadingTotal] = 0;
 
       this [_loadingObjects] .clear ();
+
+      for (const object of this .getPrivateScene () .getLoadingObjects ())
+         this .addLoadingObject (object);
    },
 };
 

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

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

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Picking/IntersectionType.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Picking/MatchCriterion.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Picking/SortOrder.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Picking/VolumePicker.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -48,9 +48,7 @@
 import Vector3   from "../../../standard/Math/Numbers/Vector3.js";
 import Rotation4 from "../../../standard/Math/Numbers/Rotation4.js";
 import Matrix4   from "../../../standard/Math/Numbers/Matrix4.js";
-import X3D       from "../../../x_ite/X3D.js";
-
-const Ammo = X3D .require ("Ammo");
+import Ammo      from "../../../lib/ammojs/AmmoClass.js";
 
 function VolumePicker ()
 {

package/src/x_ite/Browser/Picking/X3DPickingContext.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/PointingDeviceSensor/PointingDevice.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/PointingDeviceSensor/PointingDeviceSensorContainer.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/PointingDeviceSensor/X3DPointingDeviceSensorContext.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Rendering/GeometryContext.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Rendering/X3DRenderingContext.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/RigidBodyPhysics/AppliedParametersType.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Scripting/X3DScriptingContext.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Scripting/evaluate.js

@@ -38,14 +38,14 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
  *
  ******************************************************************************/
 
-export default function (globalObject, sourceText)
+function evaluate (globalObject, sourceText)
 {
    return Function (/* js */ `with (arguments [0])
    {
@@ -54,4 +54,6 @@ export default function (globalObject, sourceText)
       ${sourceText}
    }`)
    (globalObject);
-};
+}
+
+export default evaluate;

package/src/x_ite/Browser/Shaders/ShaderCompiler.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Shaders/ShaderSource.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.
@@ -77,12 +77,12 @@ const ShaderSource =
 				match = source .match (GLSL);
 
       // const
-      //    COMMENTS = "\\s+|/\\*[^]*?\\*/|//.*?\\n",
+      //    COMMENTS = "\\s+|/\\*.*?\\*/|//.*?\\n",
       //    VERSION  = "#version\\s+.*?\\n",
-      //    ANY      = "[^]*";
+      //    ANY      = ".*";
 
       // const
-      //    GLSL  = new RegExp ("^((?:" + COMMENTS + ")?(?:" + VERSION + ")?)(" + ANY + ")$"),
+      //    GLSL  = new RegExp ("^((?:" + COMMENTS + ")?(?:" + VERSION + ")?)(" + ANY + ")$", "s"),
       //    match = source .match (GLSL);
 
       if (! match)
@@ -198,7 +198,7 @@ function depreciatedWarning (source, depreciated, current)
    if (source .indexOf (depreciated) === -1)
       return;
 
-   console .warn ("Use of '" + depreciated + "' is depreciated, use '" + current + "' instead. See https://create3000.github.io/x_ite/Custom-Shaders.html.");
+   console .warn ("Use of '" + depreciated + "' is depreciated, use '" + current + "' instead. See https://create3000.github.io/x_ite/custom-shaders.");
 }
 
 export default ShaderSource;

package/src/x_ite/Browser/Shaders/Shaders.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/src/x_ite/Browser/Shaders/X3DShadersContext.js

@@ -38,7 +38,7 @@
  * 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
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.