Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amanda Ghassaei
OrigamiSimulator
Commits
e33e7e4a
Commit
e33e7e4a
authored
May 08, 2017
by
amandaghassaei
Browse files
adding ui for vr
parent
ff6f19b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
index.html
View file @
e33e7e4a
...
...
@@ -599,6 +599,17 @@
<!--Ambient Occlusion-->
<!--</label>-->
<!--</div>-->
VR:
<div
class=
"indent smallTxt"
>
Status:
<span
id=
"VRstatus"
>
No device connected
</span>
<a
class=
"about floatRight"
href=
"#"
id=
"aboutVR"
><span
class=
"fui-question-circle"
></span></a><br/>
<div
id=
"VRoptions"
>
<label
class=
"checkbox"
for=
"vrEnabled"
>
<input
id=
"vrEnabled"
data-toggle=
"checkbox"
class=
"custom-checkbox layersSelector"
type=
"checkbox"
><span
class=
"icons"
><span
class=
"icon-unchecked"
></span><span
class=
"icon-checked"
></span></span>
Connect
</label>
</div>
</div>
</div>
</div>
</div>
...
...
@@ -673,6 +684,19 @@
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->
<div
class=
"modal fade"
id=
"aboutVRmodal"
tabindex=
"-1"
role=
"dialog"
>
<div
class=
"modal-dialog modal-med"
>
<div
class=
"modal-content"
>
<div
class=
"modal-body"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
>
<span
aria-hidden=
"true"
>
×
</span>
</button>
<b>
VR
</b><br/><br/>
Working on VR support for Vive....
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->
<div
class=
"modal fade"
id=
"exportSTLModal"
tabindex=
"-1"
role=
"dialog"
>
<div
class=
"modal-dialog modal-med"
>
<div
class=
"modal-content"
>
...
...
js/controls.js
View file @
e33e7e4a
...
...
@@ -220,6 +220,13 @@ function initControls(globals){
setLink
(
"
#aboutAxialStrain
"
,
function
(){
$
(
"
#aboutAxialStrainModal
"
).
modal
(
"
show
"
);
});
setLink
(
"
#aboutVR
"
,
function
(){
$
(
"
#aboutVRmodal
"
).
modal
(
"
show
"
);
});
setCheckbox
(
"
#vrEnabled
"
,
globals
.
vrEnabled
,
function
(
val
){
globals
.
vrEnabled
=
val
;
});
setLink
(
"
#start
"
,
function
(){
$
(
"
#pause
"
).
show
();
...
...
js/globals.js
View file @
e33e7e4a
...
...
@@ -64,7 +64,8 @@ function initGlobals(){
triangulateFOLDexport
:
false
,
exportFoldAngle
:
false
,
userInteractionEnabled
:
false
userInteractionEnabled
:
false
,
vrEnabled
:
false
};
...
...
Write
Preview
Markdown
is supported
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