Application: use JmeSystem to get asset config URL
This commit is contained in:
parent
25b1780e09
commit
92e08b1f2b
@ -174,28 +174,30 @@ public class Application implements SystemListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void initAssetManager(){
|
private void initAssetManager(){
|
||||||
|
URL assetCfgUrl = null;
|
||||||
|
|
||||||
if (settings != null){
|
if (settings != null){
|
||||||
String assetCfg = settings.getString("AssetConfigURL");
|
String assetCfg = settings.getString("AssetConfigURL");
|
||||||
if (assetCfg != null){
|
if (assetCfg != null){
|
||||||
URL url = null;
|
|
||||||
try {
|
try {
|
||||||
url = new URL(assetCfg);
|
assetCfgUrl = new URL(assetCfg);
|
||||||
} catch (MalformedURLException ex) {
|
} catch (MalformedURLException ex) {
|
||||||
}
|
}
|
||||||
if (url == null) {
|
if (assetCfgUrl == null) {
|
||||||
url = Application.class.getClassLoader().getResource(assetCfg);
|
assetCfgUrl = Application.class.getClassLoader().getResource(assetCfg);
|
||||||
if (url == null) {
|
if (assetCfgUrl == null) {
|
||||||
logger.log(Level.SEVERE, "Unable to access AssetConfigURL in asset config:{0}", assetCfg);
|
logger.log(Level.SEVERE, "Unable to access AssetConfigURL in asset config:{0}", assetCfg);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
assetManager = JmeSystem.newAssetManager(url);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (assetCfgUrl == null) {
|
||||||
|
String assetCfg = JmeSystem.getPlatformAssetConfigPath();
|
||||||
|
assetCfgUrl = Thread.currentThread().getContextClassLoader().getResource(assetCfg);
|
||||||
|
}
|
||||||
if (assetManager == null){
|
if (assetManager == null){
|
||||||
assetManager = JmeSystem.newAssetManager(
|
assetManager = JmeSystem.newAssetManager(assetCfgUrl);
|
||||||
Thread.currentThread().getContextClassLoader()
|
|
||||||
.getResource("com/jme3/asset/Desktop.cfg"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user