diff --git a/minecraftcodex/studio/static/coffee/cameras.coffee b/minecraftcodex/studio/static/coffee/cameras.coffee index 9ad40f4..fa70661 100644 --- a/minecraftcodex/studio/static/coffee/cameras.coffee +++ b/minecraftcodex/studio/static/coffee/cameras.coffee @@ -15,10 +15,18 @@ class Camera @_position.y += y @_position.z += z @_self.position = @_position - $('input.camera-x').val @_position.x - $('input.camera-y').val @_position.y - $('input.camera-z').val @_position.z + $('input.camera-x').val @_position.x + $('input.camera-y').val @_position.y + $('input.camera-z').val @_position.z + goTo: (x, y, z) -> + @_position.x = x + @_position.y = y + @_position.z = z + @_self.position = @_position + $('input.camera-x').val @_position.x + $('input.camera-y').val @_position.y + $('input.camera-z').val @_position.z class orthograpicCamera extends Camera _self: null @@ -39,6 +47,7 @@ class orthograpicCamera extends Camera @_far = width * 2 camera = new THREE.OrthographicCamera @_left, @_right, @_top, @_bottom, @_near, @_far @_self = camera + @goTo 0, 0, 0 class perspectiveCamera extends Camera @@ -50,8 +59,8 @@ class perspectiveCamera extends Camera init: (width, height) -> @_aspectRatio = width / height camera = new THREE.PerspectiveCamera @_fov, @_aspectRatio, @_near, @_far - camera.position.z = 40 @_self = camera + @goTo 0, 0, 40 window.StudioCameras = diff --git a/minecraftcodex/studio/static/coffee/loader.coffee b/minecraftcodex/studio/static/coffee/loader.coffee index 23f015e..2e8f635 100644 --- a/minecraftcodex/studio/static/coffee/loader.coffee +++ b/minecraftcodex/studio/static/coffee/loader.coffee @@ -36,6 +36,24 @@ window.onload = -> camera = $(@).val() window.Studio.onCameraChange camera + $('.btn-camera-x-plus').click -> + window.Studio.camera.move 1, 0, 0 + + $('.btn-camera-x-minus').click -> + window.Studio.camera.move -1, 0, 0 + + $('.btn-camera-y-plus').click -> + window.Studio.camera.move 0, 1, 0 + + $('.btn-camera-y-minus').click -> + window.Studio.camera.move 0, -1, 0 + + $('.btn-camera-z-plus').click -> + window.Studio.camera.move 0, 0, 1 + + $('.btn-camera-z-minus').click -> + window.Studio.camera.move 0, 0, -1 + $(':radio[name="cameraType"]:first').click() # Toggles diff --git a/minecraftcodex/studio/templates/studio/main.html b/minecraftcodex/studio/templates/studio/main.html index 53a155c..daa094f 100644 --- a/minecraftcodex/studio/templates/studio/main.html +++ b/minecraftcodex/studio/templates/studio/main.html @@ -43,7 +43,7 @@ @@ -151,18 +151,18 @@
- + Y - +
- + Z - +