x_ite 8.7.8 → 8.8.0

package/src/x_ite/Browser/Texturing3D/DICOMParser.js

@@ -50,9 +50,9 @@ function DicomParser ()
    this .dicom = { dicom: false };
 }
 
-DicomParser .prototype =
+Object .assign (DicomParser .prototype,
 {
-   parse: function (input)
+   parse (input)
    {
       try
       {
@@ -78,30 +78,30 @@ DicomParser .prototype =
       this .getTansferSyntax ();
       this .getPixelData ();
 
-      // if (DEBUG)
+      // if (DEVELOPMENT)
       //    console .log (this);
 
       return this .dicom;
    },
-   getPhotometricInterpretation: function ()
+   getPhotometricInterpretation ()
    {
       // https://dicom.innolitics.com/ciods/ct-image/image-pixel/00280004
       this .photometricInterpretation = this .dataSet .string ("x00280004");
    },
-   getComponents: function ()
+   getComponents ()
    {
       // https://dicom.innolitics.com/ciods/ct-image/image-pixel/00280002
       this .dicom .components = this .dataSet .uint16 ("x00280002");
    },
-   getWidth: function ()
+   getWidth ()
    {
       this .dicom .width = this .dataSet .uint16 ("x00280011");
    },
-   getHeight: function ()
+   getHeight ()
    {
       this .dicom .height = this .dataSet .uint16 ("x00280010");
    },
-   getDepth: function ()
+   getDepth ()
    {
       if (this .dataSet .elements .x00280008)
       {
@@ -110,27 +110,27 @@ DicomParser .prototype =
       else
          this .dicom .depth = 1;
    },
-   getBitsAllocated: function ()
+   getBitsAllocated ()
    {
       this .bitsAllocated  = this .dataSet .uint16 ("x00280100");
    },
-   getBitsStored: function ()
+   getBitsStored ()
    {
       this .bitsStored  = this .dataSet .uint16 ("x00280101");
    },
-   getPixelRepresentation: function ()
+   getPixelRepresentation ()
    {
       this .pixelRepresentation = this .dataSet .uint16 ("x00280103") || 0;
    },
-   getPlanarConfiguration: function ()
+   getPlanarConfiguration ()
    {
       this .planarConfiguration = this .dataSet .uint16 ("x00280006") || 0;
    },
-   getTansferSyntax: function ()
+   getTansferSyntax ()
    {
       this .transferSyntax = this .dataSet .string ("x00020010");
    },
-   getPixelData: function ()
+   getPixelData ()
    {
       var
          dicom        = this .dicom,
@@ -295,7 +295,7 @@ DicomParser .prototype =
       dicom .components = components;
       dicom .data       = bytes;
    },
-   getFrames: function (pixelElement)
+   getFrames (pixelElement)
    {
       var frames = [ ];
 
@@ -359,7 +359,7 @@ DicomParser .prototype =
 
       return frames;
    },
-   getTypedArray: function (frame)
+   getTypedArray (frame)
    {
       switch (this .bitsAllocated)
       {
@@ -373,7 +373,7 @@ DicomParser .prototype =
             throw new Error ("DICOM: unsupported pixel format.");
       }
    },
-   flipImage: function (frame, components)
+   flipImage (frame, components)
    {
       var
          width  = this .dicom .width,
@@ -394,7 +394,7 @@ DicomParser .prototype =
 
       return out;
    },
-   getNormalizeOffsetAndFactor: function (data)
+   getNormalizeOffsetAndFactor (data)
    {
       var
          min = Number .POSITIVE_INFINITY,
@@ -410,7 +410,7 @@ DicomParser .prototype =
 
       return { offset: min, factor: diverence ? 1 / diverence * 255 : 0 };
    },
-   unpackBinaryFrame: function (byteArray, frameOffset, pixelsPerFrame)
+   unpackBinaryFrame (byteArray, frameOffset, pixelsPerFrame)
    {
       function isBitSet (byte, bitPos)
       {
@@ -437,7 +437,7 @@ DicomParser .prototype =
 
       return pixelData;
    },
-   decodeLittleEndian: function (pixelData)
+   decodeLittleEndian (pixelData)
    {
       var
          buffer = pixelData .buffer,
@@ -472,7 +472,7 @@ DicomParser .prototype =
 
       return pixelData;
    },
-   decodeBigEndian: function (pixelData)
+   decodeBigEndian (pixelData)
    {
       function swap16 (value)
       {
@@ -506,7 +506,7 @@ DicomParser .prototype =
 
       return pixelData;
    },
-   decodeRLE: function  (pixelData)
+   decodeRLE  (pixelData)
    {
       if (this .bitsAllocated === 8)
       {
@@ -521,7 +521,7 @@ DicomParser .prototype =
 
       throw new Error ("DICOM: unsupported pixel format for RLE.");
    },
-   decodeRLE8: function  (pixelData)
+   decodeRLE8  (pixelData)
    {
       const frameData  = pixelData;
       const frameSize  = this .dicom .width * this .dicom .height;
@@ -575,7 +575,7 @@ DicomParser .prototype =
 
       return out;
    },
-   decodeRLE8Planar: function  (pixelData)
+   decodeRLE8Planar  (pixelData)
    {
       const frameData = pixelData;
       const frameSize = this .dicom .width * this .dicom .height;
@@ -628,7 +628,7 @@ DicomParser .prototype =
 
       return out;
    },
-   decodeRLE16: function  (pixelData)
+   decodeRLE16  (pixelData)
    {
       const frameData = pixelData;
       const frameSize = this .dicom .width * this .dicom .height;
@@ -677,7 +677,7 @@ DicomParser .prototype =
 
       return out;
    },
-   decodeJPEGBaseline: function (pixelData)
+   decodeJPEGBaseline (pixelData)
    {
       var jpeg = new JpegImage ();
 
@@ -691,7 +691,7 @@ DicomParser .prototype =
 
       return data;
     },
-    decodeJPEGLossless: function (pixelData)
+    decodeJPEGLossless (pixelData)
     {
       const
          decoder = new jpeg .lossless .Decoder (),
@@ -699,7 +699,7 @@ DicomParser .prototype =
 
       return new Uint8Array (buffer);
    },
-   decodeJPEGLS: function (pixelData)
+   decodeJPEGLS (pixelData)
    {
       var image = this .jpegLSDecode (pixelData, this .pixelRepresentation === 1);
 
@@ -781,7 +781,7 @@ DicomParser .prototype =
          return image;
       };
    })(),
-   decodeJPEG2000: function (pixelData)
+   decodeJPEG2000 (pixelData)
    {
       var
          bytesPerPixel = this .bitsAllocated <= 8 ? 1 : 2,
@@ -885,7 +885,7 @@ DicomParser .prototype =
          return image;
       };
    })(),
-   convertRGBColorByPlane: function (pixelData)
+   convertRGBColorByPlane (pixelData)
    {
       if (pixelData .length % 3 !== 0)
          throw new Error ("DICOM: convertRGBColorByPlane: RGB buffer length must be divisble by 3.");
@@ -907,7 +907,7 @@ DicomParser .prototype =
 
       return out;
     },
-    convertYBRFullByPixel: function (pixelData)
+    convertYBRFullByPixel (pixelData)
     {
       if (pixelData .length % 3 !== 0)
          throw new Error ("DICOM: convertYBRFullByPixel: YBR buffer length must be divisble by 3.");
@@ -934,7 +934,7 @@ DicomParser .prototype =
 
       return out;
     },
-    convertYBRFullByPlane: function (pixelData)
+    convertYBRFullByPlane (pixelData)
     {
       if (pixelData .length % 3 !== 0)
          throw new Error ("DICOM: convertYBRFullByPlane: YBR buffer length must be divisble by 3.");
@@ -961,7 +961,7 @@ DicomParser .prototype =
 
       return out;
    },
-   convertPaletteColor: function (pixelData)
+   convertPaletteColor (pixelData)
    {
       function convertLUTto8Bit (lut, shift)
       {
@@ -1016,7 +1016,7 @@ DicomParser .prototype =
 
       return out;
    },
-   getLUT: function ()
+   getLUT ()
    {
       if (this .LUT)
           return this .LUT;
@@ -1027,7 +1027,7 @@ DicomParser .prototype =
 
       return this .LUT;
    },
-   populatePaletteColorLut: function (dataSet, imagePixelModule)
+   populatePaletteColorLut (dataSet, imagePixelModule)
    {
       imagePixelModule .redPaletteColorLookupTableDescriptor   = this .getLutDescriptor (dataSet, 'x00281101');
       imagePixelModule .greenPaletteColorLookupTableDescriptor = this .getLutDescriptor (dataSet, 'x00281102');
@@ -1067,14 +1067,14 @@ DicomParser .prototype =
       imagePixelModule .greenPaletteColorLookupTableData = this .getLutData (dataSet, 'x00281202', imagePixelModule .greenPaletteColorLookupTableDescriptor);
       imagePixelModule .bluePaletteColorLookupTableData  = this .getLutData (dataSet, 'x00281203', imagePixelModule .bluePaletteColorLookupTableDescriptor);
    },
-   getLutDescriptor: function  (dataSet, tag)
+   getLutDescriptor  (dataSet, tag)
    {
       if (! dataSet .elements [tag] || dataSet .elements [tag] .length !== 6)
          return;
 
       return [dataSet .uint16 (tag, 0), dataSet .uint16 (tag, 1), dataSet .uint16 (tag, 2)];
    },
-   getLutData: function  (lutDataSet, tag, lutDescriptor)
+   getLutData  (lutDataSet, tag, lutDescriptor)
    {
       const lut     = [];
       const lutData = lutDataSet .elements [tag];
@@ -1090,7 +1090,7 @@ DicomParser .prototype =
 
       return lut;
    },
-};
+});
 
 // ftp://medical.nema.org/medical/dicom/DataSets/WG04/
 

package/src/x_ite/Browser/Texturing3D/NRRDParser.js

@@ -71,9 +71,9 @@ function NRRDParser ()
    ]);
 }
 
