x_ite 5.0.3 → 6.1.0

package/docs/tutorials/Building-elevation-grids.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Building Elevation Grids
 
 ## Motivation

package/docs/tutorials/Building-extruded-shapes.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Build Extruded Shapes
 
 ## Motivation

package/docs/tutorials/Building-primitive-shapes.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Building Primitive Shapes
 
 ## Motivation

package/docs/tutorials/Building-shapes-out-of-points,-lines,-and-faces.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 
 # Building Shapes out of Points, Lines, and Faces
 

package/docs/tutorials/Controlling-appearance-with-materials.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Controlling Appearance whith Materials
 
 ## Motivation

package/docs/tutorials/Controlling-color-on-coordinate-based-geometry.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Controlling Color on Coordinate-Based Geometry
 
 ## Motivation

package/docs/tutorials/Controlling-detail.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Controlling Detail
 
 ## Motivation

package/docs/tutorials/Controlling-how-textures-are-mapped.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Controlling How Textures are Mapped
 
 ## Motivation

package/docs/tutorials/Controlling-navigation.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Controlling Navigation
 
 ## Motivation

package/docs/tutorials/Controlling-shading-on-coordinate-based-geometry.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Controlling Shading on Coordinate-Based Geometry
 
 ## Motivation

package/docs/tutorials/Controlling-the-viewpoint.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Controlling the Viewpoint
 
 ## Motivation

package/docs/tutorials/Creating-new-node-types.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Creating New Node Types
 
 ## Motivation

package/docs/tutorials/Grouping-nodes.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Grouping Nodes
 
 ## Motivation

package/docs/tutorials/Hello,-World!.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Hello, World!
 
 ## Overview

package/docs/tutorials/Improving-Performance.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Improving Performance
 
 ## Overview

package/docs/tutorials/Increasing-Rendering-Speed.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Increasing Rendering Speed
 
 ## Overivew

package/docs/tutorials/Introducing-X3D.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Introducing X3D
 
 ## What is X3D?

package/docs/tutorials/Introducing-animation.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Introducing Animations
 
 ## Motivation

package/docs/tutorials/Introducing-script-use.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Introducing Script Use
 
 ## Motivation

package/docs/tutorials/Lighting-your-world.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Lighting Your World
 
 ## Motivation

package/docs/tutorials/Mapping-textures.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Mapping Textures
 
 ## Motivation

package/docs/tutorials/Naming-nodes.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Naming Nodes
 
 ## Motivation

package/docs/tutorials/Providing-information-about-your-world.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Providing Information About Your World
 
 ## Motivation

package/docs/tutorials/Sensing-the-viewer.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Sensing the Viewer
 
 ## Motivation

package/docs/tutorials/Sensing-viewer-actions.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Sensing Viewer Actions
 
 ## Motivation

package/docs/tutorials/Transforming-Shapes.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Transforming Shapes
 
 ## Motivation

package/docs/tutorials/Writing-program-scripts-with-ECMAScript.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Writing Program Scripts with ECMAScript
 
 ## Motivation

package/docs/tutorials/index.md

@@ -1,3 +1,9 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: single
+---
 # Tutorials
 
 ## Overview
@@ -10,64 +16,64 @@ The only hardware and software requirement for most of the tutorials is a comput
 
 Simple, fast and efficient, our X3D tutorials give you all the tips and tricks to advance in the construction of your project.
 
-- [Hello, World](/x_ite/tutorials/Hello,-World!.html)
+- [Hello, World](Hello,-World!.html)
   - First let's go over to the »Hello World« tutorial, which displays a simple earth and the text »Hello World!«.
-- [A Quick Overview: Basic Nodes](/x_ite/tutorials/Basic-Nodes.html)
+- [A Quick Overview: Basic Nodes](Basic-Nodes.html)
   - Here are the basic nodes described, which are often used in an X3D world.
 
 Shapes, Geometry, and Appearance
 
