Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AMOEBA
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Amanda Ghassaei
AMOEBA
Commits
6f54f8c3
Commit
6f54f8c3
authored
Mar 18, 2016
by
amandaghassaei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
photo setup
parent
e8433669
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
159 additions
and
123 deletions
+159
-123
css/main.css
css/main.css
+1
-1
dependencies/flatUI/css/flat-ui.css
dependencies/flatUI/css/flat-ui.css
+118
-118
index.html
index.html
+2
-0
js/menus/otherUI/Navbar.js
js/menus/otherUI/Navbar.js
+25
-3
js/models/AppState.js
js/models/AppState.js
+7
-0
js/three/ThreeModel.js
js/three/ThreeModel.js
+6
-1
No files found.
css/main.css
View file @
6f54f8c3
...
...
@@ -261,7 +261,7 @@ input.intInput, input.floatInput{
}
.dropdown-submenu
li
:hover
{
background-color
:
#
428bc
a
!important
;
background-color
:
#
aa
a
!important
;
}
.dropdown-submenu
>
.dropdown-menu
{
...
...
dependencies/flatUI/css/flat-ui.css
View file @
6f54f8c3
This diff is collapsed.
Click to expand it.
index.html
View file @
6f54f8c3
...
...
@@ -94,6 +94,8 @@
<a
tabindex=
"-1"
>
Amanda
<span
class=
"pull-right fui-arrow-right"
></span></a>
<ul
class=
"dropdown-menu"
>
<li><a
id=
"videoRendering"
href=
"#"
>
Video Rendering Setup
</a></li>
<li><a
id=
"photoSetup"
href=
"#"
>
Photo Setup
</a></li>
<li><a
id=
"undoPhotoSetup"
href=
"#"
>
Undo Photo Setup
</a></li>
</ul>
</li>
<!--<li class="dropdown-submenu">-->
...
...
js/menus/otherUI/Navbar.js
View file @
6f54f8c3
...
...
@@ -3,8 +3,8 @@
*/
define
([
'
jquery
'
,
'
underscore
'
,
'
backbone
'
,
'
fileSaver
'
,
'
navViewMenu
'
,
'
appState
'
,
'
plist
'
],
function
(
$
,
_
,
Backbone
,
fileSaver
,
NavViewMenu
,
appState
,
plist
){
define
([
'
jquery
'
,
'
underscore
'
,
'
backbone
'
,
'
fileSaver
'
,
'
navViewMenu
'
,
'
appState
'
,
'
plist
'
,
'
threeModel
'
],
function
(
$
,
_
,
Backbone
,
fileSaver
,
NavViewMenu
,
appState
,
plist
,
three
){
return
Backbone
.
View
.
extend
({
...
...
@@ -27,7 +27,9 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'appStat
"
click .jsonFile
"
:
"
_loadJSON
"
,
"
click #viewMenuDropdown
"
:
"
_renderViewMenu
"
,
"
click #videoRendering
"
:
"
_videoRenderingSetup
"
"
click #videoRendering
"
:
"
_videoRenderingSetup
"
,
"
click #photoSetup
"
:
"
_photoSetup
"
,
"
click #undoPhotoSetup
"
:
"
_undoPhotoSetup
"
},
initialize
:
function
(){
...
...
@@ -111,6 +113,26 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'appStat
window
.
resizeTo
(
1000
,
700
);
//todo this doesn't work
},
_photoSetup
:
function
(
e
){
e
.
preventDefault
();
appState
.
hideAllUi
();
var
navSelection
=
appState
.
get
(
"
currentNav
"
);
if
(
plist
.
allMenus
[
navSelection
].
parentNav
)
navSelection
=
plist
.
allMenus
[
navSelection
].
parentNav
;
if
(
plist
.
allMenus
[
navSelection
].
parent
)
navSelection
=
plist
.
allMenus
[
navSelection
].
parent
;
if
(
navSelection
!=
"
navSim
"
)
appState
.
set
(
"
basePlaneIsVisible
"
,
false
);
appState
.
set
(
"
highlighterIsVisible
"
,
false
);
three
.
setBackgroundColor
(
0xffffff
);
},
_undoPhotoSetup
:
function
(
e
){
e
.
preventDefault
();
appState
.
set
(
"
menuIsVisible
"
,
true
);
appState
.
set
(
"
ribbonIsVisible
"
,
true
);
appState
.
set
(
"
basePlaneIsVisible
"
,
true
);
if
(
appState
.
get
(
"
currentNav
"
)
==
"
navDesign
"
)
appState
.
set
(
"
highlighterIsVisible
"
,
true
);
three
.
setBackgroundColor
(
0xcccccc
);
},
_save
:
function
(
e
){
...
...
js/models/AppState.js
View file @
6f54f8c3
...
...
@@ -197,6 +197,13 @@ define(['underscore', 'backbone', 'threeModel', 'three', 'plist', 'globals'],
three
.
resetCameraPosition
();
},
hideAllUi
:
function
(){
this
.
set
(
"
menuIsVisible
"
,
false
);
this
.
set
(
"
ribbonIsVisible
"
,
false
);
this
.
set
(
"
consoleIsVisible
"
,
false
);
this
.
set
(
"
scriptIsVisible
"
,
false
);
},
openAssembly
:
function
(){
this
.
set
(
"
currentNav
"
,
"
navDesign
"
);
$
(
"
#jsonInput
"
).
click
();
...
...
js/three/ThreeModel.js
View file @
6f54f8c3
...
...
@@ -261,6 +261,10 @@ define(['underscore', 'three'], function(_, THREE){
return
renderer
.
context
;
}
function
setBackgroundColor
(
color
){
renderer
.
setClearColor
(
color
,
1
);
}
return
{
//return public properties/methods
render
:
render
,
conditionalRender
:
conditionalRender
,
...
...
@@ -290,7 +294,8 @@ define(['underscore', 'three'], function(_, THREE){
resetCameraPosition
:
resetCameraPosition
,
setThreeView
:
setThreeView
,
saveSVG
:
saveSVG
,
getGLContext
:
getGLContext
getGLContext
:
getGLContext
,
setBackgroundColor
:
setBackgroundColor
}
});
\ No newline at end of file
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