* More errors sent to Application.handleError()
* Application.handleError now stops by default to prevent process from lingering on * Made sleeps in LwjglCanvas slightly longer to prevent hogging 100% cpu * Renamed elephant skeletonxml to skeleton.xml * Compressed HoverTank textures and removed high-res versions * Compressed Tree textures git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7203 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
@ -405,6 +405,8 @@ public class Application implements SystemListener {
|
||||
|
||||
public void handleError(String errMsg, Throwable t){
|
||||
logger.log(Level.SEVERE, errMsg, t);
|
||||
// user should add additional code to handle the error.
|
||||
stop(); // stop the application
|
||||
}
|
||||
|
||||
public void gainFocus(){
|
||||
|
@ -167,6 +167,10 @@ public class LwjglAudioRenderer implements AudioRenderer, Runnable {
|
||||
return;
|
||||
}
|
||||
|
||||
ALCdevice device = AL.getDevice();
|
||||
String deviceName = ALC10.alcGetString(device, ALC10.ALC_DEVICE_SPECIFIER);
|
||||
|
||||
logger.log(Level.FINER, "Audio Device: {0}", deviceName);
|
||||
logger.log(Level.FINER, "Audio Vendor: {0}", alGetString(AL_VENDOR));
|
||||
logger.log(Level.FINER, "Audio Renderer: {0}", alGetString(AL_RENDERER));
|
||||
logger.log(Level.FINER, "Audio Version: {0}", alGetString(AL_VERSION));
|
||||
@ -192,7 +196,6 @@ public class LwjglAudioRenderer implements AudioRenderer, Runnable {
|
||||
|
||||
logger.log(Level.INFO, "AudioRenderer supports {0} channels", channels.length);
|
||||
|
||||
ALCdevice device = AL.getDevice();
|
||||
supportEfx = ALC10.alcIsExtensionPresent(device, "ALC_EXT_EFX");
|
||||
logger.log(Level.FINER, "Audio EFX support: {0}", supportEfx);
|
||||
|
||||
|
@ -221,7 +221,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex
|
||||
logger.log(Level.INFO, "OGL: Waiting for canvas to become displayable..");
|
||||
while (!canvas.isDisplayable()){
|
||||
try {
|
||||
Thread.sleep(1);
|
||||
Thread.sleep(10);
|
||||
} catch (InterruptedException ex) {
|
||||
logger.log(Level.SEVERE, "OGL: Interrupted! ", ex);
|
||||
}
|
||||
@ -237,7 +237,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex
|
||||
logger.log(Level.INFO, "OGL: Waiting for display to become active..");
|
||||
while (!Display.isCreated()){
|
||||
try {
|
||||
Thread.sleep(1);
|
||||
Thread.sleep(10);
|
||||
} catch (InterruptedException ex) {
|
||||
logger.log(Level.SEVERE, "OGL: Interrupted! ", ex);
|
||||
}
|
||||
@ -257,7 +257,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex
|
||||
}
|
||||
logger.log(Level.INFO, "OGL: Input has been reinitialized");
|
||||
} catch (LWJGLException ex) {
|
||||
logger.log(Level.SEVERE, "Failed to re-init input", ex);
|
||||
listener.handleError("Failed to re-init input", ex);
|
||||
}
|
||||
|
||||
SwingUtilities.invokeLater(new Runnable(){
|
||||
|
@ -69,7 +69,7 @@ public class LwjglDisplay extends LwjglAbstractDisplay {
|
||||
}
|
||||
}
|
||||
} catch (LWJGLException ex) {
|
||||
logger.log(Level.SEVERE, "Failed to acquire fullscreen display mode!", ex);
|
||||
listener.handleError("Failed to acquire fullscreen display mode!", ex);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
<mesh>
|
||||
<submeshes>
|
||||
<submesh material="Models/HoverTank/tank_highRes.j3m" usesharedvertices="false" use32bitindexes="false" operationtype="triangle_list">
|
||||
<submesh material="Models/HoverTank/tank.j3m" usesharedvertices="false" use32bitindexes="false" operationtype="triangle_list">
|
||||
<faces count="9692">
|
||||
<face v1="0" v2="1" v3="3" />
|
||||
<face v1="1" v2="2" v3="3" />
|
||||
|
@ -1,13 +1,13 @@
|
||||
Material My Material : Common/MatDefs/Light/Lighting.j3md {
|
||||
MaterialParameters {
|
||||
SpecularMap : Models/HoverTank/tank_specular.png
|
||||
Shininess : 8
|
||||
NormalMap : Models/HoverTank/tank_normals.png
|
||||
DiffuseMap : Models/HoverTank/tank_diffuse.png
|
||||
GlowMap : Models/HoverTank/tank_glow_map_highres.png
|
||||
UseMaterialColors : true
|
||||
Ambient : 0.0 0.0 0.0 1.0
|
||||
Diffuse : 1.0 1.0 1.0 1.0
|
||||
Specular : 1.0 1.0 1.0 1.0
|
||||
}
|
||||
}
|
||||
Material My Material : Common/MatDefs/Light/Lighting.j3md {
|
||||
MaterialParameters {
|
||||
SpecularMap : Models/HoverTank/tank_specular.jpg
|
||||
Shininess : 8
|
||||
NormalMap : Models/HoverTank/tank_normals.png
|
||||
DiffuseMap : Models/HoverTank/tank_diffuse.jpg
|
||||
GlowMap : Models/HoverTank/tank_glow_map.jpg
|
||||
UseMaterialColors : true
|
||||
Ambient : 0.0 0.0 0.0 1.0
|
||||
Diffuse : 1.0 1.0 1.0 1.0
|
||||
Specular : 1.0 1.0 1.0 1.0
|
||||
}
|
||||
}
|
BIN
engine/src/test-data/Models/HoverTank/tank_diffuse.jpg
Normal file
After Width: | Height: | Size: 221 KiB |
Before Width: | Height: | Size: 1.7 MiB |
Before Width: | Height: | Size: 573 KiB |
BIN
engine/src/test-data/Models/HoverTank/tank_glow_map.jpg
Normal file
After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 130 KiB |
@ -1,9 +0,0 @@
|
||||
Material My Material : Common/MatDefs/Light/Lighting.j3md {
|
||||
MaterialParameters {
|
||||
SpecularMap : Models/HoverTank/tank_specular_lowRes.png
|
||||
Shininess : 255
|
||||
NormalMap : Models/HoverTank/tank_normals_lowRes.png
|
||||
DiffuseMap : Models/HoverTank/tank_diffuse_LowRes.png
|
||||
GlowMap : Models/HoverTank/tank_glow_map.png
|
||||
}
|
||||
}
|
Before Width: | Height: | Size: 2.4 MiB After Width: | Height: | Size: 961 KiB |
Before Width: | Height: | Size: 961 KiB |
BIN
engine/src/test-data/Models/HoverTank/tank_specular.jpg
Normal file
After Width: | Height: | Size: 94 KiB |
Before Width: | Height: | Size: 1.4 MiB |
Before Width: | Height: | Size: 456 KiB |