Commit 39ac1751 authored by amandaghassaei's avatar amandaghassaei
Browse files

eod

parent 25742177
......@@ -33,7 +33,7 @@ function initGlobals(){
density: 1,
//import pattern settings
vertTol: 0.01//vertex merge tolerange
vertTol: 0.1//vertex merge tolerange
};
......
......@@ -33,7 +33,7 @@ function initModel(globals){
var creases = [];
creases.push(new Crease(edges[2], 0, 1, Math.PI-0.001, 1, nodes[1], nodes[3], 0));
creases.push(new Crease(edges[4], 2, 1, Math.PI-0.001, 1, nodes[4], nodes[0], 1));
creases.push(new Crease(edges[4], 2, 1, -(Math.PI-0.001), 1, nodes[4], nodes[0], 1));
var _allNodeObject3Ds = [];
_.each(nodes, function(node){
......
......@@ -32,7 +32,7 @@ function initPattern(globals){
});
}
// loadSVG("assets/Tessellations/miura-ori.svg", function(svg){
// loadSVG("assets/Tessellations/SimpleVertex.svg", function(svg){
// var _$svg = $(svg);
//
// //format all lines
......
......@@ -223,7 +223,7 @@ function initStaticSolver(){
var i = indicesMapping.indexOf(crease.node1.getIndex());
var dist = crease.getLengthToNode1();
// dist = 1.0;
C[j+numFreeEdges][3*i] = -normal1.x/dist;//todo not sure about sign
C[j+numFreeEdges][3*i] = -normal1.x/dist;
C[j+numFreeEdges][3*i+1] = -normal1.y/dist;
C[j+numFreeEdges][3*i+2] = -normal1.z/dist;
rxnForceScale = crease.getK()*diff/dist;
......
......@@ -43,7 +43,7 @@ function initThreeView(globals) {
//scene.fog = new THREE.FogExp2(0xf4f4f4, 1.7);
//renderer.setClearColor(scene.fog.color);
camera.zoom = 7;
camera.zoom = 1;
camera.updateProjectionMatrix();
camera.position.x = 4000;
camera.position.y = 4000;
......
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