-NRRDParser .prototype =
+Object .assign (NRRDParser .prototype,
 {
-   parse: function (input)
+   parse (input)
    {
       this .setInput (input);
 
@@ -85,7 +85,7 @@ NRRDParser .prototype =
 
       return this .nrrd;
    },
-   setInput: function (value)
+   setInput (value)
    {
       this .dataView     = new DataView (value);
       this .input        = $.decodeText (value);
@@ -93,7 +93,7 @@ NRRDParser .prototype =
       this .nrrd         = { };
       this .littleEndian = true;
    },
-   getNRRD: function ()
+   getNRRD ()
    {
       if (Grammar .NRRD .parse (this))
       {
@@ -105,7 +105,7 @@ NRRDParser .prototype =
       this .nrrd .nrrd = false;
       return false;
    },
-   getFields: function ()
+   getFields ()
    {
       while (Grammar .comment .parse (this))
          ;
@@ -190,7 +190,7 @@ NRRDParser .prototype =
          this .encoding = encoding;
       };
    })(),
-   getDimension: function (value)
+   getDimension (value)
    {
       const result = value .match (/(\d+)/);
 
@@ -211,7 +211,7 @@ NRRDParser .prototype =
 
       throw new Error ("Unsupported NRRD dimension '" + result [1] + "', must be 1, 2, 3, or 4.");
    },
-   getSizes: function (value)
+   getSizes (value)
    {
       const
          num   = /\s*(\d+)/gy,
@@ -262,7 +262,7 @@ NRRDParser .prototype =
             throw new Error ("Unsupported NRRD sizes.");
       }
    },
