summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrian-bowyer <adrian-bowyer>2010-01-24 15:49:24 +0000
committeradrian-bowyer <adrian-bowyer@cb376a5e-1013-0410-a455-b6b1f9ac8223>2010-01-24 15:49:24 +0000
commit659273a10a9fa83ce1aa4baa42a633ef1641baaf (patch)
tree1af2bf1734b8b1d6d6e8afee487151af349f08b5
parenta4f88d329199b3b43c182ebb1bae63c5df8d48b5 (diff)
downloadreprap-659273a10a9fa83ce1aa4baa42a633ef1641baaf.tar.gz
reprap-659273a10a9fa83ce1aa4baa42a633ef1641baaf.zip
Bug in loading offsets fixed.
git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@3455 cb376a5e-1013-0410-a455-b6b1f9ac8223
-rw-r--r--trunk/users/adrian/host/src/org/reprap/gui/STLObject.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/trunk/users/adrian/host/src/org/reprap/gui/STLObject.java b/trunk/users/adrian/host/src/org/reprap/gui/STLObject.java
index 82576642..edc0e31a 100644
--- a/trunk/users/adrian/host/src/org/reprap/gui/STLObject.java
+++ b/trunk/users/adrian/host/src/org/reprap/gui/STLObject.java
@@ -327,9 +327,12 @@ public class STLObject
* @param child
* @param offset
*/
- private Offsets getOffsets(BranchGroup child, Vector3d offset)
+ private Offsets getOffsets(BranchGroup child, Vector3d userOffset)
{
Offsets result = new Offsets();
+ Vector3d offset = null;
+ if(userOffset != null)
+ offset = new Vector3d(userOffset);
if(child != null && bbox != null)
{
@@ -346,7 +349,8 @@ public class STLObject
offset.x = -p0.x; // Generally offset to put bottom left at the origin
offset.y = -p0.y;
offset.z = -p0.z;
- }
+ } else
+ offset.z = -p0.z; // Tie it down whatever the user has said...
// How big?