zincjs 3.0.0 → 3.0.1

package/src/videoHandler.js

@@ -9,94 +9,87 @@ import * as THREE from 'three/webgpu';
  * @author Alan Wu
  * @return {VideoHandler}
  */
-const VideoHandler = function(srcIn)  {
-
-	var _this = this;
-	this.video = undefined;
-	this.videoTexture = undefined;
-	var src = srcIn;
-	var lastTime = 0;
-	var lastUpdate = 0;
-	var frameRate = 30;
-	var videoPlaneLoadedFlag = false;
-	var lastPlayPos    = 0;
-	var currentPlayPos = 0;
-	var bufferingDetected = false;
-
-	var checkBuffering = function(delta, playAnimation) {
-	    currentPlayPos = _this.video.currentTime;
-
-	    // checking offset should be at most the check interval
-	    // but allow for some margin
-	    var offset = delta - 0.02;
-
-	    // if no buffering is currently detected,
-	    // and the position does not seem to increase
-	    // and the _this.video isn't manually paused...
-	    if (!bufferingDetected && (currentPlayPos < (lastPlayPos + offset)) &&
-	    		!_this.video.paused) {
-	        bufferingDetected = true;
-	    }
-
-	    // if we were buffering but the _this.video has advanced,
-	    // then there is no buffering
-	    if (bufferingDetected && (currentPlayPos > (lastPlayPos + offset)) &&
-	    		!_this.video.paused) {
-	        bufferingDetected = false;
-	    }
-	    lastPlayPos = currentPlayPos;
-	}
-
-	var initialise = function(){
-		if (document) {
-		  	_this.video = document.createElement( 'video' );
-		  	_this.video.crossOrigin = "anonymous";
-		  	_this.video.src = src;
-		  	_this.video.load();
-        _this.video.loop = true;
+const VideoHandler = function (srcIn) {
+  var _this = this;
+  this.video = undefined;
+  this.videoTexture = undefined;
+  var src = srcIn;
+  var lastTime = 0;
+  var lastUpdate = 0;
+  var frameRate = 30;
+  var videoPlaneLoadedFlag = false;
+  var lastPlayPos = 0;
+  var currentPlayPos = 0;
+  var bufferingDetected = false;
+
+  var checkBuffering = function (delta, playAnimation) {
+    currentPlayPos = _this.video.currentTime;
+
+    // checking offset should be at most the check interval
+    // but allow for some margin
+    var offset = delta - 0.02;
+
+    // if no buffering is currently detected,
+    // and the position does not seem to increase
+    // and the _this.video isn't manually paused...
+    if (!bufferingDetected && currentPlayPos < lastPlayPos + offset && !_this.video.paused) {
+      bufferingDetected = true;
+    }
 
-		}
-	}
+    // if we were buffering but the _this.video has advanced,
+    // then there is no buffering
+    if (bufferingDetected && currentPlayPos > lastPlayPos + offset && !_this.video.paused) {
+      bufferingDetected = false;
+    }
+    lastPlayPos = currentPlayPos;
+  };
+
+  var initialise = function () {
+    if (document) {
+      _this.video = document.createElement('video');
+      _this.video.crossOrigin = 'anonymous';
+      _this.video.src = src;
+      _this.video.load();
+      _this.video.loop = true;
+    }
+  };
 
-	this.setMorphTime = function(time, duration){
-		let  actualTime = time / duration * _this.video.duration;
+  this.setMorphTime = function (time, duration) {
+    let actualTime = (time / duration) * _this.video.duration;
     if (!Number.isFinite(actualTime)) {
       actualTime = 0.0;
     }
-		_this.video.currentTime = actualTime;
-	}
-
-	// videoPlaneLoaded connects the video to the video texture once it has loaded
-	 this.getVideoDuration = function() {
-		 return _this.video.duration;
-	}
-
-	this.createCanvasVideoTexture = function(){
-		_this.videoTexture = new THREE.VideoTexture( _this.video );
-		_this.videoTexture.minFilter = THREE.LinearFilter;
-		_this.videoTexture.magFilter = THREE.LinearFilter;
+    _this.video.currentTime = actualTime;
+  };
+
+  // videoPlaneLoaded connects the video to the video texture once it has loaded
+  this.getVideoDuration = function () {
+    return _this.video.duration;
+  };
+
+  this.createCanvasVideoTexture = function () {
+    _this.videoTexture = new THREE.VideoTexture(_this.video);
+    _this.videoTexture.minFilter = THREE.LinearFilter;
+    _this.videoTexture.magFilter = THREE.LinearFilter;
     _this.video.currentTime = 0;
-		return _this.videoTexture;
-	}
-
-	this.getCurrentTime = function(duration) {
-		if (_this.video)
-			return duration * (_this.video.currentTime / _this.video.duration);
-		else
-			return 0;
-	}
-
-	this.isReadyToPlay = function(){
-		// video.readyState 3 means we have data to load for the current time and foreseeable future
-		if (_this.video && _this.video.readyState >= 3){
-			return true;
-		}
-		return false;
-	}
-
-	//this should be handle by scene... check the sync at
-	initialise();
+    return _this.videoTexture;
+  };
+
+  this.getCurrentTime = function (duration) {
+    if (_this.video) return duration * (_this.video.currentTime / _this.video.duration);
+    else return 0;
+  };
+
+  this.isReadyToPlay = function () {
+    // video.readyState 3 means we have data to load for the current time and foreseeable future
+    if (_this.video && _this.video.readyState >= 3) {
+      return true;
+    }
+    return false;
+  };
 
-}
+  //this should be handle by scene... check the sync at
+  initialise();
+};
 
