First Working Version

searchController loads long at initialization

Author: Aaron Sillus

ui/aframe.html

@@ -9,6 +9,7 @@
     var metaDataJsonUrl  = modelUrl + "/metaData.json";
 
     var canvasId = "aframe-canvas";
+
     var visMode = "aframe";
 </script>
 
@@ -23,8 +24,7 @@
     <script type="text/javascript" src="libs/handlebars-v2.0.0.js"></script>
 
     <!--A-Frame-->
-    <script src="https://aframe.io/releases/0.7.0/aframe.min.js"></script>
-    <!--a frame already gets imported with the model-->
+    <script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
 
     <!--jqwidgets-->
     <script type="text/javascript" src="libs/jqwidgets/jqxcore.js"></script>
@@ -72,6 +72,7 @@
     <script type="text/javascript" src="scripts/AframeCanvasManipulator.js"></script>
     <script type="text/javascript" src="scripts/Application.js"></script>
     <script type="text/javascript" src="scripts/AframeActionController.js"></script>
+    <script type="text/javascript" src="scripts/aframe-orbit-camera-component.js"></script>
 
 
     <link rel="stylesheet" href="Style.css" type="text/css" />
@@ -84,7 +85,7 @@
 <div id="canvas">
     <script>
         $(function(){
-            $("#canvas").load("data/aframe/model.html");
+            $("#canvas").load("data/aframe/modelSmall/model.html");
 
         });
     </script>

ui/scripts/AframeActionController.js

