From c70bf6af35e9301e6ab727ce960fb9a0499143d7 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sun, 18 Jan 2015 17:08:58 -0500
Subject: [PATCH] initial camera position
---
js/models/threeModel.js | 4 +++-
js/threeViews/fillGeometryView.js | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/js/models/threeModel.js b/js/models/threeModel.js
index 9947e78e..08d734c2 100644
--- a/js/models/threeModel.js
+++ b/js/models/threeModel.js
@@ -13,7 +13,9 @@ function ThreeModel(){
function initialize(){
- camera.position.z = 500;
+ camera.position.x = 125;
+ camera.position.y = 100;
+ camera.position.z = 165;
scene.fog = new THREE.FogExp2(0xcccccc, 0.002);
// lights
diff --git a/js/threeViews/fillGeometryView.js b/js/threeViews/fillGeometryView.js
index 18a7fb1d..466b7ebf 100644
--- a/js/threeViews/fillGeometryView.js
+++ b/js/threeViews/fillGeometryView.js
@@ -39,11 +39,11 @@ FillGeometryView = PushPullMeshView.extend({
updateBounds: function(){
var bounds = this.model.get("bounds");//this has not been scaled or rotated, as is when model was first imported
var max = bounds.max.toArray();
- var min = bounds.min.toArray()
+ var min = bounds.min.toArray();
var size = numeric.sub(max, min);
var translation = numeric.mul(numeric.add(max, min), 0.5);
var geometry = new THREE.BoxGeometry(size[0], size[1], size[2]);
- geometry.applyMatrix( new THREE.Matrix4().makeTranslation(translation[0], translation[1], translation[2]));
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(translation[0], translation[1], translation[2]));
this.boundsBox.geometry = geometry;
this.boxHelper.update(this.boundsBox);
this.render();
--
GitLab