From 1bf7cc32b9816da3394440abe716fadbbc910069 Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Tue, 3 Jul 2012 18:20:50 +0000 Subject: [PATCH] Honor RockSim flipS & flipT. --- .../rocksim/importt/RockSimAppearanceBuilder.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java b/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java index f564c5d7d..14734782e 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java @@ -98,13 +98,13 @@ public class RockSimAppearanceBuilder extends AppearanceBuilder { preventSeam = "1".equals(value); } else if ("position".equals(name)) { String[] c = value.split(","); - setOffset(-1 - Double.parseDouble(c[0]), -1 - Double.parseDouble(c[1])); + setOffset(Double.parseDouble(c[0]), Double.parseDouble(c[1])); } else if ("origin".equals(name)) { String[] c = value.split(","); setCenter(Double.parseDouble(c[0]), Double.parseDouble(c[1])); } else if ("scale".equals(name)) { String[] c = value.split(","); - setScale(-Double.parseDouble(c[0]), -Double.parseDouble(c[1])); + setScale(Double.parseDouble(c[0]), Double.parseDouble(c[1])); } } @@ -116,10 +116,17 @@ public class RockSimAppearanceBuilder extends AppearanceBuilder { setEdgeMode(EdgeMode.MIRROR); } + if ( !flips ){ + setScale(getScaleU(), getScaleV() * -1); + setOffset(getOffsetU(), -1 - getOffsetV()); + } + if ( !flipr ){ + setScale(getScaleU() * -1, getScaleV()); + setOffset(-1 - getOffsetU(), getOffsetV()); + } + //TODO Make use of these values System.out.println("Interpolate: " + interpolate); - System.out.println("FlipR: " + flipr); - System.out.println("FlipS: " + flips); System.out.println("FlipT: " + flipt);; }