Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amanda Ghassaei
DMDesign
Commits
f879aa8e
Commit
f879aa8e
authored
Aug 20, 2015
by
Amanda Ghassaei
Browse files
eod
parent
ca7c3de6
Changes
2
Hide whitespace changes
Inline
Side-by-side
js/cam/assemblers/AssemblerPost.js
View file @
f879aa8e
...
...
@@ -196,11 +196,13 @@ define(['underscore', 'appState', 'lattice', 'cam'], function(_, appState, latti
AssemblerPost
.
prototype
.
_postReleaseStock
=
function
(
index
,
position
,
material
,
settings
,
exporter
,
context
){
var
data
=
""
;
//offset for rotation
var
offset
=
this
.
components
.
substrate
.
centerOfRotation
.
clone
().
multiplyScalar
(
settings
.
scale
);
// position.add(new THREE.Vector3(18.23*((index.z)%2), 0.3*((index.z)%2), 0));
if
(
index
.
z
%
2
!=
0
){
position
=
new
THREE
.
Vector3
(
-
position
.
y
,
position
.
x
,
position
.
z
);
//offset for rotation
var
offset
=
this
.
components
.
substrate
.
centerOfRotation
.
clone
().
multiplyScalar
(
settings
.
scale
);
//offset in mm
var
dist
=
position
.
clone
().
sub
(
offset
);
position
=
offset
.
add
(
new
THREE
.
Vector3
(
dist
.
y
,
-
dist
.
x
,
position
.
z
));
}
var
stock
=
_
.
find
(
this
.
stock
,
function
(
thisStock
){
...
...
js/cam/assemblers/Component.js
View file @
f879aa8e
...
...
@@ -209,7 +209,7 @@ define(['underscore', 'cam', 'three'], function(_, cam, THREE){
if
(
callback
)
callback
();
return
;
}
target
=
this
.
applyRotation
(
target
);
//absolute?
target
=
this
.
apply
Absolute
Rotation
(
target
);
//absolute?
var
currentPosition
=
this
.
getPosition
();
var
increment
=
speed
/
1500.0
*
cam
.
get
(
"
simSpeed
"
);
...
...
Write
Preview
Supports
Markdown
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