Skip to content
Draft
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions jme3-core/src/main/resources/com/jme3/asset/Desktop.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion jme3-core/src/test/java/com/jme3/asset/TestLocators.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class TestLocators {

@Test
public void testAbsoluteLocators() {
AssetManager am = JmeSystem.newAssetManager(TestLocators.class.getResource("/com/jme3/asset/Desktop.cfg"));
AssetManager am = JmeSystem.newAssetManager(TestLocators.class.getResource("/com/jme3/asset/General.cfg"));
am.registerLocator("/", ClasspathLocator.class);
am.registerLoader(WAVLoader.class, "wav");
am.registerLoader(AWTLoader.class, "jpg");
Expand Down
2 changes: 1 addition & 1 deletion jme3-core/src/test/java/com/jme3/audio/AudioNodeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class AudioNodeTest {

@Test
public void testAudioNodeClone() {
AssetManager assetManager = JmeSystem.newAssetManager(AudioNodeTest.class.getResource("/com/jme3/asset/Desktop.cfg"));
AssetManager assetManager = JmeSystem.newAssetManager(AudioNodeTest.class.getResource("/com/jme3/asset/General.cfg"));

AudioNode audio = new AudioNode(assetManager,
"Sound/Effects/Bang.wav", AudioData.DataType.Buffer);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public void simpleInitApp() { }
*/
@Test
public void testIssue1138() {
AssetManager am = JmeSystem.newAssetManager(PreventCoreIssueRegressions.class.getResource("/com/jme3/asset/Desktop.cfg"));
AssetManager am = JmeSystem.newAssetManager(PreventCoreIssueRegressions.class.getResource("/com/jme3/asset/General.cfg"));
Node cgModel = (Node)am.loadModel("Models/Elephant/Elephant.mesh.xml");
cgModel.rotate(0f, -1f, 0f);
cgModel.scale(0.04f);
Expand Down
2 changes: 1 addition & 1 deletion jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public void init(){
assetCfg = new URL(getParameter("AssetConfigURL"));
} catch (MalformedURLException ex){
System.out.println(ex.getMessage());
assetCfg = Resources.getResource("/com/jme3/asset/Desktop.cfg",this.getClass());
assetCfg = Resources.getResource("/com/jme3/asset/General.cfg", this.getClass());
}

createCanvas();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,16 @@
import javax.imageio.ImageIO;

/**
* Support loads of .ico, .ani and .cur cursor file formats.
*
* Created Jun 5, 2012 9:45:58 AM
* @author MadJack
*
* @deprecated This class is not crossplatform and the
* supported file formats are not commonly used anymore.
* Which leads to it deprecation.
Comment thread
mondogo24 marked this conversation as resolved.
Outdated
*/
@Deprecated
public class CursorLoader implements AssetLoader {
final private static int FDE_OFFSET = 6; // first directory entry offset

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public JmeDesktopSystem() {

@Override
public URL getPlatformAssetConfigURL() {
return Resources.getResource("com/jme3/asset/Desktop.cfg");
return Resources.getResource("com/jme3/asset/General.cfg");
}

private static BufferedImage verticalFlip(BufferedImage original) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class TestMaterialCompare {

public static void main(String[] args) {
AssetManager assetManager = JmeSystem.newAssetManager(
TestMaterialCompare.class.getResource("/com/jme3/asset/Desktop.cfg"));
TestMaterialCompare.class.getResource("/com/jme3/asset/General.cfg"));

// Cloned materials
Material mat1 = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ public class TestMaterialDefWrite {
@BeforeEach
public void init() {
assetManager = JmeSystem.newAssetManager(
TestMaterialDefWrite.class.getResource("/com/jme3/asset/Desktop.cfg"));


TestMaterialDefWrite.class.getResource("/com/jme3/asset/General.cfg"));
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class TestMaterialWrite {

@BeforeEach
public void init() {
URL configFile = TestMaterialWrite.class.getResource("/com/jme3/asset/Desktop.cfg");
URL configFile = TestMaterialWrite.class.getResource("/com/jme3/asset/General.cfg");
assetManager = JmeSystem.newAssetManager(configFile);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class GltfLoaderTest {
@BeforeEach
public void init() {
assetManager = JmeSystem.newAssetManager(
TestMaterialWrite.class.getResource("/com/jme3/asset/Desktop.cfg"));
TestMaterialWrite.class.getResource("/com/jme3/asset/General.cfg"));

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ public AssetManager getAssetManager() {
}

private AssetManager createAssetManager() {
/* Desktop.cfg supports the following additional file formats at the time of writing:
LOADER com.jme3.texture.plugins.AWTLoader : jpg, bmp, gif, png, jpeg
LOADER com.jme3.audio.plugins.OGGLoader : ogg
*/
return JmeSystem.newAssetManager(BaseTest.class.getResource("/com/jme3/asset/Desktop.cfg"));
return JmeSystem.newAssetManager(BaseTest.class.getResource("/com/jme3/asset/General.cfg"));
}

}
Loading