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
83e5d9a7
Commit
83e5d9a7
authored
Feb 25, 2017
by
amandaghassaei
Browse files
small changes
parent
5ddd8534
Changes
4
Show whitespace changes
Inline
Side-by-side
index.html
View file @
83e5d9a7
...
...
@@ -252,7 +252,7 @@
<div
id=
"controls"
>
<a
href=
"#"
id=
"about"
class=
"btn btn-lg btn-default"
>
About
</a><br/><br/>
<div
class=
"sliderInput"
id=
"crease
Angle
"
>
<div
class=
"sliderInput"
id=
"crease
Percent
"
>
<span
class=
"label-slider"
>
Crease Angle :
</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 int"
type=
"text"
>
</div>
...
...
js/controls.js
View file @
83e5d9a7
...
...
@@ -66,8 +66,8 @@ function initControls(globals){
globals
.
dynamicModel
.
reset
();
});
setSliderInput
(
"
#crease
Angle
"
,
globals
.
crease
Angle
,
0
,
Math
.
PI
,
0.1
,
function
(
val
){
globals
.
crease
Angle
=
val
;
setSliderInput
(
"
#crease
Percent
"
,
globals
.
crease
Percent
,
0
,
1
,
0.
0
1
,
function
(
val
){
globals
.
crease
Percent
=
val
;
});
function
setDeltaT
(
val
){
...
...
js/dynamicModel.js
View file @
83e5d9a7
...
...
@@ -215,7 +215,6 @@ function initDynamicModel(globals){
gpuMath
.
initTextureFromData
(
"
u_lastTheta
"
,
textureDimCreases
,
textureDimCreases
,
"
FLOAT
"
,
lastTheta
);
gpuMath
.
initFrameBufferForTexture
(
"
u_lastTheta
"
);
gpuMath
.
initTextureFromData
(
"
u_originalPosition
"
,
textureDim
,
textureDim
,
"
FLOAT
"
,
originalPosition
);
gpuMath
.
initTextureFromData
(
"
u_meta
"
,
textureDim
,
textureDim
,
"
FLOAT
"
,
meta
);
gpuMath
.
createProgram
(
"
positionCalc
"
,
vertexShader
,
document
.
getElementById
(
"
positionCalcShader
"
).
text
);
...
...
js/globals.js
View file @
83e5d9a7
...
...
@@ -19,7 +19,7 @@ function initGlobals(){
schematicVisible
:
true
,
//sim settings
crease
Angle
:
0
,
crease
Percent
:
0
,
axialStiffness
:
100
,
creaseStiffness
:
1
,
panelStiffness
:
1
,
...
...
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