Skip to content
GitLab
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
1d8e8d37
Commit
1d8e8d37
authored
May 03, 2017
by
amandaghassaei
Browse files
small changes
parent
7d8e5a8f
Changes
3
Hide whitespace changes
Inline
Side-by-side
index.html
View file @
1d8e8d37
...
...
@@ -417,7 +417,7 @@
</div><br/>
<b>
Fold Settings:
</b><br/><br/>
<div
class=
"sliderInput"
id=
"creasePercent"
>
<span
class=
"label-slider"
>
Fold Percent
:
</span><div
class=
"flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"
></div>
<span
class=
"label-slider"
>
Angle (-1 to 1)
:
</span><div
class=
"flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"
></div>
<input
value=
""
placeholder=
""
class=
"form-control"
type=
"text"
>
</div>
<br/><br/><br/>
...
...
@@ -434,6 +434,11 @@
<span
class=
"label-slider"
>
Panel Stiffness :
</span><div
class=
"flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"
></div>
<input
value=
""
placeholder=
""
class=
"form-control"
type=
"text"
>
</div>
<div
class=
"sliderInput"
id=
"percentDamping"
>
<span
class=
"label-slider"
>
Damping (0-1):
</span><div
class=
"flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"
></div>
<input
value=
""
placeholder=
""
class=
"form-control"
type=
"text"
>
</div>
<div
class=
"extraSpace"
></div>
</div>
<div
id=
"svgViewer"
></div>
...
...
js/controls.js
View file @
1d8e8d37
...
...
@@ -71,11 +71,9 @@ function initControls(globals){
globals
.
creaseMaterialHasChanged
=
true
;
});
setSlider
(
"
#d
amping
"
,
globals
.
percentDamping
,
0.
05
,
1
,
0.01
,
function
(
val
){
setSlider
Input
(
"
#percentD
amping
"
,
globals
.
percentDamping
,
0.
1
,
1
,
0.01
,
function
(
val
){
globals
.
percentDamping
=
val
;
},
function
(){
globals
.
materialHasChanged
=
true
;
globals
.
shouldResetDynamicSim
=
true
;
});
setSliderInput
(
"
#creasePercent
"
,
globals
.
creasePercent
,
-
1
,
1
,
0.01
,
function
(
val
){
...
...
js/dynamic/dynamicModel.js
View file @
1d8e8d37
...
...
@@ -286,7 +286,7 @@ function initDynamicModel(globals){
}
function
updateMaterials
(
initing
){
console
.
log
(
"
here
"
);
var
index
=
0
;
for
(
var
i
=
0
;
i
<
nodes
.
length
;
i
++
){
if
(
initing
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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