-- [Introducing X3D](/x_ite/tutorials/Introducing-X3D.html)
-- [Building a X3D World](/x_ite/tutorials/Building-a-X3D-world.html)
-- [Building Primitive Shapes ](/x_ite/tutorials/Building-primitive-shapes.html)
-- [Transforming Shapes](/x_ite/tutorials/Transforming-Shapes.html)
-- [Controlling Appearance with Materials ](/x_ite/tutorials/Controlling-appearance-with-materials.html)
-- [Grouping Nodes ](/x_ite/tutorials/Grouping-nodes.html)
-- [Naming Nodes](/x_ite/tutorials/Naming-nodes.html)
+- [Introducing X3D](Introducing-X3D.html)
+- [Building a X3D World](Building-a-X3D-world.html)
+- [Building Primitive Shapes ](Building-primitive-shapes.html)
+- [Transforming Shapes](Transforming-Shapes.html)
+- [Controlling Appearance with Materials ](Controlling-appearance-with-materials.html)
+- [Grouping Nodes ](Grouping-nodes.html)
+- [Naming Nodes](Naming-nodes.html)
 
 Animation, Sensors, and Geometry
 
-- [Introducing Animation](/x_ite/tutorials/Introducing-animation.html)
-- [Animating Transforms](/x_ite/tutorials/Animating-transforms.html)
-- [Sensing Viewer Actions](/x_ite/tutorials/Sensing-viewer-actions.html)
-- [Building Ahapes out of Points, Lines, and Faces](/x_ite/tutorials/Building-shapes-out-of-points,-lines,-and-faces.html)
-- [Building Elevation Grids](/x_ite/tutorials/Building-elevation-grids.html)
-- [Building Extruded Shapes](/x_ite/tutorials/Building-extruded-shapes.html)
-- [Controlling Color on Coordinate-Based Geometry](/x_ite/tutorials/Controlling-color-on-coordinate-based-geometry.html)
-- [Controlling Shading on Coordinate-Based Geometry](/x_ite/tutorials/Controlling-shading-on-coordinate-based-geometry.html)
+- [Introducing Animation](Introducing-animation.html)
+- [Animating Transforms](Animating-transforms.html)
+- [Sensing Viewer Actions](Sensing-viewer-actions.html)
+- [Building Ahapes out of Points, Lines, and Faces](Building-shapes-out-of-points,-lines,-and-faces.html)
+- [Building Elevation Grids](Building-elevation-grids.html)
+- [Building Extruded Shapes](Building-extruded-shapes.html)
+- [Controlling Color on Coordinate-Based Geometry](Controlling-color-on-coordinate-based-geometry.html)
+- [Controlling Shading on Coordinate-Based Geometry](Controlling-shading-on-coordinate-based-geometry.html)
 
 Textures, Lights, and Environment
 
-- [Mapping Textures](/x_ite/tutorials/Mapping-textures.html)
-- [Controlling How Textures are Mapped](/x_ite/tutorials/Controlling-how-textures-are-mapped.html)
-- [Lighting Your World](/x_ite/tutorials/Lighting-your-world.html)
-- [Adding Backgrounds](/x_ite/tutorials/Adding-backgrounds.html)
-- [Adding Fog](/x_ite/tutorials/Adding-fog.html)
-- [Adding Sound](/x_ite/tutorials/Adding-sound.html)
-- [Controlling the Viewpoint](/x_ite/tutorials/Controlling-the-viewpoint.html)
-- [Controlling Navigation](/x_ite/tutorials/Controlling-navigation.html)
-- [Sensing the Viewer](/x_ite/tutorials/Sensing-the-viewer.html)
+- [Mapping Textures](Mapping-textures.html)
+- [Controlling How Textures are Mapped](Controlling-how-textures-are-mapped.html)
+- [Lighting Your World](Lighting-your-world.html)
+- [Adding Backgrounds](Adding-backgrounds.html)
+- [Adding Fog](Adding-fog.html)
+- [Adding Sound](Adding-sound.html)
+- [Controlling the Viewpoint](Controlling-the-viewpoint.html)
+- [Controlling Navigation](Controlling-navigation.html)
+- [Sensing the Viewer](Sensing-the-viewer.html)
 
 Scripts and Prototypes
 
-- [Controlling Detail](/x_ite/tutorials/Controlling-detail.html)
-- [Introducing Script Use](/x_ite/tutorials/Introducing-script-use.html)
-- [Writing Program Scripts with ECMAScript](/x_ite/tutorials/Writing-program-scripts-with-ECMAScript.html)
-- [Creating New Node Types](/x_ite/tutorials/Creating-new-node-types.html)
-- [Providing Tnformation About Your wWorld](/x_ite/tutorials/Providing-information-about-your-world.html)
+- [Controlling Detail](Controlling-detail.html)
+- [Introducing Script Use](Introducing-script-use.html)
+- [Writing Program Scripts with ECMAScript](Writing-program-scripts-with-ECMAScript.html)
+- [Creating New Node Types](Creating-new-node-types.html)
+- [Providing Tnformation About Your wWorld](Providing-information-about-your-world.html)
 
 Some words about optimizing a scene
 