-export { VideoHandler }
+export { VideoHandler };

package/src/workers/geometryCSG.worker.js

@@ -1,4 +1,3 @@
-
 import { Geometry } from '../primitives/geometry';
 import { GeometryCSGInternal } from './geometryCSGInternal';
 import * as THREE from 'three/webgpu';
@@ -6,7 +5,7 @@ import * as THREE from 'three/webgpu';
 const JSONLoader = THREE.BufferGeometryLoader;
 let core = undefined;
 
-var geometryFromJSON = function(object) {
+var geometryFromJSON = function (object) {
   var JSONParser = new JSONLoader();
   var geometry = JSONParser.parse(object);
   var material = new THREE.MeshPhongMaterial();
@@ -14,61 +13,59 @@ var geometryFromJSON = function(object) {
   var host = new Geometry();
   host.setMorph(mesh);
   return host;
-}
+};
 
-var initialise = function(object) {
+var initialise = function (object) {
   var host = geometryFromJSON(object);
   core = new GeometryCSGInternal(host);
-  self.postMessage({action:"message", message: "Initialised"});
-}
+  self.postMessage({ action: 'message', message: 'Initialised' });
+};
 
-var intersect = function(object) {
+var intersect = function (object) {
   if (core) {
     var guest = geometryFromJSON(object);
     var result = core.intersect(guest);
     var json = result.toBufferGeometry().toJSON();
-    self.postMessage({action: "result", object: json});
+    self.postMessage({ action: 'result', object: json });
   }
-}
+};
 
-var subtract = function(object) {
+var subtract = function (object) {
   if (core) {
     var guest = geometryFromJSON(object);
     var result = core.subtract(guest);
     var json = result.toBufferGeometry().toJSON();
-    self.postMessage({action: "result", object: json});
+    self.postMessage({ action: 'result', object: json });
   }
-}
+};
 
-var union = function(object) {
+var union = function (object) {
   if (core) {
     var guest = geometryFromJSON(object);
     var result = core.union(guest);
     var json = result.toBufferGeometry().toJSON();
-    self.postMessage({action: "result", object: json});
+    self.postMessage({ action: 'result', object: json });
   }
-}
+};
 
-self.addEventListener('message',function (ev){
-    switch (ev.data.action) {
-        case 'initialise':
-              initialise(ev.data.object);
-              break;
-        case 'intersect':
-          intersect(ev.data.object);
-              break;
-        case 'subtract':
-          subtract(ev.data.object);
-              break;
-        case 'union':
-          union(ev.data.object);
-              break;
-        default:
-          throw 'Cannot handle specified action.';
-    }
+self.addEventListener('message', function (ev) {
+  switch (ev.data.action) {
+    case 'initialise':
+      initialise(ev.data.object);
+      break;
+    case 'intersect':
+      intersect(ev.data.object);
+      break;
+    case 'subtract':
+      subtract(ev.data.object);
+      break;
+    case 'union':
+      union(ev.data.object);
+      break;
+    default:
+      throw 'Cannot handle specified action.';
+  }
 });
 
-    //var test = ev.data;
-    //self.postMessage(test, [test]);
-
-
+//var test = ev.data;
+//self.postMessage(test, [test]);

package/src/workers/geometryCSGInternal.js

@@ -2,58 +2,53 @@ import * as THREE from 'three/webgpu';
 import { ThreeBSPWrapper } from '../three-js-csg';
 const ThreeBSP = ThreeBSPWrapper(THREE);
 
-
 const GeometryCSGInternal = function (hostIn) {
   //ZincGeoemtry of the main geometry
   let host = undefined;
-  if (hostIn && hostIn.isGeometry)
-    host = hostIn;
+  if (hostIn && hostIn.isGeometry) host = hostIn;
   let hostCSG = undefined;
 
-  this.setGeometry = hostIn => {
-    if (hostIn && hostIn.isGeometry)
-	  host = hostIn;
+  this.setGeometry = (hostIn) => {
+    if (hostIn && hostIn.isGeometry) host = hostIn;
     hostCSG = undefined;
-  }
-
-  this.setCSG = csg => {
-	  hostCSG = csg;
-  }
-
-  const prepareCSG = guestGeometry => {
-	  if (host && host.morph && guestGeometry && guestGeometry.morph) {
-	      if (hostCSG === undefined)
-	        hostCSG = new ThreeBSP(host.morph);
-	      const guestCSG = new ThreeBSP(guestGeometry.morph);
-	      return guestCSG;
-	  }
-	  return undefined;
   };
 
-  this.intersect = guestGeometry => {
-	  const guestCSG = prepareCSG(guestGeometry);
-	  if (hostCSG && guestCSG) {
-	    return hostCSG.intersect(guestCSG);
-	  }
-	  return undefined;
-  }
-
-  this.subtract = guestGeometry => {
-	  const guestCSG = prepareCSG(guestGeometry);
-	  if (hostCSG && guestCSG) {
-		  return hostCSG.subtract(guestCSG);
-	  }
-	  return undefined;
-  }
-
-  this.union = guestGeometry => {
-	  const guestCSG = prepareCSG(guestGeometry);
-	  if (hostCSG && guestCSG) {
-		  return hostCSG.union(guestCSG);
-	  }
-	  return undefined;
-  }
+  this.setCSG = (csg) => {
+    hostCSG = csg;
+  };
+
+  const prepareCSG = (guestGeometry) => {
+    if (host && host.morph && guestGeometry && guestGeometry.morph) {
+      if (hostCSG === undefined) hostCSG = new ThreeBSP(host.morph);
+      const guestCSG = new ThreeBSP(guestGeometry.morph);
+      return guestCSG;
+    }
+    return undefined;
+  };
+
+  this.intersect = (guestGeometry) => {
+    const guestCSG = prepareCSG(guestGeometry);
+    if (hostCSG && guestCSG) {
+      return hostCSG.intersect(guestCSG);
+    }
+    return undefined;
+  };
+
+  this.subtract = (guestGeometry) => {
+    const guestCSG = prepareCSG(guestGeometry);
+    if (hostCSG && guestCSG) {
+      return hostCSG.subtract(guestCSG);
+    }
+    return undefined;
+  };
+
+  this.union = (guestGeometry) => {
+    const guestCSG = prepareCSG(guestGeometry);
+    if (hostCSG && guestCSG) {
+      return hostCSG.union(guestCSG);
+    }
+    return undefined;
+  };
 };
 
 export { GeometryCSGInternal };
-

package/src/zinc.js

@@ -12,10 +12,7 @@ import { TextureArray } from './texture/textureArray';
 import { TextureSlides } from './primitives/textureSlides';
 import { Renderer } from './renderer';
 import { Scene } from './scene';
-import {
-  createPrimitivesFromNIFTI,
-  createTextureFromNIFTI
-} from './loaders/niftiReader';
+import { createPrimitivesFromNIFTI, createTextureFromNIFTI } from './loaders/niftiReader';
 //import { GeometryCSG } from './geometryCSG';
 //import { GlyphsetCSG } from './glyphsetCSG';
 import {
@@ -24,7 +21,7 @@ import {
   SmoothCameraTransition,
   RayCaster,
   CameraAutoTumble,
-  StereoEffect
+  StereoEffect,
 } from './controls';
 import { loadExternalFile, loadExternalFiles } from './utilities';
 
@@ -36,9 +33,9 @@ const version = PACKAGE.version;
  * @namespace
  * @author Alan Wu
  */
-const Zinc = function() {
+const Zinc = function () {
   this.Revision = version;
-  this.defaultMaterialColor = 0xFFFFFF;
+  this.defaultMaterialColor = 0xffffff;
   this.defaultOpacity = 1.0;
   // Assign hoisted modules to the instance
   this.Geometry = Geometry;

package/vite.config.js

@@ -14,24 +14,24 @@ export default defineConfig({
     },
     rollupOptions: {
       external(id) {
-        if (id.includes("nifti-reader-js")) {
-          return false
+        if (id.includes('nifti-reader-js')) {
+          return false;
         }
-        return !id.startsWith('.') && !path.isAbsolute(id) && !id.includes('package.json')
+        return !id.startsWith('.') && !path.isAbsolute(id) && !id.includes('package.json');
       },
       output: {
         extend: true,
         globals: {
           'css-element-queries': 'cssElememtQueries',
-          'three': 'THREE',
+          three: 'THREE',
           'three/tsl': 'THREE',
           'three/webgpu': 'THREE',
           'three-spritetext': 'SpriteText',
           'three/examples/jsm/exporters/GLTFExporter': 'GLTFExporter',
           'three/examples/jsm/loaders/GLTFLoader': 'GLTFLoader',
-          'fflate': 'fflate'
-        }
-      }
+          fflate: 'fflate',
+        },
+      },
     },
     assetsInlineLimit: 8192,
   },