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
D
DMDesign
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
DMDesign
Commits
83bd9fb5
Commit
83bd9fb5
authored
Sep 07, 2015
by
Amanda Ghassaei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more debugging for new plist structure
parent
82ba2887
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
28 deletions
+28
-28
js/lattice/Lattice.js
js/lattice/Lattice.js
+1
-0
js/menus/templates/MaterialMenuView.html
js/menus/templates/MaterialMenuView.html
+27
-28
No files found.
js/lattice/Lattice.js
View file @
83bd9fb5
...
...
@@ -74,6 +74,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
this
.
set
(
"
partType
"
,
newPartType
,
{
silent
:
true
});
var
newMaterialClass
=
(
latticeData
.
materialClasses
||
plist
.
allMaterialClasses
)[
0
];
console
.
log
(
newMaterialClass
);
appState
.
set
(
"
materialClass
"
,
newMaterialClass
);
},
...
...
js/menus/templates/MaterialMenuView.html
View file @
83bd9fb5
...
...
@@ -3,38 +3,37 @@
<div
class=
"btn-group"
>
<button
data-toggle=
"dropdown"
class=
"btn dropdown-toggle"
type=
"button"
><
%=
allMaterialClasses
[
materialClass
]
%
><span
class=
"caret"
></span></button>
<ul
role=
"menu"
class=
"dropdown-menu"
>
<
%
_.each
(
_.keys
(
allMaterialClasses
),
function
(
key
){
%
>
<li><a
class=
"appState dropdownSelector"
data-property=
"materialClass"
data-value=
"<%= key %>"
href=
"#"
><
%=
allMaterialClasses
[
key
]
%
></a></li>
<
%
_.each
(
allLattices
[
cellType
].
connection
[
connectionType
].
type
[
latticeType
].
materialClasses
||
allMaterialClasses
,
function
(
val
,
key
){
%
>
<li><a
class=
"appState dropdownSelector"
data-property=
"materialClass"
data-value=
"<%= key %>"
href=
"#"
><
%=
val
%
></a></li>
<
%
});
%
>
</ul>
</div><br/><br/>
<
%
}
%
>
<
%
if
(
allMaterialTypes
[
cellType
][
connectionType
]){
%
>
Materials:
<br/>
<
%
_.each
(
_.keys
(
allMaterials
[
materialClass
]),
function
(
key
){
%
>
<label
class=
"radio colorSwatches"
>
<input
type=
"radio"
<%
if
(key =
=
materialType
){
%
>
checked
<
%}%
>
name="materialType" value="
<
%=
key
%
>
" data-toggle="radio" class="custom-radio appState">
<span
class=
"icons"
><span
class=
"icon-unchecked"
></span><span
class=
"icon-checked"
></span></span>
<div
class=
"materialColorSwatch"
>
<div
style=
"background-color:<% if(realisticColorScheme){ %><%= materials[key].color %><% }else{ %><%= materials[key].altColor %><% } %>"
></div>
<span><span
class=
"materialListTitle"
><
%=
materials
[
key
].
name
%
></span><a
data-id=
"<%= key %>"
class=
"editMaterial"
>
Edit...
</a></span></div>
</label>
<
%
});
%
>
<
%
_.each
(
materials
,
function
(
material
,
key
){
if
(
key.substr
(0,5
) =
=
"
super
")
return
;
if
(
material.noDelete
)
return
;
%
>
<label
class=
"radio colorSwatches"
>
<input
type=
"radio"
<%
if
(key =
=
materialType
){
%
>
checked
<
%}%
>
name="materialType" value="
<
%=
key
%
>
" data-toggle="radio" class="custom-radio appState">
<span
class=
"icons"
><span
class=
"icon-unchecked"
></span><span
class=
"icon-checked"
></span></span>
<div
class=
"materialColorSwatch"
>
<div
style=
"background-color:<% if(realisticColorScheme){ %><%= material.color %><% }else{ %><%= material.altColor %><% } %>"
></div>
<span><span
class=
"materialListTitle"
><
%=
material.name
%
></span><a
data-id=
"<%= key %>"
class=
"editMaterial"
>
Edit...
</a></span></div>
</label>
<
%
});
%
>
<label
class=
"checkbox"
for=
"realisticColorScheme"
>
<input
id=
"realisticColorScheme"
data-property=
"realisticColorScheme"
type=
"checkbox"
<%
if
(
realisticColorScheme
){
%
>
checked="checked"
<
%
}
%
>
value="" data-toggle="checkbox" class="appState custom-checkbox">
<span
class=
"icons"
><span
class=
"icon-unchecked"
></span><span
class=
"icon-checked"
></span></span>
Use realistic color scheme
</label><br/>
<a
id=
"newElementaryMaterial"
href=
"#"
class=
"btn btn-block btn-lg btn-default"
>
+ Create New Material Definition
</a>
<
%
}
%
><br/>
Materials:
<br/>
<
%
_.each
(
_.keys
(
allMaterials
[
materialClass
]),
function
(
key
){
%
>
<label
class=
"radio colorSwatches"
>
<input
type=
"radio"
<%
if
(key =
=
materialType
){
%
>
checked
<
%}%
>
name="materialType" value="
<
%=
key
%
>
" data-toggle="radio" class="custom-radio appState">
<span
class=
"icons"
><span
class=
"icon-unchecked"
></span><span
class=
"icon-checked"
></span></span>
<div
class=
"materialColorSwatch"
>
<div
style=
"background-color:<% if(realisticColorScheme){ %><%= materials[key].color %><% }else{ %><%= materials[key].altColor %><% } %>"
></div>
<span><span
class=
"materialListTitle"
><
%=
materials
[
key
].
name
%
></span><a
data-id=
"<%= key %>"
class=
"editMaterial"
>
Edit...
</a></span></div>
</label>
<
%
});
%
>
<
%
_.each
(
materials
,
function
(
material
,
key
){
if
(
key.substr
(0,5
) =
=
"
super
")
return
;
if
(
material.noDelete
)
return
;
%
>
<label
class=
"radio colorSwatches"
>
<input
type=
"radio"
<%
if
(key =
=
materialType
){
%
>
checked
<
%}%
>
name="materialType" value="
<
%=
key
%
>
" data-toggle="radio" class="custom-radio appState">
<span
class=
"icons"
><span
class=
"icon-unchecked"
></span><span
class=
"icon-checked"
></span></span>
<div
class=
"materialColorSwatch"
>
<div
style=
"background-color:<% if(realisticColorScheme){ %><%= material.color %><% }else{ %><%= material.altColor %><% } %>"
></div>
<span><span
class=
"materialListTitle"
><
%=
material.name
%
></span><a
data-id=
"<%= key %>"
class=
"editMaterial"
>
Edit...
</a></span></div>
</label>
<
%
});
%
>
<label
class=
"checkbox"
for=
"realisticColorScheme"
>
<input
id=
"realisticColorScheme"
data-property=
"realisticColorScheme"
type=
"checkbox"
<%
if
(
realisticColorScheme
){
%
>
checked="checked"
<
%
}
%
>
value="" data-toggle="checkbox" class="appState custom-checkbox">
<span
class=
"icons"
><span
class=
"icon-unchecked"
></span><span
class=
"icon-checked"
></span></span>
Use realistic color scheme
</label><br/>
<a
id=
"newElementaryMaterial"
href=
"#"
class=
"btn btn-block btn-lg btn-default"
>
+ Create New Material Definition
</a>
<br/>
<
%
if
(!
inSimMode
){
%
>
Composite Materials:
<br/>
<
%
if
((cellType =
=
"
octa
"
&&
connectionType
!=
"
vertex
")
||
cellType =
=
"
tetra
"){
%
>
...
...
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