From 05263e505670ba7b9cc20b1145821fca2f7f4fe0 Mon Sep 17 00:00:00 2001 From: bkuker Date: Thu, 10 Jan 2013 20:03:31 -0500 Subject: [PATCH] An ok reusable motor appearance --- .../datafiles/textures/motors/reusable.png | Bin 0 -> 10478 bytes .../appearance/defaults/MotorAppearance.java | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 core/resources/datafiles/textures/motors/reusable.png diff --git a/core/resources/datafiles/textures/motors/reusable.png b/core/resources/datafiles/textures/motors/reusable.png new file mode 100644 index 0000000000000000000000000000000000000000..17ce44745e64fc844b800ebc583c348a77146aa9 GIT binary patch literal 10478 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 vM6o75UZn{8jQ$TSxvMDAsEU literal 0 HcmV?d00001 diff --git a/core/src/net/sf/openrocket/appearance/defaults/MotorAppearance.java b/core/src/net/sf/openrocket/appearance/defaults/MotorAppearance.java index f7b1afe60..268980e0f 100644 --- a/core/src/net/sf/openrocket/appearance/defaults/MotorAppearance.java +++ b/core/src/net/sf/openrocket/appearance/defaults/MotorAppearance.java @@ -13,6 +13,7 @@ public class MotorAppearance extends Appearance { private static MotorAppearance ESTES = new MotorAppearance("/datafiles/textures/motors/estes.png"); private static MotorAppearance AEROTECH = new MotorAppearance("/datafiles/textures/motors/aerotech.png"); + private static MotorAppearance REUSABLE = new MotorAppearance("/datafiles/textures/motors/reusable.png", new Color(195, 60, 50), .6); public static Appearance getAppearance(Motor m) { if (m instanceof ThrustCurveMotor) { @@ -24,7 +25,7 @@ public class MotorAppearance extends Appearance { return AEROTECH; } } - return Appearance.MISSING; + return REUSABLE; } protected MotorAppearance(final String resource) { @@ -39,4 +40,16 @@ public class MotorAppearance extends Appearance { new ResourceDecalImage(resource), EdgeMode.REPEAT)); } + protected MotorAppearance(final String resource, Color c, double shine) { + super( + c, + shine, + new Decal( + new Coordinate(0, 0), + new Coordinate(0, 0), + new Coordinate(1, 1), + 0, + new ResourceDecalImage(resource), EdgeMode.REPEAT)); + } + }