x_ite 8.9.6 → 8.10.0

package/src/x_ite/Parser/X3DOptimizer.js

@@ -96,12 +96,26 @@ Object .assign (X3DOptimizer .prototype,
 
             return node;
          }
+         case "Collision":
          case "LOD":
          case "Switch":
          {
             this .optimizeNodes (node .children, false, removedNodes);
             return node;
          }
+         case "HAnimJoint":
+         case "HAnimSegment":
+         case "HAnimSite":
+         {
+            node .children = this .optimizeNodes (node .children, true, removedNodes);
+            return node;
+         }
+         case "HAnimHumanoid":
+         {
+            node .skeleton = this .optimizeNodes (node .skeleton, true, removedNodes);
+            node .skin     = this .optimizeNodes (node .skin,     true, removedNodes);
+            return node;
+         }
          default:
          {
             return node;
@@ -125,7 +139,7 @@ Object .assign (X3DOptimizer .prototype,
 
       if (node .getNodeTypeName () === "Transform")
       {
-         this .combineSingleChild (node, removedNodes);
+         node = this .combineSingleChild (node, removedNodes);
 
          if (!node .translation .getValue () .equals (Vector3 .Zero))
             return node;
@@ -137,22 +151,27 @@ Object .assign (X3DOptimizer .prototype,
             return node;
       }
 
-      removedNodes .push (node .getValue ());
+      if (node .children)
+      {
+         removedNodes .push (node);
+
+         return [... node .children];
+      }
 
-      return [... node .children];
+      return node;
    },
    combineSingleChild (node, removedNodes)
    {
       if (node .children .length !== 1)
-         return;
+         return node;
 
       const child = node .children [0];
 
-      if (child .getNodeTypeName () !== "Transform")
-         return;
+      if (!child .getNodeTypeName () .match (/^(?:Transform|HAnimHumanoid)$/))
+         return node;
 
       if (child .getValue () .hasRoutes ())
-         return;
+         return node;
 
       // Combine single Transform nodes.
 
@@ -165,26 +184,36 @@ Object .assign (X3DOptimizer .prototype,
          childMatrix      = new Matrix4 ();
 
       nodeMatrix .set (node .translation .getValue (),
-                        node .rotation .getValue (),
-                        node .scale .getValue (),
-                        node .scaleOrientation .getValue ());
+                       node .rotation .getValue (),
+                       node .scale .getValue (),
+                       node .scaleOrientation .getValue (),
+                       node .center .getValue ());
 
       childMatrix .set (child .translation .getValue (),
                         child .rotation .getValue (),
                         child .scale .getValue (),
-                        child .scaleOrientation .getValue ());
+                        child .scaleOrientation .getValue (),
+                        child .center .getValue ());
 
       nodeMatrix .multLeft (childMatrix);
 
-      nodeMatrix .get (translation, rotation, scale, scaleOrientation);
+      nodeMatrix .get (translation, rotation, scale, scaleOrientation, child .center .getValue ());
+
+      child .translation      = translation;
+      child .rotation         = rotation;
+      child .scale            = scale;
+      child .scaleOrientation = scaleOrientation;
+
+      if (!child .getNodeTypeName () && node .getNodeTypeName ())
+      {
+         const executionContext = child .getExecutionContext ();
+
+         executionContext .addNamedNode (executionContext .getUniqueName (node .getNodeTypeName ()), child);
+      }
 
-      node .translation      = translation;
-      node .rotation         = rotation;
-      node .scale            = scale;
-      node .scaleOrientation = scaleOrientation;
-      node .children         = child .children;
+      removedNodes .push (node);
 
-      removedNodes .push (child .getValue ());
+      return child;
    },
 });
 

package/src/x_ite/Prototype/X3DExternProtoDeclaration.js

@@ -64,10 +64,10 @@ function X3DExternProtoDeclaration (executionContext, url)
 
    this .addType (X3DConstants .X3DExternProtoDeclaration)
 
