x_ite 8.9.4 → 8.9.6

package/docs/_config.yml

@@ -20,7 +20,7 @@ timezone:
 # ↓ --------------------------
 
 title: X_ITE X3D Browser               # the main title
-version: 8.9.4                         # x_ite latest version
+version: 8.9.6                         # x_ite latest version
 size: 286                              # size in kb
 x3d_latest_version: 4.0                # x3d latest version
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.9.4",
+	"version": "8.9.6",
 	"description": "X_ITE X3D Browser, view and manipulate X3D and VRML scenes in HTML.",
 	"homepage": "https://create3000.github.io/x_ite/",
 	"author": "Holger Seelig <holger.seelig@gmail.com>",

package/src/x_ite/Base/X3DChildObject.js

@@ -100,14 +100,14 @@ if (DEVELOPMENT)
          this .setModificationTime (Date .now ());
 
          for (const parent of this [_parents] .values ())
-            parent .deref () .addEvent (this);
+            parent .deref () ?.addEvent (this);
       },
       addEventObject (field, event)
       {
          this .setModificationTime (Date .now ());
 
          for (const parent of this [_parents] .values ())
-            parent .deref () .addEventObject (this, event);
+            parent .deref () ?.addEventObject (this, event);
       },
       processEvent ()
       {
@@ -119,7 +119,7 @@ if (DEVELOPMENT)
          let cloneCount = 0;
 
          for (const weakRef of this [_parents] .values ())
-            cloneCount += weakRef .deref () .collectCloneCount ();
+            cloneCount += weakRef .deref () ?.collectCloneCount ();
 
          return cloneCount;
       },
@@ -154,6 +154,8 @@ if (DEVELOPMENT)
          for (const weakRef of this [_parents] .values ())
             parents .add (weakRef .deref ())
 
+         parents .delete (undefined);
+
          return parents;
       },
       parentsChanged () { },

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

@@ -98,11 +98,11 @@ Object .assign (Object .setPrototypeOf (X3DViewer .prototype, X3DBaseNode .proto
    getPointer (event)
    {
       const
-         browser      = this .getBrowser (),
-         contentScale = browser .getRenderingProperty ("ContentScale"),
-         offset       = browser .getSurface () .offset (),
-         x            = (event .pageX - offset .left) * contentScale,
-         y            = browser .getViewport () [3] - (event .pageY - offset .top) * contentScale;
+         browser  = this .getBrowser (),
+         rect     = browser .getSurface () [0] .getBoundingClientRect (),
+         viewport = browser .getViewport (),
+         x        = (event .pageX - (rect .left + $(document) .scrollLeft ())) / rect .width * viewport [2],
+         y        = (rect .height - (event .pageY - (rect .top + $(document) .scrollTop ()))) / rect .height * viewport [3];
 
       return [x, y];
    },

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

@@ -79,11 +79,11 @@ Object .assign (Object .setPrototypeOf (PointingDevice .prototype, X3DBaseNode .
    getPointer (event)
    {
       const
-         browser      = this .getBrowser (),
-         contentScale = browser .getRenderingProperty ("ContentScale"),
-         offset       = browser .getSurface () .offset (),
-         x            = (event .pageX - offset .left) * contentScale,
-         y            = browser .getViewport () [3] - (event .pageY - offset .top) * contentScale;
+         browser  = this .getBrowser (),
+         rect     = browser .getSurface () [0] .getBoundingClientRect (),
+         viewport = browser .getViewport (),
+         x        = (event .pageX - (rect .left + $(document) .scrollLeft ())) / rect .width * viewport [2],
+         y        = (rect .height - (event .pageY - (rect .top + $(document) .scrollTop ()))) / rect .height * viewport [3];
 
       return [x, y];
    },

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.9.4";
+export default "8.9.6";

package/src/x_ite/Components/Core/X3DPrototypeInstance.js

@@ -235,7 +235,13 @@ Object .assign (Object .setPrototypeOf (X3DPrototypeInstance .prototype, X3DNode
 
       if (protoNode .isExternProto && protoNode .checkLoadState () !== X3DConstants .COMPLETE_STATE)
       {
+         this [_body] = null;
+
+         if (this .isInitialized ())
+            X3DChildObject .prototype .addEvent .call (this);
+
          protoNode ._updateInstances .addInterest ("construct", this);
+         protoNode .requestImmediateLoad () .catch (Function .prototype);
       }
       else
       {

package/src/x_ite.html

@@ -402,16 +402,18 @@ main.color-management #browser {
       <main>
          <div>
             <form action="javascript:alert('form submitted')">
-               <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/>
-                     it wasn't me!<br/>
-                     <br/>
-                     Your browser may not support all features required by X_ITE! You can use Firefox, Chrome,
-                     or Microsoft Edge, because this is currently the choice of the choice. We will continuously
-                     keep you informed on technical developments and as soon as X_ITE is running in other browser too.
-                  </p>
-               </x3d-canvas>
+               <div style="transform: matrix(1, 0, 0, 1, 0, 0); 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/>
+                        it wasn't me!<br/>
+                        <br/>
+                        Your browser may not support all features required by X_ITE! You can use Firefox, Chrome,
+                        or Microsoft Edge, because this is currently the choice of the choice. We will continuously
+                        keep you informed on technical developments and as soon as X_ITE is running in other browser too.
+                     </p>
+                  </x3d-canvas>
+                </div>
             </form>
             <div id="location-bar">
                <input id="location-entry" value="https://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"/>

package/x_ite.min.html

@@ -383,16 +383,18 @@ main.color-management #browser {
       <main>
          <div>
             <form action="javascript:alert('form submitted')">
-               <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/>
-                     it wasn't me!<br/>
-                     <br/>
-                     Your browser may not support all features required by X_ITE! You can use Firefox, Chrome,
-                     or Microsoft Edge, because this is currently the choice of the choice. We will continuously
-                     keep you informed on technical developments and as soon as X_ITE is running in other browser too.
-                  </p>
-               </x3d-canvas>
+               <div style="transform: matrix(1, 0, 0, 1, 0, 0); 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/>
+                        it wasn't me!<br/>
+                        <br/>
+                        Your browser may not support all features required by X_ITE! You can use Firefox, Chrome,
+                        or Microsoft Edge, because this is currently the choice of the choice. We will continuously
+                        keep you informed on technical developments and as soon as X_ITE is running in other browser too.
+                     </p>
+                  </x3d-canvas>
+                </div>
             </form>
             <div id="location-bar">
                <input id="location-entry" value="https://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"/>