Commit 9e99c307 authored by bernie wang's avatar bernie wang
Browse files

resolving merge with fixed-grid

parents e76ca56e 086f8019
......@@ -12,6 +12,7 @@ var mouseDown;
var highlightMode = false;
var threshold = 0.5;
var pointSize = 1;
// data structures
var data;
var boundingBoxes = [];
......@@ -40,6 +41,7 @@ var isMoving = false;
var isRotating = false;
var grid;
var pointMaterial = new THREE.PointsMaterial( { size: pointSize * 2, sizeAttenuation: false, vertexColors: THREE.VertexColors } );
init();
var id = 0;
......@@ -642,6 +644,7 @@ function render() {
toggle += clock.getDelta();
renderer.render( scene, camera );
// if (move2D) {
// grid.rotation.y = camera.rotation.z;
// }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment