From 1cc36b55ad849af1aefc94c93b36405f76cc96a7 Mon Sep 17 00:00:00 2001
From: amandaghassaei <amandaghassaei@gmail.com>
Date: Sun, 28 May 2017 18:00:24 -0400
Subject: [PATCH] small changes
---
js/dynamic/dynamicSolver.js | 1 +
js/globals.js | 6 +++---
js/model.js | 4 ++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/js/dynamic/dynamicSolver.js b/js/dynamic/dynamicSolver.js
index 1132620..89c8834 100755
--- a/js/dynamic/dynamicSolver.js
+++ b/js/dynamic/dynamicSolver.js
@@ -519,6 +519,7 @@ function initDynamicSolver(globals){
syncNodesAndEdges: syncNodesAndEdges,
updateFixed: updateFixed,
solve: solve,
+ render: render,
reset: reset
}
}
\ No newline at end of file
diff --git a/js/globals.js b/js/globals.js
index 1fca0a8..93b7cc4 100755
--- a/js/globals.js
+++ b/js/globals.js
@@ -38,7 +38,7 @@ function initGlobals(){
//3d vis
simType: "dynamic",
- //sim settings
+ //compliant sim settings
creasePercent: 0.5,
axialStiffness: 20,
creaseStiffness: 0.7,
@@ -48,11 +48,11 @@ function initGlobals(){
percentDamping: 0.5,
density: 1,
- strainClip: 5.0,
+ strainClip: 5.0,//for strain visualization, % strain that is drawn red
//import pattern settings
vertTol: 3,//vertex merge tolerance
- foldUseAngles: true,
+ foldUseAngles: true,//import current angles from fold format as target angles
//save stl settings
filename: null,
diff --git a/js/model.js b/js/model.js
index e9fc641..a6acd9b 100755
--- a/js/model.js
+++ b/js/model.js
@@ -46,6 +46,10 @@ function initModel(globals){
polygonOffsetUnits: 1
});
backside.visible = false;
+ if (!globals.threeView.simulationRunning) {
+ getSolver().render();
+ setGeoUpdates();
+ }
} else {
material = new THREE.MeshPhongMaterial({
shading:THREE.FlatShading, side:THREE.FrontSide,
--
GitLab