diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3c3629e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/anim.js b/anim.js
index 2d303ca..2ce3f3b 100644
--- a/anim.js
+++ b/anim.js
@@ -18,7 +18,7 @@ var width = 2;
var height = 2;
// Limit stevila objektov
-var obj_limit = 150000000;
+var obj_limit = 1000;
@@ -137,19 +137,22 @@ function addObj(w, h) {
var xAksa = new THREE.Vector3(0, 1, 0);
function camRotate () {
// rotiraj po z osi
- /*
camera.translateX(cam_rot_offset);
camera.translateZ(odmik_kamere - Math.sqrt(Math.pow(odmik_kamere, 2) + Math.pow(cam_rot_offset, 2)));
+ /*
camera.translateY(cam_rot_offset);
camera.translateX(odmik_kamere - Math.sqrt(Math.pow(odmik_kamere, 2) + Math.pow(cam_rot_offset, 2)));
camera.translateY(cam_rot_offset);
camera.translateX(odmik_kamere - Math.sqrt(Math.pow(odmik_kamere, 2) + Math.pow(cam_rot_offset, 2)));
+
+
+ camera.position.x = Math.sin((stevec % 10) / 10) * cam_rot_offset;
+ camera.position.y = Math.cos((stevec % 10) / 10) * cam_rot_offset;
*/
- camera.translateOnAxis(xAksa, cam_rot_offset);
camera.lookAt(scene.position);
};
diff --git a/control.html b/control.html
new file mode 100644
index 0000000..2a6a924
--- /dev/null
+++ b/control.html
@@ -0,0 +1,105 @@
+
+
+
+ cancerainbow control
+
+
+
+
+
+
+
+
+
diff --git a/control.js b/control.js
new file mode 100644
index 0000000..d9f1585
--- /dev/null
+++ b/control.js
@@ -0,0 +1,57 @@
+// Interaktivnost
+var socket = io();
+
+inputi = ["fov", "sirina", "visina", "obj_limit", "rotx", "roty", "rotz", "barva", "kamera"];
+
+inputi.map(function (name) {
+ var valEl = document.getElementById(name + "Val");
+ if (!valEl) { return; }
+
+ var ctlEl = document.getElementById(name + "Ctl");
+ ctlEl.oninput = function(ev) {
+ var val = ev.target.value;
+ valEl.innerHTML = val;
+
+ socket.emit('adjust', name, val);
+ };
+
+ valEl.innerHTML = ctlEl.value;
+});
+
+
+callbacks = {
+ fov: function(val) {
+ if (!camera) return;
+ FOV = val;
+ camera.fov = val;
+ camera.updateProjectionMatrix();
+ },
+ sirina: function(val) {
+ width = parseFloat(val);
+ },
+ visina: function (val) {
+ height = parseFloat(val);
+ },
+ rotx: function(val) {
+ rotacijaX = parseFloat(val);
+ },
+ roty: function(val) {
+ rotacijaY = parseFloat(val);
+ },
+ rotz: function(val) {
+ rotacijaZ = parseFloat(val);
+ },
+ obj_limit: function(val) {
+ obj_limit = parseInt(val);
+ },
+ barva: function(val) {
+ barva_mod = parseFloat(val);
+ },
+ kamera: function(val) {
+ cam_rot_offset = parseFloat(val);
+ }
+};
+
+socket.on('adjust', function(name, val) {
+ callbacks[name].call(this, val);
+});
diff --git a/index.html b/index.html
index 2037599..c03250a 100644
--- a/index.html
+++ b/index.html
@@ -14,5 +14,7 @@
+
+