Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amanda Ghassaei
OrigamiSimulator
Commits
5ddd8534
Commit
5ddd8534
authored
Feb 25, 2017
by
amandaghassaei
Browse files
dynamic sim vis
parent
f60a89c8
Changes
3
Hide whitespace changes
Inline
Side-by-side
js/controls.js
View file @
5ddd8534
...
...
@@ -21,11 +21,17 @@ function initControls(globals){
var
dynamicSimVisCallback
=
function
(
val
){
if
(
val
)
{
$
(
"
.dynamicSim
"
).
show
();
if
(
globals
.
dynamicModel
)
globals
.
dynamicModel
.
resume
();
if
(
globals
.
dynamicModel
)
{
globals
.
dynamicModel
.
resume
();
globals
.
dynamicModel
.
setVisibility
(
true
);
}
}
else
{
$
(
"
.dynamicSim
"
).
hide
();
if
(
globals
.
dynamicModel
)
globals
.
dynamicModel
.
pause
();
if
(
globals
.
dynamicModel
)
{
globals
.
dynamicModel
.
pause
();
globals
.
dynamicModel
.
setVisibility
(
false
);
}
}
};
dynamicSimVisCallback
(
globals
.
dynamicSimVisible
);
...
...
js/dynamicModel.js
View file @
5ddd8534
...
...
@@ -90,6 +90,7 @@ function initDynamicModel(globals){
function
setVisibility
(
state
){
object3D
.
visible
=
state
;
globals
.
threeView
.
render
();
}
function
solveStep
(){
...
...
@@ -420,6 +421,7 @@ function initDynamicModel(globals){
updateMaterials
:
updateMaterials
,
reset
:
reset
,
pause
:
pause
,
resume
:
resume
resume
:
resume
,
setVisibility
:
setVisibility
}
}
\ No newline at end of file
js/threeView.js
View file @
5ddd8534
...
...
@@ -88,6 +88,7 @@ function initThreeView(globals) {
pauseFlag
=
false
;
animationRunning
=
false
;
console
.
log
(
"
pausing animation
"
);
render
();
//for good measure
return
;
}
_loop
(
callback
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment