Skip to content

Commit 648dc37

Browse files
stephengoldstephengold
committed
replace the deprecated AWTLoader with the new StbImageLoader
1 parent 579160a commit 648dc37

8 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎MinieAssets/src/main/java/jme3utilities/minie/test/shapes/MakeDuck.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2019-2023, Stephen Gold
2+
Copyright (c) 2019-2026 Stephen Gold
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3838
import com.jme3.scene.plugins.gltf.BinLoader;
3939
import com.jme3.scene.plugins.gltf.GltfLoader;
4040
import com.jme3.system.NativeLibraryLoader;
41-
import com.jme3.texture.plugins.AWTLoader;
41+
import com.jme3.texture.plugins.StbImageLoader;
4242
import java.util.logging.Level;
4343
import java.util.logging.Logger;
4444
import jme3utilities.Heart;
@@ -106,10 +106,10 @@ public static void main(String[] arguments) {
106106
*/
107107
private static void makeDuck() {
108108
AssetManager assetManager = new DesktopAssetManager();
109-
assetManager.registerLoader(AWTLoader.class, "png");
110109
assetManager.registerLoader(BinLoader.class, "bin");
111110
assetManager.registerLoader(GltfLoader.class, "gltf");
112111
assetManager.registerLoader(J3MLoader.class, "j3m", "j3md");
112+
assetManager.registerLoader(StbImageLoader.class, "png");
113113
assetManager.registerLocator(null, ClasspathLocator.class);
114114
/*
115115
* Import the Duck model (by Sony Computer Entertainment Inc.)

‎MinieAssets/src/main/java/jme3utilities/minie/test/shapes/MakeSword.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2020-2023, Stephen Gold
2+
Copyright (c) 2020-2026 Stephen Gold
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3737
import com.jme3.scene.plugins.ogre.MaterialLoader;
3838
import com.jme3.scene.plugins.ogre.MeshLoader;
3939
import com.jme3.system.NativeLibraryLoader;
40-
import com.jme3.texture.plugins.AWTLoader;
40+
import com.jme3.texture.plugins.StbImageLoader;
4141
import java.util.logging.Level;
4242
import java.util.logging.Logger;
4343
import jme3utilities.Heart;
@@ -105,10 +105,10 @@ public static void main(String[] arguments) {
105105
*/
106106
private static void makeSword() {
107107
AssetManager assetManager = new DesktopAssetManager();
108-
assetManager.registerLoader(AWTLoader.class, "jpg");
109108
assetManager.registerLoader(J3MLoader.class, "j3md");
110109
assetManager.registerLoader(MaterialLoader.class, "material");
111110
assetManager.registerLoader(MeshLoader.class, "mesh.xml");
111+
assetManager.registerLoader(StbImageLoader.class, "jpg");
112112
assetManager.registerLocator(null, ClasspathLocator.class);
113113
/*
114114
* Import Sinbad's scimitar model (by Zi Ye)

‎MinieDump/src/main/java/jme3utilities/minie/cli/MinieDump.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2021-2023, Stephen Gold
2+
Copyright (c) 2021-2026 Stephen Gold
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3737
import com.jme3.material.plugins.J3MLoader;
3838
import com.jme3.scene.Spatial;
3939
import com.jme3.system.NativeLibraryLoader;
40-
import com.jme3.texture.plugins.AWTLoader;
40+
import com.jme3.texture.plugins.StbImageLoader;
4141
import java.io.File;
4242
import java.util.logging.Level;
4343
import java.util.logging.Logger;
@@ -220,9 +220,9 @@ private static void newAssetManager() {
220220
assetManager = new DesktopAssetManager();
221221

222222
// Register loaders.
223-
assetManager.registerLoader(AWTLoader.class, "jpg", "png");
224223
assetManager.registerLoader(BinaryLoader.class, "j3o");
225224
assetManager.registerLoader(J3MLoader.class, "j3m", "j3md");
225+
assetManager.registerLoader(StbImageLoader.class, "jpg", "png");
226226

227227
// Register locators.
228228
assetManager.registerLocator(assetRoot, FileLocator.class);

‎MinieLibrary/src/test/java/jme3utilities/minie/test/TestClonePhysicsControls.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2018-2024 Stephen Gold
2+
Copyright (c) 2018-2026 Stephen Gold
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5151
import com.jme3.math.Vector3f;
5252
import com.jme3.scene.Spatial;
5353
import com.jme3.system.NativeLibraryLoader;
54-
import com.jme3.texture.plugins.AWTLoader;
54+
import com.jme3.texture.plugins.StbImageLoader;
5555
import jme3utilities.Heart;
5656
import org.junit.Assert;
5757
import org.junit.Test;
@@ -78,9 +78,9 @@ public class TestClonePhysicsControls {
7878
@Test
7979
public void testClonePhysicsControls() {
8080
NativeLibraryLoader.loadNativeLibrary("bulletjme", true);
81-
assetManager.registerLoader(AWTLoader.class, "jpg", "png");
8281
assetManager.registerLoader(BinaryLoader.class, "j3o");
8382
assetManager.registerLoader(J3MLoader.class, "j3m", "j3md");
83+
assetManager.registerLoader(StbImageLoader.class, "jpg", "png");
8484
assetManager.registerLocator(null, ClasspathLocator.class);
8585

8686
// BetterCharacterControl

‎MinieLibrary/src/test/java/jme3utilities/minie/test/TestCloneShapes.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2018-2024 Stephen Gold
2+
Copyright (c) 2018-2026 Stephen Gold
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6565
import com.jme3.terrain.heightmap.ImageBasedHeightMap;
6666
import com.jme3.texture.Image;
6767
import com.jme3.texture.Texture;
68-
import com.jme3.texture.plugins.AWTLoader;
68+
import com.jme3.texture.plugins.StbImageLoader;
6969
import java.util.ArrayList;
7070
import java.util.List;
7171
import jme3utilities.Heart;
@@ -96,9 +96,9 @@ public class TestCloneShapes {
9696
@Test
9797
public void testCloneShapes() {
9898
NativeLibraryLoader.loadNativeLibrary("bulletjme", true);
99-
assetManager.registerLoader(AWTLoader.class, "jpg", "png");
10099
assetManager.registerLoader(BinaryLoader.class, "j3o");
101100
assetManager.registerLoader(J3MLoader.class, "j3m", "j3md");
101+
assetManager.registerLoader(StbImageLoader.class, "jpg", "png");
102102
assetManager.registerLocator(null, ClasspathLocator.class);
103103

104104
cloneShapesConcave();

‎MinieLibrary/src/test/java/jme3utilities/minie/test/TestSetMargin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2018-2024 Stephen Gold
2+
Copyright (c) 2018-2026 Stephen Gold
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6565
import com.jme3.terrain.heightmap.ImageBasedHeightMap;
6666
import com.jme3.texture.Image;
6767
import com.jme3.texture.Texture;
68-
import com.jme3.texture.plugins.AWTLoader;
68+
import com.jme3.texture.plugins.StbImageLoader;
6969
import java.util.ArrayList;
7070
import java.util.List;
7171
import jme3utilities.MyAsset;
@@ -89,9 +89,9 @@ public void testSetMargin() { // TODO split off testSetMarginConvex()
8989
NativeLibraryLoader.loadNativeLibrary("bulletjme", true);
9090

9191
AssetManager assetManager = new DesktopAssetManager();
92-
assetManager.registerLoader(AWTLoader.class, "jpg", "png");
9392
assetManager.registerLoader(BinaryLoader.class, "j3o");
9493
assetManager.registerLoader(J3MLoader.class, "j3m", "j3md");
94+
assetManager.registerLoader(StbImageLoader.class, "jpg", "png");
9595
assetManager.registerLocator(null, ClasspathLocator.class);
9696

9797
// Box2dShape

‎MinieLibrary/src/test/java/jme3utilities/minie/test/TestSetScale.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2018-2024 Stephen Gold
2+
Copyright (c) 2018-2026 Stephen Gold
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6565
import com.jme3.terrain.heightmap.ImageBasedHeightMap;
6666
import com.jme3.texture.Image;
6767
import com.jme3.texture.Texture;
68-
import com.jme3.texture.plugins.AWTLoader;
68+
import com.jme3.texture.plugins.StbImageLoader;
6969
import java.util.ArrayList;
7070
import java.util.List;
7171
import jme3utilities.MyAsset;
@@ -114,9 +114,9 @@ public class TestSetScale {
114114
@Test
115115
public void testSetScale() {
116116
NativeLibraryLoader.loadNativeLibrary("bulletjme", true);
117-
assetManager.registerLoader(AWTLoader.class, "jpg", "png");
118117
assetManager.registerLoader(BinaryLoader.class, "j3o");
119118
assetManager.registerLoader(J3MLoader.class, "j3m", "j3md");
119+
assetManager.registerLoader(StbImageLoader.class, "jpg", "png");
120120
assetManager.registerLocator(null, ClasspathLocator.class);
121121

122122
setScaleConcave();

‎MinieLibrary/src/test/java/jme3utilities/minie/test/TestStaticBody.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2019-2024 Stephen Gold
2+
Copyright (c) 2019-2026 Stephen Gold
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6565
import com.jme3.terrain.heightmap.ImageBasedHeightMap;
6666
import com.jme3.texture.Image;
6767
import com.jme3.texture.Texture;
68-
import com.jme3.texture.plugins.AWTLoader;
68+
import com.jme3.texture.plugins.StbImageLoader;
6969
import java.util.ArrayList;
7070
import java.util.List;
7171
import jme3utilities.MyAsset;
@@ -93,9 +93,9 @@ public class TestStaticBody {
9393
@Test
9494
public void testStaticBody() {
9595
NativeLibraryLoader.loadNativeLibrary("bulletjme", true);
96-
assetManager.registerLoader(AWTLoader.class, "jpg", "png");
9796
assetManager.registerLoader(BinaryLoader.class, "j3o");
9897
assetManager.registerLoader(J3MLoader.class, "j3m", "j3md");
98+
assetManager.registerLoader(StbImageLoader.class, "jpg", "png");
9999
assetManager.registerLocator(".", FileLocator.class);
100100
assetManager.registerLocator(null, ClasspathLocator.class);
101101

0 commit comments

Comments
 (0)