-   getEndian: function (value)
+   getEndian (value)
    {
       if (value === "little")
       {
@@ -278,7 +278,7 @@ NRRDParser .prototype =
 
       throw new Error ("Unsupported NRRD endian, must be either 'little' or 'big'.");
    },
-   getData: function ()
+   getData ()
    {
       switch (this .encoding)
       {
@@ -304,7 +304,7 @@ NRRDParser .prototype =
          }
       }
    },
-   ascii: function ()
+   ascii ()
    {
       const
          dataLength = this .nrrd .components * this .nrrd .width * this .nrrd .height * this .nrrd .depth,
@@ -361,7 +361,7 @@ NRRDParser .prototype =
          }
       }
    },
-   raw: function ()
+   raw ()
    {
       const
          dataView   = this .dataView,
@@ -414,7 +414,7 @@ NRRDParser .prototype =
          }
       }
    },
-   hex: function ()
+   hex ()
    {
       if (Grammar .data .parse (this))
       {
@@ -433,7 +433,7 @@ NRRDParser .prototype =
 
       throw new Error ("Invalid NRRD data.");
    },
-   gzip: function ()
+   gzip ()
    {
       try
       {
@@ -453,6 +453,6 @@ NRRDParser .prototype =
          throw new Error (`Invalid NRRD data: ${error}.`);
       }
    },
-};
+});
 
 export default NRRDParser;