-- [Improve Performance](/x_ite/tutorials/Improving-Performance.html)
+- [Improve Performance](Improving-Performance.html)
   - To optimize a scene is an important task when creating an X3D scene. There are several ways to improve performance.
-- [Increasing Rendering Speed](/x_ite/tutorials/Increasing-Rendering-Speed.html)
+- [Increasing Rendering Speed](Increasing-Rendering-Speed.html)
   - Using WebGL and JavaScript needs to look at speed all the time. Learn ways to increase rendering speed.
 
 ### See Also
 
-- [Script Node Authoring Interface](/x_ite/reference/Script-Node-Authoring-Interface.html)
-- [ECMAScript Object and Function Definitions](/x_ite/reference/ECMAScript-Object-and-Function-Definitions.html)
-- [Custom Shaders](/x_ite/Custom-Shaders.html)
+- [Script Node Authoring Interface](../reference/Script-Node-Authoring-Interface.html)
+- [ECMAScript Object and Function Definitions](../reference/ECMAScript-Object-and-Function-Definitions.html)
+- [Custom Shaders](../Custom-Shaders.html)
 
 ## There are also Books for Further Reading
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "x_ite",
-	"version": "5.0.3",
-	"revision": "1148",
+	"version": "6.1.0",
+	"revision": "1157",
 	"description": "X_ITE X3D Browser, a framework for integrating and manipulating X3D and VRML scenes in HTML.",
 	"main": "dist/x_ite.js",
 	"repository": {
@@ -52,11 +52,10 @@
 		"ammojs": "^0.0.2",
 		"CharLS.js": "^2.0.1",
 		"css-element-queries": "^1.2.3",
-		"dicom-parser": "^1.8.13",
-		"jpeg-js": "^0.4.3",
+		"dicom-parser": "^1.8.19",
+		"jpeg-js": "^0.4.4",
 		"jpeg-lossless-decoder-js": "^2.0.4",
-		"jquery": "^3.6.0",
-		"jquery-contextmenu": "^2.9.2",
+		"jquery": "^3.6.1",
 		"jquery-mousewheel": "^3.1.13",
 		"jquery.fullscreen": "^0.6.0",
 		"libtess": "^1.2.2",
@@ -66,7 +65,7 @@
 		"require": "^2.4.20",
 		"requirejs": "^2.3.6",
 		"requirejs-text": "^2.0.16",
-		"terser": "^5.12.1"
+		"terser": "^5.15.1"
 	},
 	"scripts": {
 		"lint": "jshint **",

package/src/assets/components/geometry2d.js

@@ -87,6 +87,6 @@ function (Components,
       abstractTypes:
       {
       },
-      browser: X3DGeometry2DContext,
+      context: X3DGeometry2DContext,
    });
 });

package/src/assets/components/key-device-sensor.js

@@ -72,6 +72,6 @@ function (Components,
       {
          X3DKeyDeviceSensorNode: X3DKeyDeviceSensorNode,
       },
-      browser: X3DKeyDeviceSensorContext,
+      context: X3DKeyDeviceSensorContext,
    });
 });

package/src/assets/components/layout.js

@@ -81,6 +81,6 @@ function (Components,
       {
          X3DLayoutNode: X3DLayoutNode,
       },
-      browser: X3DLayoutContext,
+      context: X3DLayoutContext,
    });
 });

package/src/assets/components/particle-systems.js

@@ -99,6 +99,6 @@ function (Components,
          X3DParticleEmitterNode:      X3DParticleEmitterNode,
          X3DParticlePhysicsModelNode: X3DParticlePhysicsModelNode,
       },
-      browser: X3DParticleSystemsContext,
+      context: X3DParticleSystemsContext,
    });
 });

package/src/assets/components/volume-rendering.js

@@ -113,6 +113,6 @@ function (Components,
          X3DVolumeDataNode:                  X3DVolumeDataNode,
          X3DVolumeRenderStyleNode:           X3DVolumeRenderStyleNode,
       },
-      browser: X3DVolumeRenderingContext,
+      context: X3DVolumeRenderingContext,
    });
 });