-   this .addChildObjects ("load",                 new Fields .SFBool (true),
-                          "url",                  url .copy (), // Must be of type MFString.
-                          "autoRefresh",          new Fields .SFTime (),
-                          "autoRefreshTimeLimit", new Fields .SFTime (3600));
+   this .addChildObjects (X3DConstants .inputOutput, "load",                 new Fields .SFBool (true),
+                          X3DConstants .inputOutput, "url",                  url .copy (), // Must be of type MFString.
+                          X3DConstants .inputOutput, "autoRefresh",          new Fields .SFTime (),
+                          X3DConstants .inputOutput, "autoRefreshTimeLimit", new Fields .SFTime (3600));
 }
 
 Object .assign (Object .setPrototypeOf (X3DExternProtoDeclaration .prototype, X3DProtoDeclarationNode .prototype),

package/src/x_ite/Prototype/X3DProtoDeclarationNode.js

@@ -57,7 +57,7 @@ function X3DProtoDeclarationNode (executionContext)
 
    this .addType (X3DConstants .X3DProtoDeclarationNode);
 
-   this .addChildObjects ("updateInstances", new Fields .SFTime ());
+   this .addChildObjects (X3DConstants .outputOnly, "updateInstances", new Fields .SFTime ());
 }
 
 Object .assign (Object .setPrototypeOf (X3DProtoDeclarationNode .prototype, X3DBaseNode .prototype),

package/src/x_ite/Rendering/X3DRenderObject.js

@@ -81,6 +81,7 @@ function X3DRenderObject (executionContext)
    this .localShadows             = [ false ];
    this .localFogs                = [ null ];
    this .layouts                  = [ ];
+   this .humanoids                = [ ];
    this .textureProjectors        = [ ];
    this .generatedCubeMapTextures = [ ];
    this .collisions               = [ ];
@@ -232,6 +233,10 @@ Object .assign (X3DRenderObject .prototype,
    {
       return this .layouts .at (-1);
    },
+   getHumanoids ()
+   {
+      return this .humanoids;
+   },
    getTextureProjectors ()
    {
       return this .textureProjectors;
@@ -504,8 +509,9 @@ Object .assign (X3DRenderObject .prototype,
             const pointingContext = this .pointingShapes [num];
 
             pointingContext .modelViewMatrix .set (modelViewMatrix);
-            pointingContext .shapeNode = shapeNode;
-            pointingContext .scissor   = viewVolume .getScissor ();
+            pointingContext .shapeNode    = shapeNode;
+            pointingContext .scissor      = viewVolume .getScissor ();
+            pointingContext .humanoidNode = this .humanoids .at (-1);
 
             // Clip planes & sensors
 
@@ -593,8 +599,9 @@ Object .assign (X3DRenderObject .prototype,
             const depthContext = this .shadowShapes [num];
 
             depthContext .modelViewMatrix .set (modelViewMatrix);
-            depthContext .shapeNode = shapeNode;
-            depthContext .scissor   = viewVolume .getScissor ();
+            depthContext .shapeNode    = shapeNode;
+            depthContext .scissor      = viewVolume .getScissor ();
+            depthContext .humanoidNode = this .humanoids .at (-1);
 
             // Clip planes
 
@@ -652,6 +659,7 @@ Object .assign (X3DRenderObject .prototype,
             renderContext .fogNode         = this .localFogs .at (-1);
             renderContext .shapeNode       = shapeNode;
             renderContext .appearanceNode  = shapeNode .getAppearance ();
+            renderContext .humanoidNode    = this .humanoids .at (-1);
 
             // Clip planes and local lights
 
@@ -712,11 +720,11 @@ Object .assign (X3DRenderObject .prototype,
          {
             const
                renderContext       = shapes [s],
-               { scissor, clipPlanes, modelViewMatrix, shapeNode } = renderContext,
+               { scissor, clipPlanes, modelViewMatrix, shapeNode, humanoidNode } = renderContext,
                appearanceNode      = shapeNode .getAppearance (),
                geometryContext     = shapeNode .getGeometryContext (),
                stylePropertiesNode = appearanceNode .getStyleProperties (geometryContext .geometryType),
-               shaderNode          = browser .getPointingShader (clipPlanes .length, shapeNode),
+               shaderNode          = browser .getPointingShader (clipPlanes .length, shapeNode, humanoidNode),
                id                  = browser .addPointingShape (renderContext);
 
             gl .scissor (scissor .x - x,
@@ -733,8 +741,8 @@ Object .assign (X3DRenderObject .prototype,
             gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,  false, modelViewMatrix);
             gl .uniform1f (shaderNode .x3d_Id, id);
 
-            if (stylePropertiesNode)
-               stylePropertiesNode .setShaderUniforms (gl, shaderNode);
+            stylePropertiesNode ?.setShaderUniforms (gl, shaderNode);
+            humanoidNode        ?.setShaderUniforms (gl, shaderNode);
 
             shapeNode .displaySimple (gl, renderContext, shaderNode);
             browser .resetTextureUnits ();
@@ -951,11 +959,11 @@ Object .assign (X3DRenderObject .prototype,
          {
             const
                renderContext       = shapes [s],
-               { scissor, clipPlanes, modelViewMatrix, shapeNode } = renderContext,
+               { scissor, clipPlanes, modelViewMatrix, shapeNode, humanoidNode } = renderContext,
                appearanceNode      = shapeNode .getAppearance (),
                geometryContext     = shapeNode .getGeometryContext (),
                stylePropertiesNode = appearanceNode .getStyleProperties (geometryContext .geometryType),
-               shaderNode          = browser .getDepthShader (clipPlanes .length, shapeNode);
+               shaderNode          = browser .getDepthShader (clipPlanes .length, shapeNode, humanoidNode);
 
             gl .scissor (... scissor);
 
@@ -967,8 +975,8 @@ Object .assign (X3DRenderObject .prototype,
             gl .uniformMatrix4fv (shaderNode .x3d_ProjectionMatrix, false, projectionMatrixArray);
             gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,  false, modelViewMatrix);
 
-            if (stylePropertiesNode)
-               stylePropertiesNode .setShaderUniforms (gl, shaderNode);
+            stylePropertiesNode ?.setShaderUniforms (gl, shaderNode);
+            humanoidNode        ?.setShaderUniforms (gl, shaderNode);
 
             shapeNode .displaySimple (gl, renderContext, shaderNode);
             browser .resetTextureUnits ();

package/src/x_ite.html

@@ -67,6 +67,23 @@ X3D (() =>
                },
             },
          },
+         "transforms": {
+            "name": "CSS Transforms",
+            "items": {
+               "default": {
+                  "name": "Default",
+                  "callback": () => $("#transforms") .css ("transform", "matrix(1, 0, 0, 1, 0, 0)"),
+               },
+               "75 %": {
+                  "name": "75 %",
+                  "callback": () => $("#transforms") .css ("transform", "matrix(0.75, 0, 0, 0.75, 0, 0)"),
+               },
+               "50 %": {
+                  "name": "50 %",
+                  "callback": () => $("#transforms") .css ("transform", "matrix(0.5, 0, 0, 0.5, 0, 0)"),
+               },
+            },
+         },
       };
    });
 
@@ -76,7 +93,7 @@ X3D (() =>
 
    let index = localStorage ["Bookmarks.history"] .length - 1;
 
-   function loadURL (url)
+   async function loadURL (url)
    {
       const history = localStorage ["Bookmarks.history"];
 
@@ -113,11 +130,6 @@ X3D (() =>
       console .log (Browser .toJSONString ());
    }
 
-   function viewAll ()
-   {
-      Browser .viewAll ();
-   }
-
    const bookmarks = new Bookmarks (Browser, $("#examples-box"));
 
    bookmarks .setup ([X_ITE_EXAMPLES, X_ITE_TESTS]);
@@ -129,7 +141,6 @@ X3D (() =>
    $("#print-vrml") .on ("click", toVRMLString);
    $("#print-xml") .on ("click", toXMLString);
    $("#print-json") .on ("click", toJSONString);
-   $("#view-all") .on ("click", viewAll);
    $("#browser") .on ("initialized", () => localStorage ["Bookmarks.url"] = Browser .getWorldURL ());
 
    $("#location-entry") .keydown (event =>
@@ -209,7 +220,6 @@ main.color-management #browser {
 
 #file {
    margin: 10px 40px 10px 20px;
-   border-color: white;
 }
 
 #file.loaded {
@@ -227,6 +237,21 @@ main.color-management #browser {
    border-color: #ffe32d;
 }
 
+#animations {
+   margin: 10px 40px 10px 20px;
+}
+
+#animations span {
+   cursor: pointer;
+   padding: 0 3px;
+   font-family: sans-serif;
+}
+
+#animations span.separator {
+   border-left: 1px solid white;
+   margin: 0 5px;
+}
+
 #browser {
    display: block;
    margin: 10px 0px;
@@ -397,12 +422,13 @@ main.color-management #browser {
          <div>
             <h1 id="version"></h1>
             <p id="file"></p>
+            <div id="animations"></div>
          </div>
       </header>
       <main>
          <div>
             <form action="javascript:alert('form submitted')">
-               <div style="transform: matrix(1, 0, 0, 1, 0, 0); transform-origin: 50% 50%;">
+               <div id="transforms" style="transform-origin: 50% 50%;">
                   <x3d-canvas id="browser" splashScreen="true" contextMenu="true" cache="false" debug="true" preserveDrawingBuffer="false" oninitialized="$('#file') .addClass ('loaded')" x-baseURL="tests/" x-src="lines.x3d" update="auto">
                      <p class="fallback">
                         Sorry,<br/>
@@ -420,7 +446,7 @@ main.color-management #browser {
                <button id="location-go" type="button">Load URL</button>
             </div>
             <div id="buttons">
-               <a href="#" id="view-all">▣</a><a id="print-xml" href="#">XML</a><a id="print-vrml" href="#">VRML</a><a id="print-json" href="#">JSON</a><a href="../dist/example.html">example page</a><a href="tests/d3-x3d/">d3-x3d</a><a href="tests/dom-integration/">dom-integration</a><a href="tests/legacy/">legacy</a>
+               <a id="print-xml" href="#">XML</a><a id="print-vrml" href="#">VRML</a><a id="print-json" href="#">JSON</a><a href="../dist/example.html">example page</a><a href="tests/d3-x3d/">d3-x3d</a><a href="tests/dom-integration/">dom-integration</a><a href="tests/legacy/">legacy</a>
             </div>
             <div id="links">
                <a href="../x_ite.min.html">x_ite.min.html</a><a href="https://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a><a id="website" target="_blank">website</a>

package/x_ite.min.html

@@ -48,6 +48,23 @@ X3D (() =>
                },
             },
          },
+         "transforms": {
+            "name": "CSS Transforms",
+            "items": {
+               "default": {
+                  "name": "Default",
+                  "callback": () => $("#transforms") .css ("transform", "matrix(1, 0, 0, 1, 0, 0)"),
+               },
+               "75 %": {
+                  "name": "75 %",
+                  "callback": () => $("#transforms") .css ("transform", "matrix(0.75, 0, 0, 0.75, 0, 0)"),
+               },
+               "50 %": {
+                  "name": "50 %",
+                  "callback": () => $("#transforms") .css ("transform", "matrix(0.5, 0, 0, 0.5, 0, 0)"),
+               },
+            },
+         },
       };
    });
 
