updated controls to not go under the plane

added a bit more damping to controls minor clean up of code
CityPulse · Dec 5, 2016 · 8c702e0 · 8c702e0
1 parent c7c2d66
commit 8c702e0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/3dmap-master/control.html b/3dmap-master/control.html
@@ -96,6 +96,10 @@
     camera.position.y = 1254;
 
     controls = new THREE.OrbitControls( camera, renderer.domElement );
+
+    controls.dampingFactor = 1.75;
+    controls.maxPolarAngle = Math.PI/2;
+
     let lookAt = null;
     let position = new THREE.Vector3();
     controls.addEventListener('change',function(e){

diff --git a/3dmap-master/index.html b/3dmap-master/index.html
@@ -307,8 +307,9 @@
 		controls = new THREE.OrbitControls( camera, renderer.domElement );
 
 		controls.enableDamping = true;
-		controls.dampingFactor = 0.25;
+		controls.dampingFactor = 0.5;
 		controls.enableZoom = true;
+		controls.maxPolarAngle = Math.PI/2;
 
 		//adding sun/moon object
 		var sunGeometry = new THREE.SphereGeometry( 400, 32, 32 );
@@ -443,7 +444,7 @@
 		}
 
 
-
+		controls.update();
 		//animate camera
 		if(pathCamera && autoCamAnimation){
 			let time = Date.now()

diff --git a/3dmap-master/js/WSClient/wsClient.js b/3dmap-master/js/WSClient/wsClient.js
@@ -323,9 +323,7 @@ var controlClient = (function(){
 
      connection.onmessage = function(message) {
         msg = JSON.parse(message.data);
-        console.log(msg);
         if(msg.type === "setup"){
-            console.log("setup type")
             clientId = msg.id;
             if(controlCallback){
                 controlCallback(null);
@@ -342,7 +340,6 @@ var controlClient = (function(){
 
     return {
         setup: function(isClient, callback){
-            console.log("cc setup");
             controlCallback = callback;
             if(connection && connection.readyState==1){
                 connection.send(JSON.stringify({type: "SETUP", data: {isClient : isClient}}));

diff --git a/3dmap-master/js/interaction/userInteraction.js b/3dmap-master/js/interaction/userInteraction.js
@@ -241,18 +241,23 @@ var interaction = (function(){
 			let lookAt = null;
     		let position = new THREE.Vector3();
 			controls.addEventListener('change',function(e){
+
 				if(connectedToCameraControlServer){
 					//let matrix = e.target.object.matrix;
+					/*
 					position = e.target.object.position;
 					e.target.object.getWorldDirection(lookAt);
 					lookAt = new THREE.Vector3(0,0, -1);
 					lookAt.applyMatrix4( camera.matrixWorld );
 					controlClient.sendControls(position, lookAt);
+					*/
 				}
 		    });
 
 			controlClient.setup(false, function(position, lookAt){
+
 				if(!connectedToCameraControlServer){
+
 			        connectedToCameraControlServer=true;
 				}
 

diff --git a/3dmap-master/js/mapData/dataLoader.js b/3dmap-master/js/mapData/dataLoader.js
@@ -101,11 +101,7 @@ var mapData = (function(){
 			},50);
 			getRoads();
 			//setting up a websocket to event server
-			if(cityName=="ringe"){
-				console.log('ringe');
-			}else{
-				console.log('der');
-			}
+
 			setupVanillaSocket();
 			//for testing events - can be removed when done
 			//addTestEvent();

diff --git a/WSServer/controls/controlService.js b/WSServer/controls/controlService.js
@@ -46,9 +46,6 @@ function setupWSServer() {
 	        	clients.splice(index, 1);
 
 	        }else if(obj.type == 'controls'){
-	        	console.log("gotten");
-	        	console.log(obj.data.position);
-	        	console.log(obj.data.lookAt);
 	        	clients.forEach(function(client){
 	        		if(client.id !== obj.id ){
 	        			sendCameraToClient(client, obj.data.position, obj.data.lookAt);