- change logging from logger.info() logger.fine and logger.warning()
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10272 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
parent
7ba657e430
commit
ea973c14c3
@ -166,7 +166,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
logger.info("onCreate");
|
logger.fine("onCreate");
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
JmeAndroidSystem.setActivity(this);
|
JmeAndroidSystem.setActivity(this);
|
||||||
@ -230,7 +230,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onRestart() {
|
protected void onRestart() {
|
||||||
logger.info("onRestart");
|
logger.fine("onRestart");
|
||||||
super.onRestart();
|
super.onRestart();
|
||||||
if (app != null) {
|
if (app != null) {
|
||||||
app.restart();
|
app.restart();
|
||||||
@ -240,13 +240,13 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStart() {
|
protected void onStart() {
|
||||||
logger.info("onStart");
|
logger.fine("onStart");
|
||||||
super.onStart();
|
super.onStart();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onResume() {
|
protected void onResume() {
|
||||||
logger.info("onResume");
|
logger.fine("onResume");
|
||||||
super.onResume();
|
super.onResume();
|
||||||
if (view != null) {
|
if (view != null) {
|
||||||
view.onResume();
|
view.onResume();
|
||||||
@ -282,7 +282,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
|
|||||||
protected void onPause() {
|
protected void onPause() {
|
||||||
loseFocus();
|
loseFocus();
|
||||||
|
|
||||||
logger.info("onPause");
|
logger.fine("onPause");
|
||||||
super.onPause();
|
super.onPause();
|
||||||
if (view != null) {
|
if (view != null) {
|
||||||
view.onPause();
|
view.onPause();
|
||||||
@ -315,16 +315,16 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStop() {
|
protected void onStop() {
|
||||||
logger.info("onStop");
|
logger.fine("onStop");
|
||||||
super.onStop();
|
super.onStop();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onDestroy() {
|
protected void onDestroy() {
|
||||||
logger.info("onDestroy");
|
logger.fine("onDestroy");
|
||||||
final DataObject data = (DataObject) getLastNonConfigurationInstance();
|
final DataObject data = (DataObject) getLastNonConfigurationInstance();
|
||||||
if (data != null || inConfigChange) {
|
if (data != null || inConfigChange) {
|
||||||
logger.info("In Config Change, not stopping app.");
|
logger.fine("In Config Change, not stopping app.");
|
||||||
} else {
|
} else {
|
||||||
if (app != null) {
|
if (app != null) {
|
||||||
app.stop(!isGLThreadPaused);
|
app.stop(!isGLThreadPaused);
|
||||||
|
@ -101,7 +101,7 @@ public class AndroidAssetManager extends DesktopAssetManager {
|
|||||||
registerLoaderSafe("com.jme3.scene.plugins.ogre.SceneLoader", "scene");
|
registerLoaderSafe("com.jme3.scene.plugins.ogre.SceneLoader", "scene");
|
||||||
|
|
||||||
|
|
||||||
logger.info("AndroidAssetManager created.");
|
logger.fine("AndroidAssetManager created.");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1875,7 +1875,7 @@ public class OGLESShaderRenderer implements Renderer {
|
|||||||
assert bufId != -1;
|
assert bufId != -1;
|
||||||
|
|
||||||
if (bufId == -1) {
|
if (bufId == -1) {
|
||||||
logger.info("invalid buffer id!");
|
logger.warning("invalid buffer id!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (context.boundElementArrayVBO != bufId) {
|
if (context.boundElementArrayVBO != bufId) {
|
||||||
|
@ -54,7 +54,7 @@ public class AndroidConfigChooser implements EGLConfigChooser {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
|
public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
|
||||||
logger.info("GLSurfaceView asks for egl config, returning: ");
|
logger.fine("GLSurfaceView asks for egl config, returning: ");
|
||||||
logEGLConfig(choosenConfig, display, egl);
|
logEGLConfig(choosenConfig, display, egl);
|
||||||
return choosenConfig;
|
return choosenConfig;
|
||||||
}
|
}
|
||||||
@ -76,7 +76,7 @@ public class AndroidConfigChooser implements EGLConfigChooser {
|
|||||||
compChooser = new ComponentSizeChooser(8, 8, 8, 0, 16, 0);
|
compChooser = new ComponentSizeChooser(8, 8, 8, 0, 16, 0);
|
||||||
choosenConfig = compChooser.chooseConfig(egl, display);
|
choosenConfig = compChooser.chooseConfig(egl, display);
|
||||||
}
|
}
|
||||||
logger.info("JME3 using best EGL configuration available here: ");
|
logger.fine("JME3 using best EGL configuration available here: ");
|
||||||
break;
|
break;
|
||||||
case BEST_TRANSLUCENT:
|
case BEST_TRANSLUCENT:
|
||||||
compChooser = new ComponentSizeChooser(8, 8, 8, 8, 32, 0);
|
compChooser = new ComponentSizeChooser(8, 8, 8, 8, 32, 0);
|
||||||
@ -85,18 +85,18 @@ public class AndroidConfigChooser implements EGLConfigChooser {
|
|||||||
compChooser = new ComponentSizeChooser(8, 8, 8, 8, 16, 0);
|
compChooser = new ComponentSizeChooser(8, 8, 8, 8, 16, 0);
|
||||||
choosenConfig = compChooser.chooseConfig(egl, display);
|
choosenConfig = compChooser.chooseConfig(egl, display);
|
||||||
}
|
}
|
||||||
logger.info("JME3 using best EGL configuration available here with translucent pixels: ");
|
logger.fine("JME3 using best EGL configuration available here with translucent pixels: ");
|
||||||
break;
|
break;
|
||||||
case FASTEST:
|
case FASTEST:
|
||||||
compChooser = new ComponentSizeChooser(5, 6, 5, 0, 16, 0);
|
compChooser = new ComponentSizeChooser(5, 6, 5, 0, 16, 0);
|
||||||
choosenConfig = compChooser.chooseConfig(egl, display);
|
choosenConfig = compChooser.chooseConfig(egl, display);
|
||||||
logger.info("JME3 using fastest EGL configuration available here: ");
|
logger.fine("JME3 using fastest EGL configuration available here: ");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (choosenConfig != null) {
|
if (choosenConfig != null) {
|
||||||
logger.info("JME3 using choosen config: ");
|
logger.fine("JME3 using choosen config: ");
|
||||||
logEGLConfig(choosenConfig, display, egl);
|
logEGLConfig(choosenConfig, display, egl);
|
||||||
pixelFormat = getPixelFormat(choosenConfig, display, egl);
|
pixelFormat = getPixelFormat(choosenConfig, display, egl);
|
||||||
clientOpenGLESVersion = getOpenGLVersion(choosenConfig, display, egl);
|
clientOpenGLESVersion = getOpenGLVersion(choosenConfig, display, egl);
|
||||||
@ -151,28 +151,28 @@ public class AndroidConfigChooser implements EGLConfigChooser {
|
|||||||
int[] value = new int[1];
|
int[] value = new int[1];
|
||||||
|
|
||||||
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_RED_SIZE, value);
|
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_RED_SIZE, value);
|
||||||
logger.info(String.format("EGL_RED_SIZE = %d", value[0]));
|
logger.fine(String.format("EGL_RED_SIZE = %d", value[0]));
|
||||||
|
|
||||||
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_GREEN_SIZE, value);
|
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_GREEN_SIZE, value);
|
||||||
logger.info(String.format("EGL_GREEN_SIZE = %d", value[0]));
|
logger.fine(String.format("EGL_GREEN_SIZE = %d", value[0]));
|
||||||
|
|
||||||
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_BLUE_SIZE, value);
|
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_BLUE_SIZE, value);
|
||||||
logger.info(String.format("EGL_BLUE_SIZE = %d", value[0]));
|
logger.fine(String.format("EGL_BLUE_SIZE = %d", value[0]));
|
||||||
|
|
||||||
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_ALPHA_SIZE, value);
|
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_ALPHA_SIZE, value);
|
||||||
logger.info(String.format("EGL_ALPHA_SIZE = %d", value[0]));
|
logger.fine(String.format("EGL_ALPHA_SIZE = %d", value[0]));
|
||||||
|
|
||||||
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_DEPTH_SIZE, value);
|
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_DEPTH_SIZE, value);
|
||||||
logger.info(String.format("EGL_DEPTH_SIZE = %d", value[0]));
|
logger.fine(String.format("EGL_DEPTH_SIZE = %d", value[0]));
|
||||||
|
|
||||||
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_STENCIL_SIZE, value);
|
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_STENCIL_SIZE, value);
|
||||||
logger.info(String.format("EGL_STENCIL_SIZE = %d", value[0]));
|
logger.fine(String.format("EGL_STENCIL_SIZE = %d", value[0]));
|
||||||
|
|
||||||
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_RENDERABLE_TYPE, value);
|
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_RENDERABLE_TYPE, value);
|
||||||
logger.info(String.format("EGL_RENDERABLE_TYPE = %d", value[0]));
|
logger.fine(String.format("EGL_RENDERABLE_TYPE = %d", value[0]));
|
||||||
|
|
||||||
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_SURFACE_TYPE, value);
|
egl.eglGetConfigAttrib(display, conf, EGL10.EGL_SURFACE_TYPE, value);
|
||||||
logger.info(String.format("EGL_SURFACE_TYPE = %d", value[0]));
|
logger.fine(String.format("EGL_SURFACE_TYPE = %d", value[0]));
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getClientOpenGLESVersion() {
|
public int getClientOpenGLESVersion() {
|
||||||
|
@ -124,7 +124,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
|
|||||||
view.setEGLContextClientVersion(2);
|
view.setEGLContextClientVersion(2);
|
||||||
// RGB565, Depth16
|
// RGB565, Depth16
|
||||||
view.setEGLConfigChooser(5, 6, 5, 0, 16, 0);
|
view.setEGLConfigChooser(5, 6, 5, 0, 16, 0);
|
||||||
logger.info("ConfigType.LEGACY using RGB565");
|
logger.fine("ConfigType.LEGACY using RGB565");
|
||||||
} else {
|
} else {
|
||||||
EGL10 egl = (EGL10) EGLContext.getEGL();
|
EGL10 egl = (EGL10) EGLContext.getEGL();
|
||||||
EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
|
EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
|
||||||
@ -180,7 +180,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
|
|||||||
renderer.resetGLObjects();
|
renderer.resetGLObjects();
|
||||||
} else {
|
} else {
|
||||||
if (!created.get()) {
|
if (!created.get()) {
|
||||||
logger.info("GL Surface created, doing JME3 init");
|
logger.fine("GL Surface created, doing JME3 init");
|
||||||
initInThread();
|
initInThread();
|
||||||
} else {
|
} else {
|
||||||
logger.warning("GL Surface already created");
|
logger.warning("GL Surface already created");
|
||||||
@ -191,7 +191,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
|
|||||||
protected void initInThread() {
|
protected void initInThread() {
|
||||||
created.set(true);
|
created.set(true);
|
||||||
|
|
||||||
logger.info("OGLESContext create");
|
logger.fine("OGLESContext create");
|
||||||
logger.log(Level.FINE, "Running on thread: {0}", Thread.currentThread().getName());
|
logger.log(Level.FINE, "Running on thread: {0}", Thread.currentThread().getName());
|
||||||
|
|
||||||
// Setup unhandled Exception Handler
|
// Setup unhandled Exception Handler
|
||||||
@ -235,7 +235,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
|
|||||||
timer = null;
|
timer = null;
|
||||||
|
|
||||||
// do android specific cleaning here
|
// do android specific cleaning here
|
||||||
logger.info("Display destroyed.");
|
logger.fine("Display destroyed.");
|
||||||
|
|
||||||
renderable.set(false);
|
renderable.set(false);
|
||||||
}
|
}
|
||||||
|
@ -141,7 +141,7 @@ public class SimpleTexturedTest extends SimpleApplication {
|
|||||||
|
|
||||||
// secondCounter has been removed from SimpleApplication
|
// secondCounter has been removed from SimpleApplication
|
||||||
//if (secondCounter == 0)
|
//if (secondCounter == 0)
|
||||||
// logger.info("Frames per second: " + timer.getFrameRate());
|
// logger.fine("Frames per second: " + timer.getFrameRate());
|
||||||
|
|
||||||
spheresContainer.rotate(0.2f * tpf, 0.4f * tpf, 0.8f * tpf);
|
spheresContainer.rotate(0.2f * tpf, 0.4f * tpf, 0.8f * tpf);
|
||||||
}
|
}
|
||||||
|
@ -101,21 +101,21 @@ import java.util.logging.Logger;
|
|||||||
try {
|
try {
|
||||||
result = this.load(inputStream, flipY);
|
result = this.load(inputStream, flipY);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.info("Unable to load image using AWT loader!");
|
logger.warning("Unable to load image using AWT loader!");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case DDS:
|
case DDS:
|
||||||
try {
|
try {
|
||||||
result = ddsLoader.load(inputStream);
|
result = ddsLoader.load(inputStream);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.info("Unable to load image using DDS loader!");
|
logger.warning("Unable to load image using DDS loader!");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case TGA:
|
case TGA:
|
||||||
try {
|
try {
|
||||||
result = TGALoader.load(inputStream, flipY);
|
result = TGALoader.load(inputStream, flipY);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.info("Unable to load image using TGA loader!");
|
logger.warning("Unable to load image using TGA loader!");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -504,7 +504,7 @@ public class TextureHelper extends AbstractBlenderHelper {
|
|||||||
LOGGER.log(Level.FINE, "Reading texture from file: {0}", texturePath);
|
LOGGER.log(Level.FINE, "Reading texture from file: {0}", texturePath);
|
||||||
result = this.loadImageFromFile(texturePath, blenderContext);
|
result = this.loadImageFromFile(texturePath, blenderContext);
|
||||||
} else {
|
} else {
|
||||||
LOGGER.info("Packed texture. Reading directly from the blend file!");
|
logger.fine("Packed texture. Reading directly from the blend file!");
|
||||||
Structure packedFile = pPackedFile.fetchData(blenderContext.getInputStream()).get(0);
|
Structure packedFile = pPackedFile.fetchData(blenderContext.getInputStream()).get(0);
|
||||||
Pointer pData = (Pointer) packedFile.getFieldValue("data");
|
Pointer pData = (Pointer) packedFile.getFieldValue("data");
|
||||||
FileBlockHeader dataFileBlock = blenderContext.getFileBlock(pData.getOldMemoryAddress());
|
FileBlockHeader dataFileBlock = blenderContext.getFileBlock(pData.getOldMemoryAddress());
|
||||||
|
@ -287,7 +287,7 @@ public class BinaryExporter implements JmeExporter {
|
|||||||
os = null;
|
os = null;
|
||||||
|
|
||||||
if (debug ) {
|
if (debug ) {
|
||||||
logger.info("Stats:");
|
logger.fine("Stats:");
|
||||||
logger.log(Level.FINE, "classes: {0}", classNum);
|
logger.log(Level.FINE, "classes: {0}", classNum);
|
||||||
logger.log(Level.FINE, "class table: {0} bytes", classTableSize);
|
logger.log(Level.FINE, "class table: {0} bytes", classTableSize);
|
||||||
logger.log(Level.FINE, "objects: {0}", numLocations);
|
logger.log(Level.FINE, "objects: {0}", numLocations);
|
||||||
|
@ -241,7 +241,7 @@ public final class BinaryImporter implements JmeImporter {
|
|||||||
|
|
||||||
Savable rVal = readObject(id);
|
Savable rVal = readObject(id);
|
||||||
if (debug) {
|
if (debug) {
|
||||||
logger.info("Importer Stats: ");
|
logger.fine("Importer Stats: ");
|
||||||
logger.log(Level.FINE, "Tags: {0}", numClasses);
|
logger.log(Level.FINE, "Tags: {0}", numClasses);
|
||||||
logger.log(Level.FINE, "Objects: {0}", numLocs);
|
logger.log(Level.FINE, "Objects: {0}", numLocs);
|
||||||
logger.log(Level.FINE, "Data Size: {0}", dataArray.length);
|
logger.log(Level.FINE, "Data Size: {0}", dataArray.length);
|
||||||
|
@ -84,7 +84,7 @@ public class DesktopAssetManager implements AssetManager {
|
|||||||
if (configFile != null){
|
if (configFile != null){
|
||||||
loadConfigFile(configFile);
|
loadConfigFile(configFile);
|
||||||
}
|
}
|
||||||
logger.info("DesktopAssetManager created.");
|
logger.fine("DesktopAssetManager created.");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadConfigFile(URL configFile){
|
private void loadConfigFile(URL configFile){
|
||||||
|
@ -348,7 +348,7 @@ public class BoundingSphere extends BoundingVolume {
|
|||||||
* the list of points to contain.
|
* the list of points to contain.
|
||||||
*/
|
*/
|
||||||
public void averagePoints(Vector3f[] points) {
|
public void averagePoints(Vector3f[] points) {
|
||||||
logger.info("Bounding Sphere calculated using average points.");
|
logger.fine("Bounding Sphere calculated using average points.");
|
||||||
center = points[0];
|
center = points[0];
|
||||||
|
|
||||||
for (int i = 1; i < points.length; i++) {
|
for (int i = 1; i < points.length; i++) {
|
||||||
|
@ -1208,7 +1208,7 @@ public final class Matrix4f implements Savable, Cloneable, java.io.Serializable
|
|||||||
*/
|
*/
|
||||||
public Vector4f mult(Vector4f vec, Vector4f store) {
|
public Vector4f mult(Vector4f vec, Vector4f store) {
|
||||||
if (null == vec) {
|
if (null == vec) {
|
||||||
logger.info("Source vector is null, null result returned.");
|
logger.warning("Source vector is null, null result returned.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (store == null) {
|
if (store == null) {
|
||||||
@ -1249,7 +1249,7 @@ public final class Matrix4f implements Savable, Cloneable, java.io.Serializable
|
|||||||
*/
|
*/
|
||||||
public Vector4f multAcross(Vector4f vec, Vector4f store) {
|
public Vector4f multAcross(Vector4f vec, Vector4f store) {
|
||||||
if (null == vec) {
|
if (null == vec) {
|
||||||
logger.info("Source vector is null, null result returned.");
|
logger.warning("Source vector is null, null result returned.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (store == null) {
|
if (store == null) {
|
||||||
@ -1342,7 +1342,7 @@ public final class Matrix4f implements Savable, Cloneable, java.io.Serializable
|
|||||||
*/
|
*/
|
||||||
public Vector3f multAcross(Vector3f vec, Vector3f store) {
|
public Vector3f multAcross(Vector3f vec, Vector3f store) {
|
||||||
if (null == vec) {
|
if (null == vec) {
|
||||||
logger.info("Source vector is null, null result returned.");
|
logger.warning("Source vector is null, null result returned.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (store == null) {
|
if (store == null) {
|
||||||
|
@ -65,7 +65,7 @@ public class NullContext implements JmeContext, Runnable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void initInThread(){
|
protected void initInThread(){
|
||||||
logger.info("NullContext created.");
|
logger.fine("NullContext created.");
|
||||||
logger.log(Level.FINE, "Running on thread: {0}", Thread.currentThread().getName());
|
logger.log(Level.FINE, "Running on thread: {0}", Thread.currentThread().getName());
|
||||||
|
|
||||||
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
|
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
|
||||||
@ -135,7 +135,7 @@ public class NullContext implements JmeContext, Runnable {
|
|||||||
|
|
||||||
deinitInThread();
|
deinitInThread();
|
||||||
|
|
||||||
logger.info("NullContext destroyed.");
|
logger.fine("NullContext destroyed.");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void destroy(boolean waitFor){
|
public void destroy(boolean waitFor){
|
||||||
|
@ -101,7 +101,7 @@ public class IosAssetManager extends DesktopAssetManager {
|
|||||||
registerLoaderSafe("com.jme3.scene.plugins.ogre.SceneLoader", "scene");
|
registerLoaderSafe("com.jme3.scene.plugins.ogre.SceneLoader", "scene");
|
||||||
|
|
||||||
|
|
||||||
logger.info("IosAssetManager created.");
|
logger.fine("IosAssetManager created.");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -83,7 +83,7 @@ public class JoglCanvas extends JoglAbstractDisplay implements JmeCanvasContext
|
|||||||
canvas.requestFocus();
|
canvas.requestFocus();
|
||||||
|
|
||||||
super.internalCreate();
|
super.internalCreate();
|
||||||
logger.info("Display created.");
|
logger.fine("Display created.");
|
||||||
|
|
||||||
renderer.initialize();
|
renderer.initialize();
|
||||||
listener.initialize();
|
listener.initialize();
|
||||||
@ -92,7 +92,7 @@ public class JoglCanvas extends JoglAbstractDisplay implements JmeCanvasContext
|
|||||||
public void display(GLAutoDrawable glad) {
|
public void display(GLAutoDrawable glad) {
|
||||||
if (!created.get() && renderer != null){
|
if (!created.get() && renderer != null){
|
||||||
listener.destroy();
|
listener.destroy();
|
||||||
logger.info("Canvas destroyed.");
|
logger.fine("Canvas destroyed.");
|
||||||
super.internalDestroy();
|
super.internalDestroy();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -246,7 +246,7 @@ public class JoglDisplay extends JoglAbstractDisplay {
|
|||||||
canvas.requestFocus();
|
canvas.requestFocus();
|
||||||
|
|
||||||
super.internalCreate();
|
super.internalCreate();
|
||||||
logger.info("Display created.");
|
logger.fine("Display created.");
|
||||||
|
|
||||||
renderer.initialize();
|
renderer.initialize();
|
||||||
listener.initialize();
|
listener.initialize();
|
||||||
@ -312,7 +312,7 @@ public class JoglDisplay extends JoglAbstractDisplay {
|
|||||||
device.setFullScreenWindow(null);
|
device.setFullScreenWindow(null);
|
||||||
}
|
}
|
||||||
frame.dispose();
|
frame.dispose();
|
||||||
logger.info("Display destroyed.");
|
logger.fine("Display destroyed.");
|
||||||
super.internalDestroy();
|
super.internalDestroy();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@ public class JoglNewtCanvas extends JoglNewtAbstractDisplay implements JmeCanvas
|
|||||||
canvas.requestFocus();
|
canvas.requestFocus();
|
||||||
|
|
||||||
super.internalCreate();
|
super.internalCreate();
|
||||||
logger.info("Display created.");
|
logger.fine("Display created.");
|
||||||
|
|
||||||
renderer.initialize();
|
renderer.initialize();
|
||||||
listener.initialize();
|
listener.initialize();
|
||||||
@ -112,7 +112,7 @@ public class JoglNewtCanvas extends JoglNewtAbstractDisplay implements JmeCanvas
|
|||||||
public void display(GLAutoDrawable glad) {
|
public void display(GLAutoDrawable glad) {
|
||||||
if (!created.get() && renderer != null){
|
if (!created.get() && renderer != null){
|
||||||
listener.destroy();
|
listener.destroy();
|
||||||
logger.info("Canvas destroyed.");
|
logger.fine("Canvas destroyed.");
|
||||||
super.internalDestroy();
|
super.internalDestroy();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -157,7 +157,7 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay {
|
|||||||
canvas.requestFocus();
|
canvas.requestFocus();
|
||||||
|
|
||||||
super.internalCreate();
|
super.internalCreate();
|
||||||
logger.info("Display created.");
|
logger.fine("Display created.");
|
||||||
|
|
||||||
renderer.initialize();
|
renderer.initialize();
|
||||||
listener.initialize();
|
listener.initialize();
|
||||||
@ -200,7 +200,7 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay {
|
|||||||
canvas.setFullscreen(false);
|
canvas.setFullscreen(false);
|
||||||
}
|
}
|
||||||
canvas.destroy();
|
canvas.destroy();
|
||||||
logger.info("Display destroyed.");
|
logger.fine("Display destroyed.");
|
||||||
super.internalDestroy();
|
super.internalDestroy();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,7 @@ public class JoglOffscreenBuffer extends JoglContext implements Runnable {
|
|||||||
|
|
||||||
renderable.set(true);
|
renderable.set(true);
|
||||||
|
|
||||||
logger.info("Offscreen buffer created.");
|
logger.fine("Offscreen buffer created.");
|
||||||
|
|
||||||
super.internalCreate();
|
super.internalCreate();
|
||||||
listener.initialize();
|
listener.initialize();
|
||||||
@ -115,7 +115,7 @@ public class JoglOffscreenBuffer extends JoglContext implements Runnable {
|
|||||||
listener.destroy();
|
listener.destroy();
|
||||||
renderer.cleanup();
|
renderer.cleanup();
|
||||||
offscreenDrawable.destroy();
|
offscreenDrawable.destroy();
|
||||||
logger.info("Offscreen buffer destroyed.");
|
logger.fine("Offscreen buffer destroyed.");
|
||||||
|
|
||||||
super.internalDestroy();
|
super.internalDestroy();
|
||||||
}
|
}
|
||||||
|
@ -62,7 +62,7 @@ public class LwjglKeyInput implements KeyInput {
|
|||||||
try {
|
try {
|
||||||
Keyboard.create();
|
Keyboard.create();
|
||||||
Keyboard.enableRepeatEvents(true);
|
Keyboard.enableRepeatEvents(true);
|
||||||
logger.info("Keyboard created.");
|
logger.fine("Keyboard created.");
|
||||||
} catch (LWJGLException ex) {
|
} catch (LWJGLException ex) {
|
||||||
logger.log(Level.SEVERE, "Error while creating keyboard.", ex);
|
logger.log(Level.SEVERE, "Error while creating keyboard.", ex);
|
||||||
}
|
}
|
||||||
@ -94,7 +94,7 @@ public class LwjglKeyInput implements KeyInput {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
Keyboard.destroy();
|
Keyboard.destroy();
|
||||||
logger.info("Keyboard destroyed.");
|
logger.fine("Keyboard destroyed.");
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isInitialized() {
|
public boolean isInitialized() {
|
||||||
|
@ -69,7 +69,7 @@ public class LwjglMouseInput implements MouseInput {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
Mouse.create();
|
Mouse.create();
|
||||||
logger.info("Mouse created.");
|
logger.fine("Mouse created.");
|
||||||
supportHardwareCursor = (Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) != 0;
|
supportHardwareCursor = (Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) != 0;
|
||||||
|
|
||||||
// Recall state that was set before initialization
|
// Recall state that was set before initialization
|
||||||
@ -132,7 +132,7 @@ public class LwjglMouseInput implements MouseInput {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
Mouse.destroy();
|
Mouse.destroy();
|
||||||
logger.info("Mouse destroyed.");
|
logger.fine("Mouse destroyed.");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCursorVisible(boolean visible){
|
public void setCursorVisible(boolean visible){
|
||||||
|
@ -194,7 +194,7 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna
|
|||||||
destroyContext();
|
destroyContext();
|
||||||
|
|
||||||
listener.destroy();
|
listener.destroy();
|
||||||
logger.info("Display destroyed.");
|
logger.fine("Display destroyed.");
|
||||||
super.internalDestroy();
|
super.internalDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ public class LwjglDisplay extends LwjglAbstractDisplay {
|
|||||||
logger.log(Level.SEVERE, "Failed to set display settings!", ex);
|
logger.log(Level.SEVERE, "Failed to set display settings!", ex);
|
||||||
}
|
}
|
||||||
listener.reshape(settings.getWidth(), settings.getHeight());
|
listener.reshape(settings.getWidth(), settings.getHeight());
|
||||||
logger.info("Display restarted.");
|
logger.fine("Display restarted.");
|
||||||
}
|
}
|
||||||
|
|
||||||
super.runLoop();
|
super.runLoop();
|
||||||
|
@ -81,7 +81,7 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable {
|
|||||||
|
|
||||||
renderable.set(true);
|
renderable.set(true);
|
||||||
|
|
||||||
logger.info("Offscreen buffer created.");
|
logger.fine("Offscreen buffer created.");
|
||||||
printContextInitInfo();
|
printContextInitInfo();
|
||||||
} catch (LWJGLException ex){
|
} catch (LWJGLException ex){
|
||||||
listener.handleError("Failed to create display", ex);
|
listener.handleError("Failed to create display", ex);
|
||||||
@ -139,7 +139,7 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable {
|
|||||||
listener.destroy();
|
listener.destroy();
|
||||||
renderer.cleanup();
|
renderer.cleanup();
|
||||||
pbuffer.destroy();
|
pbuffer.destroy();
|
||||||
logger.info("Offscreen buffer destroyed.");
|
logger.fine("Offscreen buffer destroyed.");
|
||||||
|
|
||||||
super.internalDestroy();
|
super.internalDestroy();
|
||||||
}
|
}
|
||||||
|
@ -149,7 +149,7 @@ public abstract class AbstractHeightMap implements HeightMap {
|
|||||||
* @return the value at (x,z).
|
* @return the value at (x,z).
|
||||||
*/
|
*/
|
||||||
public float getTrueHeightAtPoint(int x, int z) {
|
public float getTrueHeightAtPoint(int x, int z) {
|
||||||
//logger.info( heightData[x + (z*size)]);
|
//logger.fine( heightData[x + (z*size)]);
|
||||||
return heightData[x + (z * size)];
|
return heightData[x + (z * size)];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -261,7 +261,7 @@ public class CombinerHeightMap extends AbstractHeightMap {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
logger.info("Created heightmap using Combiner");
|
logger.fine("Created heightmap using Combiner");
|
||||||
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -216,7 +216,7 @@ public class FluidSimHeightMap extends AbstractHeightMap {
|
|||||||
}
|
}
|
||||||
normalizeTerrain(NORMALIZE_RANGE);
|
normalizeTerrain(NORMALIZE_RANGE);
|
||||||
|
|
||||||
logger.info("Created Heightmap using fluid simulation");
|
logger.fine("Created Heightmap using fluid simulation");
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,7 @@ public class HillHeightMap extends AbstractHeightMap {
|
|||||||
+ "or minimum radius is greater than maximum radius, "
|
+ "or minimum radius is greater than maximum radius, "
|
||||||
+ "or power of flattening is below one");
|
+ "or power of flattening is below one");
|
||||||
}
|
}
|
||||||
logger.info("Contructing hill heightmap using seed: " + seed);
|
logger.fine("Contructing hill heightmap using seed: " + seed);
|
||||||
this.size = size;
|
this.size = size;
|
||||||
this.seed = seed;
|
this.seed = seed;
|
||||||
this.iterations = iterations;
|
this.iterations = iterations;
|
||||||
@ -140,7 +140,7 @@ public class HillHeightMap extends AbstractHeightMap {
|
|||||||
|
|
||||||
normalizeTerrain(NORMALIZE_RANGE);
|
normalizeTerrain(NORMALIZE_RANGE);
|
||||||
|
|
||||||
logger.info("Created Heightmap using the Hill Algorithm");
|
logger.fine("Created Heightmap using the Hill Algorithm");
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -318,7 +318,7 @@ public class ParticleDepositionHeightMap extends AbstractHeightMap {
|
|||||||
erodeTerrain();
|
erodeTerrain();
|
||||||
normalizeTerrain(NORMALIZE_RANGE);
|
normalizeTerrain(NORMALIZE_RANGE);
|
||||||
|
|
||||||
logger.info("Created heightmap using Particle Deposition");
|
logger.fine("Created heightmap using Particle Deposition");
|
||||||
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -117,14 +117,14 @@ public class TestChooser extends JDialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (directory.exists()) {
|
if (directory.exists()) {
|
||||||
logger.info("Searching for Demo classes in \""
|
logger.fine("Searching for Demo classes in \""
|
||||||
+ directory.getName() + "\".");
|
+ directory.getName() + "\".");
|
||||||
addAllFilesInDirectory(directory, classes, pckgname, recursive);
|
addAllFilesInDirectory(directory, classes, pckgname, recursive);
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
// It does not work with the filesystem: we must
|
// It does not work with the filesystem: we must
|
||||||
// be in the case of a package contained in a jar file.
|
// be in the case of a package contained in a jar file.
|
||||||
logger.info("Searching for Demo classes in \"" + url + "\".");
|
logger.fine("Searching for Demo classes in \"" + url + "\".");
|
||||||
URLConnection urlConnection = url.openConnection();
|
URLConnection urlConnection = url.openConnection();
|
||||||
if (urlConnection instanceof JarURLConnection) {
|
if (urlConnection instanceof JarURLConnection) {
|
||||||
JarURLConnection conn = (JarURLConnection) urlConnection;
|
JarURLConnection conn = (JarURLConnection) urlConnection;
|
||||||
@ -449,7 +449,7 @@ public class TestChooser extends JDialog {
|
|||||||
|
|
||||||
protected void start(String[] args) {
|
protected void start(String[] args) {
|
||||||
final Vector<Class> classes = new Vector<Class>();
|
final Vector<Class> classes = new Vector<Class>();
|
||||||
logger.info("Composing Test list...");
|
logger.fine("Composing Test list...");
|
||||||
addDisplayedClasses(classes);
|
addDisplayedClasses(classes);
|
||||||
setup(classes);
|
setup(classes);
|
||||||
Class<?> cls;
|
Class<?> cls;
|
||||||
|
@ -175,7 +175,7 @@ class Stripifier {
|
|||||||
edgeInfo01.m_face0 = faceInfo;
|
edgeInfo01.m_face0 = faceInfo;
|
||||||
} else {
|
} else {
|
||||||
if (edgeInfo01.m_face1 != null) {
|
if (edgeInfo01.m_face1 != null) {
|
||||||
logger.info("BuildStripifyInfo: > 2 triangles on an edge"
|
logger.fine("BuildStripifyInfo: > 2 triangles on an edge"
|
||||||
+ v0 + "," + v1 + "... uncertain consequences\n");
|
+ v0 + "," + v1 + "... uncertain consequences\n");
|
||||||
} else {
|
} else {
|
||||||
edgeInfo01.m_face1 = faceInfo;
|
edgeInfo01.m_face1 = faceInfo;
|
||||||
@ -201,7 +201,7 @@ class Stripifier {
|
|||||||
edgeInfo12.m_face0 = faceInfo;
|
edgeInfo12.m_face0 = faceInfo;
|
||||||
} else {
|
} else {
|
||||||
if (edgeInfo12.m_face1 != null) {
|
if (edgeInfo12.m_face1 != null) {
|
||||||
logger.info("BuildStripifyInfo: > 2 triangles on an edge"
|
logger.fine("BuildStripifyInfo: > 2 triangles on an edge"
|
||||||
+ v1
|
+ v1
|
||||||
+ ","
|
+ ","
|
||||||
+ v2
|
+ v2
|
||||||
@ -230,7 +230,7 @@ class Stripifier {
|
|||||||
edgeInfo20.m_face0 = faceInfo;
|
edgeInfo20.m_face0 = faceInfo;
|
||||||
} else {
|
} else {
|
||||||
if (edgeInfo20.m_face1 != null) {
|
if (edgeInfo20.m_face1 != null) {
|
||||||
logger.info("BuildStripifyInfo: > 2 triangles on an edge"
|
logger.fine("BuildStripifyInfo: > 2 triangles on an edge"
|
||||||
+ v2
|
+ v2
|
||||||
+ ","
|
+ ","
|
||||||
+ v0
|
+ v0
|
||||||
@ -301,22 +301,22 @@ class Stripifier {
|
|||||||
|
|
||||||
if (fv0 != v0 && fv0 != v1) {
|
if (fv0 != v0 && fv0 != v1) {
|
||||||
if ((fv1 != v0 && fv1 != v1) || (fv2 != v0 && fv2 != v1)) {
|
if ((fv1 != v0 && fv1 != v1) || (fv2 != v0 && fv2 != v1)) {
|
||||||
logger.info("GetNextIndex: Triangle doesn't have all of its vertices\n");
|
logger.fine("GetNextIndex: Triangle doesn't have all of its vertices\n");
|
||||||
logger.info("GetNextIndex: Duplicate triangle probably got us derailed\n");
|
logger.fine("GetNextIndex: Duplicate triangle probably got us derailed\n");
|
||||||
}
|
}
|
||||||
return fv0;
|
return fv0;
|
||||||
}
|
}
|
||||||
if (fv1 != v0 && fv1 != v1) {
|
if (fv1 != v0 && fv1 != v1) {
|
||||||
if ((fv0 != v0 && fv0 != v1) || (fv2 != v0 && fv2 != v1)) {
|
if ((fv0 != v0 && fv0 != v1) || (fv2 != v0 && fv2 != v1)) {
|
||||||
logger.info("GetNextIndex: Triangle doesn't have all of its vertices\n");
|
logger.fine("GetNextIndex: Triangle doesn't have all of its vertices\n");
|
||||||
logger.info("GetNextIndex: Duplicate triangle probably got us derailed\n");
|
logger.fine("GetNextIndex: Duplicate triangle probably got us derailed\n");
|
||||||
}
|
}
|
||||||
return fv1;
|
return fv1;
|
||||||
}
|
}
|
||||||
if (fv2 != v0 && fv2 != v1) {
|
if (fv2 != v0 && fv2 != v1) {
|
||||||
if ((fv0 != v0 && fv0 != v1) || (fv1 != v0 && fv1 != v1)) {
|
if ((fv0 != v0 && fv0 != v1) || (fv1 != v0 && fv1 != v1)) {
|
||||||
logger.info("GetNextIndex: Triangle doesn't have all of its vertices\n");
|
logger.fine("GetNextIndex: Triangle doesn't have all of its vertices\n");
|
||||||
logger.info("GetNextIndex: Duplicate triangle probably got us derailed\n");
|
logger.fine("GetNextIndex: Duplicate triangle probably got us derailed\n");
|
||||||
}
|
}
|
||||||
return fv2;
|
return fv2;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user