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
DMDesign
Commits
a86ad777
Commit
a86ad777
authored
Sep 14, 2015
by
Amanda Ghassaei
Browse files
better stl
parent
58f26ac8
Changes
3
Hide whitespace changes
Inline
Side-by-side
assets/stls/parts/DNALegoBrick1x1.stl
View file @
a86ad777
No preview for this file type
js/menus/templates/LatticeMenuView.html
View file @
a86ad777
...
...
@@ -25,6 +25,15 @@ Type:
<
%
});
%
>
</ul>
</div><br/><br/>
Part Type:
<div
class=
"btn-group"
>
<button
data-toggle=
"dropdown"
class=
"btn dropdown-toggle"
type=
"button"
><
%=
allLattices
[
cellType
].
connection
[
connectionType
].
type
[
latticeType
].
parts
[
partType
].
name
%
><span
class=
"caret"
></span></button>
<ul
role=
"menu"
class=
"dropdown-menu"
>
<
%
_.each
(
allLattices
[
cellType
].
connection
[
connectionType
].
type
[
latticeType
].
parts
,
function
(
val
,
key
){
%
>
<li><a
class=
"lattice dropdownSelector"
data-property=
"partType"
data-value=
"<%= key %>"
href=
"#"
><
%=
val.name
%
></a></li>
<
%
});
%
>
</ul>
</div><br/><br/>
Aspect Ratio:
<input
data-property=
"aspectRatio"
data-key=
"x"
value=
"<%= aspectRatio.x %>"
placeholder=
"X"
class=
"form-control lattice floatInput"
type=
"text"
>
<input
data-property=
"aspectRatio"
data-key=
"y"
value=
"<%= aspectRatio.y %>"
placeholder=
"Y"
class=
"form-control lattice floatInput"
type=
"text"
>
...
...
js/parts/DNALegoPart.js
View file @
a86ad777
...
...
@@ -9,7 +9,7 @@ define(['underscore', 'stlLoader', 'gikPart', 'bin!dnaLegoBrickSTL'], function(_
var
unitGeo
=
preProcessGeo
(
loader
.
parse
(
stl
));
function
preProcessGeo
(
geo
){
geo
.
applyMatrix
(
new
THREE
.
Matrix4
().
makeRotationZ
(
Math
.
PI
/
2
));
geo
.
applyMatrix
(
new
THREE
.
Matrix4
().
makeRotationZ
(
-
Math
.
PI
/
2
));
geo
.
applyMatrix
(
new
THREE
.
Matrix4
().
makeTranslation
(
0
,
0
,
-
0.54
));
return
geo
;
}
...
...
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