Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DMDesign
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Amanda Ghassaei
DMDesign
Commits
a86ad777
Commit
a86ad777
authored
9 years ago
by
Amanda Ghassaei
Browse files
Options
Downloads
Patches
Plain Diff
better stl
parent
58f26ac8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
assets/stls/parts/DNALegoBrick1x1.stl
+0
-0
0 additions, 0 deletions
assets/stls/parts/DNALegoBrick1x1.stl
js/menus/templates/LatticeMenuView.html
+9
-0
9 additions, 0 deletions
js/menus/templates/LatticeMenuView.html
js/parts/DNALegoPart.js
+1
-1
1 addition, 1 deletion
js/parts/DNALegoPart.js
with
10 additions
and
1 deletion
assets/stls/parts/DNALegoBrick1x1.stl
+
0
−
0
View file @
a86ad777
No preview for this file type
This diff is collapsed.
Click to expand it.
js/menus/templates/LatticeMenuView.html
+
9
−
0
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"
>
...
...
This diff is collapsed.
Click to expand it.
js/parts/DNALegoPart.js
+
1
−
1
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
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment