WIP camera pivot, euler angles, cleanup

anim.js

@@ -47,16 +47,14 @@ var saturacija = 1;
 var svetlost = 0.4;
 
 // Rotiranje kamere
-var kameraX = 0;
+var qKamera = new THREE.Quaternion();
-var kameraY = 0;
-var kameraZ = 0;
 
 // Quaternioni za rotacijo in kalibracijo
-var qWW = new THREE.Quaternion(-1, 0, 0, 0);
+var qWW = new THREE.Quaternion();
-var qWWo = new THREE.Quaternion(-1, 0, 0, 0);
+var qWWo = new THREE.Quaternion();
-var qWWd = new THREE.Quaternion(-1, 0, 0, 0);
+var qWWd = new THREE.Quaternion();
-var qObj = new THREE.Quaternion(-1, 0, 0, 0);
+var qObj = new THREE.Quaternion();
-var qStart = new THREE.Quaternion(-1, 0, 0, 0);
+var qStart = new THREE.Quaternion();
 var calibrate = true;
 var reset = false;
 
@@ -85,6 +83,8 @@ renderer.setSize(window.innerWidth, window.innerHeight);
 // Črno ozadje
 renderer.setClearColor(0x000000, 1);
 
+//var pivot = new THREE.Group();
+//scene.add( pivot );
 
 
 
@@ -107,8 +107,13 @@ function render () {
 function modulirajParametre() {
   // Vsi gumbi? => RESET
   if ((keysPressed[0] + keysPressed[1] + keysPressed[2] + keysPressed[3]) === 4 && !reset) {
-    reset = true;
+    setTimeout(() => {
-    window.location.reload()
+      if ((keysPressed[0] + keysPressed[1] + keysPressed[2] + keysPressed[3]) === 4) {
+        setTimeout(() => {
+          window.location.reload()
+        }, 1000);
+      }
+    }, 1000)
   }
 
   // Posodobi kvaternion polozaja kontrolerja
@@ -131,10 +136,13 @@ function modulirajParametre() {
     drotacijaY += qWWd.y / 10;
     drotacijaZ += qWWd.z / 10;
   }
+  if (keysPressed[1]) {
+    //qKamera.multiply(qWWd);
+    obj_limit *= 1 - dqY;
+  }
   if (keysPressed[0]) {
-    width *= 1 + dqX;
+    width *= 1 + (dqX / 2);
     barva_mod += (dqZ / 100);
-    obj_limit *= 1 + (dqY);
   }
 }
 
@@ -180,6 +188,7 @@ function addObj(w, h) {
   var obj = new THREE.Line(geo, mat, THREE.LineSegments);
 
   scene.add(obj);
+  //pivot.add(obj);
   obj.setRotationFromQuaternion(qObj);
 
   // Pocisti za seboj
@@ -191,27 +200,12 @@ function addObj(w, h) {
   }
 };
 
-var xAksa = new THREE.Vector3(0, 1, 0);
+qK = new THREE.Quaternion()
+scene.setRotationFromQuaternion(qK)
+
 function camRotate () {
-  // rotiraj po z osi
+  qK.multiply(qKamera);
-  camera.translateX(kameraX);
+}
-  camera.translateZ(odmik_kamere - Math.sqrt(Math.pow(odmik_kamere, 2) + Math.pow(kameraX, 2)));
-
-  /*
-  camera.translateY(kameraY);
-  camera.translateX(odmik_kamere - Math.sqrt(Math.pow(odmik_kamere, 2) + Math.pow(kameraY, 2)));
-
-  camera.translateZ(kameraZ);
-  camera.translateX(odmik_kamere - Math.sqrt(Math.pow(odmik_kamere, 2) + Math.pow(kameraZ, 2)));
-
-  */
-  /*
-  camera.position.x = Math.sin((stevec % 10) / 10) * cam_rot_offset;
-  camera.position.y = Math.cos((stevec % 10) / 10) * cam_rot_offset;
-  */
-
-  camera.lookAt(scene.position);
-};
 
 // Inicializiraj
 document.onreadystatechange = function () {
@@ -235,7 +229,7 @@ function getVal(msg) {
   return msg.value;
 }
 
-kbdPressed = {
+const kbdPressed = {
   a: false,
   s: false,
   d: false,

scosc2.scd

@@ -64,7 +64,7 @@ o = OSCFunc({
 	~oX = ~gX;
 	~oY = ~gY;
 	~oZ = ~gZ;
-
+	msg.postln;
 	//[msg, time, addr, recvPort].postln;
 	~gW = msg[1];
 	~gZ = msg[2];
@@ -92,11 +92,11 @@ o = OSCFunc({
 
 	~euler = ~quaternionToEuler.([~dgW, ~dgX, ~dgY, ~dgZ]);
 	~euler.postln;
-}, '/quaternion/', n);
+}, '/quaternion', n);
 )
 // ENDWW
 
-OSCFunc.trace(true);
+OSCFunc.trace(false);
 
 
 

server.js

@@ -177,6 +177,12 @@ function eulerFromQuaternion(quaternion) {
 }
 
 const sendAll = (msg, info, oscWS, osclients) => {
+  // Reset euler rotation to 0
+  if (msg.address == '/keys') {
+    if (msg.args[0] && msg.args[1] && msg.args[2] && msg.args[3]) {
+      eulerRotation = [0, 0, 0]
+    }
+  }
 
   // Convert quaternion diff to euler angle diff
   if (msg.address == '/quaternionDiff') {
@@ -215,7 +221,7 @@ const osclients = []
 
 wss.on('connection', function (ws) {
   console.log('new client connection')
-  const oscWS = new osc.WebSocketPort({
+  let oscWS = new osc.WebSocketPort({
     socket: ws,
     metadata: false
   });
@@ -232,5 +238,11 @@ wss.on('connection', function (ws) {
     console.warn(error)
   })
   osclients.push(oscWS)
+
+  /*
+  oscWS.on('close', () => {
+    oscWS = null
+  })
+  */
 })
 

test.js

@@ -65,9 +65,8 @@ scene.add(skupina);
 
 // Quaternioni za rotacijo in kalibracijo
 var qWW = new THREE.Quaternion();
-var qObj = new THREE.Quaternion(-1, 0, 0, 0);
+var qObj = new THREE.Quaternion();
-var qStart = new THREE.Quaternion(-1, 0, 0, 0);
+var qStart = new THREE.Quaternion();
-var qCalibrate = new THREE.Quaternion();
 var reset = false;