@@ -1,4 +1,4 @@
-var aframeActionController = (function() {
+var actionController = (function() {
 
 
 //*********************************
@@ -84,7 +84,7 @@ var aframeActionController = (function() {
 //*********************************	
 
 	function initialize(){
-		
+		console.debug(arguments.callee.name);
 		//canvas actions
 		var canvas = document.getElementById(canvasId);
 

ui/scripts/AframeCanvasManipulator.js

@@ -1,4 +1,4 @@
-var aframeCanvasManipulator = (function() {
+var canvasManipulator = (function() {
 
 	var colors = {
 		darkred: "darkred",

ui/scripts/Application.js

@@ -23,7 +23,6 @@ $(document).ready(function () {
 });
 
 function initializeApplication(metaDataJson){
-
     //wait for canvas to be loaded full here...
 	var canvas = document.getElementById(canvasId);
 	if(!canvas){
@@ -34,25 +33,9 @@ function initializeApplication(metaDataJson){
 	//create entity model
 	model.initialize(metaDataJson);
 
-	//switch to differentiate between x3dom and a-frame (specified in index.html/aframe.html)
-	if(visMode) {
-        switch (visMode) {
-        	case "aframe": {
-				aframeActionController.initialize();
-				aframeCanvasManipulator.initialize();
-				break;
-			}
-            case "x3dom":
-            default: {
-                //start action controller
-                actionController.initialize();
-
-                //initialize canvas manipulator
-                canvasManipulator.initialize();
-                break;
-            }
-        }
-    }
+	console.debug("Initialize ActionController");
+	actionController.initialize();
+	canvasManipulator.initialize();
 
 	//initialize application
 	application.initialize();
@@ -123,9 +106,9 @@ var application = (function() {
 
 
 	function startConfigParsingAfterControllerLoading(){
-		
 		//check that all controllers loaded
 		if(setup.controllers.length !== controllers.size){
+			console.debug("controllers not loaded yet...");
 			setTimeout(startConfigParsingAfterControllerLoading, 1);
 			return;
 		}
@@ -135,10 +118,15 @@ var application = (function() {
 		canvasElement = document.getElementById("canvas");
 
 		//create ui div element
-		var uiDIV = document.createElement("DIV");
-		uiDIV.id = "ui";
-		bodyElement.appendChild(uiDIV);
-		currentUIConfig.uiDIV = uiDIV;
+		/*	AFRAME-WORKAROUND
+		FÜR AFRAME - existierendes DIV statt neuem UI aus aframe.html
+		id von "ui" zu "canvas" geändert
+		var uiDIV = document.getElementById("canvas");*/
+
+        var uiDIV = document.createElement("DIV");
+        uiDIV.id = "ui";
+        bodyElement.appendChild(uiDIV);
+        currentUIConfig.uiDIV = uiDIV;
 
 		//activate controller
 		newActiveControllers = [];
@@ -149,7 +137,6 @@ var application = (function() {
 
 			//activate controller
 			activateController();
-
 			events.log.info.publish({ text: "new config loaded: " + currentUIConfig.name });			
 		} catch(err) {
 			events.log.error.publish({ text: err.message });
@@ -205,7 +192,7 @@ var application = (function() {
 		currentUIConfig = nextUIConfig;
 		currentUIConfig.uiDIV = uiDIV;
 
-		//collect old active controllers for deactivation		
+		//collect old active controllers for deactivation
 		oldActiveControllers = Array.from(activeControllers.keys());
 		newActiveControllers = [];
 
@@ -214,16 +201,15 @@ var application = (function() {
 			parseUIConfig(currentUIConfig.name, currentUIConfig, uiDIV);
 
 			//deactive controller
-			deactivateController(oldActiveControllers);	
+			deactivateController(oldActiveControllers);
 
 			//activate controller
-			activateController();	
+			activateController();
 
 			events.log.info.publish({ text: "new config loaded: " + currentUIConfig.name });	
 		} catch(err) {
 			events.log.error.publish({ text: err.message });
 		}
-
 	}
 
 
@@ -303,11 +289,18 @@ var application = (function() {
 
 		//canvas
 		if(configPart.canvas !== undefined){
-			
-			var canvasParentElement = canvasElement.parentElement;			
-			canvasParentElement.removeChild(canvasElement);		
-		
-			parent.appendChild(canvasElement);
+			if(visMode != "aframe") {
+                var canvasParentElement = canvasElement.parentElement;
+                canvasParentElement.removeChild(canvasElement);
+
+                parent.appendChild(canvasElement);
+            } else {
+                var canvasParentElement = canvasElement.parentElement;
+                canvasParentElement.removeChild(canvasElement);
+
+                parent.appendChild(canvasElement.cloneNode(true));
+                //	evtl canvas löschen ??
+			}
 		}
 
 		//controller
@@ -332,7 +325,6 @@ var application = (function() {
 
 	function loadAndInitializeController(controller){
 		var controllerName = controller.name;
-        if(visMode == "aframe") console.debug("loadAndInitializeController("+controller.name+")");
 
 		//controller allready loaded by html-file?
 		if(window[controllerName]){
@@ -389,15 +381,14 @@ var application = (function() {
 	}
 
 	function activateController(){
-        console.debug(arguments.callee.name);
 		newActiveControllers.forEach(function(controllerObject){
 			if(controllerObject.activate){
 				var controllerDiv = activeControllers.get(controllerObject);
+				console.debug(controllerObject);
 
 				controllerObject.activate(controllerDiv);
 			}	
-		});	
-		
+		});
 	}
 
 
@@ -422,29 +413,31 @@ var application = (function() {
 	//*******************
 
 	function createNavigationMode(navigationObject){			
-		
-		var navigationInfoElement = document.getElementById("navigationInfo");
-		
-		if(!navigationInfoElement){
-			var scene = document.getElementById("scene");
-		
-			navigationInfoElement = document.createElement("NAVIGATIONINFO");
-			navigationInfoElement.id = "navigationInfo";
-			
-			scene.appendChild(navigationInfoElement);		
-		}
-						
-		if(navigationObject.type){
-			navigationInfoElement.setAttribute("type", navigationObject.type);
-		}
-		if(navigationObject.speed){
-			navigationInfoElement.setAttribute("speed", navigationObject.speed);
-		}
-		
-		//Turntable seems not to work with 1.7 and dynamic adding
-		if(navigationObject.typeParams){
-			navigationInfoElement.setAttribute("typeParams", navigationObject.typeParams);
-		}
+		if(visMode == "x3dom") {
+            var navigationInfoElement = document.getElementById("navigationInfo");
+
+            if (!navigationInfoElement) {
+                var scene = document.getElementById("scene");
+
+                navigationInfoElement = document.createElement("NAVIGATIONINFO");
+                navigationInfoElement.id = "navigationInfo";
+
+                scene.appendChild(navigationInfoElement);
+            }
+
+            if (navigationObject.type) {
+                navigationInfoElement.setAttribute("type", navigationObject.type);
+            }
+            if (navigationObject.speed) {
+                navigationInfoElement.setAttribute("speed", navigationObject.speed);
+            }
+
+            //Turntable seems not to work with 1.7 and dynamic adding
+            if (navigationObject.typeParams) {
+                navigationInfoElement.setAttribute("typeParams", navigationObject.typeParams);
+            }
+        }
+        else console.debug("No x3dom - no navigationInfoElement");
 	}
 
 	function createPanel(areaPart){

ui/scripts/Search/SearchController.js

@@ -68,6 +68,8 @@ var searchController = (function() {
 	}
 
     function initializeSearch() {
+
+		console.debug("SearchController.js: initializeSearch() - begin");
 
         suggestions = new Bloodhound({
             datumTokenizer: function(entity) {
@@ -114,10 +116,10 @@ var searchController = (function() {
         });	
 		$(jQsearchInputID).on("typeahead:closed", function(event, suggestion, dataset) {
 			rootDivElement.parentElement.style.overflow = "hidden";
-        });	
-		
-		
-        
+        });
+
+
+        console.debug("SearchController.js: initializeSearch() - end");
     }
 
     function selectEntity(id) {