@@ -57,7 +74,7 @@ X3D (() =>
 
    let index = localStorage ["Bookmarks.history"] .length - 1;
 
-   function loadURL (url)
+   async function loadURL (url)
    {
       const history = localStorage ["Bookmarks.history"];
 
@@ -94,11 +111,6 @@ X3D (() =>
       console .log (Browser .toJSONString ());
    }
 
-   function viewAll ()
-   {
-      Browser .viewAll ();
-   }
-
    const bookmarks = new Bookmarks (Browser, $("#examples-box"));
 
    bookmarks .setup ([X_ITE_EXAMPLES, X_ITE_TESTS]);
@@ -110,7 +122,6 @@ X3D (() =>
    $("#print-vrml") .on ("click", toVRMLString);
    $("#print-xml") .on ("click", toXMLString);
    $("#print-json") .on ("click", toJSONString);
-   $("#view-all") .on ("click", viewAll);
    $("#browser") .on ("initialized", () => localStorage ["Bookmarks.url"] = Browser .getWorldURL ());
 
    $("#location-entry") .keydown (event =>
@@ -190,7 +201,6 @@ main.color-management #browser {
 
 #file {
    margin: 10px 40px 10px 20px;
-   border-color: white;
 }
 
 #file.loaded {
@@ -208,6 +218,21 @@ main.color-management #browser {
    border-color: #ffe32d;
 }
 
+#animations {
+   margin: 10px 40px 10px 20px;
+}
+
+#animations span {
+   cursor: pointer;
+   padding: 0 3px;
+   font-family: sans-serif;
+}
+
+#animations span.separator {
+   border-left: 1px solid white;
+   margin: 0 5px;
+}
+
 #browser {
    display: block;
    margin: 10px 0px;