package/src/x_ite/Browser/Time/X3DTimeContext.js

@@ -61,17 +61,17 @@ function X3DTimeContext ()
    this [_currentSpeed]     = 0;
 }
 
-X3DTimeContext .prototype =
+Object .assign (X3DTimeContext .prototype,
 {
-   getCurrentTime: function ()
+   getCurrentTime ()
    {
       return this [_currentTime];
    },
-   getCurrentFrameRate: function ()
+   getCurrentFrameRate ()
    {
       return this [_currentFrameRate];
    },
-   getCurrentSpeed: function ()
+   getCurrentSpeed ()
    {
       return this [_currentSpeed];
    },
@@ -103,6 +103,6 @@ X3DTimeContext .prototype =
          }
       };
    })(),
-};
+});
 
 export default X3DTimeContext;

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.7.8";
+export default "8.8.0";

package/src/x_ite/Browser/VolumeRendering/VolumeMaterial.js

@@ -57,26 +57,13 @@ function VolumeMaterial (executionContext, volumeDataNode)
    this .volumeShaderNodes = new Map ();
 }
 
-VolumeMaterial .prototype = Object .assign (Object .create (UnlitMaterial .prototype),
+Object .assign (Object .setPrototypeOf (VolumeMaterial .prototype, UnlitMaterial .prototype),
 {
-   constructor: VolumeMaterial,
-   getTypeName: function ()
-   {
-      return "VolumeMaterial";
-   },
-   getComponentName: function ()
-   {
-      return "Shape";
-   },
-   getContainerField: function ()
-   {
-      return "material";
-   },
-   getVolumeShaders: function ()
+   getVolumeShaders ()
    {
       return this .volumeShaderNodes;
    },
-   getShader: function (geometryContext, renderContext)
+   getShader (geometryContext, renderContext)
    {
       const { fogNode, objectsCount } = renderContext;
 
@@ -90,7 +77,7 @@ VolumeMaterial .prototype = Object .assign (Object .create (UnlitMaterial .proto
 
       return this .volumeShaderNodes .get (key) || this .createShader (key, geometryContext, renderContext);
    },
-   createShader: function (key, geometryContext, renderContext)
+   createShader (key, geometryContext, renderContext)
    {
       const
          browser = this .getBrowser (),
@@ -98,19 +85,26 @@ VolumeMaterial .prototype = Object .assign (Object .create (UnlitMaterial .proto
 
       const { fogNode, objectsCount } = renderContext;
 
-      if (fogNode)
-         options .push ("X3D_FOG");
+      switch (fogNode ?.getFogType ())
+      {
+         case 1:
+            options .push ("X3D_FOG", "X3D_FOG_LINEAR");
+            break;
+         case 2:
+            options .push ("X3D_FOG", "X3D_FOG_EXPONENTIAL");
+            break;
+      }
 
       if (objectsCount [0])
       {
          options .push ("X3D_CLIP_PLANES")
-         options .push ("X3D_NUM_CLIP_PLANES " + Math .min (objectsCount [0], browser .getMaxClipPlanes ()));
+         options .push (`X3D_NUM_CLIP_PLANES ${Math .min (objectsCount [0], browser .getMaxClipPlanes ())}`);
       }
 
       if (objectsCount [1])
       {
          options .push ("X3D_LIGHTING")
-         options .push ("X3D_NUM_LIGHTS " + Math .min (objectsCount [1], browser .getMaxLights ()));
+         options .push (`X3D_NUM_LIGHTS ${Math .min (objectsCount [1], browser .getMaxLights ())}`);
       }
 
       const shaderNode = this .volumeDataNode .createShader (options, vs, fs);
@@ -119,10 +113,33 @@ VolumeMaterial .prototype = Object .assign (Object .create (UnlitMaterial .proto
 
       return shaderNode;
    },
-   setShaderUniforms: function (gl, shaderObject, renderObject, textureTransformMapping, textureCoordinateMapping)
+   setShaderUniforms (gl, shaderObject, renderObject, textureTransformMapping, textureCoordinateMapping)
    {
       this .volumeDataNode .setShaderUniforms (gl, shaderObject);
    },
 });
 
+Object .defineProperties (VolumeMaterial,
+{
+   typeName:
+   {
+      value: "VolumeMaterial",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Shape",
+      enumerable: true,
+   },
+   containerField:
+   {
+      value: "material",
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: UnlitMaterial .fieldDefinitions,
+   },
+});
+
 export default VolumeMaterial;

package/src/x_ite/Browser/VolumeRendering/X3DVolumeRenderingContext.js

@@ -57,9 +57,9 @@ const
 
 function X3DVolumeRenderingContext () { }
 
-X3DVolumeRenderingContext .prototype =
+Object .assign (X3DVolumeRenderingContext .prototype,
 {
-   getDefaultVoxels: function ()
+   getDefaultVoxels ()
    {
       this [_defaultVoxelsNode] = this .getPrivateScene () .createNode ("PixelTexture3D", false);
       this [_defaultVoxelsNode] ._image = [1, 1, 1, 1, 255];
@@ -75,7 +75,7 @@ X3DVolumeRenderingContext .prototype =
 
       return this [_defaultVoxelsNode];
    },
-   getDefaultVolumeStyle: function ()
+   getDefaultVolumeStyle ()
    {
       this [_defaultVolumeStyle] = new OpacityMapVolumeStyle (this .getPrivateScene ());
       this [_defaultVolumeStyle] .setPrivate (true);
@@ -87,7 +87,7 @@ X3DVolumeRenderingContext .prototype =
 
       return this [_defaultVolumeStyle];
    },
-   getDefaultBlendedVolumeStyle: function ()
+   getDefaultBlendedVolumeStyle ()
    {
       this [_defaultBlendedVolumeStyle] = new OpacityMapVolumeStyle (this .getPrivateScene ());
       this [_defaultBlendedVolumeStyle] .setPrivate (true);
@@ -99,7 +99,7 @@ X3DVolumeRenderingContext .prototype =
 
       return this [_defaultBlendedVolumeStyle];
    },
-   getDefaultTransferFunction: function ()
+   getDefaultTransferFunction ()
    {
       const textureProperties = new TextureProperties (this .getPrivateScene ());
       textureProperties ._boundaryModeS       = "CLAMP_TO_EDGE";
@@ -126,6 +126,6 @@ X3DVolumeRenderingContext .prototype =
 
       return this [_defaultTransferFunction];
    },
-};
+});
 
 export default X3DVolumeRenderingContext;