hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More appearances

Browse Source
This commit is contained in:
bkuker 2013-01-10 14:17:30 -05:00
parent 25a3fc1d05
commit 03c9e24705
5 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/resources/datafiles/textures/cardboard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

BIN
core/resources/datafiles/textures/chute.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 144 KiB

BIN
core/resources/datafiles/textures/hardboard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 134 KiB

BIN
core/resources/datafiles/textures/wadding.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

57
core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java
View File

@ -6,9 +6,11 @@ import net.sf.openrocket.appearance.Appearance;
import net.sf.openrocket.appearance.Decal; import net.sf.openrocket.appearance.Decal;
import net.sf.openrocket.appearance.Decal.EdgeMode; import net.sf.openrocket.appearance.Decal.EdgeMode;
import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.EngineBlock;
import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.FinSet;
import net.sf.openrocket.rocketcomponent.InnerTube; import net.sf.openrocket.rocketcomponent.InnerTube;
import net.sf.openrocket.rocketcomponent.LaunchLug; import net.sf.openrocket.rocketcomponent.LaunchLug;
import net.sf.openrocket.rocketcomponent.Parachute;
import net.sf.openrocket.rocketcomponent.RadiusRingComponent; import net.sf.openrocket.rocketcomponent.RadiusRingComponent;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.Transition; import net.sf.openrocket.rocketcomponent.Transition;
@ -18,8 +20,8 @@ import net.sf.openrocket.util.Coordinate;
public class DefaultAppearance { public class DefaultAppearance {
private static Appearance BALSA = new private static Appearance simple(String resource) {
Appearance( return new Appearance(
new Color(1, 1, 1), new Color(1, 1, 1),
0, 0,
new Decal( new Decal(
@ -27,38 +29,32 @@ public class DefaultAppearance {
new Coordinate(0, 0), new Coordinate(0, 0),
new Coordinate(1, 1), new Coordinate(1, 1),
0, 0,
new ResourceDecalImage("/datafiles/textures/balsa.png"), EdgeMode.REPEAT)); new ResourceDecalImage(resource), EdgeMode.REPEAT));
};
private static Appearance WOOD = new private static Appearance simpleAlpha(Color base, float shine, String resource) {
Appearance( return new Appearance(
new Color(1, 1, 1), base,
0, shine,
new Decal( new Decal(
new Coordinate(0, 0), new Coordinate(0, 0),
new Coordinate(0, 0), new Coordinate(0, 0),
new Coordinate(1, 1), new Coordinate(1, 1),
0, 0,
new ResourceDecalImage("/datafiles/textures/wood.png"), EdgeMode.REPEAT)); new ResourceDecalImage(resource), EdgeMode.REPEAT));
};
public static final Appearance ESTES_BT = new Appearance( private static Appearance BALSA = simple("/datafiles/textures/balsa.png");
new Color(212, 185, 145), private static Appearance WOOD = simple("/datafiles/textures/wood.png");
.3, private static Appearance CARDBOARD = simple("/datafiles/textures/cardboard.png");
new Decal( private static Appearance HARDBOARD = simple("/datafiles/textures/hardboard.png");
new Coordinate(0, 0), private static Appearance WADDING = simple("/datafiles/textures/wadding.png");
new Coordinate(0, 0), private static Appearance CHUTE = simple("/datafiles/textures/chute.png");
new Coordinate(1, 3),
0,
new ResourceDecalImage("/datafiles/textures/spiral-wound-alpha.png"), EdgeMode.REPEAT));
public static final Appearance WHITE_BT = new Appearance(
new Color(240, 240, 240), public static final Appearance ESTES_BT = simpleAlpha(new Color(212, 185, 145), .3f, "/datafiles/textures/spiral-wound-alpha.png");
.3, public static final Appearance ESTES_IT = simpleAlpha(new Color(168, 146, 116), .1f, "/datafiles/textures/spiral-wound-alpha.png");
new Decal( public static final Appearance WHITE_BT = simpleAlpha(new Color(240, 240, 240), .3f, "/datafiles/textures/spiral-wound-alpha.png");
new Coordinate(0, 0),
new Coordinate(0, 0),
new Coordinate(1, 3),
0,
new ResourceDecalImage("/datafiles/textures/spiral-wound-alpha.png"), EdgeMode.REPEAT));
private static HashMap<Color, Appearance> plastics = new HashMap<Color, Appearance>(); private static HashMap<Color, Appearance> plastics = new HashMap<Color, Appearance>();
@ -71,8 +67,10 @@ public class DefaultAppearance {
} }
public static Appearance getDefaultAppearance(RocketComponent c) { public static Appearance getDefaultAppearance(RocketComponent c) {
if (c instanceof BodyTube || c instanceof InnerTube || c instanceof TubeCoupler) if (c instanceof BodyTube)
return ESTES_BT; return ESTES_BT;
if (c instanceof InnerTube || c instanceof TubeCoupler)
return ESTES_IT;
if (c instanceof FinSet) if (c instanceof FinSet)
return BALSA; return BALSA;
if (c instanceof LaunchLug) if (c instanceof LaunchLug)
@ -81,6 +79,11 @@ public class DefaultAppearance {
return getPlastic(new Color(255, 255, 255)); return getPlastic(new Color(255, 255, 255));
if (c instanceof RadiusRingComponent) if (c instanceof RadiusRingComponent)
return WOOD; return WOOD;
if (c instanceof Parachute)
return CHUTE;
if (c instanceof EngineBlock)
return HARDBOARD;
return Appearance.MISSING; return Appearance.MISSING;
} }
} }