@abi-software/scaffoldvuer 0.1.53 → 0.1.54-beta.2

package/src/scripts/eventNotifier.js

@@ -1,8 +1,9 @@
 const EVENT_TYPE = { ALL: 0, SELECTED: 1, HIGHLIGHTED: 2, MOVE: 3 };
 
-const SelectionEvent = function(eventTypeIn, identifiersIn) {
+const SelectionEvent = function(eventTypeIn, identifiersIn, zincObjects) {
   this.eventType = eventTypeIn;
   this.identifiers = identifiersIn;
+  this.zincObjects = zincObjects;
 }
 
 const returnFullID = function(sourceId) {
@@ -23,12 +24,12 @@ const Subscription = function(subscriberIn, callbackIn, eventType) {
     return eventType;
   }
   
-  this.notify = function(source, eventType, ids) {
+  this.notify = function(source, eventType, ids, zincObjects) {
     if (source !== subscriber && (_this.targetEventType ===  EVENT_TYPE.ALL ||
         _this.targetEventType === eventType)) {
       //should support different type of id e.g lyph, name, fmas...
       //need a function that finds all relavant ids
-      const event = new SelectionEvent(eventType, ids);
+      const event = new SelectionEvent(eventType, ids, zincObjects);
       callback(event);
     }
   }
@@ -37,9 +38,9 @@ const Subscription = function(subscriberIn, callbackIn, eventType) {
 exports.EventNotifier = function() {
   const subscriptions = [];
   
-  this.publish = function(source, eventType, id) {
+  this.publish = function(source, eventType, id, zincObjects) {
     for (let i = 0; i < subscriptions.length;i++) {
-      subscriptions[i].notify(source, eventType, id);
+      subscriptions[i].notify(source, eventType, id, zincObjects);
     }
   }
   

package/src/scripts/organsRenderer.js

@@ -474,14 +474,15 @@ const OrgansSceneData = function() {
       _this.sceneData.currentName = name;
 	  }
 
-	  this.loadOrgansFromURL = function(url, speciesName, systemName, partName, viewURL) {
+	  this.loadOrgansFromURL = function(url, speciesName, systemName, partName, viewURL, clearFirst) {
 		  if (_this.zincRenderer) {
 			  if (partName && (_this.sceneData.metaURL !== url)) {
 			      setSceneData(speciesName, systemName, partName, undefined);
 			      const name = _this.sceneData.currentName;
 			      let organScene = _this.zincRenderer.getSceneByName(name);
 			      if (organScene) {
-			    	  organScene.clearAll();
+              if (clearFirst)
+			    	    organScene.clearAll();
 			      } else {
 			    	  organScene = _this.zincRenderer.createScene(name);
 			      }
@@ -507,6 +508,36 @@ const OrgansSceneData = function() {
 			  }
 		  }
 	  }
+
+    this.loadGLTFFromURL = function(url, partName, clearFirst) {
+		  if (_this.zincRenderer) {
+			  if (partName && (_this.sceneData.metaURL !== url)) {
+			      setSceneData(undefined, undefined, partName, undefined);
+			      const name = _this.sceneData.currentName;
+			      let organScene = _this.zincRenderer.getSceneByName(name);
+			      if (organScene) {
+              if (clearFirst)
+			    	    organScene.clearAll();
+			      } else {
+			    	  organScene = _this.zincRenderer.createScene(name);
+			      }
+			      for (let i = 0; i < sceneChangedCallbacks.length;i++) {
+			    	  sceneChangedCallbacks[i](_this.sceneData);
+			      }
+  	    	  _this.sceneData.viewURL = undefined;
+			      _this.sceneData.metaURL = url;
+			      organScene.loadGLTF(url, _addOrganPartCallback(undefined, partName, false),
+              downloadCompletedCallback());
+			      _this.scene = organScene;
+			      _this.zincRenderer.setCurrentScene(organScene);
+			      _this.graphicsHighlight.reset();
+			      const zincCameraControl = organScene.getZincCameraControls();
+			      zincCameraControl.enableRaycaster(organScene, _pickingCallback(), _hoverCallback());
+			      zincCameraControl.setMouseButtonAction("AUXILIARY", "ZOOM");
+			      zincCameraControl.setMouseButtonAction("SECONDARY", "PAN");
+			  }
+		  }
+	  }
 	  	  
 	  this.alignCameraWithSelectedObject = function(transitionTime) {
 	    const objects = _this.graphicsHighlight.getSelected();
@@ -536,7 +567,7 @@ const OrgansSceneData = function() {
 			  _this.setName(settings.name);
 			  if (settings.metaURL !== undefined && settings.metaURL != "") {
 				  _this.loadOrgansFromURL(settings.metaURL, settings.species,
-					settings.system, settings.part, settings.viewURL);
+					  settings.system, settings.part, settings.viewURL, true);
 			  } else {
 				  _this.loadOrgans(settings.species, settings.system, settings.part);
 			  }