@@ -378,12 +403,13 @@ main.color-management #browser {
          <div>
             <h1 id="version"></h1>
             <p id="file"></p>
+            <div id="animations"></div>
          </div>
       </header>
       <main>
          <div>
             <form action="javascript:alert('form submitted')">
-               <div style="transform: matrix(1, 0, 0, 1, 0, 0); transform-origin: 50% 50%;">
+               <div id="transforms" style="transform-origin: 50% 50%;">
                   <x3d-canvas id="browser" splashScreen="true" contextMenu="true" cache="false" debug="true" preserveDrawingBuffer="false" oninitialized="$('#file') .addClass ('loaded')" x-baseURL="src/tests/" x-src="lines.x3d" update="auto">
                      <p class="fallback">
                         Sorry,<br/>
@@ -401,7 +427,7 @@ main.color-management #browser {
                <button id="location-go" type="button">Load URL</button>
             </div>
             <div id="buttons">
-               <a href="#" id="view-all">▣</a><a id="print-xml" href="#">XML</a><a id="print-vrml" href="#">VRML</a><a id="print-json" href="#">JSON</a><a href="dist/example.html">example page</a><a href="src/tests/d3-x3d/">d3-x3d</a><a href="src/tests/dom-integration/">dom-integration</a><a href="src/tests/legacy/">legacy</a>
+               <a id="print-xml" href="#">XML</a><a id="print-vrml" href="#">VRML</a><a id="print-json" href="#">JSON</a><a href="dist/example.html">example page</a><a href="src/tests/d3-x3d/">d3-x3d</a><a href="src/tests/dom-integration/">dom-integration</a><a href="src/tests/legacy/">legacy</a>
             </div>
             <div id="links" class="min-links">
                <a href="src/x_ite.html">src/x_ite.html</a><a href="https://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a><a id="website" target="_blank">website</a>