package/src/assets/shaders/Types.glsl

@@ -45,6 +45,7 @@ struct x3d_LinePropertiesParameters
 {
    bool          applied;
    mediump float linewidthScaleFactor;
+   mediump float lineStippleScale;
    sampler2D     linetype;
 };
 
@@ -270,12 +271,3 @@ struct x3d_TextureCoordinateGeneratorParameters
 };
 
 //uniform x3d_TextureCoordinateGeneratorParameters x3d_TextureCoordinateGenerator [x3d_MaxTextures];
-
-struct x3d_ParticleParameters
-{
-   mediump int   id;
-   mediump int   life;
-   mediump float elapsedTime;
-};
-
-//uniform x3d_ParticleParameters x3d_Particle;

package/src/assets/shaders/webgl1/Gouraud.fs

@@ -8,8 +8,8 @@ precision highp int;
 
 uniform int x3d_GeometryType;
 
-uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 uniform float x3d_AlphaCutoff;
+uniform bool  x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 
 varying float fogDepth;    // fog depth
 varying vec4  frontColor;  // color

package/src/assets/shaders/webgl1/Gouraud.vs

@@ -6,11 +6,10 @@ uniform mat3 x3d_NormalMatrix;
 uniform mat4 x3d_ProjectionMatrix;
 uniform mat4 x3d_ModelViewMatrix;
 
-uniform bool x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
-
 uniform int x3d_NumLights;
 uniform x3d_LightSourceParameters x3d_LightSource [x3d_MaxLights];
 uniform x3d_MaterialParameters x3d_Material;
+uniform bool x3d_ColorMaterial; // true if a X3DColorNode is attached, otherwise false
 
 attribute float x3d_FogDepth;
 attribute vec4  x3d_Color;
@@ -87,7 +86,7 @@ getMaterialColor (const in vec3 N,
          float specularFactor = material .shininess > 0.0 ? pow (max (dot (N, H), 0.0), material .shininess * 128.0) : 1.0;
          vec3  specularTerm   = material .specularColor * specularFactor;
 
-         float attenuationFactor     = di ? 1.0 : 1.0 / max (c [0] + c [1] * dL + c [2] * (dL * dL), 1.0);
+         float attenuationFactor     = di ? 1.0 : 1.0 / max (dot (c, vec3 (1.0, dL, dL * dL)), 1.0);
          float spotFactor            = light .type == x3d_SpotLight ? getSpotFactor (light .cutOffAngle, light .beamWidth, L, d) : 1.0;
          float attenuationSpotFactor = attenuationFactor * spotFactor;
          vec3  ambientTerm           = light .ambientIntensity * ambientColor;

package/src/assets/shaders/webgl1/Line.fs

@@ -10,14 +10,9 @@ uniform float x3d_AlphaCutoff;
 uniform x3d_LinePropertiesParameters x3d_LineProperties;
 uniform ivec4 x3d_Viewport;
 
-varying float fogDepth; // fog depth
-varying vec4  color;    // color
-varying vec3  vertex;   // point on geometry
-
-#ifdef X_ITE
-varying vec3 startPosition;  // line stipple start
-varying vec3 vertexPosition; // current line stipple position
-#endif
+varying float fogDepth;    // fog depth
+varying vec4  color;       // color
+varying vec3  vertex;      // point on geometry
 
 #ifdef X3D_LOGARITHMIC_DEPTH_BUFFER
 uniform float x3d_LogarithmicFarFactor1_2;
@@ -27,31 +22,11 @@ varying float depth;
 #pragma X3D include "include/Fog.glsl"
 #pragma X3D include "include/ClipPlanes.glsl"
 
-#ifdef X_ITE
-void
-stipple ()
-{
-   if (x3d_LineProperties .applied)
-   {
-      vec2  direction = (vertexPosition .xy - startPosition .xy) * vec2 (x3d_Viewport .zw) * 0.5;
-      float distance  = length (direction) / 16.0;
-      float color     = texture2D (x3d_LineProperties .linetype, vec2 (distance, distance)) .a;
-
-      if (color == 0.0)
-         discard;
-   }
-}
-#endif
-
 void
 main ()
 {
    clip ();
 
-   #ifdef X_ITE
-   stipple ();
-   #endif
-
    vec4 finalColor = vec4 (0.0);
 
    finalColor .rgb = getFogColor (color .rgb);