diff --git a/core/resources/datafiles/examples/A simple model rocket.ork b/core/resources/datafiles/examples/A simple model rocket.ork index 686e6b69d..febaadaeb 100644 Binary files a/core/resources/datafiles/examples/A simple model rocket.ork and b/core/resources/datafiles/examples/A simple model rocket.ork differ diff --git a/core/resources/datafiles/examples/Apocalypse with decals.ork b/core/resources/datafiles/examples/Apocalypse with decals.ork index 982215881..0b368faad 100644 Binary files a/core/resources/datafiles/examples/Apocalypse with decals.ork and b/core/resources/datafiles/examples/Apocalypse with decals.ork differ diff --git a/core/resources/datafiles/examples/Boosted Dart.ork b/core/resources/datafiles/examples/Boosted Dart.ork index 37cebb2f4..7e6f31cf1 100644 Binary files a/core/resources/datafiles/examples/Boosted Dart.ork and b/core/resources/datafiles/examples/Boosted Dart.ork differ diff --git a/core/resources/datafiles/examples/Clustered rocket design.ork b/core/resources/datafiles/examples/Clustered rocket design.ork index d923be811..825059deb 100644 Binary files a/core/resources/datafiles/examples/Clustered rocket design.ork and b/core/resources/datafiles/examples/Clustered rocket design.ork differ diff --git a/core/resources/datafiles/examples/High Power Airstart.ork b/core/resources/datafiles/examples/High Power Airstart.ork index b30577db5..87ce4e0d1 100644 Binary files a/core/resources/datafiles/examples/High Power Airstart.ork and b/core/resources/datafiles/examples/High Power Airstart.ork differ diff --git a/core/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork b/core/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork index f8af09ffa..19fece7dd 100644 Binary files a/core/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork and b/core/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork differ diff --git a/core/resources/datafiles/examples/Preset Usage.ork b/core/resources/datafiles/examples/Preset Usage.ork index b24790f90..b8353dc91 100644 Binary files a/core/resources/datafiles/examples/Preset Usage.ork and b/core/resources/datafiles/examples/Preset Usage.ork differ diff --git a/core/resources/datafiles/examples/Roll-stabilized rocket.ork b/core/resources/datafiles/examples/Roll-stabilized rocket.ork index ee2d4b496..35cd43d95 100644 Binary files a/core/resources/datafiles/examples/Roll-stabilized rocket.ork and b/core/resources/datafiles/examples/Roll-stabilized rocket.ork differ diff --git a/core/resources/datafiles/examples/Simulation listeners.ork b/core/resources/datafiles/examples/Simulation listeners.ork index 19d6e57d7..8c1070fd5 100644 Binary files a/core/resources/datafiles/examples/Simulation listeners.ork and b/core/resources/datafiles/examples/Simulation listeners.ork differ diff --git a/core/resources/datafiles/examples/TARC Payloader.ork b/core/resources/datafiles/examples/TARC Payloader.ork index 9c244c3bf..8508ea1a3 100644 Binary files a/core/resources/datafiles/examples/TARC Payloader.ork and b/core/resources/datafiles/examples/TARC Payloader.ork differ diff --git a/core/resources/datafiles/examples/Three-stage rocket.ork b/core/resources/datafiles/examples/Three-stage rocket.ork index df0ebe936..1775c6774 100644 Binary files a/core/resources/datafiles/examples/Three-stage rocket.ork and b/core/resources/datafiles/examples/Three-stage rocket.ork differ diff --git a/core/resources/datafiles/textures/balsa.jpg b/core/resources/datafiles/textures/balsa.jpg new file mode 100644 index 000000000..0907a1b05 Binary files /dev/null and b/core/resources/datafiles/textures/balsa.jpg differ diff --git a/core/resources/datafiles/textures/balsa.png b/core/resources/datafiles/textures/balsa.png deleted file mode 100644 index f48f581fb..000000000 Binary files a/core/resources/datafiles/textures/balsa.png and /dev/null differ diff --git a/core/resources/datafiles/textures/cardboard.jpg b/core/resources/datafiles/textures/cardboard.jpg new file mode 100644 index 000000000..f5f0a27bc Binary files /dev/null and b/core/resources/datafiles/textures/cardboard.jpg differ diff --git a/core/resources/datafiles/textures/cardboard.png b/core/resources/datafiles/textures/cardboard.png deleted file mode 100644 index 0101594de..000000000 Binary files a/core/resources/datafiles/textures/cardboard.png and /dev/null differ diff --git a/core/resources/datafiles/textures/chute.jpg b/core/resources/datafiles/textures/chute.jpg new file mode 100644 index 000000000..029cd04d6 Binary files /dev/null and b/core/resources/datafiles/textures/chute.jpg differ diff --git a/core/resources/datafiles/textures/chute.png b/core/resources/datafiles/textures/chute.png deleted file mode 100644 index c58f4f465..000000000 Binary files a/core/resources/datafiles/textures/chute.png and /dev/null differ diff --git a/core/resources/datafiles/textures/hardboard.jpg b/core/resources/datafiles/textures/hardboard.jpg new file mode 100644 index 000000000..785faaa31 Binary files /dev/null and b/core/resources/datafiles/textures/hardboard.jpg differ diff --git a/core/resources/datafiles/textures/hardboard.png b/core/resources/datafiles/textures/hardboard.png deleted file mode 100644 index a769700d8..000000000 Binary files a/core/resources/datafiles/textures/hardboard.png and /dev/null differ diff --git a/core/resources/datafiles/textures/motors/estes.jpg b/core/resources/datafiles/textures/motors/estes.jpg new file mode 100644 index 000000000..4b68a44a8 Binary files /dev/null and b/core/resources/datafiles/textures/motors/estes.jpg differ diff --git a/core/resources/datafiles/textures/motors/estes.png b/core/resources/datafiles/textures/motors/estes.png deleted file mode 100644 index 9d8efbf24..000000000 Binary files a/core/resources/datafiles/textures/motors/estes.png and /dev/null differ diff --git a/core/resources/datafiles/textures/wadding.png b/core/resources/datafiles/textures/wadding.png index a80104b0a..626f3dc02 100644 Binary files a/core/resources/datafiles/textures/wadding.png and b/core/resources/datafiles/textures/wadding.png differ diff --git a/core/resources/datafiles/textures/wood.jpg b/core/resources/datafiles/textures/wood.jpg new file mode 100644 index 000000000..f47c3676c Binary files /dev/null and b/core/resources/datafiles/textures/wood.jpg differ diff --git a/core/resources/datafiles/textures/wood.png b/core/resources/datafiles/textures/wood.png deleted file mode 100644 index 8e46ce4a4..000000000 Binary files a/core/resources/datafiles/textures/wood.png and /dev/null differ diff --git a/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java b/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java index acb74b5d9..576580d1c 100644 --- a/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java +++ b/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java @@ -47,20 +47,20 @@ public class DefaultAppearance { new ResourceDecalImage(resource), EdgeMode.REPEAT)); }; - private static Appearance BALSA = simple("/datafiles/textures/balsa.png"); - private static Appearance WOOD = simple("/datafiles/textures/wood.png"); + private static Appearance BALSA = simple("/datafiles/textures/balsa.jpg"); + private static Appearance WOOD = simple("/datafiles/textures/wood.jpg"); @SuppressWarnings("unused") - private static Appearance CARDBOARD = simple("/datafiles/textures/cardboard.png"); - private static Appearance HARDBOARD = simple("/datafiles/textures/hardboard.png"); + private static Appearance CARDBOARD = simple("/datafiles/textures/cardboard.jpg"); + private static Appearance HARDBOARD = simple("/datafiles/textures/hardboard.jpg"); private static Appearance WADDING = simple("/datafiles/textures/wadding.png"); - private static Appearance CHUTE = simple("/datafiles/textures/chute.png"); + private static Appearance CHUTE = simple("/datafiles/textures/chute.jpg"); private static final Appearance ESTES_BT = simpleAlpha(new Color(212, 185, 145), .3f, "/datafiles/textures/spiral-wound-alpha.png"); private static final Appearance ESTES_IT = simpleAlpha(new Color(168, 146, 116), .1f, "/datafiles/textures/spiral-wound-alpha.png"); private static final Appearance WHITE_BT = simpleAlpha(new Color(240, 240, 240), .3f, "/datafiles/textures/spiral-wound-alpha.png"); - private static Appearance ESTES_MOTOR = simple("/datafiles/textures/motors/estes.png"); + private static Appearance ESTES_MOTOR = simple("/datafiles/textures/motors/estes.jpg"); private static Appearance AEROTECH_MOTOR = simple("/datafiles/textures/motors/aerotech.png"); private static Appearance REUSABLE_MOTOR = simpleAlpha(new Color(195, 60, 50), .6f, "/datafiles/textures/motors/reusable.png");