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
58f26ac8
Commit
58f26ac8
authored
Sep 14, 2015
by
Amanda Ghassaei
Browse files
separation between dna legos
parent
3d4e2109
Changes
3
Hide whitespace changes
Inline
Side-by-side
assets/stls/parts/DNALegoBrick1x1.stl
View file @
58f26ac8
No preview for this file type
js/lattice/Lattice.js
View file @
58f26ac8
...
...
@@ -73,16 +73,20 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
_cellTypeChanged
:
function
(){
var
cellType
=
this
.
get
(
"
cellType
"
);
var
connectionType
=
_
.
keys
(
plist
.
allLattices
[
cellType
].
connection
)[
0
];
this
.
set
(
"
connectionType
"
,
connectionType
,
{
silent
:
true
});
if
(
plist
.
allLattices
[
cellType
].
connection
[
this
.
get
(
"
connectionType
"
)]
===
undefined
){
var
connectionType
=
_
.
keys
(
plist
.
allLattices
[
cellType
].
connection
)[
0
];
this
.
set
(
"
connectionType
"
,
connectionType
,
{
silent
:
true
});
}
this
.
_connectionTypeChanged
();
},
_connectionTypeChanged
:
function
(){
var
cellType
=
this
.
get
(
"
cellType
"
);
var
connectionType
=
this
.
get
(
"
connectionType
"
);
var
latticeType
=
_
.
keys
(
plist
.
allLattices
[
cellType
].
connection
[
connectionType
].
type
)[
0
];
this
.
set
(
"
latticeType
"
,
latticeType
,
{
silent
:
true
});
if
(
plist
.
allLattices
[
cellType
].
connection
[
connectionType
].
type
[
this
.
get
(
"
latticeType
"
)]
===
undefined
){
var
latticeType
=
_
.
keys
(
plist
.
allLattices
[
cellType
].
connection
[
connectionType
].
type
)[
0
];
this
.
set
(
"
latticeType
"
,
latticeType
,
{
silent
:
true
});
}
this
.
_latticeTypeChanged
();
},
...
...
js/parts/DNALegoPart.js
View file @
58f26ac8
...
...
@@ -9,7 +9,8 @@ define(['underscore', 'stlLoader', 'gikPart', 'bin!dnaLegoBrickSTL'], function(_
var
unitGeo
=
preProcessGeo
(
loader
.
parse
(
stl
));
function
preProcessGeo
(
geo
){
geo
.
applyMatrix
(
new
THREE
.
Matrix4
().
makeRotationX
(
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