x_ite 5.0.2 → 6.0.0

package/src/assets/shaders/webgl2/Phong.vs

@@ -2,6 +2,7 @@
 
 precision highp float;
 precision highp int;
+precision highp sampler2D;
 
 uniform mat3 x3d_NormalMatrix;
 uniform mat4 x3d_ProjectionMatrix;
@@ -39,10 +40,12 @@ out vec4  texCoord1;   // texCoord1
 out float depth;
 #endif
 
+#pragma X3D include "include/Particle.glsl"
+
 void
 main ()
 {
-   vec4 position = x3d_ModelViewMatrix * x3d_Vertex;
+   vec4 position = x3d_ModelViewMatrix * getVertex (x3d_Vertex);
 
    fogDepth    = x3d_FogDepth;
    color       = x3d_Color;
@@ -52,11 +55,11 @@ main ()
    localVertex = x3d_Vertex .xyz;
 
    #if x3d_MaxTextures > 0
-   texCoord0 = x3d_TexCoord0;
+   texCoord0 = getTexCoord (x3d_TexCoord0);
    #endif
 
    #if x3d_MaxTextures > 1
-   texCoord1 = x3d_TexCoord1;
+   texCoord1 = getTexCoord (x3d_TexCoord1);
    #endif
 
    gl_Position = x3d_ProjectionMatrix * position;

package/src/assets/shaders/webgl2/Point.vs

@@ -2,12 +2,12 @@
 
 precision highp float;
 precision highp int;
+precision highp sampler2D;
 
 uniform x3d_PointPropertiesParameters x3d_PointProperties;
 
 uniform bool x3d_ColorMaterial;   // true if a X3DColorNode is attached, otherwise false
 uniform x3d_UnlitMaterialParameters x3d_Material;
-uniform int x3d_NumTextures;
 
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
@@ -25,12 +25,12 @@ out vec3  vertex;    // point on geometry
 out float depth;
 #endif
 
+#pragma X3D include "include/Particle.glsl"
+
 void
 main ()
 {
-   // Determine varyings.
-
-   vec4 position = x3d_ModelViewMatrix * x3d_Vertex;
+   vec4 position = x3d_ModelViewMatrix * getVertex (x3d_Vertex);
 
    fogDepth = x3d_FogDepth;
    vertex   = position .xyz;
@@ -49,10 +49,10 @@ main ()
    float dL                   = length (vertex);
 
    pointSize  = x3d_PointProperties .pointSizeScaleFactor;
-   pointSize *= 1.0 / (pointSizeAttenuation [0] + pointSizeAttenuation [1] * dL + pointSizeAttenuation [2] * (dL * dL));
+   pointSize /= pointSizeAttenuation [0] + pointSizeAttenuation [1] * dL + pointSizeAttenuation [2] * (dL * dL);
    pointSize  = clamp (pointSize, pointSizeMinValue, pointSizeMaxValue);
 
-   gl_PointSize = pointSize > 1.0 && x3d_NumTextures == 0 ? pointSize + 1.0 : pointSize;
+   gl_PointSize = pointSize > 1.0 ? pointSize + 1.0 : pointSize;
 
    // Determine color.
 

package/src/assets/shaders/webgl2/Unlit.vs

@@ -2,6 +2,7 @@
 
 precision highp float;
 precision highp int;
+precision highp sampler2D;
 
 uniform mat3 x3d_NormalMatrix;
 uniform mat4 x3d_ProjectionMatrix;
@@ -39,10 +40,12 @@ out vec4  texCoord1;   // texCoord1
 out float depth;
 #endif
 
+#pragma X3D include "include/Particle.glsl"
+
 void
 main ()
 {
-   vec4 position = x3d_ModelViewMatrix * x3d_Vertex;
+   vec4 position = x3d_ModelViewMatrix * getVertex (x3d_Vertex);
 
    fogDepth    = x3d_FogDepth;
    color       = x3d_Color;
@@ -52,11 +55,11 @@ main ()
    localVertex = x3d_Vertex .xyz;
 
    #if x3d_MaxTextures > 0
-   texCoord0 = x3d_TexCoord0;
+   texCoord0 = getTexCoord (x3d_TexCoord0);
    #endif
 
    #if x3d_MaxTextures > 1
-   texCoord1 = x3d_TexCoord1;
+   texCoord1 = getTexCoord (x3d_TexCoord1);
    #endif
 
    gl_Position = x3d_ProjectionMatrix * position;

package/src/assets/shaders/webgl2/include/Line2.glsl

@@ -0,0 +1,20 @@
+struct Line2
+{
+   vec2 point;
+   vec2 direction;
+};
+
+Line2
+line2 (const in vec2 point1, const in vec2 point2)
+{
+   return Line2 (point1, normalize (point2 - point1));
+}
+
+vec2
+closest_point (const in Line2 line, const in vec2 point)
+{
+   vec2  r = point - line .point;
+   float d = dot (r, line .direction);
+
+   return line .direction * d + line .point;
+}

package/src/assets/shaders/webgl2/include/Particle.glsl

@@ -0,0 +1,36 @@
+in vec4 x3d_Particle;
+in mat4 x3d_ParticleMatrix;
+
+uniform sampler2D x3d_TexCoordRamp;
+
+vec4
+texelFetch (const in sampler2D sampler, const in int index, const in int lod)
+{
+   int   x = textureSize (sampler, lod) .x;
+   ivec2 p = ivec2 (index % x, index / x);
+   vec4  t = texelFetch (sampler, p, lod);
+
+   return t;
+}
+
+vec4
+getVertex (const in vec4 vertex)
+{
+   if (x3d_Particle [0] == 0.0)
+      return vertex;
+
+   return x3d_ParticleMatrix * vertex;
+}
+
+vec4
+getTexCoord (const in vec4 texCoord)
+{
+   int index0 = int (x3d_Particle [3]);
+
+   if (x3d_Particle [0] == 0.0 || index0 == -1)
+      return texCoord;
+
+   const int map [6] = int [6] (0, 1, 2, 0, 2, 3);
+
+   return texelFetch (x3d_TexCoordRamp, index0 + map [gl_VertexID % 6], 0);
+}

package/src/example.html

@@ -2,19 +2,19 @@
   <html>
    <head>
     <meta charset="utf-8"/>
-    <link rel="stylesheet" type="text/css" href="https://create3000.github.io/code/x_ite/latest/dist/x_ite.css"/>
-    <script type="text/javascript" src="https://create3000.github.io/code/x_ite/latest/dist/x_ite.min.js"></script>
+    <script type="text/javascript" src="x_ite.min.js"></script>
+    <!-- <script type="text/javascript" src="https://create3000.github.io/code/x_ite/latest/dist/x_ite.min.js"></script> -->
     <style>
-X3DCanvas {
+x3d-canvas {
   width: 1000px;
   height: 563px;
 }
     </style>
   </head>
   <body>
-    <X3DCanvas src="https://cdn.rawgit.com/create3000/Library/main/Examples/X_ITE/info.x3d">
+    <x3d-canvas src="https://create3000.github.io/media/x_ite/info/info.x3d">
       <p>Your browser may not support all features required by X_ITE!</p>
-    </X3DCanvas>
-    <p>If the page is not running <a href="https://github.com/create3000/x_ite/wiki#using-firefox-chrome-and-opera-with-local-files">consider setup a localhost server</a>.</p>
+    </x3d-canvas>
+    <p>If local files are not loaded <a href="https://create3000.github.io/x_ite/#using-firefox-chrome-and-opera-with-local-files">consider setup a localhost server</a>.</p>
   </body>
 </html>

package/src/standard/Math/Algorithm.js

@@ -70,7 +70,7 @@ define (function ()
       },
       fract: function (value)
       {
-         return value > 0 ? value - Math .floor (value) : value - Math .ceil (value);
+         return value % 1;
       },
       clamp: function (value, min, max)
       {
@@ -96,23 +96,21 @@ define (function ()
       {
          let cosom = source .dot (destination);
 
-         if (cosom <= -1)
-            throw new Error ("slerp is not possible: vectors are inverse collinear.");
+         // if (cosom <= -1) ... vectors are inverse colinear.
 
-         if (cosom >= 1) // both normal vectors are equal
+         if (cosom >= 1) // Both normal vectors are equal.
             return source;
 
          if (cosom < 0)
          {
-            // Reverse signs so we travel the short way round
+            // Reverse signs so we travel the short way round.
             cosom = -cosom;
             destination .negate ();
          }
 
          const
-            omega = Math .acos (cosom),
-            sinom = Math .sin  (omega),
-
+            omega  = Math .acos (cosom),
+            sinom  = Math .sin  (omega),
             scale0 = Math .sin ((1 - t) * omega) / sinom,
             scale1 = Math .sin (t * omega) / sinom;
 
@@ -127,16 +125,14 @@ define (function ()
       {
          const cosom = source .dot (destination);
 
-         if (cosom <= -1)
-            throw new Error ("slerp is not possible: vectors are inverse collinear.");
+         // if (cosom <= -1) ... vectors are inverse colinear.
 
-         if (cosom >= 1) // both normal vectors are equal
+         if (cosom >= 1) // Both normal vectors are equal.
             return source;
 
          const
-            omega = Math .acos (cosom),
-            sinom = Math .sin  (omega),
-
+            omega  = Math .acos (cosom),
+            sinom  = Math .sin  (omega),
             scale0 = Math .sin ((1 - t) * omega) / sinom,
             scale1 = Math .sin (t * omega) / sinom;
 
@@ -172,7 +168,7 @@ define (function ()
       {
          return lhs > rhs;
       },
-      lowerBound: function (array, first, last, value, comp)
+      lowerBound: function (array, first, last, value, comp = this .less)
       {
          // http://en.cppreference.com/w/cpp/algorithm/lower_bound
 
@@ -197,7 +193,7 @@ define (function ()
 
          return first;
       },
-      upperBound: function (array, first, last, value, comp)
+      upperBound: function (array, first, last, value, comp = this .less)
       {
          // http://en.cppreference.com/w/cpp/algorithm/upper_bound
 
@@ -233,18 +229,6 @@ define (function ()
             result .add (key);
          }
 
-         return result;
-      },
-      map_difference: function (lhs, rhs, result)
-      {
-         for (const [key, value] of lhs)
-         {
-            if (rhs .has (key))
-               continue;
-
-            result .set (key, value);
-         }
-
          return result;
       },
    };

package/src/standard/Math/Geometry/Plane3.js

@@ -90,7 +90,6 @@ function (Vector3,
          return this;
       },
       multRight: function (matrix)
-      //throw
       {
          // Taken from Inventor:
 
@@ -116,7 +115,6 @@ function (Vector3,
          return this;
       },
       multLeft: function (matrix)
-      //throw
       {
          // Taken from Inventor:
 

package/src/standard/Math/Geometry/ViewVolume.js

@@ -136,66 +136,57 @@ function (Plane3,
 
          return function (projectionMatrix, viewport, scissor)
          {
-            try
-            {
-               this .viewport .assign (viewport);
-               this .scissor  .assign (scissor);
-
-               const points = this .points;
-
-               const
-                  p0 = points [0],
-                  p1 = points [1],
-                  p2 = points [2],
-                  p3 = points [3],
-                  p4 = points [4],
-                  p5 = points [5],
-                  p6 = points [6],
-                  p7 = points [7];
-
-               const
-                  x1 = scissor [0],
-                  x2 = x1 + scissor [2],
-                  y1 = scissor [1],
-                  y2 = y1 + scissor [3];
-
-               matrix .assign (projectionMatrix) .inverse ();
-
-               ViewVolume .unProjectPointMatrix (x1, y1, 0, matrix, viewport, p0),
-               ViewVolume .unProjectPointMatrix (x2, y1, 0, matrix, viewport, p1),
-               ViewVolume .unProjectPointMatrix (x2, y2, 0, matrix, viewport, p2),
-               ViewVolume .unProjectPointMatrix (x1, y2, 0, matrix, viewport, p3),
-               ViewVolume .unProjectPointMatrix (x1, y1, 1, matrix, viewport, p4),
-               ViewVolume .unProjectPointMatrix (x2, y1, 1, matrix, viewport, p5);
-               ViewVolume .unProjectPointMatrix (x2, y2, 1, matrix, viewport, p6);
-               ViewVolume .unProjectPointMatrix (x1, y2, 1, matrix, viewport, p7);
-
-               const normals = this .normals;
-
-               Triangle3 .normal (p0, p1, p2, normals [0]); // front
-               Triangle3 .normal (p7, p4, p0, normals [1]); // left
-               Triangle3 .normal (p6, p2, p1, normals [2]); // right
-               Triangle3 .normal (p2, p6, p7, normals [3]); // top
-               Triangle3 .normal (p1, p0, p4, normals [4]); // bottom
-               Triangle3 .normal (p4, p7, p6, normals [5]); // back
-
-               const planes = this .planes;
-
-               planes [0] .set (p1, normals [0]); // front
-               planes [1] .set (p4, normals [1]); // left
-               planes [2] .set (p2, normals [2]); // right
-               planes [3] .set (p6, normals [3]); // top
-               planes [4] .set (p0, normals [4]); // bottom
-               planes [5] .set (p7, normals [5]); // back
-
-               this .edges .tainted = true;
-               this .valid          = true;
-            }
-            catch (error)
-            {
-               this .valid = false;
-               //console .log (error);
-            }
+            this .viewport .assign (viewport);
+            this .scissor  .assign (scissor);
+
+            const points = this .points;
+
+            const
+               p0 = points [0],
+               p1 = points [1],
+               p2 = points [2],
+               p3 = points [3],
+               p4 = points [4],
+               p5 = points [5],
+               p6 = points [6],
+               p7 = points [7];
+
+            const
+               x1 = scissor [0],
+               x2 = x1 + scissor [2],
+               y1 = scissor [1],
+               y2 = y1 + scissor [3];
+
+            matrix .assign (projectionMatrix) .inverse ();
+
+            ViewVolume .unProjectPointMatrix (x1, y1, 0, matrix, viewport, p0),
+            ViewVolume .unProjectPointMatrix (x2, y1, 0, matrix, viewport, p1),
+            ViewVolume .unProjectPointMatrix (x2, y2, 0, matrix, viewport, p2),
+            ViewVolume .unProjectPointMatrix (x1, y2, 0, matrix, viewport, p3),
+            ViewVolume .unProjectPointMatrix (x1, y1, 1, matrix, viewport, p4),
+            ViewVolume .unProjectPointMatrix (x2, y1, 1, matrix, viewport, p5);
+            ViewVolume .unProjectPointMatrix (x2, y2, 1, matrix, viewport, p6);
+            ViewVolume .unProjectPointMatrix (x1, y2, 1, matrix, viewport, p7);
+
+            const normals = this .normals;
+
+            Triangle3 .normal (p0, p1, p2, normals [0]); // front
+            Triangle3 .normal (p7, p4, p0, normals [1]); // left
+            Triangle3 .normal (p6, p2, p1, normals [2]); // right
+            Triangle3 .normal (p2, p6, p7, normals [3]); // top
+            Triangle3 .normal (p1, p0, p4, normals [4]); // bottom
+            Triangle3 .normal (p4, p7, p6, normals [5]); // back
+
+            const planes = this .planes;
+
+            planes [0] .set (p1, normals [0]); // front
+            planes [1] .set (p4, normals [1]); // left
+            planes [2] .set (p2, normals [2]); // right
+            planes [3] .set (p6, normals [3]); // top
+            planes [4] .set (p0, normals [4]); // bottom
+            planes [5] .set (p7, normals [5]); // back
+
+            this .edges .tainted = true;
 
             return this;
          };
@@ -237,28 +228,25 @@ function (Plane3,
       },
       intersectsSphere: function (radius, center)
       {
-         if (this .valid)
-         {
-            const planes = this .planes;
+         const planes = this .planes;
 
-            if (planes [0] .getDistanceToPoint (center) > radius)
-               return false;
+         if (planes [0] .getDistanceToPoint (center) > radius)
+            return false;
 
-            if (planes [1] .getDistanceToPoint (center) > radius)
-               return false;
+         if (planes [1] .getDistanceToPoint (center) > radius)
+            return false;
 
-            if (planes [2] .getDistanceToPoint (center) > radius)
-               return false;
+         if (planes [2] .getDistanceToPoint (center) > radius)
+            return false;
 
-            if (planes [3] .getDistanceToPoint (center) > radius)
-               return false;
+         if (planes [3] .getDistanceToPoint (center) > radius)
+            return false;
 
-            if (planes [4] .getDistanceToPoint (center) > radius)
-               return false;
+         if (planes [4] .getDistanceToPoint (center) > radius)
+            return false;
 
-            if (planes [5] .getDistanceToPoint (center) > radius)
-               return false;
-         }
+         if (planes [5] .getDistanceToPoint (center) > radius)
+            return false;
 
          return true;
       },
@@ -361,12 +349,9 @@ function (Plane3,
             //Objects coordinates
             invModelViewProjection .multVecMatrix (vin);
 
-            if (vin .w === 0)
-               throw new Error ("Couldn't unproject point: divisor is 0.");
-
             const d = 1 / vin .w;
 
-            return point .set (vin .x * d, vin .y * d, vin .z * d);
+            return point .set (vin .x * d, vin .y * d, vin .z * d, 1);
          };
       })(),
       unProjectRay: (function ()
@@ -392,12 +377,32 @@ function (Plane3,
 
          return function (point, modelViewMatrix, projectionMatrix, viewport, vout)
          {
-            vin .set (point .x, point .y, point .z, 1);
+            if (point .length === 4)
+               vin .assign (point);
+            else
+               vin .set (point .x, point .y, point .z, 1);
 
             projectionMatrix .multVecMatrix (modelViewMatrix .multVecMatrix (vin));
 
-            if (vin .w === 0)
-               throw new Error ("Couldn't project point: divisor is 0.");
+            const d = 1 / (2 * vin .w);
+
+            return vout .set ((vin .x * d + 0.5) * viewport [2] + viewport [0],
+                              (vin .y * d + 0.5) * viewport [3] + viewport [1],
+                              (vin .z * d + 0.5));
+         };
+      })(),
+      projectPointMatrix: (function ()
+      {
+         const vin = new Vector4 (0, 0, 0, 0);
+
+         return function (point, modelViewProjectionMatrix, viewport, vout)
+         {
+            if (point .length === 4)
+               vin .assign (point);
+            else
+               vin .set (point .x, point .y, point .z, 1);
+
+            modelViewProjectionMatrix .multVecMatrix (vin);
 
             const d = 1 / (2 * vin .w);
 

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

@@ -81,6 +81,12 @@ function (Algorithm)
    {
       constructor: Color3,
       length: 3,
+      [Symbol .iterator]: function* ()
+      {
+         yield this [_r];
+         yield this [_g];
+         yield this [_b];
+      },
       copy: function ()
       {
          const copy = Object .create (Color3 .prototype);

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

@@ -85,6 +85,13 @@ function (Color3, Algorithm)
    {
       constructor: Color4,
       length: 4,
+      [Symbol .iterator]: function* ()
+      {
+         yield this [_r];
+         yield this [_g];
+         yield this [_b];
+         yield this [_a];
+      },
       copy: function ()
       {
          const copy = Object .create (Color4 .prototype);

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

@@ -60,6 +60,11 @@ define (function ()
    Complex .prototype =
    {
       constructor: Complex,
+      [Symbol .iterator]: function* ()
+      {
+         yield this .real;
+         yield this .imag;
+      },
       copy: function ()
       {
          const copy = Object .create (Complex .prototype);

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

@@ -76,6 +76,13 @@ function (Vector2,
       constructor: Matrix2,
       order: 2,
       length: 4,
+      [Symbol .iterator]: function* ()
+      {
+         const length = this .length;
+
+         for (let i = 0; i < length; ++ i)
+            yield this [i];
+      },
       copy: function ()
       {
          const copy = Object .create (Matrix2 .prototype);
@@ -154,8 +161,7 @@ function (Vector2,
             D = this [3],
             d = A * D - B * C;
 
-         if (d === 0)
-            throw new Error ("Matrix2 .inverse: determinant is 0.");
+         // if (d === 0) ... determinant is zero.
 
          this [0] =  D / d;
          this [1] = -B / d;
@@ -220,6 +226,18 @@ function (Vector2,
       configurable: false
    });
 
+   Object .defineProperty (Matrix2 .prototype, "y",
+   {
+      get: (function ()
+      {
+         const vector = new Vector2 (0, 0);
+
+         return function () { return vector .set (this [2], this [3]); };
+      })(),
+      enumerable: false,
+      configurable: false
+   });
+
    Object .defineProperty (Matrix2 .prototype, "xAxis",
    {
       get: function () { return this [0]; },