x_ite 8.4.3 → 8.5.3

package/src/x_ite/Components/CubeMapTexturing/ImageCubeMapTexture.js

@@ -121,8 +121,7 @@ ImageCubeMapTexture .prototype = Object .assign (Object .create (X3DEnvironmentT
 
       this .image .on ("load",        this .setImage .bind (this));
       this .image .on ("abort error", this .setError .bind (this));
-
-      this .image [0] .crossOrigin = "Anonymous";
+      this .image .prop ("crossOrigin", "Anonymous");
 
       this .requestImmediateLoad ();
    },
@@ -150,7 +149,7 @@ ImageCubeMapTexture .prototype = Object .assign (Object .create (X3DEnvironmentT
 
       if (this .URL .protocol !== "data:")
       {
-         if (!this .getBrowser () .getBrowserOptions () .getCache () || !this .getCache ())
+         if (!this .getCache ())
             this .URL .searchParams .set ("_", Date .now ());
       }
 

package/src/x_ite/Components/Geometry3D/Extrusion.js

@@ -590,6 +590,8 @@ Extrusion .prototype = Object .assign (Object .create (X3DGeometryNode .prototyp
             {
                const
                   j         = 0, // spine
+                  convex    = this ._convex .getValue (),
+                  texCoord  = { },
                   polygon   = [ ],
                   triangles = [ ];
 
@@ -599,12 +601,12 @@ Extrusion .prototype = Object .assign (Object .create (X3DGeometryNode .prototyp
                      index = INDEX (j, numCapPoints - 1 - k),
                      point = points [index] .copy ();
 
-                  point .index    = index;
-                  point .texCoord = Vector2 .subtract (crossSection [numCapPoints - 1 - k] .getValue (), min) .divide (capMax);
-                  polygon .push (point);
+                  point .index     = index;
+                  texCoord [index] = Vector2 .subtract (crossSection [numCapPoints - 1 - k] .getValue (), min) .divide (capMax);
+                  polygon .push (convex ? index : point);
                }
 
-               if (this ._convex .getValue ())
+               if (convex)
                   Triangle3 .triangulateConvexPolygon (polygon, triangles);
 
                else
@@ -612,15 +614,15 @@ Extrusion .prototype = Object .assign (Object .create (X3DGeometryNode .prototyp
 
                if (triangles .length >= 3)
                {
-                  const normal = Triangle3 .normal (points [triangles [0] .index],
-                                                    points [triangles [1] .index],
-                                                    points [triangles [2] .index],
+                  const normal = Triangle3 .normal (points [triangles [0]],
+                                                    points [triangles [1]],
+                                                    points [triangles [2]],
                                                     new Vector3 (0, 0, 0));
 
                   if (cw)
                      normal .negate ();
 
-                  this .addCap (texCoordArray, normal, points, triangles);
+                  this .addCap (texCoordArray, texCoord, normal, points, triangles);
                }
             }
 
@@ -628,6 +630,8 @@ Extrusion .prototype = Object .assign (Object .create (X3DGeometryNode .prototyp
             {
                const
                   j         = numSpines - 1, // spine
+                  convex    = this ._convex .getValue (),
+                  texCoord  = { },
                   polygon   = [ ],
                   triangles = [ ];
 
@@ -637,12 +641,12 @@ Extrusion .prototype = Object .assign (Object .create (X3DGeometryNode .prototyp
                      index = INDEX (j, k),
                      point = points [index] .copy ();
 
-                  point .index    = index;
-                  point .texCoord = Vector2 .subtract (crossSection [k] .getValue (), min) .divide (capMax);
-                  polygon .push (point);
+                  point .index     = index;
+                  texCoord [index] = Vector2 .subtract (crossSection [k] .getValue (), min) .divide (capMax);
+                  polygon .push (convex ? index : point);
                }
 
-               if (this ._convex .getValue ())
+               if (convex)
                   Triangle3 .triangulateConvexPolygon (polygon, triangles);
 
                else
@@ -650,15 +654,15 @@ Extrusion .prototype = Object .assign (Object .create (X3DGeometryNode .prototyp
 
                if (triangles .length >= 3)
                {
-                  const normal = Triangle3 .normal (points [triangles [0] .index],
-                                                    points [triangles [1] .index],
-                                                    points [triangles [2] .index],
+                  const normal = Triangle3 .normal (points [triangles [0]],
+                                                    points [triangles [1]],
+                                                    points [triangles [2]],
                                                     new Vector3 (0, 0, 0));
 
                   if (cw)
                      normal .negate ();
 
-                  this .addCap (texCoordArray, normal, points, triangles);
+                  this .addCap (texCoordArray, texCoord, normal, points, triangles);
                }
             }
          }
@@ -667,7 +671,7 @@ Extrusion .prototype = Object .assign (Object .create (X3DGeometryNode .prototyp
          this .setCCW (this ._ccw .getValue ());
       };
    })(),
-   addCap: function (texCoordArray, normal, vertices, triangles)
+   addCap: function (texCoordArray, texCoord, normal, vertices, triangles)
    {
       const
          normalArray = this .getNormals (),
@@ -676,12 +680,12 @@ Extrusion .prototype = Object .assign (Object .create (X3DGeometryNode .prototyp
       for (let i = 0, length = triangles .length; i < length; i += 3)
       {
          const
-            p0 = vertices [triangles [i]     .index],
-            p1 = vertices [triangles [i + 1] .index],
-            p2 = vertices [triangles [i + 2] .index],
-            t0 = triangles [i]     .texCoord,
-            t1 = triangles [i + 1] .texCoord,
-            t2 = triangles [i + 2] .texCoord;
+            p0 = vertices [triangles [i]],
+            p1 = vertices [triangles [i + 1]],
+            p2 = vertices [triangles [i + 2]],
+            t0 = texCoord [triangles [i]],
+            t1 = texCoord [triangles [i + 1]],
+            t2 = texCoord [triangles [i + 2]];
 
          texCoordArray .push (t0 .x, t0 .y, 0, 1);
          texCoordArray .push (t1 .x, t1 .y, 0, 1);

package/src/x_ite/Components/Geometry3D/IndexedFaceSet.js

@@ -294,7 +294,7 @@ IndexedFaceSet .prototype = Object .assign (Object .create (X3DComposedGeometryN
                            polygon   = { vertices: vertices, triangles: triangles, face: face };
 
                         if (convex)
-                           this .triangulateConvexPolygon (vertices, triangles);
+                           Triangle3 .triangulateConvexPolygon (vertices, triangles);
                         else
                            this .triangulatePolygon (vertices, triangles);
 
@@ -331,34 +331,25 @@ IndexedFaceSet .prototype = Object .assign (Object .create (X3DComposedGeometryN
             coord      = this .getCoord (),
             length     = vertices .length;
 
-         for (let v = 0; v < length; ++ v)
-         {
-            const i = vertices [v];
-
-            let vertex = polygon [v];
+         for (let i = polygon .length; i < length; ++ i)
+            polygon .push (new Vector3 (0, 0, 0));
 
-            if (!vertex)
-               vertex = polygon [v] = new Vector3 (0, 0, 0);
+         for (let i = 0; i < length; ++ i)
+         {
+            const
+               index = vertices [i],
+               point = polygon [i];
 
-            vertex .index = i;
+            point .index = index;
 
-            coord .get1Point (coordIndex [i], vertex);
+            coord .get1Point (coordIndex [index], point);
          }
 
          polygon .length = length;
 
          Triangle3 .triangulatePolygon (polygon, triangles);
-
-         for (let i = 0, length = triangles .length; i < length; ++ i)
-            triangles [i] = triangles [i] .index;
       };
    })(),
-   triangulateConvexPolygon: function (vertices, triangles)
-   {
-      // Fallback: Very simple triangulation for convex polygons.
-      for (let i = 1, length = vertices .length - 1; i < length; ++ i)
-         triangles .push (vertices [0], vertices [i], vertices [i + 1]);
-   },
    buildNormals: function (polygons)
    {
       const

package/src/x_ite/Components/Grouping/X3DBoundedObject.js

@@ -87,10 +87,8 @@ X3DBoundedObject .prototype =
 
       bbox .set ();
 
-      for (var i = 0, length = nodes .length; i < length; ++ i)
+      for (const node of nodes)
       {
-         const node = nodes [i];
-
          if (node .getBBox)
             bbox .add (node .getBBox (childBBox, shadows));
       }

package/src/x_ite/Components/HAnim/HAnimHumanoid.js

@@ -70,8 +70,8 @@ function HAnimHumanoid (executionContext)
    this ._bboxSize    .setUnit ("length");
    this ._bboxCenter  .setUnit ("length");
 
-   this .viewpointsNode = new Group (executionContext);
    this .skeletonNode   = new Group (executionContext);
+   this .viewpointsNode = new Group (executionContext);
    this .skinNode       = new Group (executionContext);
    this .transformNode  = new Transform (executionContext);
    this .jointNodes     = [ ];
@@ -79,6 +79,7 @@ function HAnimHumanoid (executionContext)
    this .skinCoordNode  = null;
    this .restNormalNode = null;
    this .restCoordNode  = null;
+   this .changed        = false;
 }
 
 HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototype),
@@ -106,12 +107,12 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
       new X3DFieldDefinition (X3DConstants .inputOutput,    "bboxDisplay",           new Fields .SFBool ()),
       new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxSize",              new Fields .SFVec3f (-1, -1, -1)),
       new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxCenter",            new Fields .SFVec3f ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput,    "skeleton",              new Fields .MFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "viewpoints",            new Fields .MFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "sites",                 new Fields .MFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "joints",                new Fields .MFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "segments",              new Fields .MFNode ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput,    "joints",                new Fields .MFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "motions",               new Fields .MFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "skeleton",              new Fields .MFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "skinBindingNormal",     new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "skinBindingCoord",      new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "skinNormal",            new Fields .SFNode ()),
@@ -137,19 +138,19 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
 
       // Groups
 
-      this .viewpointsNode .setAllowedTypes (X3DConstants .HAnimSite);
       this .skeletonNode   .setAllowedTypes (X3DConstants .HAnimJoint, X3DConstants .HAnimSite);
+      this .viewpointsNode .setAllowedTypes (X3DConstants .HAnimSite);
 
-      this ._viewpoints .addFieldInterest (this .viewpointsNode ._children);
       this ._skeleton   .addFieldInterest (this .skeletonNode   ._children);
+      this ._viewpoints .addFieldInterest (this .viewpointsNode ._children);
       this ._skin       .addFieldInterest (this .skinNode       ._children);
 
-      this .viewpointsNode ._children = this ._viewpoints;
       this .skeletonNode   ._children = this ._skeleton;
+      this .viewpointsNode ._children = this ._viewpoints;
       this .skinNode       ._children = this ._skin;
 
-      this .viewpointsNode .setPrivate (true);
       this .skeletonNode   .setPrivate (true);
+      this .viewpointsNode .setPrivate (true);
       this .skinNode       .setPrivate (true);
 
       // Transform
@@ -173,15 +174,15 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
       this .transformNode ._bboxDisplay      = this ._bboxDisplay;
       this .transformNode ._bboxSize         = this ._bboxSize;
       this .transformNode ._bboxCenter       = this ._bboxCenter;
-      this .transformNode ._children         = [ this .viewpointsNode, this .skeletonNode, this .skinNode ];
+      this .transformNode ._children         = [ this .skeletonNode, this .viewpointsNode, this .skinNode ];
 
       this .transformNode ._isCameraObject   .addFieldInterest (this ._isCameraObject);
       this .transformNode ._isPickableObject .addFieldInterest (this ._isPickableObject);
 
       // Setup
 
-      this .viewpointsNode .setup ();
       this .skeletonNode   .setup ();
+      this .viewpointsNode .setup ();
       this .skinNode       .setup ();
       this .transformNode  .setup ();
 
@@ -206,6 +207,9 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
    {
       const jointNodes = this .jointNodes;
 
+      for (const jointNode of jointNodes)
+         jointNode .removeInterest ("set_joint__", this);
+
       jointNodes .length = 0;
 
       for (const node of this ._joints)
@@ -215,6 +219,15 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
          if (jointNode)
             jointNodes .push (jointNode);
       }
+
+      for (const jointNode of jointNodes)
+         jointNode .addInterest ("set_joint__", this);
+
+      this .set_joint__ ();
+   },
+   set_joint__: function ()
+   {
+      this .changed = true;
    },
    set_skinNormal__: function ()
    {
@@ -224,6 +237,8 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
 
       if (this .skinNormalNode)
          this .restNormalNode = this .skinNormalNode .copy ();
+
+      this .changed = true;
    },
    set_skinCoord__: function ()
    {
@@ -232,16 +247,23 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
       this .skinCoordNode = X3DCast (X3DConstants .X3DCoordinateNode, this ._skinCoord);
 
       if (this .skinCoordNode)
+      {
          this .restCoordNode = this .skinCoordNode .copy ();
+
+         delete this .skinning;
+      }
+      else
+      {
+         this .skinning = Function .prototype
+      }
+
+      this .changed = true;
    },
    traverse: function (type, renderObject)
    {
-      renderObject .getJoints () .length = 0;
-
       this .transformNode .traverse (type, renderObject);
 
-      if (this .isLive () .getValue ())
-         this .skinning (type, renderObject);
+      this .skinning (type, renderObject);
    },
    skinning: (function ()
    {
@@ -257,11 +279,13 @@ HAnimHumanoid .prototype = Object .assign (Object .create (X3DChildNode .prototy
          if (type !== TraverseType .CAMERA)
             return;
 
-         if (! this .skinCoordNode)
+         if (!this .changed)
             return;
 
+         this .changed = false;
+
          const
-            jointNodes     = this .jointNodes .length ? this .jointNodes : renderObject .getJoints (),
+            jointNodes     = this .jointNodes,
             skinNormalNode = this .skinNormalNode,
             skinCoordNode  = this .skinCoordNode,
             restNormalNode = this .restNormalNode,

package/src/x_ite/Components/HAnim/HAnimJoint.js

@@ -111,7 +111,8 @@ HAnimJoint .prototype = Object .assign (Object .create (X3DTransformNode .protot
    {
       X3DTransformNode .prototype .initialize .call (this);
 
-      this ._displacers .addInterest ("set_displacers__", this);
+      this ._skinCoordIndex .addInterest ("set_skinCoordIndex__", this);
+      this ._displacers     .addInterest ("set_displacers__",     this);
 
       this .set_displacers__ ();
    },
@@ -127,6 +128,10 @@ HAnimJoint .prototype = Object .assign (Object .create (X3DTransformNode .protot
    {
       return this .displacerNodes;
    },
+   set_skinCoordIndex__: function ()
+   {
+      this .set_cameraObjects__ ();
+   },
    set_displacers__: function ()
    {
       const displacerNodes = this .displacerNodes;
@@ -146,11 +151,7 @@ HAnimJoint .prototype = Object .assign (Object .create (X3DTransformNode .protot
       if (type === TraverseType .CAMERA)
       {
          if (this ._skinCoordIndex .length)
-         {
-            renderObject .getJoints () .push (this);
-
             this .modelMatrix .assign (this .getMatrix ()) .multRight (renderObject .getModelViewMatrix () .get ());
-         }
       }
 
       X3DTransformNode .prototype .traverse .call (this, type, renderObject);
@@ -160,11 +161,7 @@ HAnimJoint .prototype = Object .assign (Object .create (X3DTransformNode .protot
       if (type === TraverseType .CAMERA)
       {
          if (this ._skinCoordIndex .length)
-         {
-            renderObject .getJoints () .push (this);
-
             this .modelMatrix .assign (renderObject .getModelViewMatrix () .get ());
-         }
       }
 
       X3DTransformNode .prototype .groupTraverse .call (this, type, renderObject);

package/src/x_ite/Components/Layering/X3DLayerNode.js

@@ -69,8 +69,9 @@ function X3DLayerNode (executionContext, defaultViewpoint, groupNode)
    if (executionContext .getSpecificationVersion () < 4.0)
       this .addAlias ("isPickable", this ._pickable);
 
-   this .groupNode       = groupNode;
-   this .currentViewport = null;
+   this .pickableGroupNode = executionContext .createNode ("PickableGroup", false);
+   this .groupNode         = groupNode;
+   this .currentViewport   = null;
 
    this .defaultNavigationInfo = new NavigationInfo (executionContext);
    this .defaultViewpoint      = defaultViewpoint;
@@ -103,6 +104,21 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
       X3DNode         .prototype .initialize .call (this);
       X3DRenderObject .prototype .initialize .call (this);
 
+      // if (this .pickableGroupNode)
+      // {
+      //    this ._pickable   .addFieldInterest (this .pickableGroupNode ._pickable);
+      //    this ._objectType .addFieldInterest (this .pickableGroupNode ._objectType);
+
+      //    this .pickableGroupNode ._pickable   = this ._pickable;
+      //    this .pickableGroupNode ._objectType = this ._objectType;
+
+      //    this .pickableGroupNode .setup ();
+      // }
+      // else
+      // {
+      //    this .pickableGroupNode = this .groupNode;
+      // }
+
       this .defaultNavigationInfo .setup ();
       this .defaultViewpoint      .setup ();
       this .defaultBackground     .setup ();
@@ -238,6 +254,9 @@ X3DLayerNode .prototype = Object .assign (Object .create (X3DNode .prototype),
       this .fogStack            .pushOnTop (fogNode);
 
       viewpointNode .resetUserOffsets ();
+
+      if (viewpointNode ._viewAll .getValue ())
+         viewpointNode .viewAll (this .getBBox (new Box3 ()));
    },
    traverse: function (type, renderObject)
    {

package/src/x_ite/Components/Layout/Layout.js

@@ -446,6 +446,8 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
       // Calculate rectangleSize
 
       var
+         browser             = this .getBrowser (),
+         contentScale        = browser .getRenderingProperty ("ContentScale"),
          matrix              = this .matrix,
          viewpoint           = renderObject .getViewpoint (),
          nearValue           = renderObject .getNavigationInfo () .getNearValue (),       // in meters
@@ -457,8 +459,8 @@ Layout .prototype = Object .assign (Object .create (X3DLayoutNode .prototype),
          rectangleSize       = this .rectangleSize,
          rectangleCenter     = this .rectangleCenter;
 
-      viewportPixel .set (viewport [2], viewport [3]);                                 // in pixel
-      pixelSize     .assign (viewportMeter) .divVec (viewportPixel);                   // size of one pixel in meter
+      viewportPixel .set (viewport [2], viewport [3]) .divide (contentScale);             // in pixel
+      pixelSize     .assign (viewportMeter) .divVec (viewportPixel);                      // size of one pixel in meter
 
       switch (this .getSizeUnitX ())
       {

package/src/x_ite/Components/Layout/ScreenFontStyle.js

@@ -86,6 +86,12 @@ ScreenFontStyle .prototype = Object .assign (Object .create (X3DFontStyleNode .p
    {
       return "fontStyle";
    },
+   initialize: function ()
+   {
+      X3DFontStyleNode .prototype .initialize .call (this);
+
+      this .getBrowser () .getRenderingProperties () ._ContentScale .addInterest ("addNodeEvent", this);
+   },
    getTextGeometry: function (text)
    {
       return new ScreenText (text, this);

package/src/x_ite/Components/Lighting/DirectionalLight.js

@@ -92,6 +92,7 @@ DirectionalLightContainer .prototype =
       this .browser   = lightNode .getBrowser ();
       this .lightNode = lightNode;
       this .groupNode = groupNode;
+      this .global    = lightNode .getGlobal ();
 
       this .modelViewMatrix .pushMatrix (modelViewMatrix);
 
@@ -105,14 +106,6 @@ DirectionalLightContainer .prototype =
             console .warn ("Couldn't create shadow buffer.");
       }
    },
-   setGroup: function (groupNode)
-   {
-      this .groupNode = groupNode;
-   },
-   getModelViewMatrix: function ()
-   {
-      return this .modelViewMatrix;
-   },
    renderShadowMap: function (renderObject)
    {
       if (! this .shadowBuffer)
@@ -122,7 +115,7 @@ DirectionalLightContainer .prototype =
          lightNode            = this .lightNode,
          cameraSpaceMatrix    = renderObject .getCameraSpaceMatrix () .get (),
          modelMatrix          = this .modelMatrix .assign (this .modelViewMatrix .get ()) .multRight (cameraSpaceMatrix),
-         invLightSpaceMatrix  = this .invLightSpaceMatrix .assign (lightNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
+         invLightSpaceMatrix  = this .invLightSpaceMatrix .assign (this .global ? modelMatrix : Matrix4 .Identity);
 
       invLightSpaceMatrix .rotate (this .rotation .setFromToVec (Vector3 .zAxis, this .direction .assign (lightNode .getDirection ()) .negate ()));
       invLightSpaceMatrix .inverse ();
@@ -148,7 +141,7 @@ DirectionalLightContainer .prototype =
 
       this .shadowBuffer .unbind ();
 
-      if (! lightNode .getGlobal ())
+      if (!this .global)
          invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
 
       this .invLightSpaceProjectionMatrix .assign (invLightSpaceMatrix) .multRight (projectionMatrix) .multRight (lightNode .getBiasMatrix ());
@@ -169,7 +162,7 @@ DirectionalLightContainer .prototype =
 
       if (this .shadowBuffer)
       {
-         const textureUnit = this .lightNode .getGlobal ()
+         const textureUnit = this .global
             ? (this .textureUnit = this .textureUnit !== undefined
                ? this .textureUnit
                : this .browser .popTexture2DUnit ())

package/src/x_ite/Components/Lighting/EnvironmentLight.js

@@ -106,11 +106,11 @@ EnvironmentLight .prototype = Object .assign (Object .create (X3DLightNode .prot
       new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",            new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "global",              new Fields .SFBool (false)),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "on",                  new Fields .SFBool (true)),
+      new X3DFieldDefinition (X3DConstants .inputOutput,    "rotation",            new Fields .SFRotation ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "color",               new Fields .SFColor (1, 1, 1)),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "intensity",           new Fields .SFFloat (1)),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "ambientIntensity",    new Fields .SFFloat ()),
 
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "rotation",            new Fields .SFRotation ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "diffuseCoefficients", new Fields .MFFloat ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "diffuse",             new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput,    "diffuseTexture",      new Fields .SFNode ()),

package/src/x_ite/Components/Lighting/PointLight.js

@@ -118,6 +118,7 @@ PointLightContainer .prototype =
       this .browser   = lightNode .getBrowser ();
       this .lightNode = lightNode;
       this .groupNode = groupNode;
+      this .global    = lightNode .getGlobal ();
 
       this .matrixArray .set (modelViewMatrix .submatrix .inverse ());
 
@@ -133,14 +134,6 @@ PointLightContainer .prototype =
             console .warn ("Couldn't create shadow buffer.");
       }
    },
-   setGroup: function (groupNode)
-   {
-      this .groupNode = groupNode;
-   },
-   getModelViewMatrix: function ()
-   {
-      return this .modelViewMatrix;
-   },
    renderShadowMap: function (renderObject)
    {
       if (! this .shadowBuffer)
@@ -150,7 +143,7 @@ PointLightContainer .prototype =
          lightNode           = this .lightNode,
          cameraSpaceMatrix   = renderObject .getCameraSpaceMatrix () .get (),
          modelMatrix         = this .modelMatrix .assign (this .modelViewMatrix .get ()) .multRight (cameraSpaceMatrix),
-         invLightSpaceMatrix = this .invLightSpaceMatrix .assign (lightNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
+         invLightSpaceMatrix = this .invLightSpaceMatrix .assign (this .global ? modelMatrix : Matrix4 .Identity);
 
       invLightSpaceMatrix .translate (lightNode .getLocation ());
       invLightSpaceMatrix .inverse ();
@@ -180,7 +173,7 @@ PointLightContainer .prototype =
 
       this .shadowBuffer .unbind ();
 
-      if (! lightNode .getGlobal ())
+      if (!this .global)
          invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
 
       this .invLightSpaceProjectionMatrix .assign (invLightSpaceMatrix);
@@ -201,7 +194,7 @@ PointLightContainer .prototype =
 
       if (this .shadowBuffer)
       {
-         const textureUnit = this .lightNode .getGlobal ()
+         const textureUnit = this .global
             ? (this .textureUnit = this .textureUnit !== undefined
                ? this .textureUnit
                : this .browser .popTexture2DUnit ())

package/src/x_ite/Components/Lighting/SpotLight.js

@@ -99,6 +99,7 @@ SpotLightContainer .prototype =
       this .browser   = lightNode .getBrowser ();
       this .lightNode = lightNode;
       this .groupNode = groupNode;
+      this .global    = lightNode .getGlobal ();
 
       this .matrixArray .set (modelViewMatrix .submatrix .inverse ());
 
@@ -114,14 +115,6 @@ SpotLightContainer .prototype =
             console .warn ("Couldn't create shadow buffer.");
       }
    },
-   setGroup: function (groupNode)
-   {
-      this .groupNode = groupNode;
-   },
-   getModelViewMatrix: function ()
-   {
-      return this .modelViewMatrix;
-   },
    renderShadowMap: function (renderObject)
    {
       if (! this .shadowBuffer)
@@ -131,7 +124,7 @@ SpotLightContainer .prototype =
          lightNode            = this .lightNode,
          cameraSpaceMatrix    = renderObject .getCameraSpaceMatrix () .get (),
          modelMatrix          = this .modelMatrix .assign (this .modelViewMatrix .get ()) .multRight (cameraSpaceMatrix),
-         invLightSpaceMatrix  = this .invLightSpaceMatrix .assign (lightNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
+         invLightSpaceMatrix  = this .invLightSpaceMatrix .assign (this .global ? modelMatrix : Matrix4 .Identity);
 
       invLightSpaceMatrix .translate (lightNode .getLocation ());
       invLightSpaceMatrix .rotate (this .rotation .setFromToVec (Vector3 .zAxis, this .direction .assign (lightNode .getDirection ()) .negate ()));
@@ -162,7 +155,7 @@ SpotLightContainer .prototype =
 
       this .shadowBuffer .unbind ();
 
-      if (! lightNode .getGlobal ())
+      if (!this .global)
          invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
 
       this .invLightSpaceProjectionMatrix .assign (invLightSpaceMatrix) .multRight (projectionMatrix) .multRight (lightNode .getBiasMatrix ());
@@ -188,7 +181,7 @@ SpotLightContainer .prototype =
 
       if (this .shadowBuffer)
       {
-         const textureUnit = this .lightNode .getGlobal ()
+         const textureUnit = this .global
             ? (this .textureUnit = this .textureUnit !== undefined
                ? this .textureUnit
                : this .browser .popTexture2DUnit ())