Commit 2086f3a4 authored by amandaghassaei's avatar amandaghassaei
Browse files

small changes

parent 701e8625
......@@ -115,7 +115,7 @@ img{
top: 0;
left: 100%;
margin-top: 0;
margin-left: -1px;
margin-left: 0;
border-radius: 0;
/*-webkit-border-radius: 0 6px 6px 6px;*/
/*-moz-border-radius: 0 6px 6px;*/
......
......@@ -67,7 +67,6 @@ $(function() {
intersection.sub(globals.threeView.getModelOffset());
highlightedObj.moveManually(intersection);
globals.nodePositionHasChanged = true;
globals.threeView.render();
}
}
......@@ -96,7 +95,6 @@ $(function() {
}
highlightedObj = object;
if (highlightedObj) highlightedObj.highlight();
globals.threeView.render();
}
function checkForIntersections(e, objects){
......@@ -124,6 +122,5 @@ $(function() {
// globals.dynamicModel.syncNodesAndEdges(true);
// globals.staticSolver.syncNodesAndEdges();
globals.pattern = initPattern(globals);
globals.threeView.render();
// globals.threeView.sceneAdd(raycasterPlane);
});
\ No newline at end of file
......@@ -130,7 +130,7 @@ function initModel(globals){
for (var i=0;i<_vertices.length;i++){
_nodes.push(new Node(_vertices[i].clone(), _nodes.length));
}
_nodes[_faces[0].a].setFixed(true);
// _nodes[_faces[0].a].setFixed(true);
// _nodes[_faces[0].b].setFixed(true);
// _nodes[_faces[0].c].setFixed(true);
......
......@@ -159,7 +159,6 @@ function initPattern(globals){
var allEdges = outlines.concat(mountains).concat(valleys).concat(cuts);
var faces = triangulatePolys(findPolygons(allEdges), allEdges);
globals.threeView.render();
var allCreaseParams = getFacesAndVerticesForEdges(faces, allEdges);
......
......@@ -45,7 +45,6 @@ function initStaticSolver(){
var avg = (bounds.min.add(bounds.max)).multiplyScalar(-0.5);
// object3D.position.set(avg.x, 0, avg.z);
// globals.threeView.centerModel(avg);
globals.threeView.render();
setUpParams();
}
......
......@@ -58,15 +58,12 @@ function initThreeView(globals) {
controls.noPan = true;
controls.staticMoving = true;
controls.dynamicDampingFactor = 0.3;
controls.addEventListener('change', render);
render();
}
function render() {
if (!animationRunning) {
_render();
}
// if (!animationRunning) {
// _render();
// }
}
function startAnimation(callback){
......
Supports Markdown
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