diff --git a/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java b/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java index b6d0913d1..5700f01cc 100644 --- a/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java +++ b/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java @@ -362,6 +362,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt * @param dialog * @param whichButton */ + @Override public void onClick(DialogInterface dialog, int whichButton) { if (whichButton != -2) { if (app != null) { @@ -473,6 +474,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt handler.setLevel(Level.ALL); } + @Override public void initialize() { app.initialize(); if (handleExitHook) { @@ -488,10 +490,12 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt } } + @Override public void reshape(int width, int height) { app.reshape(width, height); } + @Override public void update() { app.update(); // call to remove the splash screen, if present. @@ -503,10 +507,12 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt } } + @Override public void requestClose(boolean esc) { app.requestClose(esc); } + @Override public void destroy() { if (app != null) { app.destroy(); @@ -516,6 +522,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt } } + @Override public void gainFocus() { logger.fine("gainFocus"); if (view != null) { @@ -547,6 +554,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt } } + @Override public void loseFocus() { logger.fine("loseFocus"); if (app != null) { diff --git a/jme3-android/src/main/java/com/jme3/app/DefaultAndroidProfiler.java b/jme3-android/src/main/java/com/jme3/app/DefaultAndroidProfiler.java index 4faa8aa89..3c4e95bf6 100644 --- a/jme3-android/src/main/java/com/jme3/app/DefaultAndroidProfiler.java +++ b/jme3-android/src/main/java/com/jme3/app/DefaultAndroidProfiler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 jMonkeyEngine + * Copyright (c) 2014-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -82,6 +82,7 @@ import com.jme3.renderer.queue.RenderQueue; public class DefaultAndroidProfiler implements AppProfiler { private int androidApiLevel = Build.VERSION.SDK_INT; + @Override public void appStep(AppStep appStep) { if (androidApiLevel >= 18) { switch(appStep) { @@ -140,6 +141,7 @@ public class DefaultAndroidProfiler implements AppProfiler { } + @Override public void vpStep(VpStep vpStep, ViewPort vp, RenderQueue.Bucket bucket) { if (androidApiLevel >= 18) { switch (vpStep) { diff --git a/jme3-android/src/main/java/com/jme3/app/state/VideoRecorderAppState.java b/jme3-android/src/main/java/com/jme3/app/state/VideoRecorderAppState.java index f89a49879..e8774a3db 100644 --- a/jme3-android/src/main/java/com/jme3/app/state/VideoRecorderAppState.java +++ b/jme3-android/src/main/java/com/jme3/app/state/VideoRecorderAppState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -73,6 +73,7 @@ public class VideoRecorderAppState extends AbstractAppState { private Application app; private ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactory() { + @Override public Thread newThread(Runnable r) { Thread th = new Thread(r); th.setName("jME3 Video Processor"); @@ -239,6 +240,7 @@ public class VideoRecorderAppState extends AbstractAppState { renderer.readFrameBufferWithFormat(out, item.buffer, Image.Format.BGRA8); executor.submit(new Callable() { + @Override public Void call() throws Exception { if (fastMode) { item.data = item.buffer.array(); @@ -260,6 +262,7 @@ public class VideoRecorderAppState extends AbstractAppState { } } + @Override public void initialize(RenderManager rm, ViewPort viewPort) { logger.log(Level.INFO, "initialize in VideoProcessor"); this.camera = viewPort.getCamera(); @@ -275,13 +278,16 @@ public class VideoRecorderAppState extends AbstractAppState { } } + @Override public void reshape(ViewPort vp, int w, int h) { } + @Override public boolean isInitialized() { return this.isInitilized; } + @Override public void preFrame(float tpf) { if (null == writer) { try { @@ -292,14 +298,17 @@ public class VideoRecorderAppState extends AbstractAppState { } } + @Override public void postQueue(RenderQueue rq) { } + @Override public void postFrame(FrameBuffer out) { numFrames++; addImage(renderManager.getRenderer(), out); } + @Override public void cleanup() { logger.log(Level.INFO, "cleanup in VideoProcessor"); logger.log(Level.INFO, "VideoProcessor numFrames: {0}", numFrames); @@ -332,22 +341,27 @@ public class VideoRecorderAppState extends AbstractAppState { this.ticks = 0; } + @Override public long getTime() { return (long) (this.ticks * (1.0f / this.framerate) * 1000f); } + @Override public long getResolution() { return 1000L; } + @Override public float getFrameRate() { return this.framerate; } + @Override public float getTimePerFrame() { return (float) (1.0f / this.framerate); } + @Override public void update() { long time = System.currentTimeMillis(); long difference = time - lastTime; @@ -364,6 +378,7 @@ public class VideoRecorderAppState extends AbstractAppState { this.ticks++; } + @Override public void reset() { this.ticks = 0; } diff --git a/jme3-android/src/main/java/com/jme3/asset/plugins/AndroidLocator.java b/jme3-android/src/main/java/com/jme3/asset/plugins/AndroidLocator.java index 7c7200bb9..6beeac256 100644 --- a/jme3-android/src/main/java/com/jme3/asset/plugins/AndroidLocator.java +++ b/jme3-android/src/main/java/com/jme3/asset/plugins/AndroidLocator.java @@ -17,6 +17,7 @@ public class AndroidLocator implements AssetLocator { public AndroidLocator() { } + @Override public void setRootPath(String rootPath) { this.rootPath = rootPath; } diff --git a/jme3-android/src/main/java/com/jme3/audio/android/AndroidAL.java b/jme3-android/src/main/java/com/jme3/audio/android/AndroidAL.java index 2a0634c91..3dc8b4bbb 100644 --- a/jme3-android/src/main/java/com/jme3/audio/android/AndroidAL.java +++ b/jme3-android/src/main/java/com/jme3/audio/android/AndroidAL.java @@ -10,44 +10,64 @@ public final class AndroidAL implements AL { public AndroidAL() { } + @Override public native String alGetString(int parameter); + @Override public native int alGenSources(); + @Override public native int alGetError(); + @Override public native void alDeleteSources(int numSources, IntBuffer sources); + @Override public native void alGenBuffers(int numBuffers, IntBuffer buffers); + @Override public native void alDeleteBuffers(int numBuffers, IntBuffer buffers); + @Override public native void alSourceStop(int source); + @Override public native void alSourcei(int source, int param, int value); + @Override public native void alBufferData(int buffer, int format, ByteBuffer data, int size, int frequency); + @Override public native void alSourcePlay(int source); + @Override public native void alSourcePause(int source); + @Override public native void alSourcef(int source, int param, float value); + @Override public native void alSource3f(int source, int param, float value1, float value2, float value3); + @Override public native int alGetSourcei(int source, int param); + @Override public native void alSourceUnqueueBuffers(int source, int numBuffers, IntBuffer buffers); + @Override public native void alSourceQueueBuffers(int source, int numBuffers, IntBuffer buffers); + @Override public native void alListener(int param, FloatBuffer data); + @Override public native void alListenerf(int param, float value); + @Override public native void alListener3f(int param, float value1, float value2, float value3); + @Override public native void alSource3i(int source, int param, int value1, int value2, int value3); } diff --git a/jme3-android/src/main/java/com/jme3/audio/android/AndroidALC.java b/jme3-android/src/main/java/com/jme3/audio/android/AndroidALC.java index a2f0a4eb6..f05cfd03d 100644 --- a/jme3-android/src/main/java/com/jme3/audio/android/AndroidALC.java +++ b/jme3-android/src/main/java/com/jme3/audio/android/AndroidALC.java @@ -12,19 +12,27 @@ public final class AndroidALC implements ALC { public AndroidALC() { } + @Override public native void createALC(); + @Override public native void destroyALC(); + @Override public native boolean isCreated(); + @Override public native String alcGetString(int parameter); + @Override public native boolean alcIsExtensionPresent(String extension); + @Override public native void alcGetInteger(int param, IntBuffer buffer, int size); + @Override public native void alcDevicePauseSOFT(); + @Override public native void alcDeviceResumeSOFT(); } diff --git a/jme3-android/src/main/java/com/jme3/audio/android/AndroidEFX.java b/jme3-android/src/main/java/com/jme3/audio/android/AndroidEFX.java index 271d2d507..3fa6e5e6a 100644 --- a/jme3-android/src/main/java/com/jme3/audio/android/AndroidEFX.java +++ b/jme3-android/src/main/java/com/jme3/audio/android/AndroidEFX.java @@ -8,25 +8,36 @@ public class AndroidEFX implements EFX { public AndroidEFX() { } + @Override public native void alGenAuxiliaryEffectSlots(int numSlots, IntBuffer buffers); + @Override public native void alGenEffects(int numEffects, IntBuffer buffers); + @Override public native void alEffecti(int effect, int param, int value); + @Override public native void alAuxiliaryEffectSloti(int effectSlot, int param, int value); + @Override public native void alDeleteEffects(int numEffects, IntBuffer buffers); + @Override public native void alDeleteAuxiliaryEffectSlots(int numEffectSlots, IntBuffer buffers); + @Override public native void alGenFilters(int numFilters, IntBuffer buffers); + @Override public native void alFilteri(int filter, int param, int value); + @Override public native void alFilterf(int filter, int param, float value); + @Override public native void alDeleteFilters(int numFilters, IntBuffer buffers); + @Override public native void alEffectf(int effect, int param, float value); } diff --git a/jme3-android/src/main/java/com/jme3/audio/plugins/NativeVorbisLoader.java b/jme3-android/src/main/java/com/jme3/audio/plugins/NativeVorbisLoader.java index c4daf9d7b..3093b0d4b 100644 --- a/jme3-android/src/main/java/com/jme3/audio/plugins/NativeVorbisLoader.java +++ b/jme3-android/src/main/java/com/jme3/audio/plugins/NativeVorbisLoader.java @@ -46,6 +46,7 @@ public class NativeVorbisLoader implements AssetLoader { throw new IOException("Not supported for audio streams"); } + @Override public void setTime(float time) { try { file.seekTime(time); diff --git a/jme3-android/src/main/java/com/jme3/renderer/android/AndroidGL.java b/jme3-android/src/main/java/com/jme3/renderer/android/AndroidGL.java index ced4260ea..f2a99d10c 100644 --- a/jme3-android/src/main/java/com/jme3/renderer/android/AndroidGL.java +++ b/jme3-android/src/main/java/com/jme3/renderer/android/AndroidGL.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2015 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,7 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo { IntBuffer tmpBuff = BufferUtils.createIntBuffer(1); + @Override public void resetStats() { } @@ -86,10 +87,12 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo { } } + @Override public void glActiveTexture(int texture) { GLES20.glActiveTexture(texture); } + @Override public void glAttachShader(int program, int shader) { GLES20.glAttachShader(program, shader); } @@ -99,144 +102,179 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo { GLES30.glBeginQuery(target, query); } + @Override public void glBindBuffer(int target, int buffer) { GLES20.glBindBuffer(target, buffer); } + @Override public void glBindTexture(int target, int texture) { GLES20.glBindTexture(target, texture); } + @Override public void glBlendFunc(int sfactor, int dfactor) { GLES20.glBlendFunc(sfactor, dfactor); } + @Override public void glBlendFuncSeparate(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha) { GLES20.glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); } + @Override public void glBufferData(int target, FloatBuffer data, int usage) { GLES20.glBufferData(target, getLimitBytes(data), data, usage); } + @Override public void glBufferData(int target, ShortBuffer data, int usage) { GLES20.glBufferData(target, getLimitBytes(data), data, usage); } + @Override public void glBufferData(int target, ByteBuffer data, int usage) { GLES20.glBufferData(target, getLimitBytes(data), data, usage); } + @Override public void glBufferData(int target, long data_size, int usage) { GLES20.glBufferData(target, (int) data_size, null, usage); } + @Override public void glBufferSubData(int target, long offset, FloatBuffer data) { GLES20.glBufferSubData(target, (int) offset, getLimitBytes(data), data); } + @Override public void glBufferSubData(int target, long offset, ShortBuffer data) { GLES20.glBufferSubData(target, (int) offset, getLimitBytes(data), data); } + @Override public void glBufferSubData(int target, long offset, ByteBuffer data) { GLES20.glBufferSubData(target, (int) offset, getLimitBytes(data), data); } + @Override public void glGetBufferSubData(int target, long offset, ByteBuffer data) { throw new UnsupportedOperationException("OpenGL ES 2 does not support glGetBufferSubData"); } + @Override public void glClear(int mask) { GLES20.glClear(mask); } + @Override public void glClearColor(float red, float green, float blue, float alpha) { GLES20.glClearColor(red, green, blue, alpha); } + @Override public void glColorMask(boolean red, boolean green, boolean blue, boolean alpha) { GLES20.glColorMask(red, green, blue, alpha); } + @Override public void glCompileShader(int shader) { GLES20.glCompileShader(shader); } + @Override public void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, ByteBuffer data) { GLES20.glCompressedTexImage2D(target, level, internalformat, width, height, 0, getLimitBytes(data), data); } + @Override public void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, ByteBuffer data) { GLES20.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, getLimitBytes(data), data); } + @Override public int glCreateProgram() { return GLES20.glCreateProgram(); } + @Override public int glCreateShader(int shaderType) { return GLES20.glCreateShader(shaderType); } + @Override public void glCullFace(int mode) { GLES20.glCullFace(mode); } + @Override public void glDeleteBuffers(IntBuffer buffers) { checkLimit(buffers); GLES20.glDeleteBuffers(buffers.limit(), buffers); } + @Override public void glDeleteProgram(int program) { GLES20.glDeleteProgram(program); } + @Override public void glDeleteShader(int shader) { GLES20.glDeleteShader(shader); } + @Override public void glDeleteTextures(IntBuffer textures) { checkLimit(textures); GLES20.glDeleteTextures(textures.limit(), textures); } + @Override public void glDepthFunc(int func) { GLES20.glDepthFunc(func); } + @Override public void glDepthMask(boolean flag) { GLES20.glDepthMask(flag); } + @Override public void glDepthRange(double nearVal, double farVal) { GLES20.glDepthRangef((float)nearVal, (float)farVal); } + @Override public void glDetachShader(int program, int shader) { GLES20.glDetachShader(program, shader); } + @Override public void glDisable(int cap) { GLES20.glDisable(cap); } + @Override public void glDisableVertexAttribArray(int index) { GLES20.glDisableVertexAttribArray(index); } + @Override public void glDrawArrays(int mode, int first, int count) { GLES20.glDrawArrays(mode, first, count); } + @Override public void glDrawRangeElements(int mode, int start, int end, int count, int type, long indices) { GLES20.glDrawElements(mode, count, type, (int)indices); } + @Override public void glEnable(int cap) { GLES20.glEnable(cap); } + @Override public void glEnableVertexAttribArray(int index) { GLES20.glEnableVertexAttribArray(index); } @@ -246,11 +284,13 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo { GLES30.glEndQuery(target); } + @Override public void glGenBuffers(IntBuffer buffers) { checkLimit(buffers); GLES20.glGenBuffers(buffers.limit(), buffers); } + @Override public void glGenTextures(IntBuffer textures) { checkLimit(textures); GLES20.glGenTextures(textures.limit(), textures); @@ -261,29 +301,35 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo { GLES30.glGenQueries(num, buff); } + @Override public int glGetAttribLocation(int program, String name) { return GLES20.glGetAttribLocation(program, name); } + @Override public void glGetBoolean(int pname, ByteBuffer params) { // GLES20.glGetBoolean(pname, params); throw new UnsupportedOperationException("Today is not a good day for this"); } + @Override public int glGetError() { return GLES20.glGetError(); } + @Override public void glGetInteger(int pname, IntBuffer params) { checkLimit(params); GLES20.glGetIntegerv(pname, params); } + @Override public void glGetProgram(int program, int pname, IntBuffer params) { checkLimit(params); GLES20.glGetProgramiv(program, pname, params); } + @Override public String glGetProgramInfoLog(int program, int maxLength) { return GLES20.glGetProgramInfoLog(program); } @@ -303,51 +349,63 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo { return buff.get(0); } + @Override public void glGetShader(int shader, int pname, IntBuffer params) { checkLimit(params); GLES20.glGetShaderiv(shader, pname, params); } + @Override public String glGetShaderInfoLog(int shader, int maxLength) { return GLES20.glGetShaderInfoLog(shader); } + @Override public String glGetString(int name) { return GLES20.glGetString(name); } + @Override public int glGetUniformLocation(int program, String name) { return GLES20.glGetUniformLocation(program, name); } + @Override public boolean glIsEnabled(int cap) { return GLES20.glIsEnabled(cap); } + @Override public void glLineWidth(float width) { GLES20.glLineWidth(width); } + @Override public void glLinkProgram(int program) { GLES20.glLinkProgram(program); } + @Override public void glPixelStorei(int pname, int param) { GLES20.glPixelStorei(pname, param); } + @Override public void glPolygonOffset(float factor, float units) { GLES20.glPolygonOffset(factor, units); } + @Override public void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer data) { GLES20.glReadPixels(x, y, width, height, format, type, data); } + @Override public void glScissor(int x, int y, int width, int height) { GLES20.glScissor(x, y, width, height); } + @Override public void glShaderSource(int shader, String[] string, IntBuffer length) { if (string.length != 1) { throw new UnsupportedOperationException("Today is not a good day"); @@ -355,186 +413,231 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo { GLES20.glShaderSource(shader, string[0]); } + @Override public void glStencilFuncSeparate(int face, int func, int ref, int mask) { GLES20.glStencilFuncSeparate(face, func, ref, mask); } + @Override public void glStencilOpSeparate(int face, int sfail, int dpfail, int dppass) { GLES20.glStencilOpSeparate(face, sfail, dpfail, dppass); } + @Override public void glTexImage2D(int target, int level, int internalFormat, int width, int height, int border, int format, int type, ByteBuffer data) { GLES20.glTexImage2D(target, level, internalFormat, width, height, 0, format, type, data); } + @Override public void glTexParameterf(int target, int pname, float param) { GLES20.glTexParameterf(target, pname, param); } + @Override public void glTexParameteri(int target, int pname, int param) { GLES20.glTexParameteri(target, pname, param); } + @Override public void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer data) { GLES20.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, data); } + @Override public void glUniform1(int location, FloatBuffer value) { GLES20.glUniform1fv(location, getLimitCount(value, 1), value); } + @Override public void glUniform1(int location, IntBuffer value) { GLES20.glUniform1iv(location, getLimitCount(value, 1), value); } + @Override public void glUniform1f(int location, float v0) { GLES20.glUniform1f(location, v0); } + @Override public void glUniform1i(int location, int v0) { GLES20.glUniform1i(location, v0); } + @Override public void glUniform2(int location, IntBuffer value) { GLES20.glUniform2iv(location, getLimitCount(value, 2), value); } + @Override public void glUniform2(int location, FloatBuffer value) { GLES20.glUniform2fv(location, getLimitCount(value, 2), value); } + @Override public void glUniform2f(int location, float v0, float v1) { GLES20.glUniform2f(location, v0, v1); } + @Override public void glUniform3(int location, IntBuffer value) { GLES20.glUniform3iv(location, getLimitCount(value, 3), value); } + @Override public void glUniform3(int location, FloatBuffer value) { GLES20.glUniform3fv(location, getLimitCount(value, 3), value); } + @Override public void glUniform3f(int location, float v0, float v1, float v2) { GLES20.glUniform3f(location, v0, v1, v2); } + @Override public void glUniform4(int location, FloatBuffer value) { GLES20.glUniform4fv(location, getLimitCount(value, 4), value); } + @Override public void glUniform4(int location, IntBuffer value) { GLES20.glUniform4iv(location, getLimitCount(value, 4), value); } + @Override public void glUniform4f(int location, float v0, float v1, float v2, float v3) { GLES20.glUniform4f(location, v0, v1, v2, v3); } + @Override public void glUniformMatrix3(int location, boolean transpose, FloatBuffer value) { GLES20.glUniformMatrix3fv(location, getLimitCount(value, 3 * 3), transpose, value); } + @Override public void glUniformMatrix4(int location, boolean transpose, FloatBuffer value) { GLES20.glUniformMatrix4fv(location, getLimitCount(value, 4 * 4), transpose, value); } + @Override public void glUseProgram(int program) { GLES20.glUseProgram(program); } + @Override public void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, long pointer) { GLES20.glVertexAttribPointer(index, size, type, normalized, stride, (int)pointer); } + @Override public void glViewport(int x, int y, int width, int height) { GLES20.glViewport(x, y, width, height); } + @Override public void glBlitFramebufferEXT(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) { GLES30.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } + @Override public void glBufferData(int target, IntBuffer data, int usage) { GLES20.glBufferData(target, getLimitBytes(data), data, usage); } + @Override public void glBufferSubData(int target, long offset, IntBuffer data) { GLES20.glBufferSubData(target, (int)offset, getLimitBytes(data), data); } + @Override public void glDrawArraysInstancedARB(int mode, int first, int count, int primcount) { GLES30.glDrawArraysInstanced(mode, first, count, primcount); } + @Override public void glDrawBuffers(IntBuffer bufs) { GLES30.glDrawBuffers(bufs.limit(), bufs); } + @Override public void glDrawElementsInstancedARB(int mode, int indices_count, int type, long indices_buffer_offset, int primcount) { GLES30.glDrawElementsInstanced(mode, indices_count, type, (int)indices_buffer_offset, primcount); } + @Override public void glGetMultisample(int pname, int index, FloatBuffer val) { GLES31.glGetMultisamplefv(pname, index, val); } + @Override public void glRenderbufferStorageMultisampleEXT(int target, int samples, int internalformat, int width, int height) { GLES30.glRenderbufferStorageMultisample(target, samples, internalformat, width, height); } + @Override public void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height, boolean fixedsamplelocations) { GLES31.glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); } + @Override public void glVertexAttribDivisorARB(int index, int divisor) { GLES30.glVertexAttribDivisor(index, divisor); } + @Override public void glBindFramebufferEXT(int param1, int param2) { GLES20.glBindFramebuffer(param1, param2); } + @Override public void glBindRenderbufferEXT(int param1, int param2) { GLES20.glBindRenderbuffer(param1, param2); } + @Override public int glCheckFramebufferStatusEXT(int param1) { return GLES20.glCheckFramebufferStatus(param1); } + @Override public void glDeleteFramebuffersEXT(IntBuffer param1) { checkLimit(param1); GLES20.glDeleteFramebuffers(param1.limit(), param1); } + @Override public void glDeleteRenderbuffersEXT(IntBuffer param1) { checkLimit(param1); GLES20.glDeleteRenderbuffers(param1.limit(), param1); } + @Override public void glFramebufferRenderbufferEXT(int param1, int param2, int param3, int param4) { GLES20.glFramebufferRenderbuffer(param1, param2, param3, param4); } + @Override public void glFramebufferTexture2DEXT(int param1, int param2, int param3, int param4, int param5) { GLES20.glFramebufferTexture2D(param1, param2, param3, param4, param5); } + @Override public void glGenFramebuffersEXT(IntBuffer param1) { checkLimit(param1); GLES20.glGenFramebuffers(param1.limit(), param1); } + @Override public void glGenRenderbuffersEXT(IntBuffer param1) { checkLimit(param1); GLES20.glGenRenderbuffers(param1.limit(), param1); } + @Override public void glGenerateMipmapEXT(int param1) { GLES20.glGenerateMipmap(param1); } + @Override public void glRenderbufferStorageEXT(int param1, int param2, int param3, int param4) { GLES20.glRenderbufferStorage(param1, param2, param3, param4); } @@ -570,16 +673,20 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo { GLES30.glFramebufferTextureLayer(target, attachment, texture, level, layer); } + @Override public void glAlphaFunc(int func, float ref) { } + @Override public void glPointSize(float size) { } + @Override public void glPolygonMode(int face, int mode) { } // Wrapper to DrawBuffers as there's no DrawBuffer method in GLES + @Override public void glDrawBuffer(int mode) { tmpBuff.clear(); tmpBuff.put(0, mode); @@ -587,25 +694,30 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo { glDrawBuffers(tmpBuff); } + @Override public void glReadBuffer(int mode) { GLES30.glReadBuffer(mode); } + @Override public void glCompressedTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, ByteBuffer data) { GLES30.glCompressedTexImage3D(target, level, internalFormat, width, height, depth, border, getLimitBytes(data), data); } + @Override public void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, ByteBuffer data) { GLES30.glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, getLimitBytes(data), data); } + @Override public void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ByteBuffer data) { GLES30.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, data); } + @Override public void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ByteBuffer data) { GLES30.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); diff --git a/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java b/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java index efaf4f3bb..260aa4662 100644 --- a/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java +++ b/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java @@ -204,6 +204,7 @@ public class JmeAndroidSystem extends JmeSystemDelegate { public void showSoftKeyboard(final boolean show) { view.getHandler().post(new Runnable() { + @Override public void run() { InputMethodManager manager = (InputMethodManager)view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); diff --git a/jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java b/jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java index 7ea954eac..bb64a6849 100644 --- a/jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java +++ b/jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -202,6 +202,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex // Setup unhandled Exception Handler Thread.currentThread().setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { + @Override public void uncaughtException(Thread thread, Throwable thrown) { listener.handleError("Exception thrown in " + thread.toString(), thrown); } @@ -414,6 +415,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex } } + @Override public void requestDialog(final int id, final String title, final String initialValue, final SoftTextDialogInputListener listener) { logger.log(Level.FINE, "requestDialog: title: {0}, initialValue: {1}", new Object[]{title, initialValue}); @@ -457,6 +459,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex AlertDialog dialogTextInput = new AlertDialog.Builder(view.getContext()).setTitle(title).setView(layoutTextDialogInput).setPositiveButton("OK", new DialogInterface.OnClickListener() { + @Override public void onClick(DialogInterface dialog, int whichButton) { /* User clicked OK, send COMPLETE action * and text */ @@ -464,6 +467,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex } }).setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + @Override public void onClick(DialogInterface dialog, int whichButton) { /* User clicked CANCEL, send CANCEL action * and text */ diff --git a/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidBufferImageLoader.java b/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidBufferImageLoader.java index bf2abb7a4..1ee3d3a80 100644 --- a/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidBufferImageLoader.java +++ b/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidBufferImageLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2014 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -67,6 +67,7 @@ public class AndroidBufferImageLoader implements AssetLoader { } } + @Override public Object load(AssetInfo assetInfo) throws IOException { Bitmap bitmap = null; Image.Format format; diff --git a/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java b/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java index 7267d3501..af08dc4da 100644 --- a/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java +++ b/jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java @@ -25,6 +25,7 @@ public class AndroidNativeImageLoader implements AssetLoader { private static native Image load(InputStream in, boolean flipY, byte[] tmpArray) throws IOException; + @Override public Image load(AssetInfo info) throws IOException { boolean flip = ((TextureKey) info.getKey()).isFlipY(); InputStream in = null; diff --git a/jme3-android/src/main/java/com/jme3/util/RingBuffer.java b/jme3-android/src/main/java/com/jme3/util/RingBuffer.java index 1d3c22d7e..f4b50c24d 100644 --- a/jme3-android/src/main/java/com/jme3/util/RingBuffer.java +++ b/jme3-android/src/main/java/com/jme3/util/RingBuffer.java @@ -49,6 +49,7 @@ public class RingBuffer implements Iterable { return item; } + @Override public Iterator iterator() { return new RingBufferIterator(); } @@ -58,14 +59,17 @@ public class RingBuffer implements Iterable { private int i = 0; + @Override public boolean hasNext() { return i < count; } + @Override public void remove() { throw new UnsupportedOperationException(); } + @Override public T next() { if (!hasNext()) { throw new NoSuchElementException(); diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/materials/MaterialHelper.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/materials/MaterialHelper.java index 885c5850e..50aa6275e 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/materials/MaterialHelper.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/materials/MaterialHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -100,9 +100,11 @@ public class MaterialHelper extends AbstractBlenderHelper { super(blenderVersion, blenderContext); // setting alpha masks alphaMasks.put(ALPHA_MASK_NONE, new IAlphaMask() { + @Override public void setImageSize(int width, int height) { } + @Override public byte getAlpha(float x, float y) { return (byte) 255; } @@ -111,11 +113,13 @@ public class MaterialHelper extends AbstractBlenderHelper { private float r; private float[] center; + @Override public void setImageSize(int width, int height) { r = Math.min(width, height) * 0.5f; center = new float[] { width * 0.5f, height * 0.5f }; } + @Override public byte getAlpha(float x, float y) { float d = FastMath.abs(FastMath.sqrt((x - center[0]) * (x - center[0]) + (y - center[1]) * (y - center[1]))); return (byte) (d >= r ? 0 : 255); @@ -125,11 +129,13 @@ public class MaterialHelper extends AbstractBlenderHelper { private float r; private float[] center; + @Override public void setImageSize(int width, int height) { r = Math.min(width, height) * 0.5f; center = new float[] { width * 0.5f, height * 0.5f }; } + @Override public byte getAlpha(float x, float y) { float d = FastMath.abs(FastMath.sqrt((x - center[0]) * (x - center[0]) + (y - center[1]) * (y - center[1]))); return (byte) (d >= r ? 0 : -255.0f * d / r + 255.0f); @@ -139,11 +145,13 @@ public class MaterialHelper extends AbstractBlenderHelper { private float r; private float[] center; + @Override public void setImageSize(int width, int height) { r = Math.min(width, height) * 0.5f; center = new float[] { width * 0.5f, height * 0.5f }; } + @Override public byte getAlpha(float x, float y) { float d = FastMath.abs(FastMath.sqrt((x - center[0]) * (x - center[0]) + (y - center[1]) * (y - center[1]))) / r; return d >= 1.0f ? 0 : (byte) ((-FastMath.sqrt((2.0f - d) * d) + 1.0f) * 255.0f); diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/DQuaternion.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/DQuaternion.java index 9739ccd4b..11715434d 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/DQuaternion.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/DQuaternion.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -554,6 +554,7 @@ public final class DQuaternion implements Savable, Cloneable, java.io.Serializab } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule cap = e.getCapsule(this); cap.write(x, "x", 0); @@ -562,6 +563,7 @@ public final class DQuaternion implements Savable, Cloneable, java.io.Serializab cap.write(w, "w", 1); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule cap = e.getCapsule(this); x = cap.readFloat("x", 0); diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/DTransform.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/DTransform.java index 28fcda0c7..ea2440e58 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/DTransform.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/DTransform.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -158,6 +158,7 @@ public final class DTransform implements Savable, Cloneable, java.io.Serializabl return this.getClass().getSimpleName() + "[ " + translation.x + ", " + translation.y + ", " + translation.z + "]\n" + "[ " + rotation.x + ", " + rotation.y + ", " + rotation.z + ", " + rotation.w + "]\n" + "[ " + scale.x + " , " + scale.y + ", " + scale.z + "]"; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(rotation, "rot", new DQuaternion()); @@ -165,6 +166,7 @@ public final class DTransform implements Savable, Cloneable, java.io.Serializabl capsule.write(scale, "scale", Vector3d.UNIT_XYZ); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/Vector3d.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/Vector3d.java index 92453cfa3..ed3fca0f6 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/Vector3d.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/math/Vector3d.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -851,6 +851,7 @@ public final class Vector3d implements Savable, Cloneable, Serializable { return "(" + x + ", " + y + ", " + z + ")"; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(x, "x", 0); @@ -858,6 +859,7 @@ public final class Vector3d implements Savable, Cloneable, Serializable { capsule.write(z, "z", 0); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); x = capsule.readDouble("x", 0); diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/GeneratedTexture.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/GeneratedTexture.java index 772db0c3c..2eb5430e5 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/GeneratedTexture.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/GeneratedTexture.java @@ -160,6 +160,7 @@ import com.jme3.util.TempVars; Vector3f[] uvsArray = uvs.toArray(new Vector3f[uvs.size()]); BoundingBox boundingBox = UVCoordinatesGenerator.getBoundingBox(geometries); Set triangleTextureElements = new TreeSet(new Comparator() { + @Override public int compare(TriangleTextureElement o1, TriangleTextureElement o2) { return o1.faceIndex - o2.faceIndex; } diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/TriangulatedTexture.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/TriangulatedTexture.java index 9a4889109..bb63f37cc 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/TriangulatedTexture.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/TriangulatedTexture.java @@ -70,6 +70,7 @@ import com.jme3.util.BufferUtils; public TriangulatedTexture(Texture2D texture2d, List uvs, BlenderContext blenderContext) { maxTextureSize = blenderContext.getBlenderKey().getMaxTextureSize(); faceTextures = new TreeSet(new Comparator() { + @Override public int compare(TriangleTextureElement o1, TriangleTextureElement o2) { return o1.faceIndex - o2.faceIndex; } @@ -184,6 +185,7 @@ import com.jme3.util.BufferUtils; // sorting the parts by their height (from highest to the lowest) List list = new ArrayList(faceTextures); Collections.sort(list, new Comparator() { + @Override public int compare(TriangleTextureElement o1, TriangleTextureElement o2) { return o2.image.getHeight() - o1.image.getHeight(); } diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/AbstractTextureBlender.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/AbstractTextureBlender.java index 8ff55baac..d1e0e31ae 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/AbstractTextureBlender.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/AbstractTextureBlender.java @@ -103,6 +103,7 @@ import com.jme3.texture.Image; } } + @Override public void copyBlendingData(TextureBlender textureBlender) { if (textureBlender instanceof AbstractTextureBlender) { flag = ((AbstractTextureBlender) textureBlender).flag; diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderLuminance.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderLuminance.java index 1f2ae01e1..24349c809 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderLuminance.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderLuminance.java @@ -43,6 +43,7 @@ public class TextureBlenderLuminance extends AbstractTextureBlender { super(flag, negateTexture, blendType, materialColor, color, blendFactor); } + @Override public Image blend(Image image, Image baseImage, BlenderContext blenderContext) { this.prepareImagesForBlending(image, baseImage); diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/NoiseGenerator.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/NoiseGenerator.java index f3b1c30b9..a600ff075 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/NoiseGenerator.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/NoiseGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -109,30 +109,36 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra static { noiseFunctions.put(Integer.valueOf(0), new NoiseFunction() { // originalBlenderNoise + @Override public float execute(float x, float y, float z) { return NoiseFunctions.originalBlenderNoise(x, y, z); } + @Override public float executeSigned(float x, float y, float z) { return 2.0f * NoiseFunctions.originalBlenderNoise(x, y, z) - 1.0f; } }); noiseFunctions.put(Integer.valueOf(1), new NoiseFunction() { // orgPerlinNoise + @Override public float execute(float x, float y, float z) { return 0.5f + 0.5f * NoiseFunctions.noise3Perlin(x, y, z); } + @Override public float executeSigned(float x, float y, float z) { return NoiseFunctions.noise3Perlin(x, y, z); } }); noiseFunctions.put(Integer.valueOf(2), new NoiseFunction() { // newPerlin + @Override public float execute(float x, float y, float z) { return 0.5f + 0.5f * NoiseFunctions.newPerlin(x, y, z); } + @Override public float executeSigned(float x, float y, float z) { return this.execute(x, y, z); } @@ -142,11 +148,13 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra private final float[] pa = new float[12]; // voronoi_F1 + @Override public float execute(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return da[0]; } + @Override public float executeSigned(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return 2.0f * da[0] - 1.0f; @@ -157,11 +165,13 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra private final float[] pa = new float[12]; // voronoi_F2 + @Override public float execute(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return da[1]; } + @Override public float executeSigned(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return 2.0f * da[1] - 1.0f; @@ -172,11 +182,13 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra private final float[] pa = new float[12]; // voronoi_F3 + @Override public float execute(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return da[2]; } + @Override public float executeSigned(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return 2.0f * da[2] - 1.0f; @@ -187,11 +199,13 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra private final float[] pa = new float[12]; // voronoi_F4 + @Override public float execute(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return da[3]; } + @Override public float executeSigned(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return 2.0f * da[3] - 1.0f; @@ -202,11 +216,13 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra private final float[] pa = new float[12]; // voronoi_F1F2 + @Override public float execute(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return da[1] - da[0]; } + @Override public float executeSigned(float x, float y, float z) { NoiseFunctions.voronoi(x, y, z, da, pa, 1, NATURAL_DISTANCE_FUNCTION); return 2.0f * (da[1] - da[0]) - 1.0f; @@ -216,11 +232,13 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra private final NoiseFunction voronoiF1F2NoiseFunction = noiseFunctions.get(Integer.valueOf(7)); // voronoi_Cr + @Override public float execute(float x, float y, float z) { float t = 10 * voronoiF1F2NoiseFunction.execute(x, y, z); return t > 1.0f ? 1.0f : t; } + @Override public float executeSigned(float x, float y, float z) { float t = 10.0f * voronoiF1F2NoiseFunction.execute(x, y, z); return t > 1.0f ? 1.0f : 2.0f * t - 1.0f; @@ -228,6 +246,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra }); noiseFunctions.put(Integer.valueOf(14), new NoiseFunction() { // cellNoise + @Override public float execute(float x, float y, float z) { int xi = (int) FastMath.floor(x); int yi = (int) FastMath.floor(y); @@ -237,6 +256,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra return (n * (n * n * 15731 + 789221) + 1376312589) / 4294967296.0f; } + @Override public float executeSigned(float x, float y, float z) { return 2.0f * this.execute(x, y, z) - 1.0f; } @@ -248,24 +268,28 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra static { distanceFunctions.put(Integer.valueOf(0), new DistanceFunction() { // real distance + @Override public float execute(float x, float y, float z, float e) { return (float) Math.sqrt(x * x + y * y + z * z); } }); distanceFunctions.put(Integer.valueOf(1), new DistanceFunction() { // distance squared + @Override public float execute(float x, float y, float z, float e) { return x * x + y * y + z * z; } }); distanceFunctions.put(Integer.valueOf(2), new DistanceFunction() { // manhattan/taxicab/cityblock distance + @Override public float execute(float x, float y, float z, float e) { return FastMath.abs(x) + FastMath.abs(y) + FastMath.abs(z); } }); distanceFunctions.put(Integer.valueOf(3), new DistanceFunction() { // Chebychev + @Override public float execute(float x, float y, float z, float e) { x = FastMath.abs(x); y = FastMath.abs(y); @@ -276,6 +300,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra }); distanceFunctions.put(Integer.valueOf(4), new DistanceFunction() { // Minkovsky, preset exponent 0.5 (MinkovskyH) + @Override public float execute(float x, float y, float z, float e) { float d = (float) (Math.sqrt(FastMath.abs(x)) + Math.sqrt(FastMath.abs(y)) + Math.sqrt(FastMath.abs(z))); return d * d; @@ -283,6 +308,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra }); distanceFunctions.put(Integer.valueOf(5), new DistanceFunction() { // Minkovsky, preset exponent 0.25 (Minkovsky4) + @Override public float execute(float x, float y, float z, float e) { x *= x; y *= y; @@ -292,6 +318,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra }); distanceFunctions.put(Integer.valueOf(6), new DistanceFunction() { // Minkovsky, general case + @Override public float execute(float x, float y, float z, float e) { return (float) Math.pow(Math.pow(FastMath.abs(x), e) + Math.pow(FastMath.abs(y), e) + Math.pow(FastMath.abs(z), e), 1.0f / e); } @@ -303,6 +330,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra static { musgraveFunctions.put(Integer.valueOf(TEX_MFRACTAL), new MusgraveFunction() { + @Override public float execute(MusgraveData musgraveData, float x, float y, float z) { float rmd, value = 1.0f, pwr = 1.0f, pwHL = (float) Math.pow(musgraveData.lacunarity, -musgraveData.h); @@ -322,6 +350,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra }); musgraveFunctions.put(Integer.valueOf(TEX_RIDGEDMF), new MusgraveFunction() { + @Override public float execute(MusgraveData musgraveData, float x, float y, float z) { float result, signal, weight; float pwHL = (float) Math.pow(musgraveData.lacunarity, -musgraveData.h); @@ -353,6 +382,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra }); musgraveFunctions.put(Integer.valueOf(TEX_HYBRIDMF), new MusgraveFunction() { + @Override public float execute(MusgraveData musgraveData, float x, float y, float z) { float result, signal, weight, rmd; float pwHL = (float) Math.pow(musgraveData.lacunarity, -musgraveData.h); @@ -386,6 +416,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra }); musgraveFunctions.put(Integer.valueOf(TEX_FBM), new MusgraveFunction() { + @Override public float execute(MusgraveData musgraveData, float x, float y, float z) { float rmd, value = 0.0f, pwr = 1.0f, pwHL = (float) Math.pow(musgraveData.lacunarity, -musgraveData.h); @@ -406,6 +437,7 @@ import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgra }); musgraveFunctions.put(Integer.valueOf(TEX_HTERRAIN), new MusgraveFunction() { + @Override public float execute(MusgraveData musgraveData, float x, float y, float z) { float value, increment, rmd; float pwHL = (float) Math.pow(musgraveData.lacunarity, -musgraveData.h); diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorBlend.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorBlend.java index eabe6fa74..f822e5427 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorBlend.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorBlend.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,17 +46,20 @@ public final class TextureGeneratorBlend extends TextureGenerator { private static final IntensityFunction INTENSITY_FUNCTION[] = new IntensityFunction[7]; static { INTENSITY_FUNCTION[0] = new IntensityFunction() {// Linear: stype = 0 (TEX_LIN) + @Override public float getIntensity(float x, float y, float z) { return (1.0f + x) * 0.5f; } }; INTENSITY_FUNCTION[1] = new IntensityFunction() {// Quad: stype = 1 (TEX_QUAD) + @Override public float getIntensity(float x, float y, float z) { float result = (1.0f + x) * 0.5f; return result * result; } }; INTENSITY_FUNCTION[2] = new IntensityFunction() {// Ease: stype = 2 (TEX_EASE) + @Override public float getIntensity(float x, float y, float z) { float result = (1.0f + x) * 0.5f; if (result <= 0.0f) { @@ -69,23 +72,27 @@ public final class TextureGeneratorBlend extends TextureGenerator { } }; INTENSITY_FUNCTION[3] = new IntensityFunction() {// Diagonal: stype = 3 (TEX_DIAG) + @Override public float getIntensity(float x, float y, float z) { return (2.0f + x + y) * 0.25f; } }; INTENSITY_FUNCTION[4] = new IntensityFunction() {// Sphere: stype = 4 (TEX_SPHERE) + @Override public float getIntensity(float x, float y, float z) { float result = 1.0f - (float) Math.sqrt(x * x + y * y + z * z); return result < 0.0f ? 0.0f : result; } }; INTENSITY_FUNCTION[5] = new IntensityFunction() {// Halo: stype = 5 (TEX_HALO) + @Override public float getIntensity(float x, float y, float z) { float result = 1.0f - (float) Math.sqrt(x * x + y * y + z * z); return result <= 0.0f ? 0.0f : result * result; } }; INTENSITY_FUNCTION[6] = new IntensityFunction() {// Radial: stype = 6 (TEX_RAD) + @Override public float getIntensity(float x, float y, float z) { return (float) Math.atan2(y, x) * FastMath.INV_TWO_PI + 0.5f; } diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorMagic.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorMagic.java index 6f3d7b599..ff7d07196 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorMagic.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorMagic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,51 +45,61 @@ public class TextureGeneratorMagic extends TextureGenerator { private static NoiseDepthFunction[] noiseDepthFunctions = new NoiseDepthFunction[10]; static { noiseDepthFunctions[0] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[1] = -(float) Math.cos(xyz[0] - xyz[1] + xyz[2]) * turbulence; } }; noiseDepthFunctions[1] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[0] = (float) Math.cos(xyz[0] - xyz[1] - xyz[2]) * turbulence; } }; noiseDepthFunctions[2] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[2] = (float) Math.sin(-xyz[0] - xyz[1] - xyz[2]) * turbulence; } }; noiseDepthFunctions[3] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[0] = -(float) Math.cos(-xyz[0] + xyz[1] - xyz[2]) * turbulence; } }; noiseDepthFunctions[4] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[1] = -(float) Math.sin(-xyz[0] + xyz[1] + xyz[2]) * turbulence; } }; noiseDepthFunctions[5] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[1] = -(float) Math.cos(-xyz[0] + xyz[1] + xyz[2]) * turbulence; } }; noiseDepthFunctions[6] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[0] = (float) Math.cos(xyz[0] + xyz[1] + xyz[2]) * turbulence; } }; noiseDepthFunctions[7] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[2] = (float) Math.sin(xyz[0] + xyz[1] - xyz[2]) * turbulence; } }; noiseDepthFunctions[8] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[0] = -(float) Math.cos(-xyz[0] - xyz[1] + xyz[2]) * turbulence; } }; noiseDepthFunctions[9] = new NoiseDepthFunction() { + @Override public void compute(float[] xyz, float turbulence) { xyz[1] = -(float) Math.sin(xyz[0] - xyz[1] + xyz[2]) * turbulence; } diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorWood.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorWood.java index 94cf2af4c..01c28643a 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorWood.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/generating/TextureGeneratorWood.java @@ -95,12 +95,14 @@ public class TextureGeneratorWood extends TextureGenerator { static { waveformFunctions[0] = new WaveForm() {// sinus (TEX_SIN) + @Override public float execute(float x) { return 0.5f + 0.5f * (float) Math.sin(x); } }; waveformFunctions[1] = new WaveForm() {// saw (TEX_SAW) + @Override public float execute(float x) { int n = (int) (x * FastMath.INV_TWO_PI); x -= n * FastMath.TWO_PI; @@ -112,6 +114,7 @@ public class TextureGeneratorWood extends TextureGenerator { }; waveformFunctions[2] = new WaveForm() {// triangle (TEX_TRI) + @Override public float execute(float x) { return 1.0f - 2.0f * FastMath.abs((float) Math.floor(x * FastMath.INV_TWO_PI + 0.5f) - x * FastMath.INV_TWO_PI); } diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/AWTPixelInputOutput.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/AWTPixelInputOutput.java index 569c328be..8409f29ec 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/AWTPixelInputOutput.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/AWTPixelInputOutput.java @@ -11,6 +11,7 @@ import jme3tools.converters.RGB565; * @author Marcin Roguski (Kaelthas) */ /* package */class AWTPixelInputOutput implements PixelInputOutput { + @Override public void read(Image image, int layer, TexturePixel pixel, int index) { ByteBuffer data = image.getData(layer); switch (image.getFormat()) { @@ -64,11 +65,13 @@ import jme3tools.converters.RGB565; } } + @Override public void read(Image image, int layer, TexturePixel pixel, int x, int y) { int index = (y * image.getWidth() + x) * (image.getFormat().getBitsPerPixel() >> 3); this.read(image, layer, pixel, index); } + @Override public void write(Image image, int layer, TexturePixel pixel, int index) { ByteBuffer data = image.getData(layer); switch (image.getFormat()) { @@ -149,6 +152,7 @@ import jme3tools.converters.RGB565; } } + @Override public void write(Image image, int layer, TexturePixel pixel, int x, int y) { int index = (y * image.getWidth() + x) * (image.getFormat().getBitsPerPixel() >> 3); this.write(image, layer, pixel, index); diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/DDSPixelInputOutput.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/DDSPixelInputOutput.java index d82f164a1..c5ffdb7f9 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/DDSPixelInputOutput.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/DDSPixelInputOutput.java @@ -15,10 +15,12 @@ import jme3tools.converters.RGB565; /** * For this class the index should be considered as a pixel index in AWT image format. */ + @Override public void read(Image image, int layer, TexturePixel pixel, int index) { this.read(image, layer, pixel, index % image.getWidth(), index / image.getWidth()); } + @Override public void read(Image image, int layer, TexturePixel pixel, int x, int y) { int xTexetlIndex = x % image.getWidth() >> 2; int yTexelIndex = y % image.getHeight() >> 2; @@ -161,10 +163,12 @@ import jme3tools.converters.RGB565; pixel.alpha = alpha; } + @Override public void write(Image image, int layer, TexturePixel pixel, int index) { throw new UnsupportedOperationException("Cannot put the DXT pixel by index because not every index contains the pixel color!"); } + @Override public void write(Image image, int layer, TexturePixel pixel, int x, int y) { throw new UnsupportedOperationException("Writing to DDS texture pixel by pixel is not yet supported!"); } diff --git a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/LuminancePixelInputOutput.java b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/LuminancePixelInputOutput.java index fae236edc..0df0c4566 100644 --- a/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/LuminancePixelInputOutput.java +++ b/jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/io/LuminancePixelInputOutput.java @@ -11,6 +11,7 @@ import java.nio.ByteBuffer; * @author Marcin Roguski (Kaelthas) */ /* package */class LuminancePixelInputOutput implements PixelInputOutput { + @Override public void read(Image image, int layer, TexturePixel pixel, int index) { ByteBuffer data = image.getData(layer); switch (image.getFormat()) { @@ -36,11 +37,13 @@ import java.nio.ByteBuffer; } } + @Override public void read(Image image, int layer, TexturePixel pixel, int x, int y) { int index = y * image.getWidth() + x; this.read(image, layer, pixel, index); } + @Override public void write(Image image, int layer, TexturePixel pixel, int index) { ByteBuffer data = image.getData(layer); data.put(index, pixel.getInt()); @@ -67,6 +70,7 @@ import java.nio.ByteBuffer; } } + @Override public void write(Image image, int layer, TexturePixel pixel, int x, int y) { int index = y * image.getWidth() + x; this.write(image, layer, pixel, index); diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/BulletAppState.java b/jme3-bullet/src/common/java/com/jme3/bullet/BulletAppState.java index 2dc46906c..3ae2fdae0 100644 --- a/jme3-bullet/src/common/java/com/jme3/bullet/BulletAppState.java +++ b/jme3-bullet/src/common/java/com/jme3/bullet/BulletAppState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -182,6 +182,7 @@ public class BulletAppState executor = new ScheduledThreadPoolExecutor(1); final BulletAppState app = this; Callable call = new Callable() { + @Override public Boolean call() throws Exception { detachedPhysicsLastUpdate = System.currentTimeMillis(); pSpace = new PhysicsSpace(worldMin, worldMax, broadphaseType); @@ -200,6 +201,7 @@ public class BulletAppState } } private Callable parallelPhysicsUpdate = new Callable() { + @Override public Boolean call() throws Exception { pSpace.update(tpf * getSpeed()); return true; @@ -207,6 +209,7 @@ public class BulletAppState }; long detachedPhysicsLastUpdate = 0; private Callable detachedPhysicsUpdate = new Callable() { + @Override public Boolean call() throws Exception { pSpace.update(getPhysicsSpace().getAccuracy() * getSpeed()); pSpace.distributeEvents(); @@ -484,6 +487,7 @@ public class BulletAppState * @param space the space that is about to be stepped (not null) * @param f the time per physics step (in seconds, ≥0) */ + @Override public void prePhysicsTick(PhysicsSpace space, float f) { } @@ -494,6 +498,7 @@ public class BulletAppState * @param space the space that is about to be stepped (not null) * @param f the time per physics step (in seconds, ≥0) */ + @Override public void physicsTick(PhysicsSpace space, float f) { } diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java b/jme3-bullet/src/common/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java index e6b5d97b3..9665efde6 100644 --- a/jme3-bullet/src/common/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java +++ b/jme3-bullet/src/common/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -89,6 +89,7 @@ public class ChildCollisionShape implements Savable { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule capsule = ex.getCapsule(this); capsule.write(location, "location", new Vector3f()); @@ -102,6 +103,7 @@ public class ChildCollisionShape implements Savable { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { InputCapsule capsule = im.getCapsule(this); location = (Vector3f) capsule.readSavable("location", new Vector3f()); diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/AbstractPhysicsControl.java b/jme3-bullet/src/common/java/com/jme3/bullet/control/AbstractPhysicsControl.java index 739701d9f..38d0aa6d0 100644 --- a/jme3-bullet/src/common/java/com/jme3/bullet/control/AbstractPhysicsControl.java +++ b/jme3-bullet/src/common/java/com/jme3/bullet/control/AbstractPhysicsControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -231,6 +231,7 @@ public abstract class AbstractPhysicsControl implements PhysicsControl, JmeClone * * @param spatial the spatial to control (or null) */ + @Override public void setSpatial(Spatial spatial) { if (this.spatial != null && this.spatial != spatial) { removeSpatialData(this.spatial); @@ -262,6 +263,7 @@ public abstract class AbstractPhysicsControl implements PhysicsControl, JmeClone * * @param enabled true→enable the control, false→disable it */ + @Override public void setEnabled(boolean enabled) { this.enabled = enabled; if (space != null) { @@ -284,13 +286,16 @@ public abstract class AbstractPhysicsControl implements PhysicsControl, JmeClone * * @return true if enabled, otherwise false */ + @Override public boolean isEnabled() { return enabled; } + @Override public void update(float tpf) { } + @Override public void render(RenderManager rm, ViewPort vp) { } @@ -326,6 +331,7 @@ public abstract class AbstractPhysicsControl implements PhysicsControl, JmeClone * * @return the pre-existing space, or null for none */ + @Override public PhysicsSpace getPhysicsSpace() { return space; } diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/BetterCharacterControl.java b/jme3-bullet/src/common/java/com/jme3/bullet/control/BetterCharacterControl.java index 66e030646..5fd6895c5 100644 --- a/jme3-bullet/src/common/java/com/jme3/bullet/control/BetterCharacterControl.java +++ b/jme3-bullet/src/common/java/com/jme3/bullet/control/BetterCharacterControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -194,6 +194,7 @@ public class BetterCharacterControl extends AbstractPhysicsControl implements Ph * @param space the space that is about to be stepped (not null) * @param tpf the time per physics step (in seconds, ≥0) */ + @Override public void prePhysicsTick(PhysicsSpace space, float tpf) { checkOnGround(); if (wantToUnDuck && checkCanUnDuck()) { @@ -245,6 +246,7 @@ public class BetterCharacterControl extends AbstractPhysicsControl implements Ph * @param space the space that was just stepped (not null) * @param tpf the time per physics step (in seconds, ≥0) */ + @Override public void physicsTick(PhysicsSpace space, float tpf) { rigidBody.getLinearVelocity(velocity); } diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/CharacterControl.java b/jme3-bullet/src/common/java/com/jme3/bullet/control/CharacterControl.java index 2ee7fbe62..d83bec890 100644 --- a/jme3-bullet/src/common/java/com/jme3/bullet/control/CharacterControl.java +++ b/jme3-bullet/src/common/java/com/jme3/bullet/control/CharacterControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -120,6 +120,7 @@ public class CharacterControl extends PhysicsCharacter implements PhysicsControl this.spatial = cloner.clone(spatial); } + @Override public void setSpatial(Spatial spatial) { this.spatial = spatial; setUserObject(spatial); @@ -136,6 +137,7 @@ public class CharacterControl extends PhysicsCharacter implements PhysicsControl return this.spatial; } + @Override public void setEnabled(boolean enabled) { this.enabled = enabled; if (space != null) { @@ -152,6 +154,7 @@ public class CharacterControl extends PhysicsCharacter implements PhysicsControl } } + @Override public boolean isEnabled() { return enabled; } @@ -172,6 +175,7 @@ public class CharacterControl extends PhysicsCharacter implements PhysicsControl this.useViewDirection = viewDirectionEnabled; } + @Override public void update(float tpf) { if (enabled && spatial != null) { Quaternion localRotationQuat = spatial.getLocalRotation(); @@ -195,6 +199,7 @@ public class CharacterControl extends PhysicsCharacter implements PhysicsControl } } + @Override public void render(RenderManager rm, ViewPort vp) { } @@ -225,6 +230,7 @@ public class CharacterControl extends PhysicsCharacter implements PhysicsControl space = newSpace; } + @Override public PhysicsSpace getPhysicsSpace() { return space; } diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/GhostControl.java b/jme3-bullet/src/common/java/com/jme3/bullet/control/GhostControl.java index 09a0f6a99..6bfb71fe8 100644 --- a/jme3-bullet/src/common/java/com/jme3/bullet/control/GhostControl.java +++ b/jme3-bullet/src/common/java/com/jme3/bullet/control/GhostControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -196,6 +196,7 @@ public class GhostControl extends PhysicsGhostObject implements PhysicsControl, * * @param spatial the spatial to control (or null) */ + @Override public void setSpatial(Spatial spatial) { this.spatial = spatial; setUserObject(spatial); @@ -222,6 +223,7 @@ public class GhostControl extends PhysicsGhostObject implements PhysicsControl, * * @param enabled true→enable the control, false→disable it */ + @Override public void setEnabled(boolean enabled) { this.enabled = enabled; if (space != null) { @@ -244,6 +246,7 @@ public class GhostControl extends PhysicsGhostObject implements PhysicsControl, * * @return true if enabled, otherwise false */ + @Override public boolean isEnabled() { return enabled; } @@ -255,6 +258,7 @@ public class GhostControl extends PhysicsGhostObject implements PhysicsControl, * * @param tpf the time interval between frames (in seconds, ≥0) */ + @Override public void update(float tpf) { if (!enabled) { return; @@ -271,6 +275,7 @@ public class GhostControl extends PhysicsGhostObject implements PhysicsControl, * @param rm the render manager (not null) * @param vp the view port to render (not null) */ + @Override public void render(RenderManager rm, ViewPort vp) { } @@ -307,6 +312,7 @@ public class GhostControl extends PhysicsGhostObject implements PhysicsControl, * * @return the pre-existing space, or null for none */ + @Override public PhysicsSpace getPhysicsSpace() { return space; } diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/KinematicRagdollControl.java b/jme3-bullet/src/common/java/com/jme3/bullet/control/KinematicRagdollControl.java index 8a99ddc22..40d968923 100644 --- a/jme3-bullet/src/common/java/com/jme3/bullet/control/KinematicRagdollControl.java +++ b/jme3-bullet/src/common/java/com/jme3/bullet/control/KinematicRagdollControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -817,6 +817,7 @@ public class KinematicRagdollControl extends AbstractPhysicsControl implements P * * @param event (not null) */ + @Override public void collision(PhysicsCollisionEvent event) { PhysicsCollisionObject objA = event.getObjectA(); PhysicsCollisionObject objB = event.getObjectB(); diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/RigidBodyControl.java b/jme3-bullet/src/common/java/com/jme3/bullet/control/RigidBodyControl.java index ddcd0e82b..6377ee413 100644 --- a/jme3-bullet/src/common/java/com/jme3/bullet/control/RigidBodyControl.java +++ b/jme3-bullet/src/common/java/com/jme3/bullet/control/RigidBodyControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -193,6 +193,7 @@ public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl * * @param spatial the spatial to control (or null) */ + @Override public void setSpatial(Spatial spatial) { this.spatial = spatial; setUserObject(spatial); @@ -249,6 +250,7 @@ public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl * * @param enabled true→enable the control, false→disable it */ + @Override public void setEnabled(boolean enabled) { this.enabled = enabled; if (space != null) { @@ -271,6 +273,7 @@ public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl * * @return true if enabled, otherwise false */ + @Override public boolean isEnabled() { return enabled; } @@ -347,6 +350,7 @@ public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl * * @param tpf the time interval between frames (in seconds, ≥0) */ + @Override public void update(float tpf) { if (enabled && spatial != null) { if (isKinematic() && kinematicSpatial) { @@ -366,6 +370,7 @@ public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl * @param rm the render manager (not null) * @param vp the view port to render (not null) */ + @Override public void render(RenderManager rm, ViewPort vp) { } @@ -401,6 +406,7 @@ public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl * * @return the pre-existing space, or null for none */ + @Override public PhysicsSpace getPhysicsSpace() { return space; } diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/VehicleControl.java b/jme3-bullet/src/common/java/com/jme3/bullet/control/VehicleControl.java index 5188ddf96..275cb215a 100644 --- a/jme3-bullet/src/common/java/com/jme3/bullet/control/VehicleControl.java +++ b/jme3-bullet/src/common/java/com/jme3/bullet/control/VehicleControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -159,6 +159,7 @@ public class VehicleControl extends PhysicsVehicle implements PhysicsControl, Jm * * @return a new control (not null) */ + @Override public Object jmeClone() { VehicleControl control = new VehicleControl(collisionShape, mass); control.setAngularFactor(getAngularFactor()); @@ -231,6 +232,7 @@ public class VehicleControl extends PhysicsVehicle implements PhysicsControl, Jm * * @param spatial spatial to control (or null) */ + @Override public void setSpatial(Spatial spatial) { this.spatial = spatial; setUserObject(spatial); @@ -250,6 +252,7 @@ public class VehicleControl extends PhysicsVehicle implements PhysicsControl, Jm * * @param enabled true→enable the control, false→disable it */ + @Override public void setEnabled(boolean enabled) { this.enabled = enabled; if (space != null) { @@ -272,6 +275,7 @@ public class VehicleControl extends PhysicsVehicle implements PhysicsControl, Jm * * @return true if enabled, otherwise false */ + @Override public boolean isEnabled() { return enabled; } @@ -282,6 +286,7 @@ public class VehicleControl extends PhysicsVehicle implements PhysicsControl, Jm * * @param tpf the time interval between frames (in seconds, ≥0) */ + @Override public void update(float tpf) { if (enabled && spatial != null) { if (getMotionState().applyTransform(spatial)) { @@ -301,6 +306,7 @@ public class VehicleControl extends PhysicsVehicle implements PhysicsControl, Jm * @param rm the render manager (not null) * @param vp the view port to render (not null) */ + @Override public void render(RenderManager rm, ViewPort vp) { } @@ -336,6 +342,7 @@ public class VehicleControl extends PhysicsVehicle implements PhysicsControl, Jm * * @return the pre-existing space, or null for none */ + @Override public PhysicsSpace getPhysicsSpace() { return space; } diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java index be8b89df5..1f3ac4673 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -86,6 +86,7 @@ public class BoxCollisionShape extends CollisionShape { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -98,6 +99,7 @@ public class BoxCollisionShape extends CollisionShape { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java index 31d642028..52f2af555 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -141,6 +141,7 @@ public class CapsuleCollisionShape extends CollisionShape{ * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -155,6 +156,7 @@ public class CapsuleCollisionShape extends CollisionShape{ * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java index 94d39973d..615f23499 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -201,6 +201,7 @@ public abstract class CollisionShape implements Savable { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule capsule = ex.getCapsule(this); capsule.write(scale, "scale", new Vector3f(1, 1, 1)); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java index 254006676..4520e7ef4 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -152,6 +152,7 @@ public class CompoundCollisionShape extends CollisionShape { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -164,6 +165,7 @@ public class CompoundCollisionShape extends CollisionShape { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java index a8782d6a8..914176dde 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -119,6 +119,7 @@ public class ConeCollisionShape extends CollisionShape { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -133,6 +134,7 @@ public class ConeCollisionShape extends CollisionShape { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java index d85b41b98..7686cd3da 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -128,6 +128,7 @@ public class CylinderCollisionShape extends CollisionShape { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -141,6 +142,7 @@ public class CylinderCollisionShape extends CollisionShape { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java index 6878b7806..b2007aab6 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -122,6 +122,7 @@ public class GImpactCollisionShape extends CollisionShape { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -141,6 +142,7 @@ public class GImpactCollisionShape extends CollisionShape { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java index ae57bcf10..649f8612d 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -193,6 +193,7 @@ public class HeightfieldCollisionShape extends CollisionShape { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -212,6 +213,7 @@ public class HeightfieldCollisionShape extends CollisionShape { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java index 691b4871a..a21ced662 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -84,6 +84,7 @@ public class PlaneCollisionShape extends CollisionShape{ * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -96,6 +97,7 @@ public class PlaneCollisionShape extends CollisionShape{ * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java index b8db8599d..2b76ed14b 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -118,6 +118,7 @@ public class SimplexCollisionShape extends CollisionShape { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -133,6 +134,7 @@ public class SimplexCollisionShape extends CollisionShape { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java index 27549da90..665ce6f4d 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -85,6 +85,7 @@ public class SphereCollisionShape extends CollisionShape { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -97,6 +98,7 @@ public class SphereCollisionShape extends CollisionShape { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java b/jme3-bullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java index 9b38b2dc3..29b9b8070 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -242,6 +242,7 @@ public class HingeJoint extends PhysicsJoint { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -268,6 +269,7 @@ public class HingeJoint extends PhysicsJoint { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java b/jme3-bullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java index 1a80fae03..f5f9edf2e 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -192,6 +192,7 @@ public abstract class PhysicsJoint implements Savable { * @param ex exporter (not null) * @throws IOException from exporter */ + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule capsule = ex.getCapsule(this); capsule.write(nodeA, "nodeA", null); @@ -206,6 +207,7 @@ public abstract class PhysicsJoint implements Savable { * @param im importer (not null) * @throws IOException from importer */ + @Override public void read(JmeImporter im) throws IOException { InputCapsule capsule = im.getCapsule(this); this.nodeA = ((PhysicsRigidBody) capsule.readSavable("nodeA", null)); diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java b/jme3-bullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java index a765fdbe0..8e4a52e70 100644 --- a/jme3-bullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java +++ b/jme3-bullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -794,6 +794,7 @@ public class PhysicsRigidBody extends PhysicsCollisionObject { * * @param collisionShape the shape to apply (not null, alias created) */ + @Override public void setCollisionShape(CollisionShape collisionShape) { super.setCollisionShape(collisionShape); if (collisionShape instanceof MeshCollisionShape && mass != 0) { diff --git a/jme3-core/src/main/java/com/jme3/anim/Joint.java b/jme3-core/src/main/java/com/jme3/anim/Joint.java index 1c1699f64..d51848e20 100644 --- a/jme3-core/src/main/java/com/jme3/anim/Joint.java +++ b/jme3-core/src/main/java/com/jme3/anim/Joint.java @@ -216,6 +216,7 @@ public class Joint implements Savable, JmeCloneable, HasLocalTransform { this.name = name; } + @Override public void setLocalTransform(Transform localTransform) { this.localTransform.set(localTransform); } @@ -272,6 +273,7 @@ public class Joint implements Savable, JmeCloneable, HasLocalTransform { return initialTransform; } + @Override public Transform getLocalTransform() { return localTransform; } diff --git a/jme3-core/src/main/java/com/jme3/anim/MatrixJointModelTransform.java b/jme3-core/src/main/java/com/jme3/anim/MatrixJointModelTransform.java index 5f1aadad7..782c2d93b 100644 --- a/jme3-core/src/main/java/com/jme3/anim/MatrixJointModelTransform.java +++ b/jme3-core/src/main/java/com/jme3/anim/MatrixJointModelTransform.java @@ -22,6 +22,7 @@ public class MatrixJointModelTransform implements JointModelTransform { } + @Override public void getOffsetTransform(Matrix4f outTransform, Matrix4f inverseModelBindMatrix) { modelTransformMatrix.mult(inverseModelBindMatrix, outTransform); } diff --git a/jme3-core/src/main/java/com/jme3/anim/SeparateJointModelTransform.java b/jme3-core/src/main/java/com/jme3/anim/SeparateJointModelTransform.java index c06b97ba4..4cb3b155f 100644 --- a/jme3-core/src/main/java/com/jme3/anim/SeparateJointModelTransform.java +++ b/jme3-core/src/main/java/com/jme3/anim/SeparateJointModelTransform.java @@ -23,6 +23,7 @@ public class SeparateJointModelTransform implements JointModelTransform { } } + @Override public void getOffsetTransform(Matrix4f outTransform, Matrix4f inverseModelBindMatrix) { modelTransform.toTransformMatrix(outTransform).mult(inverseModelBindMatrix, outTransform); } diff --git a/jme3-core/src/main/java/com/jme3/anim/TransformTrack.java b/jme3-core/src/main/java/com/jme3/anim/TransformTrack.java index 63eba06cf..f5c16d67d 100644 --- a/jme3-core/src/main/java/com/jme3/anim/TransformTrack.java +++ b/jme3-core/src/main/java/com/jme3/anim/TransformTrack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -208,10 +208,12 @@ public class TransformTrack implements AnimTrack { } } + @Override public double getLength() { return length; } + @Override public void getDataAtTime(double t, Transform transform) { float time = (float) t; diff --git a/jme3-core/src/main/java/com/jme3/anim/tween/action/BlendAction.java b/jme3-core/src/main/java/com/jme3/anim/tween/action/BlendAction.java index 9c5848e4d..2d73031e6 100644 --- a/jme3-core/src/main/java/com/jme3/anim/tween/action/BlendAction.java +++ b/jme3-core/src/main/java/com/jme3/anim/tween/action/BlendAction.java @@ -49,6 +49,7 @@ public class BlendAction extends BlendableAction { } } + @Override public void doInterpolate(double t) { blendWeight = blendSpace.getWeight(); BlendableAction firstActiveAction = (BlendableAction) actions[firstActiveIndex]; diff --git a/jme3-core/src/main/java/com/jme3/anim/tween/action/ClipAction.java b/jme3-core/src/main/java/com/jme3/anim/tween/action/ClipAction.java index fdf211962..35dbf83ab 100644 --- a/jme3-core/src/main/java/com/jme3/anim/tween/action/ClipAction.java +++ b/jme3-core/src/main/java/com/jme3/anim/tween/action/ClipAction.java @@ -63,6 +63,7 @@ public class ClipAction extends BlendableAction { } + @Override public String toString() { return clip.toString(); } diff --git a/jme3-core/src/main/java/com/jme3/animation/AudioTrack.java b/jme3-core/src/main/java/com/jme3/animation/AudioTrack.java index e511cc9d9..41e7a151a 100644 --- a/jme3-core/src/main/java/com/jme3/animation/AudioTrack.java +++ b/jme3-core/src/main/java/com/jme3/animation/AudioTrack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -73,10 +73,12 @@ public class AudioTrack implements ClonableTrack { //Animation listener to stop the sound when the animation ends or is changed private class OnEndListener implements AnimEventListener { + @Override public void onAnimCycleDone(AnimControl control, AnimChannel channel, String animName) { stop(); } + @Override public void onAnimChange(AnimControl control, AnimChannel channel, String animName) { } } @@ -120,6 +122,7 @@ public class AudioTrack implements ClonableTrack { * @see Track#setTime(float, float, com.jme3.animation.AnimControl, * com.jme3.animation.AnimChannel, com.jme3.util.TempVars) */ + @Override public void setTime(float time, float weight, AnimControl control, AnimChannel channel, TempVars vars) { if (time >= length) { @@ -146,6 +149,7 @@ public class AudioTrack implements ClonableTrack { * * @return length of the track */ + @Override public float getLength() { return length; } @@ -255,6 +259,7 @@ public class AudioTrack implements ClonableTrack { data.addTrack(audioTrack); } + @Override public void cleanUp() { TrackInfo t = (TrackInfo) audio.getUserData("TrackInfo"); t.getTracks().remove(this); @@ -308,6 +313,7 @@ public class AudioTrack implements ClonableTrack { * @param ex exporter * @throws IOException exception */ + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule out = ex.getCapsule(this); out.write(audio, "audio", null); @@ -321,6 +327,7 @@ public class AudioTrack implements ClonableTrack { * @param im importer * @throws IOException Exception */ + @Override public void read(JmeImporter im) throws IOException { InputCapsule in = im.getCapsule(this); audio = (AudioNode) in.readSavable("audio", null); diff --git a/jme3-core/src/main/java/com/jme3/animation/BoneTrack.java b/jme3-core/src/main/java/com/jme3/animation/BoneTrack.java index d12f004de..dda5fb5b7 100644 --- a/jme3-core/src/main/java/com/jme3/animation/BoneTrack.java +++ b/jme3-core/src/main/java/com/jme3/animation/BoneTrack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -202,6 +202,7 @@ public final class BoneTrack implements JmeCloneable, Track { * @param channel * @param vars */ + @Override public void setTime(float time, float weight, AnimControl control, AnimChannel channel, TempVars vars) { BitSet affectedBones = channel.getAffectedBones(); if (affectedBones != null && !affectedBones.get(targetBoneIndex)) { @@ -268,6 +269,7 @@ public final class BoneTrack implements JmeCloneable, Track { /** * @return the length of the track */ + @Override public float getLength() { return times == null ? 0 : times[times.length - 1] - times[0]; } diff --git a/jme3-core/src/main/java/com/jme3/animation/Pose.java b/jme3-core/src/main/java/com/jme3/animation/Pose.java index 4a0f659c8..94a9816e7 100644 --- a/jme3-core/src/main/java/com/jme3/animation/Pose.java +++ b/jme3-core/src/main/java/com/jme3/animation/Pose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -117,6 +117,7 @@ public final class Pose implements Savable, Cloneable { } } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule out = e.getCapsule(this); out.write(name, "name", ""); @@ -125,6 +126,7 @@ public final class Pose implements Savable, Cloneable { out.write(indices, "indices", null); } + @Override public void read(JmeImporter i) throws IOException { InputCapsule in = i.getCapsule(this); name = in.readString("name", ""); diff --git a/jme3-core/src/main/java/com/jme3/animation/PoseTrack.java b/jme3-core/src/main/java/com/jme3/animation/PoseTrack.java index 09817c5ea..9388da731 100644 --- a/jme3-core/src/main/java/com/jme3/animation/PoseTrack.java +++ b/jme3-core/src/main/java/com/jme3/animation/PoseTrack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -87,12 +87,14 @@ public final class PoseTrack implements Track { } } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule out = e.getCapsule(this); out.write(poses, "poses", null); out.write(weights, "weights", null); } + @Override public void read(JmeImporter i) throws IOException { InputCapsule in = i.getCapsule(this); weights = in.readFloatArray("weights", null); @@ -132,6 +134,7 @@ public final class PoseTrack implements Track { pb.updateData(pb.getData()); } + @Override public void setTime(float time, float weight, AnimControl control, AnimChannel channel, TempVars vars) { // TODO: When MeshControl is created, it will gather targets // list automatically which is then retrieved here. @@ -161,6 +164,7 @@ public final class PoseTrack implements Track { /** * @return the length of the track */ + @Override public float getLength() { return times == null ? 0 : times[times.length - 1] - times[0]; } diff --git a/jme3-core/src/main/java/com/jme3/animation/SpatialTrack.java b/jme3-core/src/main/java/com/jme3/animation/SpatialTrack.java index fc992d2b0..5c7e4cf0c 100644 --- a/jme3-core/src/main/java/com/jme3/animation/SpatialTrack.java +++ b/jme3-core/src/main/java/com/jme3/animation/SpatialTrack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -101,6 +101,7 @@ public class SpatialTrack implements JmeCloneable, Track { * @param time * the current time of the animation */ + @Override public void setTime(float time, float weight, AnimControl control, AnimChannel channel, TempVars vars) { Spatial spatial = trackSpatial; if (spatial == null) { @@ -242,6 +243,7 @@ public class SpatialTrack implements JmeCloneable, Track { /** * @return the length of the track */ + @Override public float getLength() { return times == null ? 0 : times[times.length - 1] - times[0]; } diff --git a/jme3-core/src/main/java/com/jme3/animation/TrackInfo.java b/jme3-core/src/main/java/com/jme3/animation/TrackInfo.java index 93fd6a88e..5ab134567 100644 --- a/jme3-core/src/main/java/com/jme3/animation/TrackInfo.java +++ b/jme3-core/src/main/java/com/jme3/animation/TrackInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,11 +55,13 @@ public class TrackInfo implements Savable, JmeCloneable { public TrackInfo() { } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule c = ex.getCapsule(this); c.writeSavableArrayList(tracks, "tracks", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule c = im.getCapsule(this); tracks = c.readSavableArrayList("tracks", null); diff --git a/jme3-core/src/main/java/com/jme3/app/AppTask.java b/jme3-core/src/main/java/com/jme3/app/AppTask.java index 183088581..59e96c404 100644 --- a/jme3-core/src/main/java/com/jme3/app/AppTask.java +++ b/jme3-core/src/main/java/com/jme3/app/AppTask.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,6 +66,7 @@ public class AppTask implements Future { this.callable = callable; } + @Override public boolean cancel(boolean mayInterruptIfRunning) { stateLock.lock(); try { @@ -82,6 +83,7 @@ public class AppTask implements Future { } } + @Override public V get() throws InterruptedException, ExecutionException { stateLock.lock(); try { @@ -97,6 +99,7 @@ public class AppTask implements Future { } } + @Override public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { stateLock.lock(); try { @@ -115,6 +118,7 @@ public class AppTask implements Future { } } + @Override public boolean isCancelled() { stateLock.lock(); try { @@ -124,6 +128,7 @@ public class AppTask implements Future { } } + @Override public boolean isDone() { stateLock.lock(); try { diff --git a/jme3-core/src/main/java/com/jme3/app/ChaseCameraAppState.java b/jme3-core/src/main/java/com/jme3/app/ChaseCameraAppState.java index 1823e18ac..98ef2e2d8 100644 --- a/jme3-core/src/main/java/com/jme3/app/ChaseCameraAppState.java +++ b/jme3-core/src/main/java/com/jme3/app/ChaseCameraAppState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -129,6 +129,7 @@ public class ChaseCameraAppState extends AbstractAppState implements ActionListe inputManager.setCursorVisible(dragToRotate); } + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (isEnabled()) { if (dragToRotate) { @@ -150,6 +151,7 @@ public class ChaseCameraAppState extends AbstractAppState implements ActionListe } + @Override public void onAnalog(String name, float value, float tpf) { if (isEnabled()) { if (canRotate) { diff --git a/jme3-core/src/main/java/com/jme3/app/DebugKeysAppState.java b/jme3-core/src/main/java/com/jme3/app/DebugKeysAppState.java index 8e7e3f943..139247aec 100644 --- a/jme3-core/src/main/java/com/jme3/app/DebugKeysAppState.java +++ b/jme3-core/src/main/java/com/jme3/app/DebugKeysAppState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -94,6 +94,7 @@ public class DebugKeysAppState extends AbstractAppState { private class DebugKeyListener implements ActionListener { + @Override public void onAction(String name, boolean value, float tpf) { if (!value) { return; diff --git a/jme3-core/src/main/java/com/jme3/app/LegacyApplication.java b/jme3-core/src/main/java/com/jme3/app/LegacyApplication.java index 1cc53b75e..2b07b52de 100644 --- a/jme3-core/src/main/java/com/jme3/app/LegacyApplication.java +++ b/jme3-core/src/main/java/com/jme3/app/LegacyApplication.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -126,6 +126,7 @@ public class LegacyApplication implements Application, SystemListener { * * @return The lost focus behavior of the application. */ + @Override public LostFocusBehavior getLostFocusBehavior() { return lostFocusBehavior; } @@ -142,6 +143,7 @@ public class LegacyApplication implements Application, SystemListener { * * @see LostFocusBehavior */ + @Override public void setLostFocusBehavior(LostFocusBehavior lostFocusBehavior) { this.lostFocusBehavior = lostFocusBehavior; } @@ -153,6 +155,7 @@ public class LegacyApplication implements Application, SystemListener { * * @see #getLostFocusBehavior() */ + @Override public boolean isPauseOnLostFocus() { return getLostFocusBehavior() == LostFocusBehavior.PauseOnLostFocus; } @@ -173,6 +176,7 @@ public class LegacyApplication implements Application, SystemListener { * * @see #setLostFocusBehavior(com.jme3.app.LostFocusBehavior) */ + @Override public void setPauseOnLostFocus(boolean pauseOnLostFocus) { if (pauseOnLostFocus) { setLostFocusBehavior(LostFocusBehavior.PauseOnLostFocus); @@ -227,6 +231,7 @@ public class LegacyApplication implements Application, SystemListener { * * @param settings The settings to set. */ + @Override public void setSettings(AppSettings settings){ this.settings = settings; if (context != null && settings.useInput() != inputEnabled){ @@ -248,6 +253,7 @@ public class LegacyApplication implements Application, SystemListener { * frame times. By default, Application will use the Timer as returned * by the current JmeContext implementation. */ + @Override public void setTimer(Timer timer){ this.timer = timer; @@ -260,6 +266,7 @@ public class LegacyApplication implements Application, SystemListener { } } + @Override public Timer getTimer(){ return timer; } @@ -355,6 +362,7 @@ public class LegacyApplication implements Application, SystemListener { /** * @return The {@link AssetManager asset manager} for this application. */ + @Override public AssetManager getAssetManager(){ return assetManager; } @@ -362,6 +370,7 @@ public class LegacyApplication implements Application, SystemListener { /** * @return the {@link InputManager input manager}. */ + @Override public InputManager getInputManager(){ return inputManager; } @@ -369,6 +378,7 @@ public class LegacyApplication implements Application, SystemListener { /** * @return the {@link AppStateManager app state manager} */ + @Override public AppStateManager getStateManager() { return stateManager; } @@ -376,6 +386,7 @@ public class LegacyApplication implements Application, SystemListener { /** * @return the {@link RenderManager render manager} */ + @Override public RenderManager getRenderManager() { return renderManager; } @@ -383,6 +394,7 @@ public class LegacyApplication implements Application, SystemListener { /** * @return The {@link Renderer renderer} for the application */ + @Override public Renderer getRenderer(){ return renderer; } @@ -390,6 +402,7 @@ public class LegacyApplication implements Application, SystemListener { /** * @return The {@link AudioRenderer audio renderer} for the application */ + @Override public AudioRenderer getAudioRenderer() { return audioRenderer; } @@ -397,6 +410,7 @@ public class LegacyApplication implements Application, SystemListener { /** * @return The {@link Listener listener} object for audio */ + @Override public Listener getListener() { return listener; } @@ -404,6 +418,7 @@ public class LegacyApplication implements Application, SystemListener { /** * @return The {@link JmeContext display context} for the application */ + @Override public JmeContext getContext(){ return context; } @@ -411,6 +426,7 @@ public class LegacyApplication implements Application, SystemListener { /** * @return The {@link Camera camera} for the application */ + @Override public Camera getCamera(){ return cam; } @@ -420,6 +436,7 @@ public class LegacyApplication implements Application, SystemListener { * * @see #start(com.jme3.system.JmeContext.Type) */ + @Override public void start(){ start(JmeContext.Type.Display, false); } @@ -429,6 +446,7 @@ public class LegacyApplication implements Application, SystemListener { * * @see #start(com.jme3.system.JmeContext.Type) */ + @Override public void start(boolean waitFor){ start(JmeContext.Type.Display, waitFor); } @@ -468,6 +486,7 @@ public class LegacyApplication implements Application, SystemListener { * specific steps within a single update frame. Value defaults * to null. */ + @Override public void setAppProfiler(AppProfiler prof) { this.prof = prof; if (renderManager != null) { @@ -478,6 +497,7 @@ public class LegacyApplication implements Application, SystemListener { /** * Returns the current AppProfiler hook, or null if none is set. */ + @Override public AppProfiler getAppProfiler() { return prof; } @@ -538,6 +558,7 @@ public class LegacyApplication implements Application, SystemListener { /** * Internal use only. */ + @Override public void reshape(int w, int h){ if (renderManager != null) { renderManager.notifyReshape(w, h); @@ -551,6 +572,7 @@ public class LegacyApplication implements Application, SystemListener { * applied immediately; calling this method forces the context * to restart, applying the new settings. */ + @Override public void restart(){ context.setSettings(settings); context.restart(); @@ -564,6 +586,7 @@ public class LegacyApplication implements Application, SystemListener { * * @see #stop(boolean) */ + @Override public void stop(){ stop(false); } @@ -573,6 +596,7 @@ public class LegacyApplication implements Application, SystemListener { * and making necessary cleanup operations. * After the application has stopped, it cannot be used anymore. */ + @Override public void stop(boolean waitFor){ logger.log(Level.FINE, "Closing application: {0}", getClass().getName()); context.destroy(waitFor); @@ -588,6 +612,7 @@ public class LegacyApplication implements Application, SystemListener { * perspective projection with 45° field of view, with near * and far values 1 and 1000 units respectively. */ + @Override public void initialize(){ if (assetManager == null){ initAssetManager(); @@ -611,6 +636,7 @@ public class LegacyApplication implements Application, SystemListener { /** * Internal use only. */ + @Override public void handleError(String errMsg, Throwable t){ // Print error to log. logger.log(Level.SEVERE, errMsg, t); @@ -630,6 +656,7 @@ public class LegacyApplication implements Application, SystemListener { /** * Internal use only. */ + @Override public void gainFocus(){ if (lostFocusBehavior != LostFocusBehavior.Disabled) { if (lostFocusBehavior == LostFocusBehavior.PauseOnLostFocus) { @@ -645,6 +672,7 @@ public class LegacyApplication implements Application, SystemListener { /** * Internal use only. */ + @Override public void loseFocus(){ if (lostFocusBehavior != LostFocusBehavior.Disabled){ if (lostFocusBehavior == LostFocusBehavior.PauseOnLostFocus) { @@ -657,6 +685,7 @@ public class LegacyApplication implements Application, SystemListener { /** * Internal use only. */ + @Override public void requestClose(boolean esc){ context.destroy(false); } @@ -671,6 +700,7 @@ public class LegacyApplication implements Application, SystemListener { * * @param callable The callable to run in the main jME3 thread */ + @Override public Future enqueue(Callable callable) { AppTask task = new AppTask(callable); taskQueue.add(task); @@ -687,6 +717,7 @@ public class LegacyApplication implements Application, SystemListener { * * @param runnable The runnable to run in the main jME3 thread */ + @Override public void enqueue(Runnable runnable){ enqueue(new RunnableWrapper(runnable)); } @@ -707,6 +738,7 @@ public class LegacyApplication implements Application, SystemListener { * Do not call manually. * Callback from ContextListener. */ + @Override public void update(){ // Make sure the audio renderer is available to callables AudioContext.setAudioRenderer(audioRenderer); @@ -752,6 +784,7 @@ public class LegacyApplication implements Application, SystemListener { * Do not call manually. * Callback from ContextListener. */ + @Override public void destroy(){ stateManager.cleanup(); @@ -766,10 +799,12 @@ public class LegacyApplication implements Application, SystemListener { * @return The GUI viewport. Which is used for the on screen * statistics and FPS. */ + @Override public ViewPort getGuiViewPort() { return guiViewPort; } + @Override public ViewPort getViewPort() { return viewPort; } diff --git a/jme3-core/src/main/java/com/jme3/app/SimpleApplication.java b/jme3-core/src/main/java/com/jme3/app/SimpleApplication.java index 9f7a1f671..940844a0e 100644 --- a/jme3-core/src/main/java/com/jme3/app/SimpleApplication.java +++ b/jme3-core/src/main/java/com/jme3/app/SimpleApplication.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -82,6 +82,7 @@ public abstract class SimpleApplication extends LegacyApplication { private class AppActionListener implements ActionListener { + @Override public void onAction(String name, boolean value, float tpf) { if (!value) { return; diff --git a/jme3-core/src/main/java/com/jme3/app/StatsView.java b/jme3-core/src/main/java/com/jme3/app/StatsView.java index 4e9411f18..d6e138232 100644 --- a/jme3-core/src/main/java/com/jme3/app/StatsView.java +++ b/jme3-core/src/main/java/com/jme3/app/StatsView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -96,6 +96,7 @@ public class StatsView extends Node implements Control, JmeCloneable { return statText.getLineHeight() * statLabels.length; } + @Override public void update(float tpf) { if (!isEnabled()) @@ -133,6 +134,7 @@ public class StatsView extends Node implements Control, JmeCloneable { throw new UnsupportedOperationException("Not yet implemented."); } + @Override public void setSpatial(Spatial spatial) { } @@ -145,6 +147,7 @@ public class StatsView extends Node implements Control, JmeCloneable { return enabled; } + @Override public void render(RenderManager rm, ViewPort vp) { } diff --git a/jme3-core/src/main/java/com/jme3/app/state/ScreenshotAppState.java b/jme3-core/src/main/java/com/jme3/app/state/ScreenshotAppState.java index 4a2b1acc8..a1cd85fd8 100644 --- a/jme3-core/src/main/java/com/jme3/app/state/ScreenshotAppState.java +++ b/jme3-core/src/main/java/com/jme3/app/state/ScreenshotAppState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -187,6 +187,7 @@ public class ScreenshotAppState extends AbstractAppState implements ActionListen super.initialize(stateManager, app); } + @Override public void onAction(String name, boolean value, float tpf) { if (value){ capture = true; @@ -197,6 +198,7 @@ public class ScreenshotAppState extends AbstractAppState implements ActionListen capture = true; } + @Override public void initialize(RenderManager rm, ViewPort vp) { renderer = rm.getRenderer(); this.rm = rm; @@ -208,18 +210,22 @@ public class ScreenshotAppState extends AbstractAppState implements ActionListen return super.isInitialized() && renderer != null; } + @Override public void reshape(ViewPort vp, int w, int h) { outBuf = BufferUtils.createByteBuffer(w * h * 4); width = w; height = h; } + @Override public void preFrame(float tpf) { } + @Override public void postQueue(RenderQueue rq) { } + @Override public void postFrame(FrameBuffer out) { if (capture){ capture = false; diff --git a/jme3-core/src/main/java/com/jme3/asset/AssetKey.java b/jme3-core/src/main/java/com/jme3/asset/AssetKey.java index 4066d7e14..f8439c111 100644 --- a/jme3-core/src/main/java/com/jme3/asset/AssetKey.java +++ b/jme3-core/src/main/java/com/jme3/asset/AssetKey.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -191,11 +191,13 @@ public class AssetKey implements Savable, Cloneable { return name; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(name, "name", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); name = reducePath(ic.readString("name", null)); diff --git a/jme3-core/src/main/java/com/jme3/asset/CloneableAssetProcessor.java b/jme3-core/src/main/java/com/jme3/asset/CloneableAssetProcessor.java index bc6529b6b..6303e1a5e 100644 --- a/jme3-core/src/main/java/com/jme3/asset/CloneableAssetProcessor.java +++ b/jme3-core/src/main/java/com/jme3/asset/CloneableAssetProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,10 +39,12 @@ package com.jme3.asset; */ public class CloneableAssetProcessor implements AssetProcessor { + @Override public Object postProcess(AssetKey key, Object obj) { return obj; } + @Override public Object createClone(Object obj) { CloneableSmartAsset asset = (CloneableSmartAsset) obj; return asset.clone(); diff --git a/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java b/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java index 0c92e19e9..bc4718239 100644 --- a/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java +++ b/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -99,26 +99,32 @@ public class DesktopAssetManager implements AssetManager { } } + @Override public void addClassLoader(ClassLoader loader) { classLoaders.add(loader); } + @Override public void removeClassLoader(ClassLoader loader) { classLoaders.remove(loader); } + @Override public List getClassLoaders(){ return Collections.unmodifiableList(classLoaders); } + @Override public void addAssetEventListener(AssetEventListener listener) { eventListeners.add(listener); } + @Override public void removeAssetEventListener(AssetEventListener listener) { eventListeners.remove(listener); } + @Override public void clearAssetEventListeners() { eventListeners.clear(); } @@ -128,6 +134,7 @@ public class DesktopAssetManager implements AssetManager { eventListeners.add(listener); } + @Override public void registerLoader(Class loader, String ... extensions){ handler.addLoader(loader, extensions); if (logger.isLoggable(Level.FINER)){ @@ -150,6 +157,7 @@ public class DesktopAssetManager implements AssetManager { } } + @Override public void unregisterLoader(Class loaderClass) { handler.removeLoader(loaderClass); if (logger.isLoggable(Level.FINER)){ @@ -158,6 +166,7 @@ public class DesktopAssetManager implements AssetManager { } } + @Override public void registerLocator(String rootPath, Class locatorClass){ handler.addLocator(locatorClass, rootPath); if (logger.isLoggable(Level.FINER)){ @@ -180,6 +189,7 @@ public class DesktopAssetManager implements AssetManager { } } + @Override public void unregisterLocator(String rootPath, Class clazz){ handler.removeLocator(clazz, rootPath); if (logger.isLoggable(Level.FINER)){ @@ -188,6 +198,7 @@ public class DesktopAssetManager implements AssetManager { } } + @Override public AssetInfo locateAsset(AssetKey key){ AssetInfo info = handler.tryLocate(key); if (info == null){ @@ -383,48 +394,59 @@ public class DesktopAssetManager implements AssetManager { return clone; } + @Override public Object loadAsset(String name){ return loadAsset(new AssetKey(name)); } + @Override public Texture loadTexture(TextureKey key){ return (Texture) loadAsset(key); } + @Override public Material loadMaterial(String name){ return (Material) loadAsset(new MaterialKey(name)); } + @Override public Texture loadTexture(String name){ TextureKey key = new TextureKey(name, true); key.setGenerateMips(true); return loadTexture(key); } + @Override public AudioData loadAudio(AudioKey key){ return (AudioData) loadAsset(key); } + @Override public AudioData loadAudio(String name){ return loadAudio(new AudioKey(name, false)); } + @Override public BitmapFont loadFont(String name){ return (BitmapFont) loadAsset(new AssetKey(name)); } + @Override public Spatial loadModel(ModelKey key){ return (Spatial) loadAsset(key); } + @Override public Spatial loadModel(String name){ return loadModel(new ModelKey(name)); } + @Override public FilterPostProcessor loadFilter(FilterKey key){ return (FilterPostProcessor) loadAsset(key); } + @Override public FilterPostProcessor loadFilter(String name){ return loadFilter(new FilterKey(name)); } diff --git a/jme3-core/src/main/java/com/jme3/asset/ThreadingManager.java b/jme3-core/src/main/java/com/jme3/asset/ThreadingManager.java index 28f1cdb04..4fe8bca13 100644 --- a/jme3-core/src/main/java/com/jme3/asset/ThreadingManager.java +++ b/jme3-core/src/main/java/com/jme3/asset/ThreadingManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -53,6 +53,7 @@ public class ThreadingManager { } protected class LoadingThreadFactory implements ThreadFactory { + @Override public Thread newThread(Runnable r) { Thread t = new Thread(r, "jME3-threadpool-" + (nextThreadId++)); t.setDaemon(true); @@ -69,6 +70,7 @@ public class ThreadingManager { this.assetKey = assetKey; } + @Override public T call() throws Exception { return owner.loadAsset(assetKey); } diff --git a/jme3-core/src/main/java/com/jme3/asset/cache/SimpleAssetCache.java b/jme3-core/src/main/java/com/jme3/asset/cache/SimpleAssetCache.java index 0b3617ac0..94818a159 100644 --- a/jme3-core/src/main/java/com/jme3/asset/cache/SimpleAssetCache.java +++ b/jme3-core/src/main/java/com/jme3/asset/cache/SimpleAssetCache.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,25 +46,31 @@ public class SimpleAssetCache implements AssetCache { private final ConcurrentHashMap keyToAssetMap = new ConcurrentHashMap(); + @Override public void addToCache(AssetKey key, T obj) { keyToAssetMap.put(key, obj); } + @Override public void registerAssetClone(AssetKey key, T clone) { } + @Override public T getFromCache(AssetKey key) { return (T) keyToAssetMap.get(key); } + @Override public boolean deleteFromCache(AssetKey key) { return keyToAssetMap.remove(key) != null; } + @Override public void clearCache() { keyToAssetMap.clear(); } + @Override public void notifyNoAssetClone() { } diff --git a/jme3-core/src/main/java/com/jme3/asset/cache/WeakRefAssetCache.java b/jme3-core/src/main/java/com/jme3/asset/cache/WeakRefAssetCache.java index 42f73f4a5..23e96fd38 100644 --- a/jme3-core/src/main/java/com/jme3/asset/cache/WeakRefAssetCache.java +++ b/jme3-core/src/main/java/com/jme3/asset/cache/WeakRefAssetCache.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -84,6 +84,7 @@ public class WeakRefAssetCache implements AssetCache { } } + @Override public void addToCache(AssetKey key, T obj) { removeCollectedAssets(); @@ -93,6 +94,7 @@ public class WeakRefAssetCache implements AssetCache { assetCache.put(key, ref); } + @Override public T getFromCache(AssetKey key) { AssetRef ref = assetCache.get(key); if (ref != null){ @@ -102,17 +104,21 @@ public class WeakRefAssetCache implements AssetCache { } } + @Override public boolean deleteFromCache(AssetKey key) { return assetCache.remove(key) != null; } + @Override public void clearCache() { assetCache.clear(); } + @Override public void registerAssetClone(AssetKey key, T clone) { } + @Override public void notifyNoAssetClone() { } } diff --git a/jme3-core/src/main/java/com/jme3/asset/cache/WeakRefCloneAssetCache.java b/jme3-core/src/main/java/com/jme3/asset/cache/WeakRefCloneAssetCache.java index c7446dfc3..989376c3d 100644 --- a/jme3-core/src/main/java/com/jme3/asset/cache/WeakRefCloneAssetCache.java +++ b/jme3-core/src/main/java/com/jme3/asset/cache/WeakRefCloneAssetCache.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -119,6 +119,7 @@ public class WeakRefCloneAssetCache implements AssetCache { } } + @Override public void addToCache(AssetKey originalKey, T obj) { // Make room for new asset removeCollectedAssets(); @@ -143,16 +144,19 @@ public class WeakRefCloneAssetCache implements AssetCache { loadStack.add(originalKey); } + @Override public void registerAssetClone(AssetKey key, T clone) { ArrayList loadStack = assetLoadStack.get(); ((CloneableSmartAsset)clone).setKey(loadStack.remove(loadStack.size() - 1)); } + @Override public void notifyNoAssetClone() { ArrayList loadStack = assetLoadStack.get(); loadStack.remove(loadStack.size() - 1); } + @Override public T getFromCache(AssetKey key) { AssetRef smartInfo = smartCache.get(key); if (smartInfo == null) { @@ -177,6 +181,7 @@ public class WeakRefCloneAssetCache implements AssetCache { } } + @Override public boolean deleteFromCache(AssetKey key) { ArrayList loadStack = assetLoadStack.get(); @@ -188,6 +193,7 @@ public class WeakRefCloneAssetCache implements AssetCache { return smartCache.remove(key) != null; } + @Override public void clearCache() { ArrayList loadStack = assetLoadStack.get(); diff --git a/jme3-core/src/main/java/com/jme3/audio/AudioBuffer.java b/jme3-core/src/main/java/com/jme3/audio/AudioBuffer.java index 230299f5d..8350d995b 100644 --- a/jme3-core/src/main/java/com/jme3/audio/AudioBuffer.java +++ b/jme3-core/src/main/java/com/jme3/audio/AudioBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,6 +59,7 @@ public class AudioBuffer extends AudioData { super(id); } + @Override public DataType getDataType() { return DataType.Buffer; } @@ -67,6 +68,7 @@ public class AudioBuffer extends AudioData { * @return The duration of the audio in seconds. It is expected * that audio is uncompressed. */ + @Override public float getDuration(){ int bytesPerSec = (bitsPerSample / 8) * channels * sampleRate; if (audioData != null) @@ -98,6 +100,7 @@ public class AudioBuffer extends AudioData { return audioData; } + @Override public void resetObject() { id = -1; setUpdateNeeded(); diff --git a/jme3-core/src/main/java/com/jme3/audio/AudioNode.java b/jme3-core/src/main/java/com/jme3/audio/AudioNode.java index fead019ae..d8fa6eaf1 100644 --- a/jme3-core/src/main/java/com/jme3/audio/AudioNode.java +++ b/jme3-core/src/main/java/com/jme3/audio/AudioNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2016, 2018-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -252,6 +252,7 @@ public class AudioNode extends Node implements AudioSource { /** * Do not use. */ + @Override public final void setChannel(int channel) { if (status != AudioSource.Status.Stopped) { throw new IllegalStateException("Can only set source id when stopped"); @@ -263,6 +264,7 @@ public class AudioNode extends Node implements AudioSource { /** * Do not use. */ + @Override public int getChannel() { return channel; } @@ -271,6 +273,7 @@ public class AudioNode extends Node implements AudioSource { * @return The {#link Filter dry filter} that is set. * @see AudioNode#setDryFilter(com.jme3.audio.Filter) */ + @Override public Filter getDryFilter() { return dryFilter; } @@ -315,6 +318,7 @@ public class AudioNode extends Node implements AudioSource { * {@link AudioNode#setAudioData(com.jme3.audio.AudioData, com.jme3.audio.AudioKey) } * or any of the constructors that initialize the audio data. */ + @Override public AudioData getAudioData() { return data; } @@ -324,6 +328,7 @@ public class AudioNode extends Node implements AudioSource { * The status will be changed when either the {@link AudioNode#play() } * or {@link AudioNode#stop() } methods are called. */ + @Override public AudioSource.Status getStatus() { return status; } @@ -331,6 +336,7 @@ public class AudioNode extends Node implements AudioSource { /** * Do not use. */ + @Override public final void setStatus(AudioSource.Status status) { this.status = status; } @@ -353,6 +359,7 @@ public class AudioNode extends Node implements AudioSource { * otherwise, false. * @see AudioNode#setLooping(boolean) */ + @Override public boolean isLooping() { return loop; } @@ -373,6 +380,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setPitch(float) */ + @Override public float getPitch() { return pitch; } @@ -399,6 +407,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setVolume(float) */ + @Override public float getVolume() { return volume; } @@ -424,6 +433,7 @@ public class AudioNode extends Node implements AudioSource { /** * @return the time offset in the sound sample when to start playing. */ + @Override public float getTimeOffset() { return timeOffset; } @@ -456,6 +466,7 @@ public class AudioNode extends Node implements AudioSource { return 0; } + @Override public Vector3f getPosition() { return getWorldTranslation(); } @@ -465,6 +476,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setVelocity(com.jme3.math.Vector3f) */ + @Override public Vector3f getVelocity() { return velocity; } @@ -487,6 +499,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setReverbEnabled(boolean) */ + @Override public boolean isReverbEnabled() { return reverbEnabled; } @@ -513,6 +526,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setReverbFilter(com.jme3.audio.Filter) */ + @Override public Filter getReverbFilter() { return reverbFilter; } @@ -538,6 +552,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setMaxDistance(float) */ + @Override public float getMaxDistance() { return maxDistance; } @@ -572,6 +587,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setRefDistance(float) */ + @Override public float getRefDistance() { return refDistance; } @@ -601,6 +617,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setDirectional(boolean) */ + @Override public boolean isDirectional() { return directional; } @@ -626,6 +643,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setDirection(com.jme3.math.Vector3f) */ + @Override public Vector3f getDirection() { return direction; } @@ -648,6 +666,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setInnerAngle(float) */ + @Override public float getInnerAngle() { return innerAngle; } @@ -669,6 +688,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setOuterAngle(float) */ + @Override public float getOuterAngle() { return outerAngle; } @@ -690,6 +710,7 @@ public class AudioNode extends Node implements AudioSource { * * @see AudioNode#setPositional(boolean) */ + @Override public boolean isPositional() { return positional; } diff --git a/jme3-core/src/main/java/com/jme3/audio/AudioStream.java b/jme3-core/src/main/java/com/jme3/audio/AudioStream.java index 1047c673b..5ae74a4a6 100644 --- a/jme3-core/src/main/java/com/jme3/audio/AudioStream.java +++ b/jme3-core/src/main/java/com/jme3/audio/AudioStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -115,6 +115,7 @@ public class AudioStream extends AudioData implements Closeable { return readSamples(buf, 0, buf.length); } + @Override public float getDuration() { return duration; } @@ -181,6 +182,7 @@ public class AudioStream extends AudioData implements Closeable { * * @throws IOException */ + @Override public void close() { if (in != null && open) { try { diff --git a/jme3-core/src/main/java/com/jme3/audio/Filter.java b/jme3-core/src/main/java/com/jme3/audio/Filter.java index b46270c11..9faa1f051 100644 --- a/jme3-core/src/main/java/com/jme3/audio/Filter.java +++ b/jme3-core/src/main/java/com/jme3/audio/Filter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -47,10 +47,12 @@ public abstract class Filter extends NativeObject implements Savable { super(id); } + @Override public void write(JmeExporter ex) throws IOException { // nothing to save } + @Override public void read(JmeImporter im) throws IOException { // nothing to read } diff --git a/jme3-core/src/main/java/com/jme3/audio/LowPassFilter.java b/jme3-core/src/main/java/com/jme3/audio/LowPassFilter.java index 4445c2463..8ce385773 100644 --- a/jme3-core/src/main/java/com/jme3/audio/LowPassFilter.java +++ b/jme3-core/src/main/java/com/jme3/audio/LowPassFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -76,6 +76,7 @@ public class LowPassFilter extends Filter { this.updateNeeded = true; } + @Override public void write(JmeExporter ex) throws IOException{ super.write(ex); OutputCapsule oc = ex.getCapsule(this); diff --git a/jme3-core/src/main/java/com/jme3/audio/openal/ALAudioRenderer.java b/jme3-core/src/main/java/com/jme3/audio/openal/ALAudioRenderer.java index a4bcddeea..ab76b3694 100644 --- a/jme3-core/src/main/java/com/jme3/audio/openal/ALAudioRenderer.java +++ b/jme3-core/src/main/java/com/jme3/audio/openal/ALAudioRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -216,6 +216,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { alc.destroyALC(); } + @Override public void initialize() { if (decoderThread.isAlive()) { throw new IllegalStateException("Initialize already called"); @@ -237,6 +238,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void run() { long updateRateNanos = (long) (UPDATE_RATE * 1000000000); mainloop: @@ -267,6 +269,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void cleanup() { // kill audio thread if (!decoderThread.isAlive()) { @@ -359,6 +362,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void updateSourceParam(AudioSource src, AudioParam param) { checkDead(); synchronized (threadLock) { @@ -585,6 +589,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void updateListenerParam(Listener listener, ListenerParam param) { checkDead(); synchronized (threadLock) { @@ -651,6 +656,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void setEnvironment(Environment env) { checkDead(); synchronized (threadLock) { @@ -845,6 +851,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void update(float tpf) { synchronized (threadLock) { updateInRenderThread(tpf); @@ -977,6 +984,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { objManager.deleteUnused(this); } + @Override public void setListener(Listener listener) { checkDead(); synchronized (threadLock) { @@ -996,6 +1004,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void pauseAll() { if (!supportPauseDevice) { throw new UnsupportedOperationException("Pause device is NOT supported!"); @@ -1004,6 +1013,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { alc.alcDevicePauseSOFT(); } + @Override public void resumeAll() { if (!supportPauseDevice) { throw new UnsupportedOperationException("Pause device is NOT supported!"); @@ -1012,6 +1022,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { alc.alcDeviceResumeSOFT(); } + @Override public void playSourceInstance(AudioSource src) { checkDead(); synchronized (threadLock) { @@ -1049,6 +1060,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void playSource(AudioSource src) { checkDead(); synchronized (threadLock) { @@ -1087,6 +1099,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void pauseSource(AudioSource src) { checkDead(); synchronized (threadLock) { @@ -1103,6 +1116,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void stopSource(AudioSource src) { synchronized (threadLock) { if (audioDisabled) { @@ -1196,6 +1210,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void deleteFilter(Filter filter) { int id = filter.getId(); if (id != -1) { @@ -1206,6 +1221,7 @@ public class ALAudioRenderer implements AudioRenderer, Runnable { } } + @Override public void deleteAudioData(AudioData ad) { synchronized (threadLock) { if (audioDisabled) { diff --git a/jme3-core/src/main/java/com/jme3/bounding/BoundingBox.java b/jme3-core/src/main/java/com/jme3/bounding/BoundingBox.java index 6e422dea4..a621d3ea6 100644 --- a/jme3-core/src/main/java/com/jme3/bounding/BoundingBox.java +++ b/jme3-core/src/main/java/com/jme3/bounding/BoundingBox.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2013 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -106,6 +106,7 @@ public class BoundingBox extends BoundingVolume { setMinMax(min, max); } + @Override public Type getType() { return Type.AABB; } @@ -117,6 +118,7 @@ public class BoundingBox extends BoundingVolume { * @param points * the points to contain. */ + @Override public void computeFromPoints(FloatBuffer points) { containAABB(points); } @@ -293,6 +295,7 @@ public class BoundingBox extends BoundingVolume { * @param store * box to store result in */ + @Override public BoundingVolume transform(Transform trans, BoundingVolume store) { BoundingBox box; @@ -326,6 +329,7 @@ public class BoundingBox extends BoundingVolume { return box; } + @Override public BoundingVolume transform(Matrix4f trans, BoundingVolume store) { BoundingBox box; if (store == null || store.getType() != Type.AABB) { @@ -365,6 +369,7 @@ public class BoundingBox extends BoundingVolume { * @param plane * the plane to check against. */ + @Override public Plane.Side whichSide(Plane plane) { float radius = FastMath.abs(xExtent * plane.getNormal().getX()) + FastMath.abs(yExtent * plane.getNormal().getY()) @@ -392,6 +397,7 @@ public class BoundingBox extends BoundingVolume { * @return this box (with its components modified) or null if the second * volume is of some type other than AABB or Sphere */ + @Override public BoundingVolume merge(BoundingVolume volume) { return mergeLocal(volume); } @@ -406,6 +412,7 @@ public class BoundingBox extends BoundingVolume { * @return this box (with its components modified) or null if the second * volume is of some type other than AABB or Sphere */ + @Override public BoundingVolume mergeLocal(BoundingVolume volume) { if (volume == null) { return this; @@ -548,6 +555,7 @@ public class BoundingBox extends BoundingVolume { * a new store is created. * @return the new BoundingBox */ + @Override public BoundingVolume clone(BoundingVolume store) { if (store != null && store.getType() == Type.AABB) { BoundingBox rVal = (BoundingBox) store; @@ -584,6 +592,7 @@ public class BoundingBox extends BoundingVolume { * * @see BoundingVolume#intersects(com.jme3.bounding.BoundingVolume) */ + @Override public boolean intersects(BoundingVolume bv) { return bv.intersectsBoundingBox(this); } @@ -593,6 +602,7 @@ public class BoundingBox extends BoundingVolume { * * @see BoundingVolume#intersectsSphere(com.jme3.bounding.BoundingSphere) */ + @Override public boolean intersectsSphere(BoundingSphere bs) { return bs.intersectsBoundingBox(this); } @@ -604,6 +614,7 @@ public class BoundingBox extends BoundingVolume { * * @see BoundingVolume#intersectsBoundingBox(com.jme3.bounding.BoundingBox) */ + @Override public boolean intersectsBoundingBox(BoundingBox bb) { assert Vector3f.isValidVector(center) && Vector3f.isValidVector(bb.center); @@ -636,6 +647,7 @@ public class BoundingBox extends BoundingVolume { * * @see BoundingVolume#intersects(com.jme3.math.Ray) */ + @Override public boolean intersects(Ray ray) { assert Vector3f.isValidVector(center); @@ -853,6 +865,7 @@ public class BoundingBox extends BoundingVolume { && FastMath.abs(center.z - point.z) <= zExtent; } + @Override public float distanceToEdge(Vector3f point) { // compute coordinates of point in box coordinate system TempVars vars= TempVars.get(); diff --git a/jme3-core/src/main/java/com/jme3/bounding/BoundingSphere.java b/jme3-core/src/main/java/com/jme3/bounding/BoundingSphere.java index 7936c7224..0b0cb810f 100644 --- a/jme3-core/src/main/java/com/jme3/bounding/BoundingSphere.java +++ b/jme3-core/src/main/java/com/jme3/bounding/BoundingSphere.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -85,6 +85,7 @@ public class BoundingSphere extends BoundingVolume { this.radius = r; } + @Override public Type getType() { return Type.Sphere; } @@ -116,6 +117,7 @@ public class BoundingSphere extends BoundingVolume { * @param points * the points to contain. */ + @Override public void computeFromPoints(FloatBuffer points) { calcWelzl(points); } @@ -383,6 +385,7 @@ public class BoundingSphere extends BoundingVolume { * @return BoundingVolume * @return ref */ + @Override public BoundingVolume transform(Transform trans, BoundingVolume store) { BoundingSphere sphere; if (store == null || store.getType() != BoundingVolume.Type.Sphere) { @@ -398,6 +401,7 @@ public class BoundingSphere extends BoundingVolume { return sphere; } + @Override public BoundingVolume transform(Matrix4f trans, BoundingVolume store) { BoundingSphere sphere; if (store == null || store.getType() != BoundingVolume.Type.Sphere) { @@ -441,6 +445,7 @@ public class BoundingSphere extends BoundingVolume { * the plane to check against. * @return side */ + @Override public Plane.Side whichSide(Plane plane) { float distance = plane.pseudoDistance(center); @@ -461,6 +466,7 @@ public class BoundingSphere extends BoundingVolume { * the sphere to combine with this sphere. * @return a new sphere */ + @Override public BoundingVolume merge(BoundingVolume volume) { if (volume == null) { return this; @@ -506,6 +512,7 @@ public class BoundingSphere extends BoundingVolume { * the sphere to combine with this sphere. * @return this */ + @Override public BoundingVolume mergeLocal(BoundingVolume volume) { if (volume == null) { return this; @@ -629,6 +636,7 @@ public class BoundingSphere extends BoundingVolume { * a new store is created. * @return the new BoundingSphere */ + @Override public BoundingVolume clone(BoundingVolume store) { if (store != null && store.getType() == Type.Sphere) { BoundingSphere rVal = (BoundingSphere) store; @@ -661,6 +669,7 @@ public class BoundingSphere extends BoundingVolume { * * @see com.jme.bounding.BoundingVolume#intersects(com.jme.bounding.BoundingVolume) */ + @Override public boolean intersects(BoundingVolume bv) { return bv.intersectsSphere(this); } @@ -670,6 +679,7 @@ public class BoundingSphere extends BoundingVolume { * * @see com.jme.bounding.BoundingVolume#intersectsSphere(com.jme.bounding.BoundingSphere) */ + @Override public boolean intersectsSphere(BoundingSphere bs) { return Intersection.intersect(bs, center, radius); } @@ -679,6 +689,7 @@ public class BoundingSphere extends BoundingVolume { * * @see com.jme.bounding.BoundingVolume#intersectsBoundingBox(com.jme.bounding.BoundingBox) */ + @Override public boolean intersectsBoundingBox(BoundingBox bb) { return Intersection.intersect(bb, center, radius); } @@ -697,6 +708,7 @@ public class BoundingSphere extends BoundingVolume { * * @see com.jme.bounding.BoundingVolume#intersects(com.jme.math.Ray) */ + @Override public boolean intersects(Ray ray) { assert Vector3f.isValidVector(center); @@ -988,6 +1000,7 @@ public class BoundingSphere extends BoundingVolume { } } + @Override public int collideWith(Collidable other, CollisionResults results) { if (other instanceof Ray) { Ray ray = (Ray) other; @@ -1034,6 +1047,7 @@ public class BoundingSphere extends BoundingVolume { return center.distanceSquared(point) <= (getRadius() * getRadius()); } + @Override public float distanceToEdge(Vector3f point) { return center.distance(point) - radius; } diff --git a/jme3-core/src/main/java/com/jme3/bounding/BoundingVolume.java b/jme3-core/src/main/java/com/jme3/bounding/BoundingVolume.java index 4491fcedf..504a61e28 100644 --- a/jme3-core/src/main/java/com/jme3/bounding/BoundingVolume.java +++ b/jme3-core/src/main/java/com/jme3/bounding/BoundingVolume.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -317,10 +317,12 @@ public abstract class BoundingVolume implements Savable, Cloneable, Collidable { } } + @Override public void write(JmeExporter e) throws IOException { e.getCapsule(this).write(center, "center", Vector3f.ZERO); } + @Override public void read(JmeImporter e) throws IOException { center = (Vector3f) e.getCapsule(this).readSavable("center", Vector3f.ZERO.clone()); } diff --git a/jme3-core/src/main/java/com/jme3/cinematic/Cinematic.java b/jme3-core/src/main/java/com/jme3/cinematic/Cinematic.java index 73db01d47..9c5af0e35 100644 --- a/jme3-core/src/main/java/com/jme3/cinematic/Cinematic.java +++ b/jme3-core/src/main/java/com/jme3/cinematic/Cinematic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -270,6 +270,7 @@ public class Cinematic extends AbstractCinematicEvent implements AppState { * @param stateManager the state manager * @param app the application */ + @Override public void initialize(AppStateManager stateManager, Application app) { initEvent(app, this); for (CinematicEvent cinematicEvent : cinematicEvents) { @@ -288,6 +289,7 @@ public class Cinematic extends AbstractCinematicEvent implements AppState { * * @return true if initialized, otherwise false */ + @Override public boolean isInitialized() { return initialized; } @@ -312,6 +314,7 @@ public class Cinematic extends AbstractCinematicEvent implements AppState { * * @param enabled true or false */ + @Override public void setEnabled(boolean enabled) { if (enabled) { play(); @@ -324,6 +327,7 @@ public class Cinematic extends AbstractCinematicEvent implements AppState { * * @return true if enabled */ + @Override public boolean isEnabled() { return playState == PlayState.Playing; } @@ -333,6 +337,7 @@ public class Cinematic extends AbstractCinematicEvent implements AppState { * * @param stateManager the state manager */ + @Override public void stateAttached(AppStateManager stateManager) { } @@ -341,6 +346,7 @@ public class Cinematic extends AbstractCinematicEvent implements AppState { * * @param stateManager the state manager */ + @Override public void stateDetached(AppStateManager stateManager) { stop(); } @@ -508,6 +514,7 @@ public class Cinematic extends AbstractCinematicEvent implements AppState { * * @see AppState#render(com.jme3.renderer.RenderManager) */ + @Override public void render(RenderManager rm) { } @@ -516,6 +523,7 @@ public class Cinematic extends AbstractCinematicEvent implements AppState { * * @see AppState#postRender() */ + @Override public void postRender() { } @@ -524,6 +532,7 @@ public class Cinematic extends AbstractCinematicEvent implements AppState { * * @see AppState#cleanup() */ + @Override public void cleanup() { } diff --git a/jme3-core/src/main/java/com/jme3/cinematic/KeyFrame.java b/jme3-core/src/main/java/com/jme3/cinematic/KeyFrame.java index 458a482a9..d8ad5b69d 100644 --- a/jme3-core/src/main/java/com/jme3/cinematic/KeyFrame.java +++ b/jme3-core/src/main/java/com/jme3/cinematic/KeyFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,12 +69,14 @@ public class KeyFrame implements Savable { return cinematicEvents.isEmpty(); } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.writeSavableArrayList((ArrayList) cinematicEvents, "cinematicEvents", null); oc.write(index, "index", 0); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); cinematicEvents = ic.readSavableArrayList("cinematicEvents", null); diff --git a/jme3-core/src/main/java/com/jme3/cinematic/TimeLine.java b/jme3-core/src/main/java/com/jme3/cinematic/TimeLine.java index e51c909dd..c84422629 100644 --- a/jme3-core/src/main/java/com/jme3/cinematic/TimeLine.java +++ b/jme3-core/src/main/java/com/jme3/cinematic/TimeLine.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -104,6 +104,7 @@ public class TimeLine extends HashMap implements Savable { return lastKeyFrameIndex; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); ArrayList list = new ArrayList(); @@ -111,6 +112,7 @@ public class TimeLine extends HashMap implements Savable { oc.writeSavableArrayList(list, "keyFrames", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); ArrayList list = ic.readSavableArrayList("keyFrames", null); diff --git a/jme3-core/src/main/java/com/jme3/cinematic/events/AbstractCinematicEvent.java b/jme3-core/src/main/java/com/jme3/cinematic/events/AbstractCinematicEvent.java index 6fb4899c3..a65a07882 100644 --- a/jme3-core/src/main/java/com/jme3/cinematic/events/AbstractCinematicEvent.java +++ b/jme3-core/src/main/java/com/jme3/cinematic/events/AbstractCinematicEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -104,6 +104,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * or when it was force-stopped during playback. * By default, this method just calls regular stop(). */ + @Override public void forceStop(){ stop(); } @@ -111,6 +112,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { /** * Play this event. */ + @Override public void play() { onPlay(); playState = PlayState.Playing; @@ -131,6 +133,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * Used internally only. * @param tpf time per frame. */ + @Override public void internalUpdate(float tpf) { if (playState == PlayState.Playing) { time = time + (tpf * speed); @@ -161,6 +164,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * Stops the animation. * Next time when play() is called, the animation starts from the beginning. */ + @Override public void stop() { onStop(); time = 0; @@ -182,6 +186,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * Pause this event. * Next time when play() is called, the animation restarts from here. */ + @Override public void pause() { onPause(); playState = PlayState.Paused; @@ -202,6 +207,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * Returns the actual duration of the animation (initialDuration/speed) * @return the duration (in seconds) */ + @Override public float getDuration() { return initialDuration / speed; } @@ -212,6 +218,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * At speed = 2, the animation will last initialDuration/2... * @param speed */ + @Override public void setSpeed(float speed) { this.speed = speed; } @@ -220,6 +227,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * Returns the speed of the animation. * @return the speed */ + @Override public float getSpeed() { return speed; } @@ -228,6 +236,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * Returns the current playstate of the animation (playing or paused or stopped). * @return the enum value */ + @Override public PlayState getPlayState() { return playState; } @@ -236,6 +245,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * Returns the initial duration of the animation at speed = 1 in seconds. * @return the duration in seconds */ + @Override public float getInitialDuration() { return initialDuration; } @@ -244,6 +254,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * Sets the duration of the animation at speed = 1 in seconds. * @param initialDuration */ + @Override public void setInitialDuration(float initialDuration) { this.initialDuration = initialDuration; } @@ -253,6 +264,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * @see LoopMode * @return the enum value */ + @Override public LoopMode getLoopMode() { return loopMode; } @@ -262,6 +274,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * @see LoopMode * @param loopMode */ + @Override public void setLoopMode(LoopMode loopMode) { this.loopMode = loopMode; } @@ -271,6 +284,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * @param ex exporter * @throws IOException */ + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(playState, "playState", PlayState.Stopped); @@ -284,6 +298,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * @param im importer * @throws IOException */ + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); playState = ic.readEnum("playState", PlayState.class, PlayState.Stopped); @@ -297,6 +312,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * @param app * @param cinematic */ + @Override public void initEvent(Application app, Cinematic cinematic) { } @@ -331,6 +347,7 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { * Fast-forward the event to the given timestamp. Time=0 is the start of the event. * @param time the time to fast forward to. */ + @Override public void setTime(float time) { this.time = time ; } @@ -338,10 +355,12 @@ public abstract class AbstractCinematicEvent implements CinematicEvent { /** * Return the current timestamp of the event. Time=0 is the start of the event. */ + @Override public float getTime() { return time; } + @Override public void dispose() { } diff --git a/jme3-core/src/main/java/com/jme3/cinematic/events/MotionEvent.java b/jme3-core/src/main/java/com/jme3/cinematic/events/MotionEvent.java index e7d217f45..f4d56e21d 100644 --- a/jme3-core/src/main/java/com/jme3/cinematic/events/MotionEvent.java +++ b/jme3-core/src/main/java/com/jme3/cinematic/events/MotionEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -159,6 +159,7 @@ public class MotionEvent extends AbstractCinematicEvent implements Control, JmeC this.loopMode = loopMode; } + @Override public void update(float tpf) { if (isControl) { internalUpdate(tpf); @@ -200,6 +201,7 @@ public class MotionEvent extends AbstractCinematicEvent implements Control, JmeC onUpdate(0); } + @Override public void onUpdate(float tpf) { traveledDistance = path.interpolatePath(time, this, tpf); computeTargetDirection(); @@ -457,9 +459,11 @@ public class MotionEvent extends AbstractCinematicEvent implements Control, JmeC return playState != PlayState.Stopped; } + @Override public void render(RenderManager rm, ViewPort vp) { } + @Override public void setSpatial(Spatial spatial) { this.spatial = spatial; } diff --git a/jme3-core/src/main/java/com/jme3/collision/CollisionResult.java b/jme3-core/src/main/java/com/jme3/collision/CollisionResult.java index d66ec62cf..d0f6cb91e 100644 --- a/jme3-core/src/main/java/com/jme3/collision/CollisionResult.java +++ b/jme3-core/src/main/java/com/jme3/collision/CollisionResult.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -97,6 +97,7 @@ public class CollisionResult implements Comparable { return store; } + @Override public int compareTo(CollisionResult other) { return Float.compare(distance, other.distance); } @@ -134,6 +135,7 @@ public class CollisionResult implements Comparable { return triangleIndex; } + @Override public String toString() { return "CollisionResult[geometry=" + geometry + ", contactPoint=" + contactPoint diff --git a/jme3-core/src/main/java/com/jme3/collision/CollisionResults.java b/jme3-core/src/main/java/com/jme3/collision/CollisionResults.java index 93c5c81b5..8728106c2 100644 --- a/jme3-core/src/main/java/com/jme3/collision/CollisionResults.java +++ b/jme3-core/src/main/java/com/jme3/collision/CollisionResults.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,6 +61,7 @@ public class CollisionResults implements Iterable { * * @return the iterator */ + @Override public Iterator iterator() { if (results == null) { List dumbCompiler = Collections.emptyList(); diff --git a/jme3-core/src/main/java/com/jme3/collision/SweepSphere.java b/jme3-core/src/main/java/com/jme3/collision/SweepSphere.java index 75470dcb5..c1895449c 100644 --- a/jme3-core/src/main/java/com/jme3/collision/SweepSphere.java +++ b/jme3-core/src/main/java/com/jme3/collision/SweepSphere.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -412,6 +412,7 @@ class SweepSphere implements Collidable { } } + @Override public int collideWith(Collidable other, CollisionResults results) throws UnsupportedCollisionException { if (other instanceof AbstractTriangle){ diff --git a/jme3-core/src/main/java/com/jme3/collision/bih/BIHNode.java b/jme3-core/src/main/java/com/jme3/collision/bih/BIHNode.java index 52e4f91ca..6f422baed 100644 --- a/jme3-core/src/main/java/com/jme3/collision/bih/BIHNode.java +++ b/jme3-core/src/main/java/com/jme3/collision/bih/BIHNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -111,6 +111,7 @@ public final class BIHNode implements Savable { this.rightPlane = rightPlane; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(leftIndex, "left_index", 0); @@ -122,6 +123,7 @@ public final class BIHNode implements Savable { oc.write(right, "right_node", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); leftIndex = ic.readInt("left_index", 0); diff --git a/jme3-core/src/main/java/com/jme3/collision/bih/BIHTree.java b/jme3-core/src/main/java/com/jme3/collision/bih/BIHTree.java index 2d7a4dc24..8813cbed1 100644 --- a/jme3-core/src/main/java/com/jme3/collision/bih/BIHTree.java +++ b/jme3-core/src/main/java/com/jme3/collision/bih/BIHTree.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -461,6 +461,7 @@ public class BIHTree implements CollisionData { return root.intersectWhere(bv, bbox, worldMatrix, this, results); } + @Override public int collideWith(Collidable other, Matrix4f worldMatrix, BoundingVolume worldBound, @@ -477,6 +478,7 @@ public class BIHTree implements CollisionData { } } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(mesh, "mesh", null); @@ -486,6 +488,7 @@ public class BIHTree implements CollisionData { oc.write(triIndices, "indices", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); mesh = (Mesh) ic.readSavable("mesh", null); diff --git a/jme3-core/src/main/java/com/jme3/collision/bih/TriangleAxisComparator.java b/jme3-core/src/main/java/com/jme3/collision/bih/TriangleAxisComparator.java index 836a972e9..e503a6334 100644 --- a/jme3-core/src/main/java/com/jme3/collision/bih/TriangleAxisComparator.java +++ b/jme3-core/src/main/java/com/jme3/collision/bih/TriangleAxisComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ public class TriangleAxisComparator implements Comparator { this.axis = axis; } + @Override public int compare(BIHTriangle o1, BIHTriangle o2) { float v1, v2; Vector3f c1 = o1.getCenter(); diff --git a/jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java b/jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java index ea0a2a3b4..367cab86b 100644 --- a/jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java +++ b/jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -141,6 +141,7 @@ public class ParticleEmitter extends Geometry { this.parentEmitter = cloner.clone(parentEmitter); } + @Override public void setSpatial(Spatial spatial) { } @@ -152,17 +153,21 @@ public class ParticleEmitter extends Geometry { return parentEmitter.isEnabled(); } + @Override public void update(float tpf) { parentEmitter.updateFromControl(tpf); } + @Override public void render(RenderManager rm, ViewPort vp) { parentEmitter.renderFromControl(rm, vp); } + @Override public void write(JmeExporter ex) throws IOException { } + @Override public void read(JmeImporter im) throws IOException { } } @@ -180,6 +185,7 @@ public class ParticleEmitter extends Geometry { /** * The old clone() method that did not use the new Cloner utility. */ + @Override public ParticleEmitter oldClone(boolean cloneMaterial) { ParticleEmitter clone = (ParticleEmitter) super.clone(cloneMaterial); clone.shape = shape.deepClone(); diff --git a/jme3-core/src/main/java/com/jme3/export/NullSavable.java b/jme3-core/src/main/java/com/jme3/export/NullSavable.java index a57dcc701..e3384a4ca 100644 --- a/jme3-core/src/main/java/com/jme3/export/NullSavable.java +++ b/jme3-core/src/main/java/com/jme3/export/NullSavable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,8 +41,10 @@ import java.io.IOException; * @author Kirill Vainer */ public class NullSavable implements Savable { + @Override public void write(JmeExporter ex) throws IOException { } + @Override public void read(JmeImporter im) throws IOException { } } diff --git a/jme3-core/src/main/java/com/jme3/font/BitmapCharacter.java b/jme3-core/src/main/java/com/jme3/font/BitmapCharacter.java index 1fb13ab93..bb6113e17 100644 --- a/jme3-core/src/main/java/com/jme3/font/BitmapCharacter.java +++ b/jme3-core/src/main/java/com/jme3/font/BitmapCharacter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -152,6 +152,7 @@ public class BitmapCharacter implements Savable, Cloneable { return i.intValue(); } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(c, "c", 0); @@ -177,6 +178,7 @@ public class BitmapCharacter implements Savable, Cloneable { oc.write(amounts, "amounts", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); c = (char) ic.readInt("c", 0); diff --git a/jme3-core/src/main/java/com/jme3/font/Kerning.java b/jme3-core/src/main/java/com/jme3/font/Kerning.java index 3a6daeed3..5c4130d31 100644 --- a/jme3-core/src/main/java/com/jme3/font/Kerning.java +++ b/jme3-core/src/main/java/com/jme3/font/Kerning.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,12 +59,14 @@ public class Kerning implements Savable { this.amount = amount; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(second, "second", 0); oc.write(amount, "amount", 0); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); second = ic.readInt("second", 0); diff --git a/jme3-core/src/main/java/com/jme3/font/Rectangle.java b/jme3-core/src/main/java/com/jme3/font/Rectangle.java index e3bb90dd8..5eb5cdd0c 100644 --- a/jme3-core/src/main/java/com/jme3/font/Rectangle.java +++ b/jme3-core/src/main/java/com/jme3/font/Rectangle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,6 +62,7 @@ public class Rectangle implements Cloneable { } } + @Override public String toString() { return getClass().getSimpleName() + "[x=" + x + ", y=" + y + ", width=" + width + ", height=" + height + "]"; } diff --git a/jme3-core/src/main/java/com/jme3/input/ChaseCamera.java b/jme3-core/src/main/java/com/jme3/input/ChaseCamera.java index 43f0941fc..bf47afdd9 100644 --- a/jme3-core/src/main/java/com/jme3/input/ChaseCamera.java +++ b/jme3-core/src/main/java/com/jme3/input/ChaseCamera.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -184,6 +184,7 @@ public class ChaseCamera implements ActionListener, AnalogListener, Control, Jme registerWithInput(inputManager); } + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (dragToRotate) { if (name.equals(CameraInput.CHASECAM_TOGGLEROTATE) && enabled) { @@ -204,6 +205,7 @@ public class ChaseCamera implements ActionListener, AnalogListener, Control, Jme } + @Override public void onAnalog(String name, float value, float tpf) { if (name.equals(CameraInput.CHASECAM_MOVELEFT)) { rotateCamera(-value); @@ -612,6 +614,7 @@ public class ChaseCamera implements ActionListener, AnalogListener, Control, Jme * Sets the spacial for the camera control, should only be used internally * @param spatial */ + @Override public void setSpatial(Spatial spatial) { target = spatial; if (spatial == null) { @@ -626,6 +629,7 @@ public class ChaseCamera implements ActionListener, AnalogListener, Control, Jme * update the camera control, should only be used internally * @param tpf */ + @Override public void update(float tpf) { updateCamera(tpf); } @@ -635,6 +639,7 @@ public class ChaseCamera implements ActionListener, AnalogListener, Control, Jme * @param rm * @param vp */ + @Override public void render(RenderManager rm, ViewPort vp) { //nothing to render } @@ -644,6 +649,7 @@ public class ChaseCamera implements ActionListener, AnalogListener, Control, Jme * @param ex the exporter * @throws IOException */ + @Override public void write(JmeExporter ex) throws IOException { throw new UnsupportedOperationException("remove ChaseCamera before saving"); } @@ -653,6 +659,7 @@ public class ChaseCamera implements ActionListener, AnalogListener, Control, Jme * @param im * @throws IOException */ + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); maxDistance = ic.readFloat("maxDistance", 40); diff --git a/jme3-core/src/main/java/com/jme3/input/DefaultJoystickAxis.java b/jme3-core/src/main/java/com/jme3/input/DefaultJoystickAxis.java index 7d7901911..c201628b0 100644 --- a/jme3-core/src/main/java/com/jme3/input/DefaultJoystickAxis.java +++ b/jme3-core/src/main/java/com/jme3/input/DefaultJoystickAxis.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public class DefaultJoystickAxis implements JoystickAxis { * @param positiveMapping The mapping to receive events when the axis is negative * @param negativeMapping The mapping to receive events when the axis is positive */ + @Override public void assignAxis(String positiveMapping, String negativeMapping){ if (axisIndex != -1) { inputManager.addMapping(positiveMapping, new JoyAxisTrigger(parent.getJoyId(), axisIndex, false)); @@ -81,6 +82,7 @@ public class DefaultJoystickAxis implements JoystickAxis { /** * Returns the joystick to which this axis object belongs. */ + @Override public Joystick getJoystick() { return parent; } @@ -90,6 +92,7 @@ public class DefaultJoystickAxis implements JoystickAxis { * * @return the name of this joystick. */ + @Override public String getName() { return name; } @@ -99,6 +102,7 @@ public class DefaultJoystickAxis implements JoystickAxis { * * @return the logical identifier of this joystick. */ + @Override public String getLogicalId() { return logicalId; } @@ -108,6 +112,7 @@ public class DefaultJoystickAxis implements JoystickAxis { * * @return the axisId of this joystick axis. */ + @Override public int getAxisId() { return axisIndex; } @@ -116,6 +121,7 @@ public class DefaultJoystickAxis implements JoystickAxis { * Returns true if this is an analog axis, meaning the values * are a continuous range instead of 1, 0, and -1. */ + @Override public boolean isAnalog() { return isAnalog; } @@ -123,6 +129,7 @@ public class DefaultJoystickAxis implements JoystickAxis { /** * Returns true if this axis presents relative values. */ + @Override public boolean isRelative() { return isRelative; } @@ -131,6 +138,7 @@ public class DefaultJoystickAxis implements JoystickAxis { * Returns the suggested dead zone for this axis. Values less than this * can be safely ignored. */ + @Override public float getDeadZone() { return deadZone; } diff --git a/jme3-core/src/main/java/com/jme3/input/DefaultJoystickButton.java b/jme3-core/src/main/java/com/jme3/input/DefaultJoystickButton.java index 827f33c6e..443f27c2d 100644 --- a/jme3-core/src/main/java/com/jme3/input/DefaultJoystickButton.java +++ b/jme3-core/src/main/java/com/jme3/input/DefaultJoystickButton.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,6 +61,7 @@ public class DefaultJoystickButton implements JoystickButton { * * @param mappingName The mapping to receive joystick button events. */ + @Override public void assignButton(String mappingName) { inputManager.addMapping(mappingName, new JoyButtonTrigger(parent.getJoyId(), buttonIndex)); } @@ -68,6 +69,7 @@ public class DefaultJoystickButton implements JoystickButton { /** * Returns the joystick to which this axis object belongs. */ + @Override public Joystick getJoystick() { return parent; } @@ -77,6 +79,7 @@ public class DefaultJoystickButton implements JoystickButton { * * @return the name of this joystick. */ + @Override public String getName() { return name; } @@ -86,6 +89,7 @@ public class DefaultJoystickButton implements JoystickButton { * * @return the logical identifier of this joystick. */ + @Override public String getLogicalId() { return logicalId; } @@ -96,6 +100,7 @@ public class DefaultJoystickButton implements JoystickButton { * * @return the buttonId of this joystick axis. */ + @Override public int getButtonId() { return buttonIndex; } diff --git a/jme3-core/src/main/java/com/jme3/input/controls/JoyAxisTrigger.java b/jme3-core/src/main/java/com/jme3/input/controls/JoyAxisTrigger.java index 846c207dc..b2945c3ee 100644 --- a/jme3-core/src/main/java/com/jme3/input/controls/JoyAxisTrigger.java +++ b/jme3-core/src/main/java/com/jme3/input/controls/JoyAxisTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,10 +65,12 @@ public class JoyAxisTrigger implements Trigger { return negative; } + @Override public String getName() { return "JoyAxis[joyId="+joyId+", axisId="+axisId+", neg="+negative+"]"; } + @Override public int triggerHashCode() { return joyAxisHash(joyId, axisId, negative); } diff --git a/jme3-core/src/main/java/com/jme3/input/controls/JoyButtonTrigger.java b/jme3-core/src/main/java/com/jme3/input/controls/JoyButtonTrigger.java index e1b2eb160..a922e013f 100644 --- a/jme3-core/src/main/java/com/jme3/input/controls/JoyButtonTrigger.java +++ b/jme3-core/src/main/java/com/jme3/input/controls/JoyButtonTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,10 +61,12 @@ public class JoyButtonTrigger implements Trigger { return joyId; } + @Override public String getName() { return "JoyButton[joyId="+joyId+", axisId="+buttonId+"]"; } + @Override public int triggerHashCode() { return joyButtonHash(joyId, buttonId); } diff --git a/jme3-core/src/main/java/com/jme3/input/controls/KeyTrigger.java b/jme3-core/src/main/java/com/jme3/input/controls/KeyTrigger.java index eaf10aa6a..18a540151 100644 --- a/jme3-core/src/main/java/com/jme3/input/controls/KeyTrigger.java +++ b/jme3-core/src/main/java/com/jme3/input/controls/KeyTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,6 +51,7 @@ public class KeyTrigger implements Trigger { this.keyCode = keyCode; } + @Override public String getName() { return "KeyCode " + keyCode; } @@ -64,6 +65,7 @@ public class KeyTrigger implements Trigger { return keyCode & 0xff; } + @Override public int triggerHashCode() { return keyHash(keyCode); } diff --git a/jme3-core/src/main/java/com/jme3/input/controls/MouseAxisTrigger.java b/jme3-core/src/main/java/com/jme3/input/controls/MouseAxisTrigger.java index 72c231d1f..95a7871ae 100644 --- a/jme3-core/src/main/java/com/jme3/input/controls/MouseAxisTrigger.java +++ b/jme3-core/src/main/java/com/jme3/input/controls/MouseAxisTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -68,6 +68,7 @@ public class MouseAxisTrigger implements Trigger { return negative; } + @Override public String getName() { String sign = negative ? "Negative" : "Positive"; switch (mouseAxis){ @@ -83,6 +84,7 @@ public class MouseAxisTrigger implements Trigger { return (negative ? 768 : 512) | (mouseAxis & 0xff); } + @Override public int triggerHashCode() { return mouseAxisHash(mouseAxis, negative); } diff --git a/jme3-core/src/main/java/com/jme3/input/controls/MouseButtonTrigger.java b/jme3-core/src/main/java/com/jme3/input/controls/MouseButtonTrigger.java index 4badddf20..66cb055ea 100644 --- a/jme3-core/src/main/java/com/jme3/input/controls/MouseButtonTrigger.java +++ b/jme3-core/src/main/java/com/jme3/input/controls/MouseButtonTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,6 +62,7 @@ public class MouseButtonTrigger implements Trigger { return mouseButton; } + @Override public String getName() { return "Mouse Button " + mouseButton; } @@ -71,6 +72,7 @@ public class MouseButtonTrigger implements Trigger { return 256 | (mouseButton & 0xff); } + @Override public int triggerHashCode() { return mouseButtonHash(mouseButton); } diff --git a/jme3-core/src/main/java/com/jme3/input/controls/TouchTrigger.java b/jme3-core/src/main/java/com/jme3/input/controls/TouchTrigger.java index 2592249be..16ad19b50 100644 --- a/jme3-core/src/main/java/com/jme3/input/controls/TouchTrigger.java +++ b/jme3-core/src/main/java/com/jme3/input/controls/TouchTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,6 +62,7 @@ public class TouchTrigger implements Trigger { return 0xfedcba98 + keyCode; } + @Override public int triggerHashCode() { return touchHash(keyCode); } diff --git a/jme3-core/src/main/java/com/jme3/input/dummy/DummyInput.java b/jme3-core/src/main/java/com/jme3/input/dummy/DummyInput.java index 6525ac365..ec10be2ec 100644 --- a/jme3-core/src/main/java/com/jme3/input/dummy/DummyInput.java +++ b/jme3-core/src/main/java/com/jme3/input/dummy/DummyInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,6 +44,7 @@ public class DummyInput implements Input { protected boolean inited = false; + @Override public void initialize() { if (inited) throw new IllegalStateException("Input already initialized."); @@ -51,11 +52,13 @@ public class DummyInput implements Input { inited = true; } + @Override public void update() { if (!inited) throw new IllegalStateException("Input not initialized."); } + @Override public void destroy() { if (!inited) throw new IllegalStateException("Input not initialized."); @@ -63,13 +66,16 @@ public class DummyInput implements Input { inited = false; } + @Override public boolean isInitialized() { return inited; } + @Override public void setInputListener(RawInputListener listener) { } + @Override public long getInputTimeNanos() { return System.currentTimeMillis() * 1000000; } diff --git a/jme3-core/src/main/java/com/jme3/input/dummy/DummyMouseInput.java b/jme3-core/src/main/java/com/jme3/input/dummy/DummyMouseInput.java index 497490e39..f8d18be2e 100644 --- a/jme3-core/src/main/java/com/jme3/input/dummy/DummyMouseInput.java +++ b/jme3-core/src/main/java/com/jme3/input/dummy/DummyMouseInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,15 +42,18 @@ import com.jme3.input.MouseInput; */ public class DummyMouseInput extends DummyInput implements MouseInput { + @Override public void setCursorVisible(boolean visible) { if (!inited) throw new IllegalStateException("Input not initialized."); } + @Override public int getButtonCount() { return 0; } + @Override public void setNativeCursor(JmeCursor cursor) { } diff --git a/jme3-core/src/main/java/com/jme3/light/Light.java b/jme3-core/src/main/java/com/jme3/light/Light.java index 0a66fb729..0757d2ac0 100644 --- a/jme3-core/src/main/java/com/jme3/light/Light.java +++ b/jme3-core/src/main/java/com/jme3/light/Light.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015-2016 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -259,6 +259,7 @@ public abstract class Light implements Savable, Cloneable { } } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(color, "color", null); @@ -266,6 +267,7 @@ public abstract class Light implements Savable, Cloneable { oc.write(name, "name", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); color = (ColorRGBA) ic.readSavable("color", null); diff --git a/jme3-core/src/main/java/com/jme3/light/LightList.java b/jme3-core/src/main/java/com/jme3/light/LightList.java index cdb96e3a5..7cc7b267c 100644 --- a/jme3-core/src/main/java/com/jme3/light/LightList.java +++ b/jme3-core/src/main/java/com/jme3/light/LightList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -58,6 +58,7 @@ public final class LightList implements Iterable, Savable, Cloneable, Jme /** * This assumes lastDistance have been computed in a previous step. */ + @Override public int compare(Light l1, Light l2) { if (l1.lastDistance < l2.lastDistance) return -1; @@ -266,15 +267,18 @@ public final class LightList implements Iterable, Savable, Cloneable, Jme * * @return an iterator that can be used to iterate over this LightList. */ + @Override public Iterator iterator() { return new Iterator(){ int index = 0; + @Override public boolean hasNext() { return index < size(); } + @Override public Light next() { if (!hasNext()) throw new NoSuchElementException(); @@ -282,6 +286,7 @@ public final class LightList implements Iterable, Savable, Cloneable, Jme return list[index++]; } + @Override public void remove() { LightList.this.remove(--index); } @@ -322,6 +327,7 @@ public final class LightList implements Iterable, Savable, Cloneable, Jme this.distToOwner = cloner.clone(distToOwner); } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); // oc.write(owner, "owner", null); @@ -333,6 +339,7 @@ public final class LightList implements Iterable, Savable, Cloneable, Jme oc.writeSavableArrayList(lights, "lights", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); // owner = (Spatial) ic.readSavable("owner", null); diff --git a/jme3-core/src/main/java/com/jme3/light/OrientedBoxProbeArea.java b/jme3-core/src/main/java/com/jme3/light/OrientedBoxProbeArea.java index 6b1e1b594..ae479a1ea 100644 --- a/jme3-core/src/main/java/com/jme3/light/OrientedBoxProbeArea.java +++ b/jme3-core/src/main/java/com/jme3/light/OrientedBoxProbeArea.java @@ -202,6 +202,7 @@ public class OrientedBoxProbeArea implements ProbeArea { vars.release(); } + @Override public Matrix4f getUniformMatrix() { return uniformMatrix; } @@ -219,6 +220,7 @@ public class OrientedBoxProbeArea implements ProbeArea { return transform.getTranslation(); } + @Override public void setCenter(Vector3f center) { transform.setTranslation(center); updateMatrix(); diff --git a/jme3-core/src/main/java/com/jme3/light/SphereProbeArea.java b/jme3-core/src/main/java/com/jme3/light/SphereProbeArea.java index ded9bfffa..90f409bcf 100644 --- a/jme3-core/src/main/java/com/jme3/light/SphereProbeArea.java +++ b/jme3-core/src/main/java/com/jme3/light/SphereProbeArea.java @@ -28,11 +28,13 @@ public class SphereProbeArea implements ProbeArea { return center; } + @Override public void setCenter(Vector3f center) { this.center.set(center); updateMatrix(); } + @Override public float getRadius() { return radius; } diff --git a/jme3-core/src/main/java/com/jme3/material/MatParam.java b/jme3-core/src/main/java/com/jme3/material/MatParam.java index f274d9340..f182d6b3f 100644 --- a/jme3-core/src/main/java/com/jme3/material/MatParam.java +++ b/jme3-core/src/main/java/com/jme3/material/MatParam.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -298,6 +298,7 @@ When arrays can be inserted in J3M files } } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(type, "varType", null); @@ -320,6 +321,7 @@ When arrays can be inserted in J3M files } } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); type = ic.readEnum("varType", VarType.class, null); diff --git a/jme3-core/src/main/java/com/jme3/material/Material.java b/jme3-core/src/main/java/com/jme3/material/Material.java index 15bd3c17d..3f27bb9a1 100644 --- a/jme3-core/src/main/java/com/jme3/material/Material.java +++ b/jme3-core/src/main/java/com/jme3/material/Material.java @@ -139,10 +139,12 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable { this.name = name; } + @Override public void setKey(AssetKey key) { this.key = key; } + @Override public AssetKey getKey() { return key; } @@ -1040,6 +1042,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable { render(geom, geom.getWorldLightList(), rm); } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(def.getAssetName(), "material_def", null); @@ -1057,6 +1060,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable { "]"; } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); diff --git a/jme3-core/src/main/java/com/jme3/material/MaterialProcessor.java b/jme3-core/src/main/java/com/jme3/material/MaterialProcessor.java index 49d04c5db..ce119cf6b 100644 --- a/jme3-core/src/main/java/com/jme3/material/MaterialProcessor.java +++ b/jme3-core/src/main/java/com/jme3/material/MaterialProcessor.java @@ -36,10 +36,12 @@ import com.jme3.asset.AssetProcessor; public class MaterialProcessor implements AssetProcessor { + @Override public Object postProcess(AssetKey key, Object obj) { return null; } + @Override public Object createClone(Object obj) { return ((Material) obj).clone(); } diff --git a/jme3-core/src/main/java/com/jme3/material/RenderState.java b/jme3-core/src/main/java/com/jme3/material/RenderState.java index 5413c3880..a61e3e10a 100644 --- a/jme3-core/src/main/java/com/jme3/material/RenderState.java +++ b/jme3-core/src/main/java/com/jme3/material/RenderState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -486,6 +486,7 @@ public class RenderState implements Cloneable, Savable { BlendFunc sfactorAlpha = BlendFunc.One; BlendFunc dfactorAlpha = BlendFunc.One; + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(true, "pointSprite", false); @@ -529,6 +530,7 @@ public class RenderState implements Cloneable, Savable { } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); wireframe = ic.readBoolean("wireframe", false); diff --git a/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java b/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java index 913fe59ce..7fd57de0b 100644 --- a/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java +++ b/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -650,6 +650,7 @@ public class TechniqueDef implements Savable, Cloneable { return worldBinds; } + @Override public void write(JmeExporter ex) throws IOException{ OutputCapsule oc = ex.getCapsule(this); oc.write(name, "name", null); @@ -680,6 +681,7 @@ public class TechniqueDef implements Savable, Cloneable { // oc.write(worldBinds, "worldBinds", null); } + @Override public void read(JmeImporter im) throws IOException{ InputCapsule ic = im.getCapsule(this); name = ic.readString("name", null); diff --git a/jme3-core/src/main/java/com/jme3/math/AbstractTriangle.java b/jme3-core/src/main/java/com/jme3/math/AbstractTriangle.java index 5bd6442b6..777e3a9b3 100644 --- a/jme3-core/src/main/java/com/jme3/math/AbstractTriangle.java +++ b/jme3-core/src/main/java/com/jme3/math/AbstractTriangle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,6 +41,7 @@ public abstract class AbstractTriangle implements Collidable { public abstract Vector3f get3(); public abstract void set(Vector3f v1, Vector3f v2, Vector3f v3); + @Override public int collideWith(Collidable other, CollisionResults results){ return other.collideWith(this, results); } diff --git a/jme3-core/src/main/java/com/jme3/math/ColorRGBA.java b/jme3-core/src/main/java/com/jme3/math/ColorRGBA.java index f403bbaa6..01d76b13a 100644 --- a/jme3-core/src/main/java/com/jme3/math/ColorRGBA.java +++ b/jme3-core/src/main/java/com/jme3/math/ColorRGBA.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine All rights reserved. + * Copyright (c) 2009-2020 jMonkeyEngine All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -462,6 +462,7 @@ public final class ColorRGBA implements Savable, Cloneable, java.io.Serializable return hash; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(r, "r", 0); @@ -470,6 +471,7 @@ public final class ColorRGBA implements Savable, Cloneable, java.io.Serializable capsule.write(a, "a", 0); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); r = capsule.readFloat("r", 0); diff --git a/jme3-core/src/main/java/com/jme3/math/Line.java b/jme3-core/src/main/java/com/jme3/math/Line.java index 1ca99b4be..07d3172f6 100644 --- a/jme3-core/src/main/java/com/jme3/math/Line.java +++ b/jme3-core/src/main/java/com/jme3/math/Line.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -213,12 +213,14 @@ public class Line implements Savable, Cloneable, java.io.Serializable { return result; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(origin, "origin", Vector3f.ZERO); capsule.write(direction, "direction", Vector3f.ZERO); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); origin = (Vector3f) capsule.readSavable("origin", Vector3f.ZERO.clone()); diff --git a/jme3-core/src/main/java/com/jme3/math/LineSegment.java b/jme3-core/src/main/java/com/jme3/math/LineSegment.java index b01edeb50..c21efdddf 100644 --- a/jme3-core/src/main/java/com/jme3/math/LineSegment.java +++ b/jme3-core/src/main/java/com/jme3/math/LineSegment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -575,6 +575,7 @@ public class LineSegment implements Cloneable, Savable, java.io.Serializable { return origin.subtract((direction.mult(extent, store)), store); } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(origin, "origin", Vector3f.ZERO); @@ -582,6 +583,7 @@ public class LineSegment implements Cloneable, Savable, java.io.Serializable { capsule.write(extent, "extent", 0); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); origin = (Vector3f) capsule.readSavable("origin", Vector3f.ZERO.clone()); diff --git a/jme3-core/src/main/java/com/jme3/math/Matrix3f.java b/jme3-core/src/main/java/com/jme3/math/Matrix3f.java index ca9e7287b..9f40a79a7 100644 --- a/jme3-core/src/main/java/com/jme3/math/Matrix3f.java +++ b/jme3-core/src/main/java/com/jme3/math/Matrix3f.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1252,6 +1252,7 @@ public final class Matrix3f implements Savable, Cloneable, java.io.Serializable return true; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule cap = e.getCapsule(this); cap.write(m00, "m00", 1); @@ -1265,6 +1266,7 @@ public final class Matrix3f implements Savable, Cloneable, java.io.Serializable cap.write(m22, "m22", 1); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule cap = e.getCapsule(this); m00 = cap.readFloat("m00", 1); diff --git a/jme3-core/src/main/java/com/jme3/math/Matrix4f.java b/jme3-core/src/main/java/com/jme3/math/Matrix4f.java index ff51e3c7b..e2226f184 100644 --- a/jme3-core/src/main/java/com/jme3/math/Matrix4f.java +++ b/jme3-core/src/main/java/com/jme3/math/Matrix4f.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -2225,6 +2225,7 @@ public final class Matrix4f implements Savable, Cloneable, java.io.Serializable return true; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule cap = e.getCapsule(this); cap.write(m00, "m00", 1); @@ -2245,6 +2246,7 @@ public final class Matrix4f implements Savable, Cloneable, java.io.Serializable cap.write(m33, "m33", 1); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule cap = e.getCapsule(this); m00 = cap.readFloat("m00", 1); diff --git a/jme3-core/src/main/java/com/jme3/math/Plane.java b/jme3-core/src/main/java/com/jme3/math/Plane.java index 3da90b2bc..078f8a335 100644 --- a/jme3-core/src/main/java/com/jme3/math/Plane.java +++ b/jme3-core/src/main/java/com/jme3/math/Plane.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -269,12 +269,14 @@ public class Plane implements Savable, Cloneable, java.io.Serializable { + constant + "]"; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(normal, "normal", Vector3f.ZERO); capsule.write(constant, "constant", 0); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); normal = (Vector3f) capsule.readSavable("normal", Vector3f.ZERO.clone()); diff --git a/jme3-core/src/main/java/com/jme3/math/Quaternion.java b/jme3-core/src/main/java/com/jme3/math/Quaternion.java index 1ce5a1c0d..84671660d 100644 --- a/jme3-core/src/main/java/com/jme3/math/Quaternion.java +++ b/jme3-core/src/main/java/com/jme3/math/Quaternion.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1381,6 +1381,7 @@ public final class Quaternion implements Savable, Cloneable, java.io.Serializabl return this; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule cap = e.getCapsule(this); cap.write(x, "x", 0); @@ -1389,6 +1390,7 @@ public final class Quaternion implements Savable, Cloneable, java.io.Serializabl cap.write(w, "w", 1); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule cap = e.getCapsule(this); x = cap.readFloat("x", 0); diff --git a/jme3-core/src/main/java/com/jme3/math/Ray.java b/jme3-core/src/main/java/com/jme3/math/Ray.java index 81e54d99f..a3fce2816 100644 --- a/jme3-core/src/main/java/com/jme3/math/Ray.java +++ b/jme3-core/src/main/java/com/jme3/math/Ray.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -383,6 +383,7 @@ public final class Ray implements Savable, Cloneable, Collidable, java.io.Serial return true; } + @Override public int collideWith(Collidable other, CollisionResults results) { if (other instanceof BoundingVolume) { BoundingVolume bv = (BoundingVolume) other; @@ -492,16 +493,19 @@ public final class Ray implements Savable, Cloneable, Collidable, java.io.Serial direction.set(source.getDirection()); } + @Override public String toString() { return getClass().getSimpleName() + " [Origin: " + origin + ", Direction: " + direction + "]"; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(origin, "origin", Vector3f.ZERO); capsule.write(direction, "direction", Vector3f.ZERO); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); origin = (Vector3f) capsule.readSavable("origin", Vector3f.ZERO.clone()); diff --git a/jme3-core/src/main/java/com/jme3/math/Rectangle.java b/jme3-core/src/main/java/com/jme3/math/Rectangle.java index e8ba4c23d..48e0fcd2a 100644 --- a/jme3-core/src/main/java/com/jme3/math/Rectangle.java +++ b/jme3-core/src/main/java/com/jme3/math/Rectangle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -167,6 +167,7 @@ public final class Rectangle implements Savable, Cloneable, java.io.Serializable return result; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(a, "a", Vector3f.ZERO); @@ -174,6 +175,7 @@ public final class Rectangle implements Savable, Cloneable, java.io.Serializable capsule.write(c, "c", Vector3f.ZERO); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); a = (Vector3f) capsule.readSavable("a", Vector3f.ZERO.clone()); diff --git a/jme3-core/src/main/java/com/jme3/math/Ring.java b/jme3-core/src/main/java/com/jme3/math/Ring.java index 1c9eebc45..639dc7027 100644 --- a/jme3-core/src/main/java/com/jme3/math/Ring.java +++ b/jme3-core/src/main/java/com/jme3/math/Ring.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -200,6 +200,7 @@ public final class Ring implements Savable, Cloneable, java.io.Serializable { return result; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(center, "center", Vector3f.ZERO); @@ -208,6 +209,7 @@ public final class Ring implements Savable, Cloneable, java.io.Serializable { capsule.write(outerRadius, "outerRadius", 1f); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); center = (Vector3f) capsule.readSavable("center", diff --git a/jme3-core/src/main/java/com/jme3/math/Vector2f.java b/jme3-core/src/main/java/com/jme3/math/Vector2f.java index e2c3a96c0..e74c20847 100644 --- a/jme3-core/src/main/java/com/jme3/math/Vector2f.java +++ b/jme3-core/src/main/java/com/jme3/math/Vector2f.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -635,6 +635,7 @@ public final class Vector2f implements Savable, Cloneable, java.io.Serializable * * @return the hash code value of this vector. */ + @Override public int hashCode() { int hash = 37; hash += 37 * hash + Float.floatToIntBits(x); @@ -676,6 +677,7 @@ public final class Vector2f implements Savable, Cloneable, java.io.Serializable * the object to compare for equality * @return true if they are equal */ + @Override public boolean equals(Object o) { if (!(o instanceof Vector2f)) { return false; @@ -717,6 +719,7 @@ public final class Vector2f implements Savable, Cloneable, java.io.Serializable * * @return the string representation of this vector. */ + @Override public String toString() { return "(" + x + ", " + y + ")"; } @@ -749,12 +752,14 @@ public final class Vector2f implements Savable, Cloneable, java.io.Serializable out.writeFloat(y); } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(x, "x", 0); capsule.write(y, "y", 0); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); x = capsule.readFloat("x", 0); diff --git a/jme3-core/src/main/java/com/jme3/math/Vector3f.java b/jme3-core/src/main/java/com/jme3/math/Vector3f.java index 04638ef2b..ed28f77d8 100644 --- a/jme3-core/src/main/java/com/jme3/math/Vector3f.java +++ b/jme3-core/src/main/java/com/jme3/math/Vector3f.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -958,6 +958,7 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable * the object to compare for equality * @return true if they are equal */ + @Override public boolean equals(Object o) { if (!(o instanceof Vector3f)) { return false; } @@ -996,6 +997,7 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable * the same hash code value. * @return the hash code value of this vector. */ + @Override public int hashCode() { int hash = 37; hash += 37 * hash + Float.floatToIntBits(x); @@ -1012,10 +1014,12 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable * * @return the string representation of this vector. */ + @Override public String toString() { return "(" + x + ", " + y + ", " + z + ")"; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(x, "x", 0); @@ -1023,6 +1027,7 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable capsule.write(z, "z", 0); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); x = capsule.readFloat("x", 0); diff --git a/jme3-core/src/main/java/com/jme3/math/Vector4f.java b/jme3-core/src/main/java/com/jme3/math/Vector4f.java index d7c3e48f1..a669fcf14 100644 --- a/jme3-core/src/main/java/com/jme3/math/Vector4f.java +++ b/jme3-core/src/main/java/com/jme3/math/Vector4f.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -862,6 +862,7 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable * the object to compare for equality * @return true if they are equal */ + @Override public boolean equals(Object o) { if (!(o instanceof Vector4f)) { return false; } @@ -904,6 +905,7 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable * the same hash code value. * @return the hash code value of this vector. */ + @Override public int hashCode() { int hash = 37; hash += 37 * hash + Float.floatToIntBits(x); @@ -921,10 +923,12 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable * * @return the string representation of this vector. */ + @Override public String toString() { return "(" + x + ", " + y + ", " + z + ", " + w + ")"; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(x, "x", 0); @@ -933,6 +937,7 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable capsule.write(w, "w", 0); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); x = capsule.readFloat("x", 0); diff --git a/jme3-core/src/main/java/com/jme3/post/Filter.java b/jme3-core/src/main/java/com/jme3/post/Filter.java index d594b7be8..aabe3b154 100644 --- a/jme3-core/src/main/java/com/jme3/post/Filter.java +++ b/jme3-core/src/main/java/com/jme3/post/Filter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -336,6 +336,7 @@ public abstract class Filter implements Savable { * @param ex * @throws IOException */ + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(name, "name", ""); @@ -347,6 +348,7 @@ public abstract class Filter implements Savable { * is loaded else only basic properties of the filter will be loaded * This method should always begin by super.read(im); */ + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); name = ic.readString("name", ""); diff --git a/jme3-core/src/main/java/com/jme3/post/FilterPostProcessor.java b/jme3-core/src/main/java/com/jme3/post/FilterPostProcessor.java index b5db4d0f4..628540235 100644 --- a/jme3-core/src/main/java/com/jme3/post/FilterPostProcessor.java +++ b/jme3-core/src/main/java/com/jme3/post/FilterPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -137,6 +137,7 @@ public class FilterPostProcessor implements SceneProcessor, Savable { return filters.iterator(); } + @Override public void initialize(RenderManager rm, ViewPort vp) { renderManager = rm; renderer = rm.getRenderer(); @@ -230,10 +231,12 @@ public class FilterPostProcessor implements SceneProcessor, Savable { renderManager.renderGeometry(fsQuad); } + @Override public boolean isInitialized() { return viewPort != null; } + @Override public void postQueue(RenderQueue rq) { for (Filter filter : filters.getArray()) { if (filter.isEnabled()) { @@ -323,6 +326,7 @@ public class FilterPostProcessor implements SceneProcessor, Savable { } } + @Override public void postFrame(FrameBuffer out) { FrameBuffer sceneBuffer = renderFrameBuffer; @@ -340,6 +344,7 @@ public class FilterPostProcessor implements SceneProcessor, Savable { } } + @Override public void preFrame(float tpf) { if (filters.isEmpty() || lastFilterIndex == -1) { //If the camera is initialized and there are no filter to render, the camera viewport is restored as it was @@ -408,6 +413,7 @@ public class FilterPostProcessor implements SceneProcessor, Savable { } } + @Override public void cleanup() { if (viewPort != null) { //reset the viewport camera viewport to its initial value @@ -438,6 +444,7 @@ public class FilterPostProcessor implements SceneProcessor, Savable { this.prof = profiler; } + @Override public void reshape(ViewPort vp, int w, int h) { Camera cam = vp.getCamera(); //this has no effect at first init but is useful when resizing the canvas with multi views @@ -543,12 +550,14 @@ public class FilterPostProcessor implements SceneProcessor, Savable { this.fbFormat = fbFormat; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(numSamples, "numSamples", 0); oc.writeSavableArrayList(new ArrayList(filters), "filters", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); numSamples = ic.readInt("numSamples", 0); diff --git a/jme3-core/src/main/java/com/jme3/post/HDRRenderer.java b/jme3-core/src/main/java/com/jme3/post/HDRRenderer.java index 424f3b689..bd10f8f4e 100644 --- a/jme3-core/src/main/java/com/jme3/post/HDRRenderer.java +++ b/jme3-core/src/main/java/com/jme3/post/HDRRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -252,10 +252,12 @@ public class HDRRenderer implements SceneProcessor { renderProcessing(r, scene1FB[curSrc], hdr1); } + @Override public boolean isInitialized(){ return viewPort != null; } + @Override public void reshape(ViewPort vp, int w, int h){ if (mainSceneFB != null){ renderer.deleteFrameBuffer(mainSceneFB); @@ -290,6 +292,7 @@ public class HDRRenderer implements SceneProcessor { createLumShaders(); } + @Override public void initialize(RenderManager rm, ViewPort vp){ if (!enabled) return; @@ -335,6 +338,7 @@ public class HDRRenderer implements SceneProcessor { } + @Override public void preFrame(float tpf) { if (!enabled) return; @@ -343,9 +347,11 @@ public class HDRRenderer implements SceneProcessor { blendFactor = (time / throttle); } + @Override public void postQueue(RenderQueue rq) { } + @Override public void postFrame(FrameBuffer out) { if (!enabled) return; @@ -404,6 +410,7 @@ public class HDRRenderer implements SceneProcessor { renderManager.setCamera(viewPort.getCamera(), false); } + @Override public void cleanup() { if (!enabled) return; diff --git a/jme3-core/src/main/java/com/jme3/post/PreDepthProcessor.java b/jme3-core/src/main/java/com/jme3/post/PreDepthProcessor.java index a3125dd1e..835e418fd 100644 --- a/jme3-core/src/main/java/com/jme3/post/PreDepthProcessor.java +++ b/jme3-core/src/main/java/com/jme3/post/PreDepthProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,22 +65,27 @@ public class PreDepthProcessor implements SceneProcessor { forcedRS.setDepthWrite(false); } + @Override public void initialize(RenderManager rm, ViewPort vp) { this.rm = rm; this.vp = vp; } + @Override public void reshape(ViewPort vp, int w, int h) { this.vp = vp; } + @Override public boolean isInitialized() { return vp != null; } + @Override public void preFrame(float tpf) { } + @Override public void postQueue(RenderQueue rq) { // lay depth first rm.setForcedMaterial(preDepth); @@ -90,10 +95,12 @@ public class PreDepthProcessor implements SceneProcessor { rm.setForcedRenderState(forcedRS); } + @Override public void postFrame(FrameBuffer out) { rm.setForcedRenderState(null); } + @Override public void cleanup() { vp = null; } diff --git a/jme3-core/src/main/java/com/jme3/renderer/Camera.java b/jme3-core/src/main/java/com/jme3/renderer/Camera.java index 79dd24059..c7bd6a7d8 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/Camera.java +++ b/jme3-core/src/main/java/com/jme3/renderer/Camera.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1432,6 +1432,7 @@ public class Camera implements Savable, Cloneable { + "near=" + frustumNear + ", far=" + frustumFar + "]"; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(location, "location", Vector3f.ZERO); @@ -1455,6 +1456,7 @@ public class Camera implements Savable, Cloneable { capsule.write(name, "name", null); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); location = (Vector3f) capsule.readSavable("location", Vector3f.ZERO.clone()); diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLDebugDesktop.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLDebugDesktop.java index 3dfd2a8ca..396a1bc97 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLDebugDesktop.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLDebugDesktop.java @@ -16,61 +16,73 @@ public class GLDebugDesktop extends GLDebugES implements GL2, GL3, GL4 { this.gl4 = gl instanceof GL4 ? (GL4) gl : null; } + @Override public void glAlphaFunc(int func, float ref) { gl2.glAlphaFunc(func, ref); checkError(); } + @Override public void glPointSize(float size) { gl2.glPointSize(size); checkError(); } + @Override public void glPolygonMode(int face, int mode) { gl2.glPolygonMode(face, mode); checkError(); } + @Override public void glDrawBuffer(int mode) { gl2.glDrawBuffer(mode); checkError(); } + @Override public void glReadBuffer(int mode) { gl2.glReadBuffer(mode); checkError(); } + @Override public void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, ByteBuffer data) { gl2.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, data); checkError(); } + @Override public void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, ByteBuffer data) { gl2.glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, data); checkError(); } + @Override public void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ByteBuffer data) { gl2.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, data); checkError(); } + @Override public void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ByteBuffer data) { gl2.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); checkError(); } + @Override public void glBindFragDataLocation(int param1, int param2, String param3) { gl3.glBindFragDataLocation(param1, param2, param3); checkError(); } + @Override public void glBindVertexArray(int param1) { gl3.glBindVertexArray(param1); checkError(); } + @Override public void glGenVertexArrays(IntBuffer param1) { gl3.glGenVertexArrays(param1); checkError(); @@ -121,6 +133,7 @@ public class GLDebugDesktop extends GLDebugES implements GL2, GL3, GL4 { checkError(); } + @Override public void glBlendEquationSeparate(int colorMode, int alphaMode) { gl.glBlendEquationSeparate(colorMode, alphaMode); checkError(); diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLDebugES.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLDebugES.java index 19546f20f..fd8d764e7 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLDebugES.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLDebugES.java @@ -16,15 +16,18 @@ public class GLDebugES extends GLDebug implements GL, GL2, GLES_30, GLFbo, GLExt this.glfbo = glfbo; } + @Override public void resetStats() { gl.resetStats(); } + @Override public void glActiveTexture(int texture) { gl.glActiveTexture(texture); checkError(); } + @Override public void glAttachShader(int program, int shader) { gl.glAttachShader(program, shader); checkError(); @@ -36,169 +39,202 @@ public class GLDebugES extends GLDebug implements GL, GL2, GLES_30, GLFbo, GLExt checkError(); } + @Override public void glBindBuffer(int target, int buffer) { gl.glBindBuffer(target, buffer); checkError(); } + @Override public void glBindTexture(int target, int texture) { gl.glBindTexture(target, texture); checkError(); } + @Override public void glBlendFunc(int sfactor, int dfactor) { gl.glBlendFunc(sfactor, dfactor); checkError(); } + @Override public void glBlendFuncSeparate(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dFactorAlpha) { gl.glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dFactorAlpha); checkError(); } + @Override public void glBufferData(int target, FloatBuffer data, int usage) { gl.glBufferData(target, data, usage); checkError(); } + @Override public void glBufferData(int target, ShortBuffer data, int usage) { gl.glBufferData(target, data, usage); checkError(); } + @Override public void glBufferData(int target, ByteBuffer data, int usage) { gl.glBufferData(target, data, usage); checkError(); } + @Override public void glBufferSubData(int target, long offset, FloatBuffer data) { gl.glBufferSubData(target, offset, data); checkError(); } + @Override public void glBufferSubData(int target, long offset, ShortBuffer data) { gl.glBufferSubData(target, offset, data); checkError(); } + @Override public void glBufferSubData(int target, long offset, ByteBuffer data) { gl.glBufferSubData(target, offset, data); checkError(); } + @Override public void glClear(int mask) { gl.glClear(mask); checkError(); } + @Override public void glClearColor(float red, float green, float blue, float alpha) { gl.glClearColor(red, green, blue, alpha); checkError(); } + @Override public void glColorMask(boolean red, boolean green, boolean blue, boolean alpha) { gl.glColorMask(red, green, blue, alpha); checkError(); } + @Override public void glCompileShader(int shader) { gl.glCompileShader(shader); checkError(); } + @Override public void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, ByteBuffer data) { gl.glCompressedTexImage2D(target, level, internalformat, width, height, border, data); checkError(); } + @Override public void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, ByteBuffer data) { gl.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, data); checkError(); } + @Override public int glCreateProgram() { int program = gl.glCreateProgram(); checkError(); return program; } + @Override public int glCreateShader(int shaderType) { int shader = gl.glCreateShader(shaderType); checkError(); return shader; } + @Override public void glCullFace(int mode) { gl.glCullFace(mode); checkError(); } + @Override public void glDeleteBuffers(IntBuffer buffers) { gl.glDeleteBuffers(buffers); checkError(); } + @Override public void glDeleteProgram(int program) { gl.glDeleteProgram(program); checkError(); } + @Override public void glDeleteShader(int shader) { gl.glDeleteShader(shader); checkError(); } + @Override public void glDeleteTextures(IntBuffer textures) { gl.glDeleteTextures(textures); checkError(); } + @Override public void glDepthFunc(int func) { gl.glDepthFunc(func); checkError(); } + @Override public void glDepthMask(boolean flag) { gl.glDepthMask(flag); checkError(); } + @Override public void glDepthRange(double nearVal, double farVal) { gl.glDepthRange(nearVal, farVal); checkError(); } + @Override public void glDetachShader(int program, int shader) { gl.glDetachShader(program, shader); checkError(); } + @Override public void glDisable(int cap) { gl.glDisable(cap); checkError(); } + @Override public void glDisableVertexAttribArray(int index) { gl.glDisableVertexAttribArray(index); checkError(); } + @Override public void glDrawArrays(int mode, int first, int count) { gl.glDrawArrays(mode, first, count); checkError(); } + @Override public void glDrawRangeElements(int mode, int start, int end, int count, int type, long indices) { gl.glDrawRangeElements(mode, start, end, count, type, indices); checkError(); } + @Override public void glEnable(int cap) { gl.glEnable(cap); checkError(); } + @Override public void glEnableVertexAttribArray(int index) { gl.glEnableVertexAttribArray(index); checkError(); @@ -209,11 +245,13 @@ public class GLDebugES extends GLDebug implements GL, GL2, GLES_30, GLFbo, GLExt checkError(); } + @Override public void glGenBuffers(IntBuffer buffers) { gl.glGenBuffers(buffers); checkError(); } + @Override public void glGenTextures(IntBuffer textures) { gl.glGenTextures(textures); checkError(); @@ -225,32 +263,38 @@ public class GLDebugES extends GLDebug implements GL, GL2, GLES_30, GLFbo, GLExt checkError(); } + @Override public int glGetAttribLocation(int program, String name) { int location = gl.glGetAttribLocation(program, name); checkError(); return location; } + @Override public void glGetBoolean(int pname, ByteBuffer params) { gl.glGetBoolean(pname, params); checkError(); } + @Override public int glGetError() { // No need to check for error here? Haha return gl.glGetError(); } + @Override public void glGetInteger(int pname, IntBuffer params) { gl.glGetInteger(pname, params); checkError(); } + @Override public void glGetProgram(int program, int pname, IntBuffer params) { gl.glGetProgram(program, pname, params); checkError(); } + @Override public String glGetProgramInfoLog(int program, int maxSize) { String infoLog = gl.glGetProgramInfoLog(program, maxSize); checkError(); @@ -271,251 +315,300 @@ public class GLDebugES extends GLDebug implements GL, GL2, GLES_30, GLFbo, GLExt return res; } + @Override public void glGetShader(int shader, int pname, IntBuffer params) { gl.glGetShader(shader, pname, params); checkError(); } + @Override public String glGetShaderInfoLog(int shader, int maxSize) { String infoLog = gl.glGetShaderInfoLog(shader, maxSize); checkError(); return infoLog; } + @Override public String glGetString(int name) { String string = gl.glGetString(name); checkError(); return string; } + @Override public int glGetUniformLocation(int program, String name) { int location = gl.glGetUniformLocation(program, name); checkError(); return location; } + @Override public boolean glIsEnabled(int cap) { boolean enabled = gl.glIsEnabled(cap); checkError(); return enabled; } + @Override public void glLineWidth(float width) { gl.glLineWidth(width); checkError(); } + @Override public void glLinkProgram(int program) { gl.glLinkProgram(program); checkError(); } + @Override public void glPixelStorei(int pname, int param) { gl.glPixelStorei(pname, param); checkError(); } + @Override public void glPolygonOffset(float factor, float units) { gl.glPolygonOffset(factor, units); checkError(); } + @Override public void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer data) { gl.glReadPixels(x, y, width, height, format, type, data); checkError(); } + @Override public void glReadPixels(int x, int y, int width, int height, int format, int type, long offset) { gl.glReadPixels(x, y, width, height, format, type, offset); checkError(); } + @Override public void glScissor(int x, int y, int width, int height) { gl.glScissor(x, y, width, height); checkError(); } + @Override public void glShaderSource(int shader, String[] string, IntBuffer length) { gl.glShaderSource(shader, string, length); checkError(); } + @Override public void glStencilFuncSeparate(int face, int func, int ref, int mask) { gl.glStencilFuncSeparate(face, func, ref, mask); checkError(); } + @Override public void glStencilOpSeparate(int face, int sfail, int dpfail, int dppass) { gl.glStencilOpSeparate(face, sfail, dpfail, dppass); checkError(); } + @Override public void glTexImage2D(int target, int level, int internalFormat, int width, int height, int border, int format, int type, ByteBuffer data) { gl.glTexImage2D(target, level, internalFormat, width, height, border, format, type, data); checkError(); } + @Override public void glTexParameterf(int target, int pname, float param) { gl.glTexParameterf(target, pname, param); checkError(); } + @Override public void glTexParameteri(int target, int pname, int param) { gl.glTexParameteri(target, pname, param); checkError(); } + @Override public void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer data) { gl.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, data); checkError(); } + @Override public void glUniform1(int location, FloatBuffer value) { gl.glUniform1(location, value); checkError(); } + @Override public void glUniform1(int location, IntBuffer value) { gl.glUniform1(location, value); checkError(); } + @Override public void glUniform1f(int location, float v0) { gl.glUniform1f(location, v0); checkError(); } + @Override public void glUniform1i(int location, int v0) { gl.glUniform1i(location, v0); checkError(); } + @Override public void glUniform2(int location, IntBuffer value) { gl.glUniform2(location, value); checkError(); } + @Override public void glUniform2(int location, FloatBuffer value) { gl.glUniform2(location, value); checkError(); } + @Override public void glUniform2f(int location, float v0, float v1) { gl.glUniform2f(location, v0, v1); checkError(); } + @Override public void glUniform3(int location, IntBuffer value) { gl.glUniform3(location, value); checkError(); } + @Override public void glUniform3(int location, FloatBuffer value) { gl.glUniform3(location, value); checkError(); } + @Override public void glUniform3f(int location, float v0, float v1, float v2) { gl.glUniform3f(location, v0, v1, v2); checkError(); } + @Override public void glUniform4(int location, FloatBuffer value) { gl.glUniform4(location, value); checkError(); } + @Override public void glUniform4(int location, IntBuffer value) { gl.glUniform4(location, value); checkError(); } + @Override public void glUniform4f(int location, float v0, float v1, float v2, float v3) { gl.glUniform4f(location, v0, v1, v2, v3); checkError(); } + @Override public void glUniformMatrix3(int location, boolean transpose, FloatBuffer value) { gl.glUniformMatrix3(location, transpose, value); checkError(); } + @Override public void glUniformMatrix4(int location, boolean transpose, FloatBuffer value) { gl.glUniformMatrix4(location, transpose, value); checkError(); } + @Override public void glUseProgram(int program) { gl.glUseProgram(program); checkError(); } + @Override public void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, long pointer) { gl.glVertexAttribPointer(index, size, type, normalized, stride, pointer); checkError(); } + @Override public void glViewport(int x, int y, int width, int height) { gl.glViewport(x, y, width, height); checkError(); } + @Override public void glBindFramebufferEXT(int param1, int param2) { glfbo.glBindFramebufferEXT(param1, param2); checkError(); } + @Override public void glBindRenderbufferEXT(int param1, int param2) { glfbo.glBindRenderbufferEXT(param1, param2); checkError(); } + @Override public int glCheckFramebufferStatusEXT(int param1) { int result = glfbo.glCheckFramebufferStatusEXT(param1); checkError(); return result; } + @Override public void glDeleteFramebuffersEXT(IntBuffer param1) { glfbo.glDeleteFramebuffersEXT(param1); checkError(); } + @Override public void glDeleteRenderbuffersEXT(IntBuffer param1) { glfbo.glDeleteRenderbuffersEXT(param1); checkError(); } + @Override public void glFramebufferRenderbufferEXT(int param1, int param2, int param3, int param4) { glfbo.glFramebufferRenderbufferEXT(param1, param2, param3, param4); checkError(); } + @Override public void glFramebufferTexture2DEXT(int param1, int param2, int param3, int param4, int param5) { glfbo.glFramebufferTexture2DEXT(param1, param2, param3, param4, param5); checkError(); } + @Override public void glGenFramebuffersEXT(IntBuffer param1) { glfbo.glGenFramebuffersEXT(param1); checkError(); } + @Override public void glGenRenderbuffersEXT(IntBuffer param1) { glfbo.glGenRenderbuffersEXT(param1); checkError(); } + @Override public void glGenerateMipmapEXT(int param1) { glfbo.glGenerateMipmapEXT(param1); checkError(); } + @Override public void glRenderbufferStorageEXT(int param1, int param2, int param3, int param4) { glfbo.glRenderbufferStorageEXT(param1, param2, param3, param4); checkError(); } + @Override public void glBlitFramebufferEXT(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) { glfbo.glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); checkError(); @@ -533,46 +626,55 @@ public class GLDebugES extends GLDebug implements GL, GL2, GLES_30, GLFbo, GLExt checkError(); } + @Override public void glBufferData(int target, IntBuffer data, int usage) { glext.glBufferData(target, data, usage); checkError(); } + @Override public void glBufferSubData(int target, long offset, IntBuffer data) { glext.glBufferSubData(target, offset, data); checkError(); } + @Override public void glDrawArraysInstancedARB(int mode, int first, int count, int primcount) { glext.glDrawArraysInstancedARB(mode, first, count, primcount); checkError(); } + @Override public void glDrawBuffers(IntBuffer bufs) { glext.glDrawBuffers(bufs); checkError(); } + @Override public void glDrawElementsInstancedARB(int mode, int indices_count, int type, long indices_buffer_offset, int primcount) { glext.glDrawElementsInstancedARB(mode, indices_count, type, indices_buffer_offset, primcount); checkError(); } + @Override public void glGetMultisample(int pname, int index, FloatBuffer val) { glext.glGetMultisample(pname, index, val); checkError(); } + @Override public void glRenderbufferStorageMultisampleEXT(int target, int samples, int internalformat, int width, int height) { glfbo.glRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height); checkError(); } + @Override public void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height, boolean fixedsamplelocations) { glext.glTexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); checkError(); } + @Override public void glVertexAttribDivisorARB(int index, int divisor) { glext.glVertexAttribDivisorARB(index, divisor); checkError(); @@ -610,49 +712,58 @@ public class GLDebugES extends GLDebug implements GL, GL2, GLES_30, GLFbo, GLExt checkError(); } + @Override public void glAlphaFunc(int func, float ref) { ((GL2)gl).glAlphaFunc(func, ref); checkError(); } + @Override public void glPointSize(float size) { ((GL2)gl).glPointSize(size); checkError(); } + @Override public void glPolygonMode(int face, int mode) { ((GL2)gl).glPolygonMode(face, mode); checkError(); } + @Override public void glDrawBuffer(int mode) { ((GL2)gl).glDrawBuffer(mode); checkError(); } + @Override public void glReadBuffer(int mode) { ((GL2)gl).glReadBuffer(mode); checkError(); } + @Override public void glCompressedTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, ByteBuffer data) { ((GL2)gl).glCompressedTexImage3D(target, level, internalFormat, width, height, depth, border, data); checkError(); } + @Override public void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, ByteBuffer data) { ((GL2)gl).glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, data); checkError(); } + @Override public void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ByteBuffer data) { ((GL2)gl).glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, data); checkError(); } + @Override public void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ByteBuffer data) { ((GL2)gl).glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java index c61e54aec..23bd4d5f7 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -126,6 +126,7 @@ public final class GLRenderer implements Renderer { } // Not making public yet ... + @Override public EnumMap getLimits() { return limits; } @@ -595,6 +596,7 @@ public final class GLRenderer implements Renderer { } @SuppressWarnings("fallthrough") + @Override public void initialize() { loadCapabilities(); @@ -620,6 +622,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void invalidateState() { context.reset(); if (gl2 != null) { @@ -628,6 +631,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void resetGLObjects() { logger.log(Level.FINE, "Reseting objects and invalidating state"); objManager.resetObjects(); @@ -635,6 +639,7 @@ public final class GLRenderer implements Renderer { invalidateState(); } + @Override public void cleanup() { logger.log(Level.FINE, "Deleting objects and invalidating state"); objManager.deleteAllObjects(this); @@ -646,10 +651,12 @@ public final class GLRenderer implements Renderer { /*********************************************************************\ |* Render State *| \*********************************************************************/ + @Override public void setDepthRange(float start, float end) { gl.glDepthRange(start, end); } + @Override public void clearBuffers(boolean color, boolean depth, boolean stencil) { int bits = 0; if (color) { @@ -681,6 +688,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void setBackgroundColor(ColorRGBA color) { if (!context.clearColor.equals(color)) { gl.glClearColor(color.r, color.g, color.b, color.a); @@ -696,6 +704,7 @@ public final class GLRenderer implements Renderer { this.defaultAnisotropicFilter = level; } + @Override public void setAlphaToCoverage(boolean value) { if (caps.contains(Caps.Multisample)) { if (value) { @@ -706,6 +715,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void applyRenderState(RenderState state) { if (gl2 != null) { if (state.isWireframe() && !context.wireframe) { @@ -1076,6 +1086,7 @@ public final class GLRenderer implements Renderer { /*********************************************************************\ |* Camera and World transforms *| \*********************************************************************/ + @Override public void setViewPort(int x, int y, int w, int h) { if (x != vpX || vpY != y || vpW != w || vpH != h) { gl.glViewport(x, y, w, h); @@ -1086,6 +1097,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void setClipRect(int x, int y, int width, int height) { if (!context.clipRectEnabled) { gl.glEnable(GL.GL_SCISSOR_TEST); @@ -1100,6 +1112,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void clearClipRect() { if (context.clipRectEnabled) { gl.glDisable(GL.GL_SCISSOR_TEST); @@ -1559,6 +1572,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void setShader(Shader shader) { if (shader == null) { throw new IllegalArgumentException("Shader cannot be null"); @@ -1578,6 +1592,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void deleteShaderSource(ShaderSource source) { if (source.getId() < 0) { logger.warning("Shader source is not uploaded to GPU, cannot delete."); @@ -1588,6 +1603,7 @@ public final class GLRenderer implements Renderer { source.resetObject(); } + @Override public void deleteShader(Shader shader) { if (shader.getId() == -1) { logger.warning("Shader is not uploaded to GPU, cannot delete."); @@ -1613,6 +1629,7 @@ public final class GLRenderer implements Renderer { copyFrameBuffer(src, dst, true); } + @Override public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst, boolean copyDepth) { if (caps.contains(Caps.FrameBufferBlit)) { int srcX0 = 0; @@ -1891,6 +1908,7 @@ public final class GLRenderer implements Renderer { return samplePositions; } + @Override public void setMainFrameBufferOverride(FrameBuffer fb) { mainFbOverride = null; if (context.boundFBO == 0) { @@ -1970,6 +1988,7 @@ public final class GLRenderer implements Renderer { } + @Override public void setFrameBuffer(FrameBuffer fb) { if (fb == null && mainFbOverride != null) { fb = mainFbOverride; @@ -2022,6 +2041,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void readFrameBuffer(FrameBuffer fb, ByteBuffer byteBuf) { readFrameBufferWithGLFormat(fb, byteBuf, GL.GL_RGBA, GL.GL_UNSIGNED_BYTE); } @@ -2049,6 +2069,7 @@ public final class GLRenderer implements Renderer { gl.glReadPixels(vpX, vpY, vpW, vpH, glFormat, dataType, byteBuf); } + @Override public void readFrameBufferWithFormat(FrameBuffer fb, ByteBuffer byteBuf, Image.Format format) { GLImageFormat glFormat = texUtil.getImageFormatWithError(format, false); readFrameBufferWithGLFormat(fb, byteBuf, glFormat.format, glFormat.dataType); @@ -2059,6 +2080,7 @@ public final class GLRenderer implements Renderer { glfbo.glDeleteRenderbuffersEXT(intBuf1); } + @Override public void deleteFrameBuffer(FrameBuffer fb) { if (fb.getId() != -1) { if (context.boundFBO == fb.getId()) { @@ -2547,6 +2569,7 @@ public final class GLRenderer implements Renderer { * @deprecated Use modifyTexture(Texture2D dest, Image src, int destX, int destY, int srcX, int srcY, int areaW, int areaH) */ @Deprecated + @Override public void modifyTexture(Texture tex, Image pixels, int x, int y) { setTexture(0, tex); if(caps.contains(Caps.OpenGLES20) && pixels.getFormat()!=tex.getImage().getFormat() ) { @@ -2576,6 +2599,7 @@ public final class GLRenderer implements Renderer { texUtil.uploadSubTexture(target, src, 0, destX, destY, srcX, srcY, areaW, areaH, linearizeSrgbImages); } + @Override public void deleteImage(Image image) { int texId = image.getId(); if (texId != -1) { @@ -2628,6 +2652,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void updateBufferData(VertexBuffer vb) { int bufId = vb.getId(); boolean created = false; @@ -2743,6 +2768,7 @@ public final class GLRenderer implements Renderer { bo.clearUpdateNeeded(); } + @Override public void deleteBuffer(VertexBuffer vb) { int bufId = vb.getId(); if (bufId != -1) { @@ -3140,6 +3166,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void renderMesh(Mesh mesh, int lod, int count, VertexBuffer[] instanceData) { if (mesh.getVertexCount() == 0 || mesh.getTriangleCount() == 0 || count == 0) { return; @@ -3165,6 +3192,7 @@ public final class GLRenderer implements Renderer { // } } + @Override public void setMainFrameBufferSrgb(boolean enableSrgb) { // Gamma correction if (!caps.contains(Caps.Srgb) && enableSrgb) { @@ -3191,6 +3219,7 @@ public final class GLRenderer implements Renderer { } } + @Override public void setLinearizeSrgbImages(boolean linearize) { if (caps.contains(Caps.Srgb)) { linearizeSrgbImages = linearize; diff --git a/jme3-core/src/main/java/com/jme3/renderer/queue/GeometryList.java b/jme3-core/src/main/java/com/jme3/renderer/queue/GeometryList.java index 09b43b9e8..796050d6a 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/queue/GeometryList.java +++ b/jme3-core/src/main/java/com/jme3/renderer/queue/GeometryList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -159,16 +159,19 @@ public class GeometryList implements Iterable{ } } + @Override public Iterator iterator() { return new Iterator() { int index = 0; + @Override public boolean hasNext() { return index < size(); } + @Override public Geometry next() { if ( index >= size() ) { throw new NoSuchElementException("Geometry list has only " + size() + " elements"); @@ -176,6 +179,7 @@ public class GeometryList implements Iterable{ return get(index++); } + @Override public void remove() { throw new UnsupportedOperationException("Geometry list doesn't support iterator removal"); } diff --git a/jme3-core/src/main/java/com/jme3/renderer/queue/GuiComparator.java b/jme3-core/src/main/java/com/jme3/renderer/queue/GuiComparator.java index 541b7eb12..7629afdf9 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/queue/GuiComparator.java +++ b/jme3-core/src/main/java/com/jme3/renderer/queue/GuiComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ import com.jme3.scene.Geometry; */ public class GuiComparator implements GeometryComparator { + @Override public int compare(Geometry o1, Geometry o2) { float z1 = o1.getWorldTranslation().getZ(); float z2 = o2.getWorldTranslation().getZ(); @@ -53,6 +54,7 @@ public class GuiComparator implements GeometryComparator { return 0; } + @Override public void setCamera(Camera cam) { } diff --git a/jme3-core/src/main/java/com/jme3/renderer/queue/NullComparator.java b/jme3-core/src/main/java/com/jme3/renderer/queue/NullComparator.java index bd810ca81..3fab4435c 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/queue/NullComparator.java +++ b/jme3-core/src/main/java/com/jme3/renderer/queue/NullComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,10 +41,12 @@ import com.jme3.scene.Geometry; * @author Kirill Vainer */ public class NullComparator implements GeometryComparator { + @Override public int compare(Geometry o1, Geometry o2) { return 0; } + @Override public void setCamera(Camera cam) { } } diff --git a/jme3-core/src/main/java/com/jme3/renderer/queue/OpaqueComparator.java b/jme3-core/src/main/java/com/jme3/renderer/queue/OpaqueComparator.java index 4b1305c60..8eab520e7 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/queue/OpaqueComparator.java +++ b/jme3-core/src/main/java/com/jme3/renderer/queue/OpaqueComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ public class OpaqueComparator implements GeometryComparator { private final Vector3f tempVec = new Vector3f(); private final Vector3f tempVec2 = new Vector3f(); + @Override public void setCamera(Camera cam){ this.cam = cam; } diff --git a/jme3-core/src/main/java/com/jme3/renderer/queue/TransparentComparator.java b/jme3-core/src/main/java/com/jme3/renderer/queue/TransparentComparator.java index c5c3fc79f..9f1507daa 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/queue/TransparentComparator.java +++ b/jme3-core/src/main/java/com/jme3/renderer/queue/TransparentComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,6 +40,7 @@ public class TransparentComparator implements GeometryComparator { private Camera cam; private final Vector3f tempVec = new Vector3f(); + @Override public void setCamera(Camera cam){ this.cam = cam; } @@ -87,6 +88,7 @@ public class TransparentComparator implements GeometryComparator { return spat.getWorldBound().distanceToEdge(cam.getLocation()); } + @Override public int compare(Geometry o1, Geometry o2) { float d1 = distanceToCam(o1); float d2 = distanceToCam(o2); diff --git a/jme3-core/src/main/java/com/jme3/scene/Geometry.java b/jme3-core/src/main/java/com/jme3/scene/Geometry.java index 424b44504..8b302d434 100644 --- a/jme3-core/src/main/java/com/jme3/scene/Geometry.java +++ b/jme3-core/src/main/java/com/jme3/scene/Geometry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -206,6 +206,7 @@ public class Geometry extends Spatial { * * @see Mesh#getVertexCount() */ + @Override public int getVertexCount() { return mesh.getVertexCount(); } @@ -217,6 +218,7 @@ public class Geometry extends Spatial { * * @see Mesh#getTriangleCount() */ + @Override public int getTriangleCount() { return mesh.getTriangleCount(); } @@ -288,6 +290,7 @@ public class Geometry extends Spatial { * Updates the bounding volume of the mesh. Should be called when the * mesh has been modified. */ + @Override public void updateModelBound() { mesh.updateBound(); setBoundRefresh(); @@ -457,6 +460,7 @@ public class Geometry extends Spatial { //updateModelBound(); } + @Override public int collideWith(Collidable other, CollisionResults results) { // Force bound to update checkDoBoundUpdate(); diff --git a/jme3-core/src/main/java/com/jme3/scene/Node.java b/jme3-core/src/main/java/com/jme3/scene/Node.java index 6fa788392..290781ac4 100644 --- a/jme3-core/src/main/java/com/jme3/scene/Node.java +++ b/jme3-core/src/main/java/com/jme3/scene/Node.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -574,6 +574,7 @@ public class Node extends Spatial { } } + @Override public int collideWith(Collidable other, CollisionResults results){ int total = 0; // optimization: try collideWith BoundingVolume to avoid possibly redundant tests on children diff --git a/jme3-core/src/main/java/com/jme3/scene/Spatial.java b/jme3-core/src/main/java/com/jme3/scene/Spatial.java index 06bc63f7f..ab3cf0d47 100644 --- a/jme3-core/src/main/java/com/jme3/scene/Spatial.java +++ b/jme3-core/src/main/java/com/jme3/scene/Spatial.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -213,10 +213,12 @@ public abstract class Spatial implements Savable, Cloneable, Collidable, Cloneab refreshFlags |= RF_BOUND; } + @Override public void setKey(AssetKey key) { this.key = key; } + @Override public AssetKey getKey() { return key; } @@ -1103,6 +1105,7 @@ public abstract class Spatial implements Savable, Cloneable, Collidable, Cloneab * setLocalTransform sets the local transform of this * spatial. */ + @Override public void setLocalTransform(Transform t) { this.localTransform.set(t); setTransformRefresh(); @@ -1114,6 +1117,7 @@ public abstract class Spatial implements Savable, Cloneable, Collidable, Cloneab * * @return the local transform of this spatial. */ + @Override public Transform getLocalTransform() { return localTransform; } @@ -1535,6 +1539,7 @@ public abstract class Spatial implements Savable, Cloneable, Collidable, Cloneab return true; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule capsule = ex.getCapsule(this); capsule.write(name, "name", null); @@ -1552,6 +1557,7 @@ public abstract class Spatial implements Savable, Cloneable, Collidable, Cloneab capsule.writeStringSavableMap(userData, "user_data", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); diff --git a/jme3-core/src/main/java/com/jme3/scene/UserData.java b/jme3-core/src/main/java/com/jme3/scene/UserData.java index 0e94e2c0b..d144ba452 100644 --- a/jme3-core/src/main/java/com/jme3/scene/UserData.java +++ b/jme3-core/src/main/java/com/jme3/scene/UserData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -134,6 +134,7 @@ public final class UserData implements Savable { } } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(type, "type", (byte) 0); @@ -191,6 +192,7 @@ public final class UserData implements Savable { } } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); type = ic.readByte("type", (byte) 0); diff --git a/jme3-core/src/main/java/com/jme3/scene/control/AbstractControl.java b/jme3-core/src/main/java/com/jme3/scene/control/AbstractControl.java index 4afbb437b..ca0dd4737 100644 --- a/jme3-core/src/main/java/com/jme3/scene/control/AbstractControl.java +++ b/jme3-core/src/main/java/com/jme3/scene/control/AbstractControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,6 +55,7 @@ public abstract class AbstractControl implements Control, JmeCloneable { public AbstractControl(){ } + @Override public void setSpatial(Spatial spatial) { if (this.spatial != null && spatial != null && spatial != this.spatial) { throw new IllegalStateException("This control has already been added to a Spatial"); @@ -104,6 +105,7 @@ public abstract class AbstractControl implements Control, JmeCloneable { this.spatial = cloner.clone(spatial); } + @Override public void update(float tpf) { if (!enabled) return; @@ -111,6 +113,7 @@ public abstract class AbstractControl implements Control, JmeCloneable { controlUpdate(tpf); } + @Override public void render(RenderManager rm, ViewPort vp) { if (!enabled) return; @@ -118,12 +121,14 @@ public abstract class AbstractControl implements Control, JmeCloneable { controlRender(rm, vp); } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(enabled, "enabled", true); oc.write(spatial, "spatial", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); enabled = ic.readBoolean("enabled", true); diff --git a/jme3-core/src/main/java/com/jme3/scene/control/LodControl.java b/jme3-core/src/main/java/com/jme3/scene/control/LodControl.java index fd74de5d1..fc03a584c 100644 --- a/jme3-core/src/main/java/com/jme3/scene/control/LodControl.java +++ b/jme3-core/src/main/java/com/jme3/scene/control/LodControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -153,6 +153,7 @@ public class LodControl extends AbstractControl implements Cloneable, JmeCloneab protected void controlUpdate(float tpf) { } + @Override protected void controlRender(RenderManager rm, ViewPort vp) { BoundingVolume bv = spatial.getWorldBound(); diff --git a/jme3-core/src/main/java/com/jme3/scene/debug/custom/ArmatureDebugAppState.java b/jme3-core/src/main/java/com/jme3/scene/debug/custom/ArmatureDebugAppState.java index a3618b444..1afc84454 100644 --- a/jme3-core/src/main/java/com/jme3/scene/debug/custom/ArmatureDebugAppState.java +++ b/jme3-core/src/main/java/com/jme3/scene/debug/custom/ArmatureDebugAppState.java @@ -122,6 +122,7 @@ public class ArmatureDebugAppState extends BaseAppState { } private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (name.equals("shoot") && isPressed) { clickDelay = 0; diff --git a/jme3-core/src/main/java/com/jme3/scene/instancing/InstancedNode.java b/jme3-core/src/main/java/com/jme3/scene/instancing/InstancedNode.java index 2ddaa4cc1..5c3808a15 100644 --- a/jme3-core/src/main/java/com/jme3/scene/instancing/InstancedNode.java +++ b/jme3-core/src/main/java/com/jme3/scene/instancing/InstancedNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018 jMonkeyEngine + * Copyright (c) 2014-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -151,19 +151,24 @@ public class InstancedNode extends GeometryGroupNode { this.node = cloner.clone(node); } + @Override public void setSpatial(Spatial spatial){ } + @Override public void update(float tpf){ } + @Override public void render(RenderManager rm, ViewPort vp) { node.renderFromControl(); } + @Override public void write(JmeExporter ex) throws IOException { } + @Override public void read(JmeImporter im) throws IOException { } } diff --git a/jme3-core/src/main/java/com/jme3/scene/shape/Box.java b/jme3-core/src/main/java/com/jme3/scene/shape/Box.java index a36af31db..40be05df6 100644 --- a/jme3-core/src/main/java/com/jme3/scene/shape/Box.java +++ b/jme3-core/src/main/java/com/jme3/scene/shape/Box.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -145,24 +145,28 @@ public class Box extends AbstractBox { return new Box(center.clone(), xExtent, yExtent, zExtent); } + @Override protected void doUpdateGeometryIndices() { if (getBuffer(Type.Index) == null){ setBuffer(Type.Index, 3, BufferUtils.createShortBuffer(GEOMETRY_INDICES_DATA)); } } + @Override protected void doUpdateGeometryNormals() { if (getBuffer(Type.Normal) == null){ setBuffer(Type.Normal, 3, BufferUtils.createFloatBuffer(GEOMETRY_NORMALS_DATA)); } } + @Override protected void doUpdateGeometryTextures() { if (getBuffer(Type.TexCoord) == null){ setBuffer(Type.TexCoord, 2, BufferUtils.createFloatBuffer(GEOMETRY_TEXTURE_DATA)); } } + @Override protected void doUpdateGeometryVertices() { FloatBuffer fpb = BufferUtils.createVector3Buffer(24); Vector3f[] v = computeVertices(); diff --git a/jme3-core/src/main/java/com/jme3/scene/shape/Sphere.java b/jme3-core/src/main/java/com/jme3/scene/shape/Sphere.java index a9deee367..97d24eb90 100644 --- a/jme3-core/src/main/java/com/jme3/scene/shape/Sphere.java +++ b/jme3-core/src/main/java/com/jme3/scene/shape/Sphere.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -402,6 +402,7 @@ public class Sphere extends Mesh { setStatic(); } + @Override public void read(JmeImporter e) throws IOException { super.read(e); InputCapsule capsule = e.getCapsule(this); @@ -413,6 +414,7 @@ public class Sphere extends Mesh { interior = capsule.readBoolean("interior", false); } + @Override public void write(JmeExporter e) throws IOException { super.write(e); OutputCapsule capsule = e.getCapsule(this); diff --git a/jme3-core/src/main/java/com/jme3/scene/shape/StripBox.java b/jme3-core/src/main/java/com/jme3/scene/shape/StripBox.java index b76168b75..16d1eb31d 100644 --- a/jme3-core/src/main/java/com/jme3/scene/shape/StripBox.java +++ b/jme3-core/src/main/java/com/jme3/scene/shape/StripBox.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -139,12 +139,14 @@ public class StripBox extends AbstractBox { return new StripBox(center.clone(), xExtent, yExtent, zExtent); } + @Override protected void doUpdateGeometryIndices() { if (getBuffer(Type.Index) == null){ setBuffer(Type.Index, 3, BufferUtils.createShortBuffer(GEOMETRY_INDICES_DATA)); } } + @Override protected void doUpdateGeometryNormals() { if (getBuffer(Type.Normal) == null){ float[] normals = new float[8 * 3]; @@ -164,12 +166,14 @@ public class StripBox extends AbstractBox { } } + @Override protected void doUpdateGeometryTextures() { if (getBuffer(Type.TexCoord) == null){ setBuffer(Type.TexCoord, 2, BufferUtils.createFloatBuffer(GEOMETRY_TEXTURE_DATA)); } } + @Override protected void doUpdateGeometryVertices() { FloatBuffer fpb = BufferUtils.createVector3Buffer(8 * 3); Vector3f[] v = computeVertices(); diff --git a/jme3-core/src/main/java/com/jme3/shader/Shader.java b/jme3-core/src/main/java/com/jme3/shader/Shader.java index cd93ab9f3..214f0cc18 100644 --- a/jme3-core/src/main/java/com/jme3/shader/Shader.java +++ b/jme3-core/src/main/java/com/jme3/shader/Shader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -205,15 +205,18 @@ public final class Shader extends NativeObject { + sourceType.name()+", language=" + language + "]"; } + @Override public void resetObject(){ id = -1; setUpdateNeeded(); } + @Override public void deleteObject(Object rendererObject){ ((Renderer)rendererObject).deleteShaderSource(ShaderSource.this); } + @Override public NativeObject createDestructableClone(){ return new ShaderSource(ShaderSource.this); } @@ -449,6 +452,7 @@ public final class Shader extends NativeObject { ((Renderer)rendererObject).deleteShader(this); } + @Override public NativeObject createDestructableClone(){ return new Shader(this); } diff --git a/jme3-core/src/main/java/com/jme3/shadow/AbstractShadowRenderer.java b/jme3-core/src/main/java/com/jme3/shadow/AbstractShadowRenderer.java index 4c0df0bd6..de07fa1fd 100644 --- a/jme3-core/src/main/java/com/jme3/shadow/AbstractShadowRenderer.java +++ b/jme3-core/src/main/java/com/jme3/shadow/AbstractShadowRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -330,6 +330,7 @@ public abstract class AbstractShadowRenderer implements SceneProcessor, Savable, * @param rm the render manager * @param vp the viewport */ + @Override public void initialize(RenderManager rm, ViewPort vp) { renderManager = rm; viewPort = vp; @@ -349,6 +350,7 @@ public abstract class AbstractShadowRenderer implements SceneProcessor, Savable, * * @return true if initialized, otherwise false */ + @Override public boolean isInitialized() { return viewPort != null; } @@ -390,6 +392,7 @@ public abstract class AbstractShadowRenderer implements SceneProcessor, Savable, } @SuppressWarnings("fallthrough") + @Override public void postQueue(RenderQueue rq) { lightReceivers.clear(); skipPostPass = false; @@ -471,6 +474,7 @@ public abstract class AbstractShadowRenderer implements SceneProcessor, Savable, protected abstract void getReceivers(GeometryList lightReceivers); + @Override public void postFrame(FrameBuffer out) { if (skipPostPass) { return; @@ -684,12 +688,15 @@ public abstract class AbstractShadowRenderer implements SceneProcessor, Savable, */ protected abstract boolean checkCulling(Camera viewCam); + @Override public void preFrame(float tpf) { } + @Override public void cleanup() { } + @Override public void reshape(ViewPort vp, int w, int h) { } @@ -824,6 +831,7 @@ public abstract class AbstractShadowRenderer implements SceneProcessor, Savable, init(assetManager, nbShadowMaps, (int) shadowMapSize); } + @Override public void setProfiler(AppProfiler profiler) { this.prof = profiler; } @@ -833,6 +841,7 @@ public abstract class AbstractShadowRenderer implements SceneProcessor, Savable, * * @param im importer (not null) */ + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); assetManager = im.getAssetManager(); @@ -852,6 +861,7 @@ public abstract class AbstractShadowRenderer implements SceneProcessor, Savable, * * @param ex exporter (not null) */ + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(nbShadowMaps, "nbShadowMaps", 1); diff --git a/jme3-core/src/main/java/com/jme3/shadow/BasicShadowRenderer.java b/jme3-core/src/main/java/com/jme3/shadow/BasicShadowRenderer.java index 54c1f3b4f..3729f4095 100644 --- a/jme3-core/src/main/java/com/jme3/shadow/BasicShadowRenderer.java +++ b/jme3-core/src/main/java/com/jme3/shadow/BasicShadowRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -104,6 +104,7 @@ public class BasicShadowRenderer implements SceneProcessor { } } + @Override public void initialize(RenderManager rm, ViewPort vp) { renderManager = rm; viewPort = vp; @@ -111,6 +112,7 @@ public class BasicShadowRenderer implements SceneProcessor { reshape(vp, vp.getCamera().getWidth(), vp.getCamera().getHeight()); } + @Override public boolean isInitialized() { return viewPort != null; } @@ -148,6 +150,7 @@ public class BasicShadowRenderer implements SceneProcessor { return shadowCam; } + @Override public void postQueue(RenderQueue rq) { for (Spatial scene : viewPort.getScenes()) { ShadowUtil.getGeometriesInCamFrustum(scene, viewPort.getCamera(), ShadowMode.Receive, lightReceivers); @@ -208,6 +211,7 @@ public class BasicShadowRenderer implements SceneProcessor { return dispPic; } + @Override public void postFrame(FrameBuffer out) { if (!noOccluders) { postshadowMat.setMatrix4("LightViewProjectionMatrix", shadowCam.getViewProjectionMatrix()); @@ -217,9 +221,11 @@ public class BasicShadowRenderer implements SceneProcessor { } } + @Override public void preFrame(float tpf) { } + @Override public void cleanup() { } @@ -228,6 +234,7 @@ public class BasicShadowRenderer implements SceneProcessor { this.prof = profiler; } + @Override public void reshape(ViewPort vp, int w, int h) { dispPic.setPosition(w / 20f, h / 20f); dispPic.setWidth(w / 5f); diff --git a/jme3-core/src/main/java/com/jme3/shadow/PssmShadowRenderer.java b/jme3-core/src/main/java/com/jme3/shadow/PssmShadowRenderer.java index 0b36a5647..33e59fec6 100644 --- a/jme3-core/src/main/java/com/jme3/shadow/PssmShadowRenderer.java +++ b/jme3-core/src/main/java/com/jme3/shadow/PssmShadowRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -352,12 +352,14 @@ public class PssmShadowRenderer implements SceneProcessor { return frustumMdl; } + @Override public void initialize(RenderManager rm, ViewPort vp) { renderManager = rm; viewPort = vp; postTechniqueName = "PostShadow"; } + @Override public boolean isInitialized() { return viewPort != null; } @@ -381,6 +383,7 @@ public class PssmShadowRenderer implements SceneProcessor { } @SuppressWarnings("fallthrough") + @Override public void postQueue(RenderQueue rq) { for (Spatial scene : viewPort.getScenes()) { ShadowUtil.getGeometriesInCamFrustum(scene, viewPort.getCamera(), ShadowMode.Receive, lightReceivers); @@ -488,6 +491,7 @@ public class PssmShadowRenderer implements SceneProcessor { debug = true; } + @Override public void postFrame(FrameBuffer out) { if (debug) { @@ -581,12 +585,15 @@ public class PssmShadowRenderer implements SceneProcessor { } } + @Override public void preFrame(float tpf) { } + @Override public void cleanup() { } + @Override public void reshape(ViewPort vp, int w, int h) { } diff --git a/jme3-core/src/main/java/com/jme3/system/NanoTimer.java b/jme3-core/src/main/java/com/jme3/system/NanoTimer.java index e0a4d8b46..096485741 100644 --- a/jme3-core/src/main/java/com/jme3/system/NanoTimer.java +++ b/jme3-core/src/main/java/com/jme3/system/NanoTimer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,28 +62,34 @@ public class NanoTimer extends Timer { return getTime() * INVERSE_TIMER_RESOLUTION; } + @Override public long getTime() { return System.nanoTime() - startTime; } + @Override public long getResolution() { return TIMER_RESOLUTION; } + @Override public float getFrameRate() { return fps; } + @Override public float getTimePerFrame() { return tpf; } + @Override public void update() { tpf = (getTime() - previousTime) * (1.0f / TIMER_RESOLUTION); fps = 1.0f / tpf; previousTime = getTime(); } + @Override public void reset() { startTime = System.nanoTime(); previousTime = getTime(); diff --git a/jme3-core/src/main/java/com/jme3/system/NullContext.java b/jme3-core/src/main/java/com/jme3/system/NullContext.java index 205d0a2c0..984ba74d5 100644 --- a/jme3-core/src/main/java/com/jme3/system/NullContext.java +++ b/jme3-core/src/main/java/com/jme3/system/NullContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,10 +59,12 @@ public class NullContext implements JmeContext, Runnable { protected SystemListener listener; protected NullRenderer renderer; + @Override public Type getType() { return Type.Headless; } + @Override public void setSystemListener(SystemListener listener){ this.listener = listener; } @@ -72,6 +74,7 @@ public class NullContext implements JmeContext, Runnable { logger.log(Level.FINE, "Running on thread: {0}", Thread.currentThread().getName()); Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { + @Override public void uncaughtException(Thread thread, Throwable thrown) { listener.handleError("Uncaught exception thrown in "+thread.toString(), thrown); } @@ -126,6 +129,7 @@ public class NullContext implements JmeContext, Runnable { timeThen = timeNow; } + @Override public void run(){ initInThread(); @@ -142,12 +146,14 @@ public class NullContext implements JmeContext, Runnable { logger.fine("NullContext destroyed."); } + @Override public void destroy(boolean waitFor){ needClose.set(true); if (waitFor) waitFor(false); } + @Override public void create(boolean waitFor){ if (created.get()){ logger.warning("create() called when NullContext is already created!"); @@ -159,28 +165,35 @@ public class NullContext implements JmeContext, Runnable { waitFor(true); } + @Override public void restart() { } + @Override public void setAutoFlushFrames(boolean enabled){ } + @Override public MouseInput getMouseInput() { return new DummyMouseInput(); } + @Override public KeyInput getKeyInput() { return new DummyKeyInput(); } + @Override public JoyInput getJoyInput() { return null; } + @Override public TouchInput getTouchInput() { return null; } + @Override public void setTitle(String title) { } @@ -203,10 +216,12 @@ public class NullContext implements JmeContext, Runnable { } } + @Override public boolean isCreated(){ return created.get(); } + @Override public void setSettings(AppSettings settings) { this.settings.copyFrom(settings); frameRate = settings.getFrameRate(); @@ -214,18 +229,22 @@ public class NullContext implements JmeContext, Runnable { frameRate = 60; // use default update rate. } + @Override public AppSettings getSettings(){ return settings; } + @Override public Renderer getRenderer() { return renderer; } + @Override public Timer getTimer() { return timer; } + @Override public boolean isRenderable() { return true; // Doesn't really matter if true or false. Either way // RenderManager won't render anything. diff --git a/jme3-core/src/main/java/com/jme3/system/NullRenderer.java b/jme3-core/src/main/java/com/jme3/system/NullRenderer.java index 76b3fa146..156b2aabb 100644 --- a/jme3-core/src/main/java/com/jme3/system/NullRenderer.java +++ b/jme3-core/src/main/java/com/jme3/system/NullRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -58,6 +58,7 @@ public class NullRenderer implements Renderer { private final EnumMap limits = new EnumMap<>(Limits.class); private final Statistics stats = new Statistics(); + @Override public void initialize() { for (Limits limit : Limits.values()) { limits.put(limit, Integer.MAX_VALUE); @@ -69,29 +70,37 @@ public class NullRenderer implements Renderer { return limits; } + @Override public EnumSet getCaps() { return caps; } + @Override public Statistics getStatistics() { return stats; } + @Override public void invalidateState(){ } + @Override public void clearBuffers(boolean color, boolean depth, boolean stencil) { } + @Override public void setBackgroundColor(ColorRGBA color) { } + @Override public void applyRenderState(RenderState state) { } + @Override public void setDepthRange(float start, float end) { } + @Override public void postFrame() { } @@ -101,57 +110,72 @@ public class NullRenderer implements Renderer { public void setViewProjectionMatrices(Matrix4f viewMatrix, Matrix4f projMatrix) { } + @Override public void setViewPort(int x, int y, int width, int height) { } + @Override public void setClipRect(int x, int y, int width, int height) { } + @Override public void clearClipRect() { } public void setLighting(LightList lights) { } + @Override public void setShader(Shader shader) { } + @Override public void deleteShader(Shader shader) { } + @Override public void deleteShaderSource(ShaderSource source) { } public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst) { } + @Override public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst, boolean copyDepth) { } + @Override public void setMainFrameBufferOverride(FrameBuffer fb) { } + @Override public void setFrameBuffer(FrameBuffer fb) { } + @Override public void readFrameBuffer(FrameBuffer fb, ByteBuffer byteBuf) { } + @Override public void deleteFrameBuffer(FrameBuffer fb) { } + @Override public void setTexture(int unit, Texture tex) { } + @Override public void modifyTexture(Texture tex, Image pixels, int x, int y) { } + @Override public void updateBufferData(VertexBuffer vb) { } @Override public void updateBufferData(BufferObject bo) { } + @Override public void deleteBuffer(VertexBuffer vb) { } @@ -160,24 +184,31 @@ public class NullRenderer implements Renderer { } + @Override public void renderMesh(Mesh mesh, int lod, int count, VertexBuffer[] instanceData) { } + @Override public void resetGLObjects() { } + @Override public void cleanup() { } + @Override public void deleteImage(Image image) { } + @Override public void setAlphaToCoverage(boolean value) { } + @Override public void setMainFrameBufferSrgb(boolean srgb) { } + @Override public void setLinearizeSrgbImages(boolean linearize) { } @@ -206,6 +237,7 @@ public class NullRenderer implements Renderer { return false; } + @Override public void readFrameBufferWithFormat(FrameBuffer fb, ByteBuffer byteBuf, Image.Format format) { } diff --git a/jme3-core/src/main/java/com/jme3/texture/FrameBuffer.java b/jme3-core/src/main/java/com/jme3/texture/FrameBuffer.java index d5684e885..2626cee90 100644 --- a/jme3-core/src/main/java/com/jme3/texture/FrameBuffer.java +++ b/jme3-core/src/main/java/com/jme3/texture/FrameBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -587,6 +587,7 @@ public class FrameBuffer extends NativeObject { ((Renderer)rendererObject).deleteFrameBuffer(this); } + @Override public NativeObject createDestructableClone(){ return new FrameBuffer(this); } diff --git a/jme3-core/src/main/java/com/jme3/texture/Image.java b/jme3-core/src/main/java/com/jme3/texture/Image.java index f7cee1b55..f14de5b9a 100644 --- a/jme3-core/src/main/java/com/jme3/texture/Image.java +++ b/jme3-core/src/main/java/com/jme3/texture/Image.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1232,6 +1232,7 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ { return hash; } + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(format, "format", Format.RGBA8); @@ -1244,6 +1245,7 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ { capsule.write(colorSpace, "colorSpace", null); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); format = capsule.readEnum("format", Format.class, Format.RGBA8); diff --git a/jme3-core/src/main/java/com/jme3/texture/Texture.java b/jme3-core/src/main/java/com/jme3/texture/Texture.java index 65563928f..5def31ee1 100644 --- a/jme3-core/src/main/java/com/jme3/texture/Texture.java +++ b/jme3-core/src/main/java/com/jme3/texture/Texture.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -424,10 +424,12 @@ public abstract class Texture implements CloneableSmartAsset, Savable, Cloneable /** * @param key The texture key that was used to load this texture */ + @Override public void setKey(AssetKey key){ this.key = (TextureKey) key; } + @Override public AssetKey getKey(){ return this.key; } @@ -587,6 +589,7 @@ public abstract class Texture implements CloneableSmartAsset, Savable, Cloneable @Deprecated public abstract Texture createSimpleClone(); + @Override public void write(JmeExporter e) throws IOException { OutputCapsule capsule = e.getCapsule(this); capsule.write(name, "name", null); @@ -605,6 +608,7 @@ public abstract class Texture implements CloneableSmartAsset, Savable, Cloneable MagFilter.Bilinear); } + @Override public void read(JmeImporter e) throws IOException { InputCapsule capsule = e.getCapsule(this); name = capsule.readString("name", null); diff --git a/jme3-core/src/main/java/com/jme3/texture/Texture2D.java b/jme3-core/src/main/java/com/jme3/texture/Texture2D.java index 441da1353..aca6125a1 100644 --- a/jme3-core/src/main/java/com/jme3/texture/Texture2D.java +++ b/jme3-core/src/main/java/com/jme3/texture/Texture2D.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -121,6 +121,7 @@ public class Texture2D extends Texture { * @throws IllegalArgumentException * if axis or mode are null */ + @Override public void setWrap(WrapAxis axis, WrapMode mode) { if (mode == null) { throw new IllegalArgumentException("mode can not be null."); @@ -147,6 +148,7 @@ public class Texture2D extends Texture { * @throws IllegalArgumentException * if mode is null */ + @Override public void setWrap(WrapMode mode) { if (mode == null) { throw new IllegalArgumentException("mode can not be null."); @@ -165,6 +167,7 @@ public class Texture2D extends Texture { * @throws IllegalArgumentException * if axis is null */ + @Override public WrapMode getWrap(WrapAxis axis) { switch (axis) { case S: diff --git a/jme3-core/src/main/java/com/jme3/texture/Texture3D.java b/jme3-core/src/main/java/com/jme3/texture/Texture3D.java index c94d7c3ad..d05e353c7 100644 --- a/jme3-core/src/main/java/com/jme3/texture/Texture3D.java +++ b/jme3-core/src/main/java/com/jme3/texture/Texture3D.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -124,6 +124,7 @@ public class Texture3D extends Texture { * @throws IllegalArgumentException * if axis or mode are null */ + @Override public void setWrap(WrapAxis axis, WrapMode mode) { if (mode == null) { throw new IllegalArgumentException("mode can not be null."); @@ -151,6 +152,7 @@ public class Texture3D extends Texture { * @throws IllegalArgumentException * if mode is null */ + @Override public void setWrap(WrapMode mode) { if (mode == null) { throw new IllegalArgumentException("mode can not be null."); @@ -170,6 +172,7 @@ public class Texture3D extends Texture { * @throws IllegalArgumentException * if axis is null */ + @Override public WrapMode getWrap(WrapAxis axis) { switch (axis) { case S: diff --git a/jme3-core/src/main/java/com/jme3/texture/TextureCubeMap.java b/jme3-core/src/main/java/com/jme3/texture/TextureCubeMap.java index f1a0f7d3b..c4abcdbf0 100644 --- a/jme3-core/src/main/java/com/jme3/texture/TextureCubeMap.java +++ b/jme3-core/src/main/java/com/jme3/texture/TextureCubeMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -93,6 +93,7 @@ public class TextureCubeMap extends Texture { return image; } + @Override public Texture createSimpleClone() { return createSimpleClone(new TextureCubeMap()); } @@ -116,6 +117,7 @@ public class TextureCubeMap extends Texture { * @throws IllegalArgumentException * if axis or mode are null */ + @Override public void setWrap(WrapAxis axis, WrapMode mode) { if (mode == null) { throw new IllegalArgumentException("mode can not be null."); @@ -143,6 +145,7 @@ public class TextureCubeMap extends Texture { * @throws IllegalArgumentException * if mode is null */ + @Override public void setWrap(WrapMode mode) { if (mode == null) { throw new IllegalArgumentException("mode can not be null."); @@ -162,6 +165,7 @@ public class TextureCubeMap extends Texture { * @throws IllegalArgumentException * if axis is null */ + @Override public WrapMode getWrap(WrapAxis axis) { switch (axis) { case S: diff --git a/jme3-core/src/main/java/com/jme3/texture/TextureProcessor.java b/jme3-core/src/main/java/com/jme3/texture/TextureProcessor.java index 78107836e..c0dc0ad35 100644 --- a/jme3-core/src/main/java/com/jme3/texture/TextureProcessor.java +++ b/jme3-core/src/main/java/com/jme3/texture/TextureProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -73,6 +73,7 @@ public class TextureProcessor implements AssetProcessor { return tex; } + @Override public Object createClone(Object obj) { Texture tex = (Texture) obj; return tex.clone(); diff --git a/jme3-core/src/main/java/com/jme3/texture/image/BitMaskImageCodec.java b/jme3-core/src/main/java/com/jme3/texture/image/BitMaskImageCodec.java index 324052604..2de903d96 100644 --- a/jme3-core/src/main/java/com/jme3/texture/image/BitMaskImageCodec.java +++ b/jme3-core/src/main/java/com/jme3/texture/image/BitMaskImageCodec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -103,6 +103,7 @@ class BitMaskImageCodec extends ImageCodec { components[3] = (inputPixel >> bs) & maxBlue; } + @Override public void writeComponents(ByteBuffer buf, int x, int y, int width, int offset, int[] components, byte[] tmp) { // Shift components then mask them // Map all components into a single bitspace diff --git a/jme3-core/src/main/java/com/jme3/texture/image/ByteAlignedImageCodec.java b/jme3-core/src/main/java/com/jme3/texture/image/ByteAlignedImageCodec.java index d00ab7e22..c307d4b53 100644 --- a/jme3-core/src/main/java/com/jme3/texture/image/ByteAlignedImageCodec.java +++ b/jme3-core/src/main/java/com/jme3/texture/image/ByteAlignedImageCodec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -109,6 +109,7 @@ class ByteAlignedImageCodec extends ImageCodec { // } } + @Override public void readComponents(ByteBuffer buf, int x, int y, int width, int offset, int[] components, byte[] tmp) { readPixelRaw(buf, (x + y * width ) * bpp + offset, bpp, tmp); components[0] = readComponent(tmp, ap, az); @@ -117,6 +118,7 @@ class ByteAlignedImageCodec extends ImageCodec { components[3] = readComponent(tmp, bp, bz); } + @Override public void writeComponents(ByteBuffer buf, int x, int y, int width, int offset, int[] components, byte[] tmp) { writeComponent(components[0], ap, az, tmp); writeComponent(components[1], rp, rz, tmp); diff --git a/jme3-core/src/main/java/com/jme3/util/IntMap.java b/jme3-core/src/main/java/com/jme3/util/IntMap.java index b572fad22..c1c9b0abe 100644 --- a/jme3-core/src/main/java/com/jme3/util/IntMap.java +++ b/jme3-core/src/main/java/com/jme3/util/IntMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -219,6 +219,7 @@ public final class IntMap implements Iterable>, Cloneable, JmeClonea size = 0; } + @Override public Iterator> iterator() { IntMapIterator it = new IntMapIterator(); it.beginUse(); @@ -251,10 +252,12 @@ public final class IntMap implements Iterable>, Cloneable, JmeClonea el = 0; } + @Override public boolean hasNext() { return el < size; } + @Override public Entry next() { if (el >= size) throw new NoSuchElementException("No more elements!"); @@ -285,6 +288,7 @@ public final class IntMap implements Iterable>, Cloneable, JmeClonea return e; } + @Override public void remove() { } diff --git a/jme3-core/src/main/java/com/jme3/util/ListMap.java b/jme3-core/src/main/java/com/jme3/util/ListMap.java index 379fff741..5d721208b 100644 --- a/jme3-core/src/main/java/com/jme3/util/ListMap.java +++ b/jme3-core/src/main/java/com/jme3/util/ListMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -53,14 +53,17 @@ public final class ListMap extends AbstractMap implements Cloneable, this.value = value; } + @Override public K getKey() { return key; } + @Override public V getValue() { return value; } + @Override public V setValue(V v) { throw new UnsupportedOperationException(); } @@ -322,6 +325,7 @@ public final class ListMap extends AbstractMap implements Cloneable, // return values; } + @Override public Set> entrySet() { return backingMap.entrySet(); // HashSet> entryset = new HashSet>(); diff --git a/jme3-core/src/main/java/com/jme3/util/ListSort.java b/jme3-core/src/main/java/com/jme3/util/ListSort.java index 517f2dd6b..cbb038bca 100644 --- a/jme3-core/src/main/java/com/jme3/util/ListSort.java +++ b/jme3-core/src/main/java/com/jme3/util/ListSort.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1000,6 +1000,7 @@ public class ListSort { ListSort ls = new ListSort(); ls.allocateStack(34); ls.sort(arr, new Comparator() { + @Override public int compare(Integer o1, Integer o2) { int x = o1 - o2; return (x == 0) ? 0 : (x > 0) ? 1 : -1; diff --git a/jme3-core/src/main/java/com/jme3/util/LittleEndien.java b/jme3-core/src/main/java/com/jme3/util/LittleEndien.java index abff3acca..6cb1eeada 100644 --- a/jme3-core/src/main/java/com/jme3/util/LittleEndien.java +++ b/jme3-core/src/main/java/com/jme3/util/LittleEndien.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -52,6 +52,7 @@ public class LittleEndien extends InputStream implements DataInput { this.in = new BufferedInputStream(in); } + @Override public int read() throws IOException { return in.read(); } @@ -66,6 +67,7 @@ public class LittleEndien extends InputStream implements DataInput { return in.read(buf, off, len); } + @Override public int readUnsignedShort() throws IOException { return (in.read() & 0xff) | ((in.read() & 0xff) << 8); } @@ -80,26 +82,32 @@ public class LittleEndien extends InputStream implements DataInput { | (((long) (in.read() & 0xff)) << 24)); } + @Override public boolean readBoolean() throws IOException { return (in.read() != 0); } + @Override public byte readByte() throws IOException { return (byte) in.read(); } + @Override public int readUnsignedByte() throws IOException { return in.read(); } + @Override public short readShort() throws IOException { return (short) this.readUnsignedShort(); } + @Override public char readChar() throws IOException { return (char) this.readUnsignedShort(); } + @Override public int readInt() throws IOException { return ((in.read() & 0xff) | ((in.read() & 0xff) << 8) @@ -107,6 +115,7 @@ public class LittleEndien extends InputStream implements DataInput { | ((in.read() & 0xff) << 24)); } + @Override public long readLong() throws IOException { return ((in.read() & 0xff) | ((long) (in.read() & 0xff) << 8) @@ -118,30 +127,37 @@ public class LittleEndien extends InputStream implements DataInput { | ((long) (in.read() & 0xff) << 56)); } + @Override public float readFloat() throws IOException { return Float.intBitsToFloat(readInt()); } + @Override public double readDouble() throws IOException { return Double.longBitsToDouble(readLong()); } + @Override public void readFully(byte b[]) throws IOException { in.read(b, 0, b.length); } + @Override public void readFully(byte b[], int off, int len) throws IOException { in.read(b, off, len); } + @Override public int skipBytes(int n) throws IOException { return (int) in.skip(n); } + @Override public String readLine() throws IOException { throw new IOException("Unsupported operation"); } + @Override public String readUTF() throws IOException { throw new IOException("Unsupported operation"); } diff --git a/jme3-core/src/main/java/com/jme3/util/MaterialDebugAppState.java b/jme3-core/src/main/java/com/jme3/util/MaterialDebugAppState.java index b0f3565e4..9aafe44ce 100644 --- a/jme3-core/src/main/java/com/jme3/util/MaterialDebugAppState.java +++ b/jme3-core/src/main/java/com/jme3/util/MaterialDebugAppState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2014 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -183,6 +183,7 @@ public class MaterialDebugAppState extends AbstractAppState { } else { final String actionName = binding.getActionName(); inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (actionName.equals(name) && isPressed) { //reloading the material @@ -265,6 +266,7 @@ public class MaterialDebugAppState extends AbstractAppState { } + @Override public void reload() { Material reloadedMat = reloadMaterial(geom.getMaterial()); //if the reload is successful, we re setup the material with its params and reassign it to the box @@ -274,11 +276,13 @@ public class MaterialDebugAppState extends AbstractAppState { } } + @Override public String getActionName() { return geom.getName() + "Reload"; } + @Override public Trigger getTrigger() { return trigger; } @@ -294,6 +298,7 @@ public class MaterialDebugAppState extends AbstractAppState { this.filter = filter; } + @Override public void reload() { Field[] fields1 = filter.getClass().getDeclaredFields(); Field[] fields2 = filter.getClass().getSuperclass().getDeclaredFields(); @@ -351,10 +356,12 @@ public class MaterialDebugAppState extends AbstractAppState { } + @Override public String getActionName() { return filter.getName() + "Reload"; } + @Override public Trigger getTrigger() { return trigger; } @@ -400,10 +407,12 @@ public class MaterialDebugAppState extends AbstractAppState { return false; } + @Override public String getName() { return fileName; } + @Override public int triggerHashCode() { return 0; } diff --git a/jme3-core/src/main/java/com/jme3/util/SafeArrayList.java b/jme3-core/src/main/java/com/jme3/util/SafeArrayList.java index 0085b20d3..73759f03c 100644 --- a/jme3-core/src/main/java/com/jme3/util/SafeArrayList.java +++ b/jme3-core/src/main/java/com/jme3/util/SafeArrayList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -103,6 +103,7 @@ public class SafeArrayList implements List, Cloneable { this.size = buffer.size(); } + @Override public SafeArrayList clone() { try { SafeArrayList clone = (SafeArrayList)super.clone(); @@ -167,26 +168,32 @@ public class SafeArrayList implements List, Cloneable { return buffer; } + @Override public final int size() { return size; } + @Override public final boolean isEmpty() { return size == 0; } + @Override public boolean contains(Object o) { return indexOf(o) >= 0; } + @Override public Iterator iterator() { return listIterator(); } + @Override public Object[] toArray() { return getArray(); } + @Override public T[] toArray(T[] a) { E[] array = getArray(); @@ -203,51 +210,60 @@ public class SafeArrayList implements List, Cloneable { return a; } + @Override public boolean add(E e) { boolean result = getBuffer().add(e); size = getBuffer().size(); return result; } + @Override public boolean remove(Object o) { boolean result = getBuffer().remove(o); size = getBuffer().size(); return result; } + @Override public boolean containsAll(Collection c) { return Arrays.asList(getArray()).containsAll(c); } + @Override public boolean addAll(Collection c) { boolean result = getBuffer().addAll(c); size = getBuffer().size(); return result; } + @Override public boolean addAll(int index, Collection c) { boolean result = getBuffer().addAll(index, c); size = getBuffer().size(); return result; } + @Override public boolean removeAll(Collection c) { boolean result = getBuffer().removeAll(c); size = getBuffer().size(); return result; } + @Override public boolean retainAll(Collection c) { boolean result = getBuffer().retainAll(c); size = getBuffer().size(); return result; } + @Override public void clear() { getBuffer().clear(); size = 0; } + @Override public boolean equals(Object o) { if (o == this) { @@ -276,6 +292,7 @@ public class SafeArrayList implements List, Cloneable { return !(i1.hasNext() || i2.hasNext()); } + @Override public int hashCode() { // Exactly the hash code described in the List interface, basically E[] array = getArray(); @@ -286,6 +303,7 @@ public class SafeArrayList implements List, Cloneable { return result; } + @Override public final E get(int index) { if( backingArray != null ) return backingArray[index]; @@ -294,21 +312,25 @@ public class SafeArrayList implements List, Cloneable { throw new IndexOutOfBoundsException( "Index:" + index + ", Size:0" ); } + @Override public E set(int index, E element) { return getBuffer().set(index, element); } + @Override public void add(int index, E element) { getBuffer().add(index, element); size = getBuffer().size(); } + @Override public E remove(int index) { E result = getBuffer().remove(index); size = getBuffer().size(); return result; } + @Override public int indexOf(Object o) { E[] array = getArray(); for( int i = 0; i < array.length; i++ ) { @@ -323,6 +345,7 @@ public class SafeArrayList implements List, Cloneable { return -1; } + @Override public int lastIndexOf(Object o) { E[] array = getArray(); for( int i = array.length - 1; i >= 0; i-- ) { @@ -337,14 +360,17 @@ public class SafeArrayList implements List, Cloneable { return -1; } + @Override public ListIterator listIterator() { return new ArrayIterator(getArray(), 0); } + @Override public ListIterator listIterator(int index) { return new ArrayIterator(getArray(), index); } + @Override public List subList(int fromIndex, int toIndex) { // So far JME doesn't use subList that I can see so I'm nerfing it. @@ -352,6 +378,7 @@ public class SafeArrayList implements List, Cloneable { return Collections.unmodifiableList(raw); } + @Override public String toString() { E[] array = getArray(); @@ -382,10 +409,12 @@ public class SafeArrayList implements List, Cloneable { this.lastReturned = -1; } + @Override public boolean hasNext() { return next != array.length; } + @Override public E next() { if( !hasNext() ) throw new NoSuchElementException(); @@ -393,10 +422,12 @@ public class SafeArrayList implements List, Cloneable { return array[lastReturned]; } + @Override public boolean hasPrevious() { return next != 0; } + @Override public E previous() { if( !hasPrevious() ) throw new NoSuchElementException(); @@ -404,14 +435,17 @@ public class SafeArrayList implements List, Cloneable { return array[lastReturned]; } + @Override public int nextIndex() { return next; } + @Override public int previousIndex() { return next - 1; } + @Override public void remove() { // This operation is not so easy to do but we will fake it. // The issue is that the backing list could be completely @@ -423,10 +457,12 @@ public class SafeArrayList implements List, Cloneable { SafeArrayList.this.remove( array[lastReturned] ); } + @Override public void set(E e) { throw new UnsupportedOperationException(); } + @Override public void add(E e) { throw new UnsupportedOperationException(); } diff --git a/jme3-core/src/main/java/com/jme3/util/SortUtil.java b/jme3-core/src/main/java/com/jme3/util/SortUtil.java index 7628495f5..104e35a9e 100644 --- a/jme3-core/src/main/java/com/jme3/util/SortUtil.java +++ b/jme3-core/src/main/java/com/jme3/util/SortUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -155,6 +155,7 @@ end procedure public static void main(String[] args) { Comparator ic = new Comparator() { + @Override public int compare(Float o1, Float o2) { return (int) (o1 - o2); } diff --git a/jme3-core/src/main/java/com/jme3/util/clone/IdentityCloneFunction.java b/jme3-core/src/main/java/com/jme3/util/clone/IdentityCloneFunction.java index ac3dce6ee..287fb3cb9 100644 --- a/jme3-core/src/main/java/com/jme3/util/clone/IdentityCloneFunction.java +++ b/jme3-core/src/main/java/com/jme3/util/clone/IdentityCloneFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 jMonkeyEngine + * Copyright (c) 2016-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,7 @@ public class IdentityCloneFunction implements CloneFunction { /** * Returns the object directly. */ + @Override public T cloneObject( Cloner cloner, T object ) { return object; } @@ -53,6 +54,7 @@ public class IdentityCloneFunction implements CloneFunction { /** * Does nothing. */ + @Override public void cloneFields( Cloner cloner, T clone, T object ) { } } diff --git a/jme3-core/src/main/java/com/jme3/util/clone/ListCloneFunction.java b/jme3-core/src/main/java/com/jme3/util/clone/ListCloneFunction.java index a1f269d67..b43172980 100644 --- a/jme3-core/src/main/java/com/jme3/util/clone/ListCloneFunction.java +++ b/jme3-core/src/main/java/com/jme3/util/clone/ListCloneFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 jMonkeyEngine + * Copyright (c) 2016-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ import java.util.List; */ public class ListCloneFunction implements CloneFunction { + @Override public T cloneObject( Cloner cloner, T object ) { try { T clone = cloner.javaClone(object); @@ -55,6 +56,7 @@ public class ListCloneFunction implements CloneFunction { * Clones the elements of the list. */ @SuppressWarnings("unchecked") + @Override public void cloneFields( Cloner cloner, T clone, T object ) { for( int i = 0; i < clone.size(); i++ ) { // Need to clone the clones... because T might diff --git a/jme3-core/src/plugins/java/com/jme3/asset/plugins/ClasspathLocator.java b/jme3-core/src/plugins/java/com/jme3/asset/plugins/ClasspathLocator.java index 14e57790e..ab9602970 100644 --- a/jme3-core/src/plugins/java/com/jme3/asset/plugins/ClasspathLocator.java +++ b/jme3-core/src/plugins/java/com/jme3/asset/plugins/ClasspathLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,6 +62,7 @@ public class ClasspathLocator implements AssetLocator { public ClasspathLocator(){ } + @Override public void setRootPath(String rootPath) { this.root = rootPath; if (root.equals("/")) @@ -75,6 +76,7 @@ public class ClasspathLocator implements AssetLocator { } } + @Override public AssetInfo locate(AssetManager manager, AssetKey key) { URL url; String name = key.getName(); diff --git a/jme3-core/src/plugins/java/com/jme3/asset/plugins/FileLocator.java b/jme3-core/src/plugins/java/com/jme3/asset/plugins/FileLocator.java index f46a97516..b4b6ce5fa 100644 --- a/jme3-core/src/plugins/java/com/jme3/asset/plugins/FileLocator.java +++ b/jme3-core/src/plugins/java/com/jme3/asset/plugins/FileLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,6 +44,7 @@ public class FileLocator implements AssetLocator { private File root; + @Override public void setRootPath(String rootPath) { if (rootPath == null) throw new NullPointerException(); @@ -79,6 +80,7 @@ public class FileLocator implements AssetLocator { } } + @Override public AssetInfo locate(AssetManager manager, AssetKey key) { String name = key.getName(); File file = new File(root, name); diff --git a/jme3-core/src/plugins/java/com/jme3/asset/plugins/HttpZipLocator.java b/jme3-core/src/plugins/java/com/jme3/asset/plugins/HttpZipLocator.java index 7edda53e4..d058a5c82 100644 --- a/jme3-core/src/plugins/java/com/jme3/asset/plugins/HttpZipLocator.java +++ b/jme3-core/src/plugins/java/com/jme3/asset/plugins/HttpZipLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -339,6 +339,7 @@ public class HttpZipLocator implements AssetLocator { return openStream(entry); } + @Override public void setRootPath(String path){ if (!rootPath.equals(path)){ rootPath = path; @@ -350,6 +351,7 @@ public class HttpZipLocator implements AssetLocator { } } + @Override public AssetInfo locate(AssetManager manager, AssetKey key){ final ZipEntry2 entry = entries.get(key.getName()); if (entry == null) diff --git a/jme3-core/src/plugins/java/com/jme3/asset/plugins/UrlLocator.java b/jme3-core/src/plugins/java/com/jme3/asset/plugins/UrlLocator.java index 31cfe0f2c..846356ac4 100644 --- a/jme3-core/src/plugins/java/com/jme3/asset/plugins/UrlLocator.java +++ b/jme3-core/src/plugins/java/com/jme3/asset/plugins/UrlLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,6 +57,7 @@ public class UrlLocator implements AssetLocator { private static final Logger logger = Logger.getLogger(UrlLocator.class.getName()); private URL root; + @Override public void setRootPath(String rootPath) { try { this.root = new URL(rootPath); @@ -65,6 +66,7 @@ public class UrlLocator implements AssetLocator { } } + @Override public AssetInfo locate(AssetManager manager, AssetKey key) { String name = key.getName(); try{ diff --git a/jme3-core/src/plugins/java/com/jme3/asset/plugins/ZipLocator.java b/jme3-core/src/plugins/java/com/jme3/asset/plugins/ZipLocator.java index 22e7cc244..26e48e999 100644 --- a/jme3-core/src/plugins/java/com/jme3/asset/plugins/ZipLocator.java +++ b/jme3-core/src/plugins/java/com/jme3/asset/plugins/ZipLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,6 +63,7 @@ public class ZipLocator implements AssetLocator { this.entry = entry; } + @Override public InputStream openStream(){ try{ return zipfile.getInputStream(entry); @@ -72,6 +73,7 @@ public class ZipLocator implements AssetLocator { } } + @Override public void setRootPath(String rootPath) { try{ zipfile = new ZipFile(new File(rootPath), ZipFile.OPEN_READ); @@ -80,6 +82,7 @@ public class ZipLocator implements AssetLocator { } } + @Override public AssetInfo locate(AssetManager manager, AssetKey key) { String name = key.getName(); if(name.startsWith("/"))name=name.substring(1); diff --git a/jme3-core/src/plugins/java/com/jme3/audio/plugins/WAVLoader.java b/jme3-core/src/plugins/java/com/jme3/audio/plugins/WAVLoader.java index 997a8f4fb..6873f74db 100644 --- a/jme3-core/src/plugins/java/com/jme3/audio/plugins/WAVLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/audio/plugins/WAVLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -82,6 +82,7 @@ public class WAVLoader implements AssetLoader { this.resetOffset = resetOffset; } + @Override public void setTime(float time) { if (time != 0f) { throw new UnsupportedOperationException("Seeking WAV files not supported"); @@ -215,6 +216,7 @@ public class WAVLoader implements AssetLoader { } } + @Override public Object load(AssetInfo info) throws IOException { AudioData data; InputStream inputStream = null; diff --git a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryExporter.java b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryExporter.java index 3ad1b8b22..2a4e13e6f 100644 --- a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryExporter.java +++ b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryExporter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -194,6 +194,7 @@ public class BinaryExporter implements JmeExporter { } } + @Override public void save(Savable object, OutputStream os) throws IOException { // reset some vars aliasCount = 1; @@ -349,6 +350,7 @@ public class BinaryExporter implements JmeExporter { return bytes; } + @Override public void save(Savable object, File f) throws IOException { File parentDirectory = f.getParentFile(); if (parentDirectory != null && !parentDirectory.exists()) { @@ -363,6 +365,7 @@ public class BinaryExporter implements JmeExporter { } } + @Override public BinaryOutputCapsule getCapsule(Savable object) { return contentTable.get(object).getContent(); } diff --git a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java index 93f082337..24c22d4d1 100644 --- a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java +++ b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,6 +77,7 @@ public final class BinaryImporter implements JmeImporter { public BinaryImporter() { } + @Override public int getFormatVersion(){ return formatVersion; } @@ -93,10 +94,12 @@ public final class BinaryImporter implements JmeImporter { this.assetManager = manager; } + @Override public AssetManager getAssetManager(){ return assetManager; } + @Override public Object load(AssetInfo info){ // if (!(info.getKey() instanceof ModelKey)) // throw new IllegalArgumentException("Model assets must be loaded using a ModelKey"); diff --git a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryInputCapsule.java b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryInputCapsule.java index 121688714..5240c6d91 100644 --- a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryInputCapsule.java +++ b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryInputCapsule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -257,11 +257,13 @@ final class BinaryInputCapsule implements InputCapsule { } } + @Override public int getSavableVersion(Class desiredClass){ return SavableClassUtil.getSavedSavableVersion(savable, desiredClass, cObj.classHierarchyVersions, importer.getFormatVersion()); } + @Override public BitSet readBitSet(String name, BitSet defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -269,6 +271,7 @@ final class BinaryInputCapsule implements InputCapsule { return (BitSet) fieldData.get(field.alias); } + @Override public boolean readBoolean(String name, boolean defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -276,6 +279,7 @@ final class BinaryInputCapsule implements InputCapsule { return ((Boolean) fieldData.get(field.alias)).booleanValue(); } + @Override public boolean[] readBooleanArray(String name, boolean[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -284,6 +288,7 @@ final class BinaryInputCapsule implements InputCapsule { return (boolean[]) fieldData.get(field.alias); } + @Override public boolean[][] readBooleanArray2D(String name, boolean[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -292,6 +297,7 @@ final class BinaryInputCapsule implements InputCapsule { return (boolean[][]) fieldData.get(field.alias); } + @Override public byte readByte(String name, byte defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -299,6 +305,7 @@ final class BinaryInputCapsule implements InputCapsule { return ((Byte) fieldData.get(field.alias)).byteValue(); } + @Override public byte[] readByteArray(String name, byte[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -306,6 +313,7 @@ final class BinaryInputCapsule implements InputCapsule { return (byte[]) fieldData.get(field.alias); } + @Override public byte[][] readByteArray2D(String name, byte[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -314,6 +322,7 @@ final class BinaryInputCapsule implements InputCapsule { return (byte[][]) fieldData.get(field.alias); } + @Override public ByteBuffer readByteBuffer(String name, ByteBuffer defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -323,6 +332,7 @@ final class BinaryInputCapsule implements InputCapsule { } @SuppressWarnings("unchecked") + @Override public ArrayList readByteBufferArrayList(String name, ArrayList defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -331,6 +341,7 @@ final class BinaryInputCapsule implements InputCapsule { return (ArrayList) fieldData.get(field.alias); } + @Override public double readDouble(String name, double defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -338,6 +349,7 @@ final class BinaryInputCapsule implements InputCapsule { return ((Double) fieldData.get(field.alias)).doubleValue(); } + @Override public double[] readDoubleArray(String name, double[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -346,6 +358,7 @@ final class BinaryInputCapsule implements InputCapsule { return (double[]) fieldData.get(field.alias); } + @Override public double[][] readDoubleArray2D(String name, double[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -354,6 +367,7 @@ final class BinaryInputCapsule implements InputCapsule { return (double[][]) fieldData.get(field.alias); } + @Override public float readFloat(String name, float defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -361,6 +375,7 @@ final class BinaryInputCapsule implements InputCapsule { return ((Float) fieldData.get(field.alias)).floatValue(); } + @Override public float[] readFloatArray(String name, float[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -369,6 +384,7 @@ final class BinaryInputCapsule implements InputCapsule { return (float[]) fieldData.get(field.alias); } + @Override public float[][] readFloatArray2D(String name, float[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -377,6 +393,7 @@ final class BinaryInputCapsule implements InputCapsule { return (float[][]) fieldData.get(field.alias); } + @Override public FloatBuffer readFloatBuffer(String name, FloatBuffer defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -386,6 +403,7 @@ final class BinaryInputCapsule implements InputCapsule { } @SuppressWarnings("unchecked") + @Override public ArrayList readFloatBufferArrayList(String name, ArrayList defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -394,6 +412,7 @@ final class BinaryInputCapsule implements InputCapsule { return (ArrayList) fieldData.get(field.alias); } + @Override public int readInt(String name, int defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -401,6 +420,7 @@ final class BinaryInputCapsule implements InputCapsule { return ((Integer) fieldData.get(field.alias)).intValue(); } + @Override public int[] readIntArray(String name, int[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -408,6 +428,7 @@ final class BinaryInputCapsule implements InputCapsule { return (int[]) fieldData.get(field.alias); } + @Override public int[][] readIntArray2D(String name, int[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -416,6 +437,7 @@ final class BinaryInputCapsule implements InputCapsule { return (int[][]) fieldData.get(field.alias); } + @Override public IntBuffer readIntBuffer(String name, IntBuffer defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -424,6 +446,7 @@ final class BinaryInputCapsule implements InputCapsule { return (IntBuffer) fieldData.get(field.alias); } + @Override public long readLong(String name, long defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -431,6 +454,7 @@ final class BinaryInputCapsule implements InputCapsule { return ((Long) fieldData.get(field.alias)).longValue(); } + @Override public long[] readLongArray(String name, long[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -438,6 +462,7 @@ final class BinaryInputCapsule implements InputCapsule { return (long[]) fieldData.get(field.alias); } + @Override public long[][] readLongArray2D(String name, long[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -446,6 +471,7 @@ final class BinaryInputCapsule implements InputCapsule { return (long[][]) fieldData.get(field.alias); } + @Override public Savable readSavable(String name, Savable defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -461,6 +487,7 @@ final class BinaryInputCapsule implements InputCapsule { return defVal; } + @Override public Savable[] readSavableArray(String name, Savable[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -488,6 +515,7 @@ final class BinaryInputCapsule implements InputCapsule { } } + @Override public Savable[][] readSavableArray2D(String name, Savable[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -576,6 +604,7 @@ final class BinaryInputCapsule implements InputCapsule { return map; } + @Override public ArrayList readSavableArrayList(String name, ArrayList defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -591,6 +620,7 @@ final class BinaryInputCapsule implements InputCapsule { return (ArrayList) value; } + @Override public ArrayList[] readSavableArrayListArray(String name, ArrayList[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -613,6 +643,7 @@ final class BinaryInputCapsule implements InputCapsule { return (ArrayList[]) value; } + @Override public ArrayList[][] readSavableArrayListArray2D(String name, ArrayList[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -639,6 +670,7 @@ final class BinaryInputCapsule implements InputCapsule { } @SuppressWarnings("unchecked") + @Override public Map readSavableMap(String name, Map defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -655,6 +687,7 @@ final class BinaryInputCapsule implements InputCapsule { } @SuppressWarnings("unchecked") + @Override public Map readStringSavableMap(String name, Map defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -672,6 +705,7 @@ final class BinaryInputCapsule implements InputCapsule { } @SuppressWarnings("unchecked") + @Override public IntMap readIntSavableMap(String name, IntMap defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -688,6 +722,7 @@ final class BinaryInputCapsule implements InputCapsule { return (IntMap) value; } + @Override public short readShort(String name, short defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -695,6 +730,7 @@ final class BinaryInputCapsule implements InputCapsule { return ((Short) fieldData.get(field.alias)).shortValue(); } + @Override public short[] readShortArray(String name, short[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -703,6 +739,7 @@ final class BinaryInputCapsule implements InputCapsule { return (short[]) fieldData.get(field.alias); } + @Override public short[][] readShortArray2D(String name, short[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -711,6 +748,7 @@ final class BinaryInputCapsule implements InputCapsule { return (short[][]) fieldData.get(field.alias); } + @Override public ShortBuffer readShortBuffer(String name, ShortBuffer defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -719,6 +757,7 @@ final class BinaryInputCapsule implements InputCapsule { return (ShortBuffer) fieldData.get(field.alias); } + @Override public String readString(String name, String defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); if (field == null || !fieldData.containsKey(field.alias)) @@ -726,6 +765,7 @@ final class BinaryInputCapsule implements InputCapsule { return (String) fieldData.get(field.alias); } + @Override public String[] readStringArray(String name, String[] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -734,6 +774,7 @@ final class BinaryInputCapsule implements InputCapsule { return (String[]) fieldData.get(field.alias); } + @Override public String[][] readStringArray2D(String name, String[][] defVal) throws IOException { BinaryClassField field = cObj.nameFields.get(name); @@ -1368,6 +1409,7 @@ final class BinaryInputCapsule implements InputCapsule { public ID[] values; } + @Override public > T readEnum(String name, Class enumType, T defVal) throws IOException { String eVal = readString(name, defVal != null ? defVal.name() : null); if (eVal != null) { diff --git a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryOutputCapsule.java b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryOutputCapsule.java index 380772eaf..7119bb78c 100644 --- a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryOutputCapsule.java +++ b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryOutputCapsule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -68,6 +68,7 @@ final class BinaryOutputCapsule implements OutputCapsule { this.cObj = bco; } + @Override public void write(byte value, String name, byte defVal) throws IOException { if (value == defVal) return; @@ -75,6 +76,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(byte[] value, String name, byte[] defVal) throws IOException { if (value == defVal) @@ -83,6 +85,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(byte[][] value, String name, byte[][] defVal) throws IOException { if (value == defVal) @@ -91,6 +94,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(int value, String name, int defVal) throws IOException { if (value == defVal) return; @@ -98,6 +102,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(int[] value, String name, int[] defVal) throws IOException { if (value == defVal) @@ -106,6 +111,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(int[][] value, String name, int[][] defVal) throws IOException { if (value == defVal) @@ -114,6 +120,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(float value, String name, float defVal) throws IOException { if (value == defVal) @@ -122,6 +129,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(float[] value, String name, float[] defVal) throws IOException { if (value == defVal) @@ -130,6 +138,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(float[][] value, String name, float[][] defVal) throws IOException { if (value == defVal) @@ -138,6 +147,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(double value, String name, double defVal) throws IOException { if (value == defVal) @@ -146,6 +156,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(double[] value, String name, double[] defVal) throws IOException { if (value == defVal) @@ -154,6 +165,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(double[][] value, String name, double[][] defVal) throws IOException { if (value == defVal) @@ -162,6 +174,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(long value, String name, long defVal) throws IOException { if (value == defVal) return; @@ -169,6 +182,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(long[] value, String name, long[] defVal) throws IOException { if (value == defVal) @@ -177,6 +191,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(long[][] value, String name, long[][] defVal) throws IOException { if (value == defVal) @@ -185,6 +200,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(short value, String name, short defVal) throws IOException { if (value == defVal) @@ -193,6 +209,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(short[] value, String name, short[] defVal) throws IOException { if (value == defVal) @@ -201,6 +218,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(short[][] value, String name, short[][] defVal) throws IOException { if (value == defVal) @@ -209,6 +227,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(boolean value, String name, boolean defVal) throws IOException { if (value == defVal) @@ -217,6 +236,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(boolean[] value, String name, boolean[] defVal) throws IOException { if (value == defVal) @@ -225,6 +245,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(boolean[][] value, String name, boolean[][] defVal) throws IOException { if (value == defVal) @@ -233,6 +254,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(String value, String name, String defVal) throws IOException { if (value == null ? defVal == null : value.equals(defVal)) @@ -241,6 +263,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(String[] value, String name, String[] defVal) throws IOException { if (value == defVal) @@ -249,6 +272,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(String[][] value, String name, String[][] defVal) throws IOException { if (value == defVal) @@ -257,6 +281,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(BitSet value, String name, BitSet defVal) throws IOException { if (value == defVal) @@ -265,6 +290,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(Savable object, String name, Savable defVal) throws IOException { if (object == defVal) @@ -273,6 +299,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(object); } + @Override public void write(Savable[] objects, String name, Savable[] defVal) throws IOException { if (objects == defVal) @@ -281,6 +308,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(objects); } + @Override public void write(Savable[][] objects, String name, Savable[][] defVal) throws IOException { if (objects == defVal) @@ -289,6 +317,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(objects); } + @Override public void write(FloatBuffer value, String name, FloatBuffer defVal) throws IOException { if (value == defVal) @@ -297,6 +326,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(IntBuffer value, String name, IntBuffer defVal) throws IOException { if (value == defVal) @@ -305,6 +335,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(ByteBuffer value, String name, ByteBuffer defVal) throws IOException { if (value == defVal) @@ -313,6 +344,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void write(ShortBuffer value, String name, ShortBuffer defVal) throws IOException { if (value == defVal) @@ -321,6 +353,7 @@ final class BinaryOutputCapsule implements OutputCapsule { write(value); } + @Override public void writeFloatBufferArrayList(ArrayList array, String name, ArrayList defVal) throws IOException { if (array == defVal) @@ -329,6 +362,7 @@ final class BinaryOutputCapsule implements OutputCapsule { writeFloatBufferArrayList(array); } + @Override public void writeByteBufferArrayList(ArrayList array, String name, ArrayList defVal) throws IOException { if (array == defVal) @@ -337,6 +371,7 @@ final class BinaryOutputCapsule implements OutputCapsule { writeByteBufferArrayList(array); } + @Override public void writeSavableArrayList(ArrayList array, String name, ArrayList defVal) throws IOException { if (array == defVal) @@ -345,6 +380,7 @@ final class BinaryOutputCapsule implements OutputCapsule { writeSavableArrayList(array); } + @Override public void writeSavableArrayListArray(ArrayList[] array, String name, ArrayList[] defVal) throws IOException { if (array == defVal) @@ -353,6 +389,7 @@ final class BinaryOutputCapsule implements OutputCapsule { writeSavableArrayListArray(array); } + @Override public void writeSavableArrayListArray2D(ArrayList[][] array, String name, ArrayList[][] defVal) throws IOException { if (array == defVal) @@ -361,6 +398,7 @@ final class BinaryOutputCapsule implements OutputCapsule { writeSavableArrayListArray2D(array); } + @Override public void writeSavableMap(Map map, String name, Map defVal) throws IOException { @@ -370,6 +408,7 @@ final class BinaryOutputCapsule implements OutputCapsule { writeSavableMap(map); } + @Override public void writeStringSavableMap(Map map, String name, Map defVal) throws IOException { @@ -379,6 +418,7 @@ final class BinaryOutputCapsule implements OutputCapsule { writeStringSavableMap(map); } + @Override public void writeIntSavableMap(IntMap map, String name, IntMap defVal) throws IOException { @@ -931,6 +971,7 @@ final class BinaryOutputCapsule implements OutputCapsule { value.rewind(); } + @Override public void write(Enum value, String name, Enum defVal) throws IOException { if (value == defVal) return; diff --git a/jme3-core/src/plugins/java/com/jme3/font/plugins/BitmapFontLoader.java b/jme3-core/src/plugins/java/com/jme3/font/plugins/BitmapFontLoader.java index 07aa9813e..082ab3544 100644 --- a/jme3-core/src/plugins/java/com/jme3/font/plugins/BitmapFontLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/font/plugins/BitmapFontLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -162,6 +162,7 @@ public class BitmapFontLoader implements AssetLoader { return font; } + @Override public Object load(AssetInfo info) throws IOException { InputStream in = null; try { diff --git a/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java b/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java index 88674fdff..fc8f88376 100644 --- a/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -786,6 +786,7 @@ public class J3MLoader implements AssetLoader { } } + @Override public Object load(AssetInfo info) throws IOException { this.assetManager = info.getManager(); diff --git a/jme3-core/src/plugins/java/com/jme3/scene/plugins/MTLLoader.java b/jme3-core/src/plugins/java/com/jme3/scene/plugins/MTLLoader.java index cdc3655d6..63a1f30e9 100644 --- a/jme3-core/src/plugins/java/com/jme3/scene/plugins/MTLLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/scene/plugins/MTLLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -287,6 +287,7 @@ public class MTLLoader implements AssetLoader { } @SuppressWarnings("empty-statement") + @Override public Object load(AssetInfo info) throws IOException{ reset(); diff --git a/jme3-core/src/plugins/java/com/jme3/scene/plugins/OBJLoader.java b/jme3-core/src/plugins/java/com/jme3/scene/plugins/OBJLoader.java index 4d57567c4..8f3b9f98f 100644 --- a/jme3-core/src/plugins/java/com/jme3/scene/plugins/OBJLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/scene/plugins/OBJLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -549,6 +549,7 @@ public final class OBJLoader implements AssetLoader { } @SuppressWarnings("empty-statement") + @Override public Object load(AssetInfo info) throws IOException{ reset(); diff --git a/jme3-core/src/plugins/java/com/jme3/texture/plugins/DDSLoader.java b/jme3-core/src/plugins/java/com/jme3/texture/plugins/DDSLoader.java index 359fa979e..7058c64bb 100644 --- a/jme3-core/src/plugins/java/com/jme3/texture/plugins/DDSLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/texture/plugins/DDSLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -117,6 +117,7 @@ public class DDSLoader implements AssetLoader { public DDSLoader() { } + @Override public Object load(AssetInfo info) throws IOException { if (!(info.getKey() instanceof TextureKey)) { throw new IllegalArgumentException("Texture assets must be loaded using a TextureKey"); diff --git a/jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java b/jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java index 50f7fe5c0..212aae52d 100644 --- a/jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/texture/plugins/HDRLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -313,6 +313,7 @@ public class HDRLoader implements AssetLoader { return new Image(pixelFormat, width, height, dataStore, ColorSpace.Linear); } + @Override public Object load(AssetInfo info) throws IOException { if (!(info.getKey() instanceof TextureKey)) throw new IllegalArgumentException("Texture assets must be loaded using a TextureKey"); diff --git a/jme3-core/src/plugins/java/com/jme3/texture/plugins/PFMLoader.java b/jme3-core/src/plugins/java/com/jme3/texture/plugins/PFMLoader.java index a94641f7e..0ea456af6 100644 --- a/jme3-core/src/plugins/java/com/jme3/texture/plugins/PFMLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/texture/plugins/PFMLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -133,6 +133,7 @@ public class PFMLoader implements AssetLoader { return new Image(format, width, height, imageData, null, ColorSpace.Linear); } + @Override public Object load(AssetInfo info) throws IOException { if (!(info.getKey() instanceof TextureKey)) throw new IllegalArgumentException("Texture assets must be loaded using a TextureKey"); diff --git a/jme3-core/src/plugins/java/com/jme3/texture/plugins/TGALoader.java b/jme3-core/src/plugins/java/com/jme3/texture/plugins/TGALoader.java index 4ecb60b8f..10c6e30f2 100644 --- a/jme3-core/src/plugins/java/com/jme3/texture/plugins/TGALoader.java +++ b/jme3-core/src/plugins/java/com/jme3/texture/plugins/TGALoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public final class TGALoader implements AssetLoader { // 11 - run-length encoded, black and white image public static final int TYPE_BLACKANDWHITE_RLE = 11; + @Override public Object load(AssetInfo info) throws IOException { if (!(info.getKey() instanceof TextureKey)) { throw new IllegalArgumentException("Texture assets must be loaded using a TextureKey"); diff --git a/jme3-core/src/tools/java/jme3tools/optimize/LodGenerator.java b/jme3-core/src/tools/java/jme3tools/optimize/LodGenerator.java index 5b2ee6fd8..4509e8c67 100644 --- a/jme3-core/src/tools/java/jme3tools/optimize/LodGenerator.java +++ b/jme3-core/src/tools/java/jme3tools/optimize/LodGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2013 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -243,6 +243,7 @@ public class LodGenerator { * Comparator used to sort vertices according to their collapse cost */ private Comparator collapseComparator = new Comparator() { + @Override public int compare(Vertex o1, Vertex o2) { if (Float.compare(o1.collapseCost, o2.collapseCost) == 0) { return 0; diff --git a/jme3-core/src/tools/java/jme3tools/shadercheck/CgcValidator.java b/jme3-core/src/tools/java/jme3tools/shadercheck/CgcValidator.java index c5f314711..7710b5ddb 100644 --- a/jme3-core/src/tools/java/jme3tools/shadercheck/CgcValidator.java +++ b/jme3-core/src/tools/java/jme3tools/shadercheck/CgcValidator.java @@ -33,14 +33,17 @@ public class CgcValidator implements Validator { return null; } + @Override public String getName() { return "NVIDIA Cg Toolkit"; } + @Override public boolean isInstalled() { return getInstalledVersion() != null; } + @Override public String getInstalledVersion() { if (version == null){ version = checkCgCompilerVersion(); @@ -94,6 +97,7 @@ public class CgcValidator implements Validator { } } + @Override public void validate(Shader shader, StringBuilder results) { for (ShaderSource source : shader.getSources()){ results.append("Checking: ").append(source.getName()); diff --git a/jme3-core/src/tools/java/jme3tools/shadercheck/GpuAnalyzerValidator.java b/jme3-core/src/tools/java/jme3tools/shadercheck/GpuAnalyzerValidator.java index d06f26c88..2064c5ced 100644 --- a/jme3-core/src/tools/java/jme3tools/shadercheck/GpuAnalyzerValidator.java +++ b/jme3-core/src/tools/java/jme3tools/shadercheck/GpuAnalyzerValidator.java @@ -37,14 +37,17 @@ public class GpuAnalyzerValidator implements Validator { return null; } + @Override public String getName() { return "AMD GPU Shader Analyzer"; } + @Override public boolean isInstalled() { return getInstalledVersion() != null; } + @Override public String getInstalledVersion() { if (version == null){ version = checkGpuAnalyzerVersion(); @@ -104,6 +107,7 @@ public class GpuAnalyzerValidator implements Validator { } } + @Override public void validate(Shader shader, StringBuilder results) { for (ShaderSource source : shader.getSources()){ results.append("Checking: ").append(source.getName()); diff --git a/jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java b/jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java index 3765c1f80..3dee23bec 100644 --- a/jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java +++ b/jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -170,6 +170,7 @@ public class AppletHarness extends Applet { public void destroy(){ System.out.println("applet:destroyStart"); SwingUtilities.invokeLater(new Runnable(){ + @Override public void run(){ removeAll(); System.out.println("applet:destroyRemoved"); diff --git a/jme3-desktop/src/main/java/com/jme3/app/SettingsDialog.java b/jme3-desktop/src/main/java/com/jme3/app/SettingsDialog.java index 15e7aa76c..91e0984d7 100644 --- a/jme3-desktop/src/main/java/com/jme3/app/SettingsDialog.java +++ b/jme3-desktop/src/main/java/com/jme3/app/SettingsDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -352,6 +352,7 @@ public final class SettingsDialog extends JFrame { fullscreenBox.setSelected(source.isFullscreen()); fullscreenBox.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { updateResolutionChoices(); } @@ -438,6 +439,7 @@ public final class SettingsDialog extends JFrame { // saves. ok.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if (verifyAndSaveCurrentSelection()) { setUserSelection(APPROVE_SELECTION); @@ -454,6 +456,7 @@ public final class SettingsDialog extends JFrame { cancel.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setUserSelection(CANCEL_SELECTION); dispose(); @@ -487,6 +490,7 @@ public final class SettingsDialog extends JFrame { mainPanel.getRootPane().setDefaultButton(ok); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { // Fill in the combos once the window has opened so that the insets can be read. // The assumption is made that the settings window and the display window will have the @@ -629,6 +633,7 @@ public final class SettingsDialog extends JFrame { resolutionBox.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { updateDisplayChoices(); } @@ -880,6 +885,7 @@ public final class SettingsDialog extends JFrame { /** * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public int compare(DisplayMode a, DisplayMode b) { // Width if (a.getWidth() != b.getWidth()) { diff --git a/jme3-desktop/src/main/java/com/jme3/app/state/VideoRecorderAppState.java b/jme3-desktop/src/main/java/com/jme3/app/state/VideoRecorderAppState.java index eb4abe4cd..750cf4d6c 100644 --- a/jme3-desktop/src/main/java/com/jme3/app/state/VideoRecorderAppState.java +++ b/jme3-desktop/src/main/java/com/jme3/app/state/VideoRecorderAppState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -70,6 +70,7 @@ public class VideoRecorderAppState extends AbstractAppState { private Application app; private ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactory() { + @Override public Thread newThread(Runnable r) { Thread th = new Thread(r); th.setName("jME3 Video Processor"); @@ -233,6 +234,7 @@ public class VideoRecorderAppState extends AbstractAppState { renderer.readFrameBufferWithFormat(out, item.buffer, Image.Format.BGRA8); executor.submit(new Callable() { + @Override public Void call() throws Exception { Screenshots.convertScreenShot(item.buffer, item.image); item.data = writer.writeImageToBytes(item.image, quality); @@ -250,6 +252,7 @@ public class VideoRecorderAppState extends AbstractAppState { } } + @Override public void initialize(RenderManager rm, ViewPort viewPort) { this.camera = viewPort.getCamera(); this.width = camera.getWidth(); @@ -264,13 +267,16 @@ public class VideoRecorderAppState extends AbstractAppState { } } + @Override public void reshape(ViewPort vp, int w, int h) { } + @Override public boolean isInitialized() { return this.isInitilized; } + @Override public void preFrame(float tpf) { if (null == writer) { try { @@ -281,13 +287,16 @@ public class VideoRecorderAppState extends AbstractAppState { } } + @Override public void postQueue(RenderQueue rq) { } + @Override public void postFrame(FrameBuffer out) { addImage(renderManager.getRenderer(), out); } + @Override public void cleanup() { try { while (freeItems.size() < numCpus) { @@ -317,22 +326,27 @@ public class VideoRecorderAppState extends AbstractAppState { this.ticks = 0; } + @Override public long getTime() { return (long) (this.ticks * (1.0f / this.framerate) * 1000f); } + @Override public long getResolution() { return 1000L; } + @Override public float getFrameRate() { return this.framerate; } + @Override public float getTimePerFrame() { return (float) (1.0f / this.framerate); } + @Override public void update() { long time = System.currentTimeMillis(); long difference = time - lastTime; @@ -346,6 +360,7 @@ public class VideoRecorderAppState extends AbstractAppState { this.ticks++; } + @Override public void reset() { this.ticks = 0; } diff --git a/jme3-desktop/src/main/java/com/jme3/cursors/plugins/CursorLoader.java b/jme3-desktop/src/main/java/com/jme3/cursors/plugins/CursorLoader.java index 037927ac6..d5c8f7de2 100644 --- a/jme3-desktop/src/main/java/com/jme3/cursors/plugins/CursorLoader.java +++ b/jme3-desktop/src/main/java/com/jme3/cursors/plugins/CursorLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -67,6 +67,7 @@ public class CursorLoader implements AssetLoader { * @return A JmeCursor representation of the LWJGL's Cursor. * @throws IOException if the file is not found. */ + @Override public JmeCursor load(AssetInfo info) throws IOException { isIco = false; diff --git a/jme3-desktop/src/main/java/com/jme3/input/awt/AwtKeyInput.java b/jme3-desktop/src/main/java/com/jme3/input/awt/AwtKeyInput.java index b27e29035..7a1d49b62 100644 --- a/jme3-desktop/src/main/java/com/jme3/input/awt/AwtKeyInput.java +++ b/jme3-desktop/src/main/java/com/jme3/input/awt/AwtKeyInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,9 +61,11 @@ public class AwtKeyInput implements KeyInput, KeyListener { public AwtKeyInput(){ } + @Override public void initialize() { } + @Override public void destroy() { } @@ -79,6 +81,7 @@ public class AwtKeyInput implements KeyInput, KeyListener { } } + @Override public long getInputTimeNanos() { return System.nanoTime(); } @@ -87,6 +90,7 @@ public class AwtKeyInput implements KeyInput, KeyListener { return KeyEvent.KEY_LAST+1; } + @Override public void update() { synchronized (eventQueue){ // flush events to listener @@ -97,18 +101,22 @@ public class AwtKeyInput implements KeyInput, KeyListener { } } + @Override public boolean isInitialized() { return true; } + @Override public void setInputListener(RawInputListener listener) { this.listener = listener; } + @Override public void keyTyped(KeyEvent evt) { // key code is zero for typed events } + @Override public void keyPressed(KeyEvent evt) { int code = convertAwtKey(evt.getKeyCode()); @@ -123,6 +131,7 @@ public class AwtKeyInput implements KeyInput, KeyListener { } } + @Override public void keyReleased(KeyEvent evt) { int code = convertAwtKey(evt.getKeyCode()); diff --git a/jme3-desktop/src/main/java/com/jme3/input/awt/AwtMouseInput.java b/jme3-desktop/src/main/java/com/jme3/input/awt/AwtMouseInput.java index f53a3b003..2ebe9b18f 100644 --- a/jme3-desktop/src/main/java/com/jme3/input/awt/AwtMouseInput.java +++ b/jme3-desktop/src/main/java/com/jme3/input/awt/AwtMouseInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -122,24 +122,30 @@ public class AwtMouseInput implements MouseInput, MouseListener, MouseWheelListe component.addMouseWheelListener(this); } + @Override public void initialize() { } + @Override public void destroy() { } + @Override public boolean isInitialized() { return true; } + @Override public void setInputListener(RawInputListener listener) { this.listener = listener; } + @Override public long getInputTimeNanos() { return System.nanoTime(); } + @Override public void setCursorVisible(boolean visible) { // if(JmeSystem.getPlatform() != Platform.MacOSX32 && // JmeSystem.getPlatform() != Platform.MacOSX64 && @@ -151,6 +157,7 @@ public class AwtMouseInput implements MouseInput, MouseListener, MouseWheelListe this.visible = visible; final boolean newVisible = visible; SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { component.setCursor(newVisible ? null : getTransparentCursor()); if (!newVisible) { @@ -162,6 +169,7 @@ public class AwtMouseInput implements MouseInput, MouseListener, MouseWheelListe } } + @Override public void update() { if (cursorMoved) { int newX = location.x; @@ -215,15 +223,18 @@ public class AwtMouseInput implements MouseInput, MouseListener, MouseWheelListe // } + @Override public int getButtonCount() { return 3; } + @Override public void mouseClicked(MouseEvent awtEvt) { // MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(arg0), false); // listener.onMouseButtonEvent(evt); } + @Override public void mousePressed(MouseEvent awtEvt) { // Must flip Y! int y = component.getHeight() - awtEvt.getY(); @@ -234,6 +245,7 @@ public class AwtMouseInput implements MouseInput, MouseListener, MouseWheelListe } } + @Override public void mouseReleased(MouseEvent awtEvt) { int y = component.getHeight() - awtEvt.getY(); MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(awtEvt), false, awtEvt.getX(), y); @@ -243,28 +255,33 @@ public class AwtMouseInput implements MouseInput, MouseListener, MouseWheelListe } } + @Override public void mouseEntered(MouseEvent awtEvt) { if (!visible) { recenterMouse(awtEvt.getComponent()); } } + @Override public void mouseExited(MouseEvent awtEvt) { if (!visible) { recenterMouse(awtEvt.getComponent()); } } + @Override public void mouseWheelMoved(MouseWheelEvent awtEvt) { int dwheel = awtEvt.getUnitsToScroll(); wheelPos += dwheel * WHEEL_AMP; cursorMoved = true; } + @Override public void mouseDragged(MouseEvent awtEvt) { mouseMoved(awtEvt); } + @Override public void mouseMoved(MouseEvent awtEvt) { if (isRecentering) { // MHenze (cylab) Fix Issue 35: @@ -321,6 +338,7 @@ public class AwtMouseInput implements MouseInput, MouseListener, MouseWheelListe return index; } + @Override public void setNativeCursor(JmeCursor cursor) { } } diff --git a/jme3-desktop/src/main/java/com/jme3/system/JmeDesktopSystem.java b/jme3-desktop/src/main/java/com/jme3/system/JmeDesktopSystem.java index d02b5d21c..b489eaa9a 100644 --- a/jme3-desktop/src/main/java/com/jme3/system/JmeDesktopSystem.java +++ b/jme3-desktop/src/main/java/com/jme3/system/JmeDesktopSystem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -120,6 +120,7 @@ public class JmeDesktopSystem extends JmeSystemDelegate { if (!GraphicsEnvironment.isHeadless()) { final String msg = message; EventQueue.invokeLater(new Runnable() { + @Override public void run() { ErrorDialog.showDialog(msg); } @@ -155,6 +156,7 @@ public class JmeDesktopSystem extends JmeSystemDelegate { final SelectionListener selectionListener = new SelectionListener() { + @Override public void onSelection(int selection) { synchronized (lock) { done.set(true); @@ -165,6 +167,7 @@ public class JmeDesktopSystem extends JmeSystemDelegate { }; SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { synchronized (lock) { SettingsDialog dialog = new SettingsDialog(settings, iconUrl, loadFromRegistry); diff --git a/jme3-desktop/src/main/java/com/jme3/system/awt/AwtPanelsContext.java b/jme3-desktop/src/main/java/com/jme3/system/awt/AwtPanelsContext.java index ee41ea569..52cbcb3ff 100644 --- a/jme3-desktop/src/main/java/com/jme3/system/awt/AwtPanelsContext.java +++ b/jme3-desktop/src/main/java/com/jme3/system/awt/AwtPanelsContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,37 +57,45 @@ public class AwtPanelsContext implements JmeContext { private class AwtPanelsListener implements SystemListener { + @Override public void initialize() { initInThread(); } + @Override public void reshape(int width, int height) { throw new IllegalStateException(); } + @Override public void update() { updateInThread(); } + @Override public void requestClose(boolean esc) { // shouldn't happen throw new IllegalStateException(); } + @Override public void gainFocus() { // shouldn't happen throw new IllegalStateException(); } + @Override public void loseFocus() { // shouldn't happen throw new IllegalStateException(); } + @Override public void handleError(String errorMsg, Throwable t) { listener.handleError(errorMsg, t); } + @Override public void destroy() { destroyInThread(); } @@ -102,46 +110,57 @@ public class AwtPanelsContext implements JmeContext { keyInput.setInputSource(panel); } + @Override public Type getType() { return Type.OffscreenSurface; } + @Override public void setSystemListener(SystemListener listener) { this.listener = listener; } + @Override public AppSettings getSettings() { return settings; } + @Override public Renderer getRenderer() { return actualContext.getRenderer(); } + @Override public MouseInput getMouseInput() { return mouseInput; } + @Override public KeyInput getKeyInput() { return keyInput; } + @Override public JoyInput getJoyInput() { return null; } + @Override public TouchInput getTouchInput() { return null; } + @Override public Timer getTimer() { return actualContext.getTimer(); } + @Override public boolean isCreated() { return actualContext != null && actualContext.isCreated(); } + @Override public boolean isRenderable() { return actualContext != null && actualContext.isRenderable(); } @@ -208,6 +227,7 @@ public class AwtPanelsContext implements JmeContext { listener.destroy(); } + @Override public void setSettings(AppSettings settings) { this.settings.copyFrom(settings); this.settings.setRenderer(AppSettings.LWJGL_OPENGL2); @@ -216,6 +236,7 @@ public class AwtPanelsContext implements JmeContext { } } + @Override public void create(boolean waitFor) { if (actualContext != null){ throw new IllegalStateException("Already created"); @@ -226,6 +247,7 @@ public class AwtPanelsContext implements JmeContext { actualContext.create(waitFor); } + @Override public void destroy(boolean waitFor) { if (actualContext == null) throw new IllegalStateException("Not created"); @@ -234,14 +256,17 @@ public class AwtPanelsContext implements JmeContext { actualContext.destroy(waitFor); } + @Override public void setTitle(String title) { // not relevant, ignore } + @Override public void setAutoFlushFrames(boolean enabled) { // not relevant, ignore } + @Override public void restart() { // only relevant if changing pixel format. } diff --git a/jme3-desktop/src/main/java/com/jme3/texture/plugins/AWTLoader.java b/jme3-desktop/src/main/java/com/jme3/texture/plugins/AWTLoader.java index 952b3a6fd..cf0ffe0e7 100644 --- a/jme3-desktop/src/main/java/com/jme3/texture/plugins/AWTLoader.java +++ b/jme3-desktop/src/main/java/com/jme3/texture/plugins/AWTLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -183,6 +183,7 @@ public class AWTLoader implements AssetLoader { return load(img, flipY); } + @Override public Object load(AssetInfo info) throws IOException { if (ImageIO.getImageReadersBySuffix(info.getKey().getExtension()) != null){ boolean flip = ((TextureKey) info.getKey()).isFlipY(); diff --git a/jme3-effects/src/main/java/com/jme3/water/ReflectionProcessor.java b/jme3-effects/src/main/java/com/jme3/water/ReflectionProcessor.java index f310f5313..c2406d421 100644 --- a/jme3-effects/src/main/java/com/jme3/water/ReflectionProcessor.java +++ b/jme3-effects/src/main/java/com/jme3/water/ReflectionProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,21 +65,26 @@ public class ReflectionProcessor implements SceneProcessor { this.reflectionClipPlane = reflectionClipPlane; } + @Override public void initialize(RenderManager rm, ViewPort vp) { this.rm = rm; this.vp = vp; } + @Override public void reshape(ViewPort vp, int w, int h) { } + @Override public boolean isInitialized() { return rm != null; } + @Override public void preFrame(float tpf) { } + @Override public void postQueue(RenderQueue rq) { //we need special treatement for the sky because it must not be clipped rm.getRenderer().setFrameBuffer(reflectionBuffer); @@ -96,9 +101,11 @@ public class ReflectionProcessor implements SceneProcessor { } + @Override public void postFrame(FrameBuffer out) { } + @Override public void cleanup() { } diff --git a/jme3-effects/src/main/java/com/jme3/water/SimpleWaterProcessor.java b/jme3-effects/src/main/java/com/jme3/water/SimpleWaterProcessor.java index 677cc6d20..14f0791da 100644 --- a/jme3-effects/src/main/java/com/jme3/water/SimpleWaterProcessor.java +++ b/jme3-effects/src/main/java/com/jme3/water/SimpleWaterProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -142,6 +142,7 @@ public class SimpleWaterProcessor implements SceneProcessor { } + @Override public void initialize(RenderManager rm, ViewPort vp) { this.rm = rm; this.vp = vp; @@ -164,15 +165,18 @@ public class SimpleWaterProcessor implements SceneProcessor { } } + @Override public void reshape(ViewPort vp, int w, int h) { } + @Override public boolean isInitialized() { return rm != null; } float time = 0; float savedTpf = 0; + @Override public void preFrame(float tpf) { time = time + (tpf * speed); if (time > 1f) { @@ -182,6 +186,7 @@ public class SimpleWaterProcessor implements SceneProcessor { savedTpf = tpf; } + @Override public void postQueue(RenderQueue rq) { Camera sceneCam = rm.getCurrentCamera(); @@ -207,6 +212,7 @@ public class SimpleWaterProcessor implements SceneProcessor { } + @Override public void postFrame(FrameBuffer out) { if (debug) { displayMap(rm.getRenderer(), dispRefraction, 64); @@ -215,6 +221,7 @@ public class SimpleWaterProcessor implements SceneProcessor { } } + @Override public void cleanup() { } @@ -588,29 +595,36 @@ public class SimpleWaterProcessor implements SceneProcessor { ViewPort vp; private AppProfiler prof; + @Override public void initialize(RenderManager rm, ViewPort vp) { this.rm = rm; this.vp = vp; } + @Override public void reshape(ViewPort vp, int w, int h) { } + @Override public boolean isInitialized() { return rm != null; } + @Override public void preFrame(float tpf) { refractionCam.setClipPlane(refractionClipPlane, Plane.Side.Negative);//,-1 } + @Override public void postQueue(RenderQueue rq) { } + @Override public void postFrame(FrameBuffer out) { } + @Override public void cleanup() { } diff --git a/jme3-examples/src/main/java/jme3test/TestChooser.java b/jme3-examples/src/main/java/jme3test/TestChooser.java index c47196035..a4d9afc49 100644 --- a/jme3-examples/src/main/java/jme3test/TestChooser.java +++ b/jme3-examples/src/main/java/jme3test/TestChooser.java @@ -237,6 +237,7 @@ public class TestChooser extends JDialog { */ private FileFilter getFileFilter() { return new FileFilter() { + @Override public boolean accept(File pathname) { return (pathname.isDirectory() && !pathname.getName().startsWith(".")) || (pathname.getName().endsWith(".class") @@ -256,6 +257,7 @@ public class TestChooser extends JDialog { } new Thread(new Runnable(){ + @Override public void run(){ for (int i = 0; i < appClass.size(); i++) { Class clazz = (Class)appClass.get(i); @@ -332,11 +334,13 @@ public class TestChooser extends JDialog { list.getSelectionModel().addListSelectionListener( new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent e) { selectedClass = list.getSelectedValuesList(); } }); list.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if (e.getClickCount() == 2 && selectedClass != null) { startApp(selectedClass); @@ -362,6 +366,7 @@ public class TestChooser extends JDialog { buttonPanel.add(okButton); getRootPane().setDefaultButton(okButton); okButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { startApp(selectedClass); } @@ -371,6 +376,7 @@ public class TestChooser extends JDialog { cancelButton.setMnemonic('C'); buttonPanel.add(cancelButton); cancelButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dispose(); } @@ -386,6 +392,7 @@ public class TestChooser extends JDialog { private String filter; private ListModel originalModel; + @Override public void setModel(ListModel m) { originalModel = m; super.setModel(m); @@ -471,19 +478,23 @@ public class TestChooser extends JDialog { BorderLayout.WEST); final javax.swing.JTextField jtf = new javax.swing.JTextField(); jtf.getDocument().addDocumentListener(new DocumentListener() { + @Override public void removeUpdate(DocumentEvent e) { classes.setFilter(jtf.getText()); } + @Override public void insertUpdate(DocumentEvent e) { classes.setFilter(jtf.getText()); } + @Override public void changedUpdate(DocumentEvent e) { classes.setFilter(jtf.getText()); } }); jtf.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { selectedClass = classes.getSelectedValuesList(); startApp(selectedClass); @@ -492,6 +503,7 @@ public class TestChooser extends JDialog { final JCheckBox showSettingCheck = new JCheckBox("Show Setting"); showSettingCheck.setSelected(true); showSettingCheck.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { showSetting = showSettingCheck.isSelected(); } diff --git a/jme3-examples/src/main/java/jme3test/animation/TestCameraMotionPath.java b/jme3-examples/src/main/java/jme3test/animation/TestCameraMotionPath.java index 392792ac2..24292ea96 100644 --- a/jme3-examples/src/main/java/jme3test/animation/TestCameraMotionPath.java +++ b/jme3-examples/src/main/java/jme3test/animation/TestCameraMotionPath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -99,6 +99,7 @@ public class TestCameraMotionPath extends SimpleApplication { path.addListener(new MotionPathListener() { + @Override public void onWayPointReach(MotionEvent control, int wayPointIndex) { if (path.getNbWayPoints() == wayPointIndex + 1) { wayPointsText.setText(control.getSpatial().getName() + " Finish!!! "); @@ -156,6 +157,7 @@ public class TestCameraMotionPath extends SimpleApplication { inputManager.addMapping("play_stop", new KeyTrigger(KeyInput.KEY_SPACE)); ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("display_hidePath") && keyPressed) { if (active) { diff --git a/jme3-examples/src/main/java/jme3test/animation/TestCinematic.java b/jme3-examples/src/main/java/jme3test/animation/TestCinematic.java index 8332ffafe..ab4bd3bd7 100644 --- a/jme3-examples/src/main/java/jme3test/animation/TestCinematic.java +++ b/jme3-examples/src/main/java/jme3test/animation/TestCinematic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -148,15 +148,18 @@ public class TestCinematic extends SimpleApplication { cinematic.addListener(new CinematicEventListener() { + @Override public void onPlay(CinematicEvent cinematic) { chaseCam.setEnabled(false); System.out.println("play"); } + @Override public void onPause(CinematicEvent cinematic) { System.out.println("pause"); } + @Override public void onStop(CinematicEvent cinematic) { chaseCam.setEnabled(true); fade.setValue(1); @@ -244,6 +247,7 @@ public class TestCinematic extends SimpleApplication { inputManager.addMapping("navBack", new KeyTrigger(keyInput.KEY_LEFT)); ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("togglePause") && keyPressed) { if (cinematic.getPlayState() == PlayState.Playing) { diff --git a/jme3-examples/src/main/java/jme3test/animation/TestJaime.java b/jme3-examples/src/main/java/jme3test/animation/TestJaime.java index 330788d08..68de198d1 100644 --- a/jme3-examples/src/main/java/jme3test/animation/TestJaime.java +++ b/jme3-examples/src/main/java/jme3test/animation/TestJaime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -212,6 +212,7 @@ public class TestJaime extends SimpleApplication { inputManager.addMapping("start", new KeyTrigger(KeyInput.KEY_PAUSE)); inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if(name.equals("start") && isPressed){ if(cinematic.getPlayState() != PlayState.Playing){ diff --git a/jme3-examples/src/main/java/jme3test/animation/TestMotionPath.java b/jme3-examples/src/main/java/jme3test/animation/TestMotionPath.java index 02bc5335c..79453cafc 100644 --- a/jme3-examples/src/main/java/jme3test/animation/TestMotionPath.java +++ b/jme3-examples/src/main/java/jme3test/animation/TestMotionPath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -92,6 +92,7 @@ public class TestMotionPath extends SimpleApplication { path.addListener(new MotionPathListener() { + @Override public void onWayPointReach(MotionEvent control, int wayPointIndex) { if (path.getNbWayPoints() == wayPointIndex + 1) { wayPointsText.setText(control.getSpatial().getName() + "Finished!!! "); @@ -153,6 +154,7 @@ public class TestMotionPath extends SimpleApplication { inputManager.addMapping("play_stop", new KeyTrigger(KeyInput.KEY_SPACE)); ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("display_hidePath") && keyPressed) { if (active) { diff --git a/jme3-examples/src/main/java/jme3test/app/TestCloner.java b/jme3-examples/src/main/java/jme3test/app/TestCloner.java index 4ae105603..7c5f6fe38 100644 --- a/jme3-examples/src/main/java/jme3test/app/TestCloner.java +++ b/jme3-examples/src/main/java/jme3test/app/TestCloner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 jMonkeyEngine + * Copyright (c) 2016-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -125,6 +125,7 @@ public class TestCloner { this.i = i; } + @Override public RegularObject clone() { try { return (RegularObject)super.clone(); @@ -133,6 +134,7 @@ public class TestCloner { } } + @Override public String toString() { return getClass().getSimpleName() + "@" + System.identityHashCode(this) + "[i=" + i + "]"; @@ -147,6 +149,7 @@ public class TestCloner { this.name = name; } + @Override public String toString() { return getClass().getSimpleName() + "@" + System.identityHashCode(this) + "[i=" + i + ", name=" + name + "]"; @@ -163,6 +166,7 @@ public class TestCloner { this.rsc = new RegularSubclass(age, name); } + @Override public Parent clone() { try { return (Parent)super.clone(); @@ -171,17 +175,20 @@ public class TestCloner { } } + @Override public Parent jmeClone() { // Ok to delegate to clone() in this case because no deep // cloning is done there. return clone(); } + @Override public void cloneFields( Cloner cloner, Object original ) { this.ro = cloner.clone(ro); this.rsc = cloner.clone(rsc); } + @Override public String toString() { return getClass().getSimpleName() + "@" + System.identityHashCode(this) + "[ro=" + ro + ", rsc=" + rsc + "]"; @@ -230,6 +237,7 @@ public class TestCloner { return links; } + @Override public GraphNode jmeClone() { try { return (GraphNode)super.clone(); @@ -238,10 +246,12 @@ public class TestCloner { } } + @Override public void cloneFields( Cloner cloner, Object original ) { this.links = cloner.clone(links); } + @Override public String toString() { return getClass().getSimpleName() + "@" + System.identityHashCode(this) + "[name=" + name + "]"; @@ -273,6 +283,7 @@ public class TestCloner { } } + @Override public ArrayHolder jmeClone() { try { return (ArrayHolder)super.clone(); @@ -281,6 +292,7 @@ public class TestCloner { } } + @Override public void cloneFields( Cloner cloner, Object original ) { intArray = cloner.clone(intArray); intArray2D = cloner.clone(intArray2D); @@ -294,6 +306,7 @@ public class TestCloner { //strings = cloner.clone(strings); } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("intArray=" + intArray); diff --git a/jme3-examples/src/main/java/jme3test/app/TestEnqueueRunnable.java b/jme3-examples/src/main/java/jme3test/app/TestEnqueueRunnable.java index 88ce27732..c790d860d 100644 --- a/jme3-examples/src/main/java/jme3test/app/TestEnqueueRunnable.java +++ b/jme3-examples/src/main/java/jme3test/app/TestEnqueueRunnable.java @@ -48,9 +48,11 @@ public class TestEnqueueRunnable extends SimpleApplication{ return thread; } + @Override public void run(){ while(running){ enqueue(new Runnable(){ //primary usage of this in real applications would use lambda expressions which are unavailable at java 6 + @Override public void run(){ material.setColor("Color", ColorRGBA.randomColor()); } diff --git a/jme3-examples/src/main/java/jme3test/app/TestResizableApp.java b/jme3-examples/src/main/java/jme3test/app/TestResizableApp.java index d2314b989..f0d410352 100644 --- a/jme3-examples/src/main/java/jme3test/app/TestResizableApp.java +++ b/jme3-examples/src/main/java/jme3test/app/TestResizableApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2015 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,6 +56,7 @@ public class TestResizableApp extends SimpleApplication { app.start(); } + @Override public void reshape(int width, int height) { super.reshape(width, height); @@ -65,6 +66,7 @@ public class TestResizableApp extends SimpleApplication { "Current Size: " + settings.getWidth() + "x" + settings.getHeight()); } + @Override public void simpleInitApp() { flyCam.setDragToRotate(true); diff --git a/jme3-examples/src/main/java/jme3test/asset/TestAssetCache.java b/jme3-examples/src/main/java/jme3test/asset/TestAssetCache.java index 2f86e9abf..da7114ba6 100644 --- a/jme3-examples/src/main/java/jme3test/asset/TestAssetCache.java +++ b/jme3-examples/src/main/java/jme3test/asset/TestAssetCache.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -73,10 +73,12 @@ public class TestAssetCache { return data; } + @Override public AssetKey getKey() { return key; } + @Override public void setKey(AssetKey key) { this.key = key; } diff --git a/jme3-examples/src/main/java/jme3test/asset/TextLoader.java b/jme3-examples/src/main/java/jme3test/asset/TextLoader.java index 27cf33995..f9d0481c4 100644 --- a/jme3-examples/src/main/java/jme3test/asset/TextLoader.java +++ b/jme3-examples/src/main/java/jme3test/asset/TextLoader.java @@ -10,6 +10,7 @@ import java.util.Scanner; * files as strings. */ public class TextLoader implements AssetLoader { + @Override public Object load(AssetInfo assetInfo) throws IOException { Scanner scan = new Scanner(assetInfo.openStream()); StringBuilder sb = new StringBuilder(); diff --git a/jme3-examples/src/main/java/jme3test/audio/TestMusicPlayer.java b/jme3-examples/src/main/java/jme3test/audio/TestMusicPlayer.java index 50fe7456a..c28004c3b 100644 --- a/jme3-examples/src/main/java/jme3test/audio/TestMusicPlayer.java +++ b/jme3-examples/src/main/java/jme3test/audio/TestMusicPlayer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -90,6 +90,7 @@ public class TestMusicPlayer extends javax.swing.JFrame { setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); addWindowListener(new java.awt.event.WindowAdapter() { + @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -102,6 +103,7 @@ public class TestMusicPlayer extends javax.swing.JFrame { sldVolume.setPaintTicks(true); sldVolume.setValue(100); sldVolume.addChangeListener(new javax.swing.event.ChangeListener() { + @Override public void stateChanged(javax.swing.event.ChangeEvent evt) { sldVolumeStateChanged(evt); } @@ -113,6 +115,7 @@ public class TestMusicPlayer extends javax.swing.JFrame { btnStop.setText("[ ]"); btnStop.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { btnStopActionPerformed(evt); } @@ -121,6 +124,7 @@ public class TestMusicPlayer extends javax.swing.JFrame { btnPlay.setText("II / >"); btnPlay.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { btnPlayActionPerformed(evt); } @@ -129,6 +133,7 @@ public class TestMusicPlayer extends javax.swing.JFrame { btnFF.setText(">>"); btnFF.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { btnFFActionPerformed(evt); } @@ -137,6 +142,7 @@ public class TestMusicPlayer extends javax.swing.JFrame { btnOpen.setText("Open ..."); btnOpen.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { btnOpenActionPerformed(evt); } @@ -153,6 +159,7 @@ public class TestMusicPlayer extends javax.swing.JFrame { sldBar.setValue(0); sldBar.addChangeListener(new javax.swing.event.ChangeListener() { + @Override public void stateChanged(javax.swing.event.ChangeEvent evt) { sldBarStateChanged(evt); } @@ -276,6 +283,7 @@ public class TestMusicPlayer extends javax.swing.JFrame { */ public static void main(String args[]) { java.awt.EventQueue.invokeLater(new Runnable() { + @Override public void run() { new TestMusicPlayer().setVisible(true); } diff --git a/jme3-examples/src/main/java/jme3test/awt/AppHarness.java b/jme3-examples/src/main/java/jme3test/awt/AppHarness.java index 77e8d7092..34d6c0522 100644 --- a/jme3-examples/src/main/java/jme3test/awt/AppHarness.java +++ b/jme3-examples/src/main/java/jme3test/awt/AppHarness.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -138,6 +138,7 @@ public class AppHarness extends Applet { public void destroy(){ System.out.println("applet:destroyStart"); SwingUtilities.invokeLater(new Runnable(){ + @Override public void run(){ removeAll(); System.out.println("applet:destroyRemoved"); diff --git a/jme3-examples/src/main/java/jme3test/awt/TestApplet.java b/jme3-examples/src/main/java/jme3test/awt/TestApplet.java index 8ac4b7f0a..9f052fc50 100644 --- a/jme3-examples/src/main/java/jme3test/awt/TestApplet.java +++ b/jme3-examples/src/main/java/jme3test/awt/TestApplet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -85,6 +85,7 @@ public class TestApplet extends Applet { app.startCanvas(); app.enqueue(new Callable(){ + @Override public Void call(){ if (app instanceof SimpleApplication){ SimpleApplication simpleApp = (SimpleApplication) app; @@ -133,6 +134,7 @@ public class TestApplet extends Applet { @Override public void destroy(){ SwingUtilities.invokeLater(new Runnable(){ + @Override public void run(){ removeAll(); System.out.println("applet:destroyStart"); diff --git a/jme3-examples/src/main/java/jme3test/awt/TestAwtPanels.java b/jme3-examples/src/main/java/jme3test/awt/TestAwtPanels.java index 55d74e119..d8c6aa8c9 100644 --- a/jme3-examples/src/main/java/jme3test/awt/TestAwtPanels.java +++ b/jme3-examples/src/main/java/jme3test/awt/TestAwtPanels.java @@ -56,6 +56,7 @@ public class TestAwtPanels extends SimpleApplication { app.start(); SwingUtilities.invokeLater(new Runnable(){ + @Override public void run(){ /* * Sleep 2 seconds to ensure there's no race condition. diff --git a/jme3-examples/src/main/java/jme3test/awt/TestCanvas.java b/jme3-examples/src/main/java/jme3test/awt/TestCanvas.java index be4e5e8f6..019fee406 100644 --- a/jme3-examples/src/main/java/jme3test/awt/TestCanvas.java +++ b/jme3-examples/src/main/java/jme3test/awt/TestCanvas.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -88,6 +88,7 @@ public class TestCanvas { final JMenuItem itemRemoveCanvas = new JMenuItem("Remove Canvas"); menuTortureMethods.add(itemRemoveCanvas); itemRemoveCanvas.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if (itemRemoveCanvas.getText().equals("Remove Canvas")){ currentPanel.remove(canvas); @@ -104,6 +105,7 @@ public class TestCanvas { final JMenuItem itemHideCanvas = new JMenuItem("Hide Canvas"); menuTortureMethods.add(itemHideCanvas); itemHideCanvas.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if (itemHideCanvas.getText().equals("Hide Canvas")){ canvas.setVisible(false); @@ -118,6 +120,7 @@ public class TestCanvas { final JMenuItem itemSwitchTab = new JMenuItem("Switch to tab #2"); menuTortureMethods.add(itemSwitchTab); itemSwitchTab.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ if (itemSwitchTab.getText().equals("Switch to tab #2")){ canvasPanel1.remove(canvas); @@ -136,6 +139,7 @@ public class TestCanvas { JMenuItem itemSwitchLaf = new JMenuItem("Switch Look and Feel"); menuTortureMethods.add(itemSwitchLaf); itemSwitchLaf.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -150,6 +154,7 @@ public class TestCanvas { JMenuItem itemSmallSize = new JMenuItem("Set size to (0, 0)"); menuTortureMethods.add(itemSmallSize); itemSmallSize.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e){ Dimension preferred = frame.getPreferredSize(); frame.setPreferredSize(new Dimension(0, 0)); @@ -161,6 +166,7 @@ public class TestCanvas { JMenuItem itemKillCanvas = new JMenuItem("Stop/Start Canvas"); menuTortureMethods.add(itemKillCanvas); itemKillCanvas.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { currentPanel.remove(canvas); app.stop(true); @@ -175,6 +181,7 @@ public class TestCanvas { JMenuItem itemExit = new JMenuItem("Exit"); menuTortureMethods.add(itemExit); itemExit.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent ae) { frame.dispose(); app.stop(); @@ -225,6 +232,7 @@ public class TestCanvas { public static void startApp(){ app.startCanvas(); app.enqueue(new Callable(){ + @Override public Void call(){ if (app instanceof SimpleApplication){ SimpleApplication simpleApp = (SimpleApplication) app; @@ -253,6 +261,7 @@ public class TestCanvas { } SwingUtilities.invokeLater(new Runnable(){ + @Override public void run(){ JPopupMenu.setDefaultLightWeightPopupEnabled(false); diff --git a/jme3-examples/src/main/java/jme3test/batching/TestBatchNodeCluster.java b/jme3-examples/src/main/java/jme3test/batching/TestBatchNodeCluster.java index 9430aa368..5f9f65777 100644 --- a/jme3-examples/src/main/java/jme3test/batching/TestBatchNodeCluster.java +++ b/jme3-examples/src/main/java/jme3test/batching/TestBatchNodeCluster.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,6 +65,7 @@ public class TestBatchNodeCluster extends SimpleApplication { } private ActionListener al = new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (name.equals("Start Game")) { // randomGenerator(); diff --git a/jme3-examples/src/main/java/jme3test/batching/TestBatchNodeTower.java b/jme3-examples/src/main/java/jme3test/batching/TestBatchNodeTower.java index a13dc6168..655bd7979 100644 --- a/jme3-examples/src/main/java/jme3test/batching/TestBatchNodeTower.java +++ b/jme3-examples/src/main/java/jme3test/batching/TestBatchNodeTower.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -141,6 +141,7 @@ public class TestBatchNodeTower extends SimpleApplication { } private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("shoot") && !keyPressed) { Geometry bulletg = new Geometry("bullet", bullet); diff --git a/jme3-examples/src/main/java/jme3test/bullet/BombControl.java b/jme3-examples/src/main/java/jme3test/bullet/BombControl.java index 4d9af6a45..180d8e1b5 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/BombControl.java +++ b/jme3-examples/src/main/java/jme3test/bullet/BombControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,6 +81,7 @@ public class BombControl extends RigidBodyControl implements PhysicsCollisionLis prepareEffect(manager); } + @Override public void setPhysicsSpace(PhysicsSpace space) { super.setPhysicsSpace(space); if (space != null) { @@ -116,6 +117,7 @@ public class BombControl extends RigidBodyControl implements PhysicsCollisionLis ghostObject = new PhysicsGhostObject(new SphereCollisionShape(explosionRadius)); } + @Override public void collision(PhysicsCollisionEvent event) { if (space == null) { return; @@ -135,10 +137,12 @@ public class BombControl extends RigidBodyControl implements PhysicsCollisionLis } } + @Override public void prePhysicsTick(PhysicsSpace space, float f) { space.removeCollisionListener(this); } + @Override public void physicsTick(PhysicsSpace space, float f) { //get all overlapping objects and apply impulse to them for (Iterator it = ghostObject.getOverlappingObjects().iterator(); it.hasNext();) { diff --git a/jme3-examples/src/main/java/jme3test/bullet/PhysicsHoverControl.java b/jme3-examples/src/main/java/jme3test/bullet/PhysicsHoverControl.java index 901b3433c..f1a5139bf 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/PhysicsHoverControl.java +++ b/jme3-examples/src/main/java/jme3test/bullet/PhysicsHoverControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -112,6 +112,7 @@ public class PhysicsHoverControl extends PhysicsVehicle implements PhysicsContro throw new UnsupportedOperationException("Not yet implemented."); } + @Override public void setSpatial(Spatial spatial) { this.spatial = spatial; setUserObject(spatial); @@ -122,10 +123,12 @@ public class PhysicsHoverControl extends PhysicsVehicle implements PhysicsContro setPhysicsRotation(spatial.getWorldRotation().toRotationMatrix()); } + @Override public void setEnabled(boolean enabled) { this.enabled = enabled; } + @Override public boolean isEnabled() { return enabled; } @@ -140,6 +143,7 @@ public class PhysicsHoverControl extends PhysicsVehicle implements PhysicsContro } } + @Override public void prePhysicsTick(PhysicsSpace space, float f) { Vector3f angVel = getAngularVelocity(); float rotationVelocity = angVel.getY(); @@ -183,18 +187,22 @@ public class PhysicsHoverControl extends PhysicsVehicle implements PhysicsContro } } + @Override public void physicsTick(PhysicsSpace space, float f) { } + @Override public void update(float tpf) { if (enabled && spatial != null) { getMotionState().applyTransform(spatial); } } + @Override public void render(RenderManager rm, ViewPort vp) { } + @Override public void setPhysicsSpace(PhysicsSpace space) { createVehicle(space); if (space == null) { @@ -210,6 +218,7 @@ public class PhysicsHoverControl extends PhysicsVehicle implements PhysicsContro this.space = space; } + @Override public PhysicsSpace getPhysicsSpace() { return space; } diff --git a/jme3-examples/src/main/java/jme3test/bullet/PhysicsTestHelper.java b/jme3-examples/src/main/java/jme3test/bullet/PhysicsTestHelper.java index 4d8a5a92f..610e23049 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/PhysicsTestHelper.java +++ b/jme3-examples/src/main/java/jme3test/bullet/PhysicsTestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -225,6 +225,7 @@ public class PhysicsTestHelper { public static void createBallShooter(final Application app, final Node rootNode, final PhysicsSpace space) { ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { Sphere bullet = new Sphere(32, 32, 0.4f, true, false); bullet.setTextureMode(TextureMode.Projected); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestAttachDriver.java b/jme3-examples/src/main/java/jme3test/bullet/TestAttachDriver.java index 1de5b0118..af6c272de 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestAttachDriver.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestAttachDriver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -244,6 +244,7 @@ public class TestAttachDriver extends SimpleApplication implements ActionListene cam.lookAt(vehicle.getPhysicsLocation(), Vector3f.UNIT_Y); } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Lefts")) { if (value) { diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestAttachGhostObject.java b/jme3-examples/src/main/java/jme3test/bullet/TestAttachGhostObject.java index 5fac3fc5f..0f3f2f1e5 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestAttachGhostObject.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestAttachGhostObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public class TestAttachGhostObject extends SimpleApplication implements AnalogLi inputManager.addListener(this, "Lefts", "Rights", "Space"); } + @Override public void onAnalog(String binding, float value, float tpf) { if (binding.equals("Lefts")) { joint.enableMotor(true, 1, .1f); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestBetterCharacter.java b/jme3-examples/src/main/java/jme3test/bullet/TestBetterCharacter.java index 4a86f8219..e4eb5f25e 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestBetterCharacter.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestBetterCharacter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -198,6 +198,7 @@ public class TestBetterCharacter extends SimpleApplication implements ActionList return bulletAppState.getPhysicsSpace(); } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Strafe Left")) { if (value) { diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestBrickTower.java b/jme3-examples/src/main/java/jme3test/bullet/TestBrickTower.java index feffac8e6..136fb5189 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestBrickTower.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestBrickTower.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -142,6 +142,7 @@ public class TestBrickTower extends SimpleApplication { } private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("shoot") && !keyPressed) { Geometry bulletg = new Geometry("bullet", bullet); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestBrickWall.java b/jme3-examples/src/main/java/jme3test/bullet/TestBrickWall.java index ce61e355e..9b36c8f96 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestBrickWall.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestBrickWall.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -111,6 +111,7 @@ public class TestBrickWall extends SimpleApplication { } private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("shoot") && !keyPressed) { Geometry bulletg = new Geometry("bullet", bullet); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestCcd.java b/jme3-examples/src/main/java/jme3test/bullet/TestCcd.java index 58cb77c65..b20752f29 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestCcd.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestCcd.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -125,6 +125,7 @@ public class TestCcd extends SimpleApplication implements ActionListener { //TODO: add render code } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("shoot") && !value) { Geometry bulletg = new Geometry("bullet", bullet); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestCollisionListener.java b/jme3-examples/src/main/java/jme3test/bullet/TestCollisionListener.java index 3c9450f3d..04b5039d4 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestCollisionListener.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestCollisionListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -87,6 +87,7 @@ public class TestCollisionListener extends SimpleApplication implements PhysicsC //TODO: add render code } + @Override public void collision(PhysicsCollisionEvent event) { if ("Box".equals(event.getNodeA().getName()) || "Box".equals(event.getNodeB().getName())) { if ("bullet".equals(event.getNodeA().getName()) || "bullet".equals(event.getNodeB().getName())) { diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestFancyCar.java b/jme3-examples/src/main/java/jme3test/bullet/TestFancyCar.java index 3803c4c5d..8f56e9119 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestFancyCar.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestFancyCar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -209,6 +209,7 @@ public class TestFancyCar extends SimpleApplication implements ActionListener { getPhysicsSpace().add(player); } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Lefts")) { if (value) { diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestHoveringTank.java b/jme3-examples/src/main/java/jme3test/bullet/TestHoveringTank.java index 922ce973b..06137cbb4 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestHoveringTank.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestHoveringTank.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -200,9 +200,11 @@ public class TestHoveringTank extends SimpleApplication implements AnalogListene getPhysicsSpace().add(missile); } + @Override public void onAnalog(String binding, float value, float tpf) { } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Lefts")) { hoverControl.steer(value ? 50f : 0); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCar.java b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCar.java index 4ba4e060b..39164e962 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCar.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -177,6 +177,7 @@ public class TestPhysicsCar extends SimpleApplication implements ActionListener cam.lookAt(vehicle.getPhysicsLocation(), Vector3f.UNIT_Y); } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Lefts")) { if (value) { diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCharacter.java b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCharacter.java index 3a75ad512..4dea7438d 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCharacter.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCharacter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine All rights reserved.

+ * Copyright (c) 2009-2020 jMonkeyEngine All rights reserved.

* Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * @@ -154,6 +154,7 @@ public class TestPhysicsCharacter extends SimpleApplication implements ActionLis physicsCharacter.setViewDirection(viewDirection); } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Strafe Left")) { if (value) { diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsHingeJoint.java b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsHingeJoint.java index 029892ad9..12b18af86 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsHingeJoint.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsHingeJoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -60,6 +60,7 @@ public class TestPhysicsHingeJoint extends SimpleApplication implements AnalogLi inputManager.addListener(this, "Left", "Right", "Swing"); } + @Override public void onAnalog(String binding, float value, float tpf) { if(binding.equals("Left")){ joint.enableMotor(true, 1, .1f); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestQ3.java b/jme3-examples/src/main/java/jme3test/bullet/TestQ3.java index 01d0c9ade..c38b89b9f 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestQ3.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestQ3.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -70,6 +70,7 @@ public class TestQ3 extends SimpleApplication implements ActionListener { app.start(); } + @Override public void simpleInitApp() { bulletAppState = new BulletAppState(); stateManager.attach(bulletAppState); @@ -152,6 +153,7 @@ public class TestQ3 extends SimpleApplication implements ActionListener { inputManager.addListener(this,"Space"); } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Lefts")) { diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestRagDoll.java b/jme3-examples/src/main/java/jme3test/bullet/TestRagDoll.java index 2752ce5a8..bc7001b66 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestRagDoll.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestRagDoll.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -131,6 +131,7 @@ public class TestRagDoll extends SimpleApplication implements ActionListener { return joint; } + @Override public void onAction(String string, boolean bln, float tpf) { if ("Pull ragdoll up".equals(string)) { if (bln) { diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestWalkingChar.java b/jme3-examples/src/main/java/jme3test/bullet/TestWalkingChar.java index 532052da0..cf187c63b 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestWalkingChar.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestWalkingChar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -355,6 +355,7 @@ public class TestWalkingChar extends SimpleApplication implements ActionListener character.setWalkDirection(walkDirection); } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("CharLeft")) { if (value) { @@ -402,6 +403,7 @@ public class TestWalkingChar extends SimpleApplication implements ActionListener getPhysicsSpace().add(bulletControl); } + @Override public void collision(PhysicsCollisionEvent event) { if (event.getObjectA() instanceof BombControl) { final Spatial node = event.getNodeA(); @@ -416,12 +418,14 @@ public class TestWalkingChar extends SimpleApplication implements ActionListener } } + @Override public void onAnimCycleDone(AnimControl control, AnimChannel channel, String animName) { if (channel == shootingChannel) { channel.setAnim("stand"); } } + @Override public void onAnimChange(AnimControl control, AnimChannel channel, String animName) { } } diff --git a/jme3-examples/src/main/java/jme3test/collision/TestTriangleCollision.java b/jme3-examples/src/main/java/jme3test/collision/TestTriangleCollision.java index e28d7c768..cf1885673 100644 --- a/jme3-examples/src/main/java/jme3test/collision/TestTriangleCollision.java +++ b/jme3-examples/src/main/java/jme3test/collision/TestTriangleCollision.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -92,6 +92,7 @@ public class TestTriangleCollision extends SimpleApplication { } private AnalogListener analogListener = new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { if (name.equals("MoveRight")) { geom1.move(2 * tpf, 0, 0); diff --git a/jme3-examples/src/main/java/jme3test/effect/TestMovingParticle.java b/jme3-examples/src/main/java/jme3test/effect/TestMovingParticle.java index b38eed97a..7aee88507 100644 --- a/jme3-examples/src/main/java/jme3test/effect/TestMovingParticle.java +++ b/jme3-examples/src/main/java/jme3test/effect/TestMovingParticle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -74,6 +74,7 @@ public class TestMovingParticle extends SimpleApplication { inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if ("setNum".equals(name) && isPressed) { emit.setNumParticles(1000); diff --git a/jme3-examples/src/main/java/jme3test/effect/TestPointSprite.java b/jme3-examples/src/main/java/jme3test/effect/TestPointSprite.java index 1a3e89092..8543eba0e 100644 --- a/jme3-examples/src/main/java/jme3test/effect/TestPointSprite.java +++ b/jme3-examples/src/main/java/jme3test/effect/TestPointSprite.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -75,6 +75,7 @@ public class TestPointSprite extends SimpleApplication { rootNode.attachChild(emit); inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if ("setNum".equals(name) && isPressed) { emit.setNumParticles(5000); diff --git a/jme3-examples/src/main/java/jme3test/effect/TestSoftParticles.java b/jme3-examples/src/main/java/jme3test/effect/TestSoftParticles.java index 84189e1e9..ecc9d68f4 100644 --- a/jme3-examples/src/main/java/jme3test/effect/TestSoftParticles.java +++ b/jme3-examples/src/main/java/jme3test/effect/TestSoftParticles.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -109,6 +109,7 @@ public class TestSoftParticles extends SimpleApplication { inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if(isPressed && name.equals("toggle")){ // tbf.setEnabled(!tbf.isEnabled()); @@ -125,6 +126,7 @@ public class TestSoftParticles extends SimpleApplication { // emit again inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if(isPressed && name.equals("refire")) { //fpp.removeFilter(tbf); // <-- add back in to fix diff --git a/jme3-examples/src/main/java/jme3test/games/CubeField.java b/jme3-examples/src/main/java/jme3test/games/CubeField.java index ec4f07f50..228e97f4f 100644 --- a/jme3-examples/src/main/java/jme3test/games/CubeField.java +++ b/jme3-examples/src/main/java/jme3test/games/CubeField.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -311,6 +311,7 @@ public class CubeField extends SimpleApplication implements AnalogListener { inputManager.addListener(this, "START", "Left", "Right"); } + @Override public void onAnalog(String binding, float value, float tpf) { if (binding.equals("START") && !START){ START = true; diff --git a/jme3-examples/src/main/java/jme3test/games/WorldOfInception.java b/jme3-examples/src/main/java/jme3test/games/WorldOfInception.java index 080b3d00b..8d784fa81 100644 --- a/jme3-examples/src/main/java/jme3test/games/WorldOfInception.java +++ b/jme3-examples/src/main/java/jme3test/games/WorldOfInception.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -164,6 +164,7 @@ public class WorldOfInception extends SimpleApplication implements AnalogListene viewPort.addProcessor(fpp); } + @Override public void onAnalog(String name, float value, float tpf) { Vector3f left = rootNode.getLocalRotation().mult(Vector3f.UNIT_X.negate()); Vector3f forward = rootNode.getLocalRotation().mult(Vector3f.UNIT_Z.negate()); diff --git a/jme3-examples/src/main/java/jme3test/gui/TestBitmapFontLayout.java b/jme3-examples/src/main/java/jme3test/gui/TestBitmapFontLayout.java index d2ac0e8be..7f03fb9b2 100644 --- a/jme3-examples/src/main/java/jme3test/gui/TestBitmapFontLayout.java +++ b/jme3-examples/src/main/java/jme3test/gui/TestBitmapFontLayout.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 20018 jMonkeyEngine + * Copyright (c) 2018-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -454,6 +454,7 @@ public class TestBitmapFontLayout extends SimpleApplication { ZOOM_IN, ZOOM_OUT); } + @Override public void simpleUpdate( float tpf ) { if( scroll.lengthSquared() != 0 ) { scrollRoot.move(scroll.mult(tpf)); @@ -465,6 +466,7 @@ public class TestBitmapFontLayout extends SimpleApplication { } private class KeyStateListener implements ActionListener { + @Override public void onAction(String name, boolean value, float tpf) { switch( name ) { case RESET_VIEW: diff --git a/jme3-examples/src/main/java/jme3test/gui/TestOrtho.java b/jme3-examples/src/main/java/jme3test/gui/TestOrtho.java index 2e252aad3..dc61e9e2c 100644 --- a/jme3-examples/src/main/java/jme3test/gui/TestOrtho.java +++ b/jme3-examples/src/main/java/jme3test/gui/TestOrtho.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ public class TestOrtho extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { Picture p = new Picture("Picture"); p.move(0, 0, -1); // make it appear behind stats view diff --git a/jme3-examples/src/main/java/jme3test/gui/TestSoftwareMouse.java b/jme3-examples/src/main/java/jme3test/gui/TestSoftwareMouse.java index 44bee2882..cf6e01359 100644 --- a/jme3-examples/src/main/java/jme3test/gui/TestSoftwareMouse.java +++ b/jme3-examples/src/main/java/jme3test/gui/TestSoftwareMouse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -49,14 +49,19 @@ public class TestSoftwareMouse extends SimpleApplication { private float x = 0, y = 0; + @Override public void beginInput() { } + @Override public void endInput() { } + @Override public void onJoyAxisEvent(JoyAxisEvent evt) { } + @Override public void onJoyButtonEvent(JoyButtonEvent evt) { } + @Override public void onMouseMotionEvent(MouseMotionEvent evt) { x += evt.getDX(); y += evt.getDY(); @@ -69,10 +74,13 @@ public class TestSoftwareMouse extends SimpleApplication { // adjust for hotspot cursor.setPosition(x, y - 64); } + @Override public void onMouseButtonEvent(MouseButtonEvent evt) { } + @Override public void onKeyEvent(KeyInputEvent evt) { } + @Override public void onTouchEvent(TouchEvent evt) { } }; diff --git a/jme3-examples/src/main/java/jme3test/gui/TestZOrder.java b/jme3-examples/src/main/java/jme3test/gui/TestZOrder.java index 5a5683f68..6d9ed9768 100644 --- a/jme3-examples/src/main/java/jme3test/gui/TestZOrder.java +++ b/jme3-examples/src/main/java/jme3test/gui/TestZOrder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ public class TestZOrder extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { Picture p = new Picture("Picture1"); p.move(0,0,-1); diff --git a/jme3-examples/src/main/java/jme3test/helloworld/HelloAnimation.java b/jme3-examples/src/main/java/jme3test/helloworld/HelloAnimation.java index db9c700c8..ad8d82fe8 100644 --- a/jme3-examples/src/main/java/jme3test/helloworld/HelloAnimation.java +++ b/jme3-examples/src/main/java/jme3test/helloworld/HelloAnimation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -79,6 +79,7 @@ public class HelloAnimation extends SimpleApplication } /** Use this listener to trigger something after an animation is done. */ + @Override public void onAnimCycleDone(AnimControl control, AnimChannel channel, String animName) { if (animName.equals("Walk")) { /** After "walk", reset to "stand". */ @@ -89,6 +90,7 @@ public class HelloAnimation extends SimpleApplication } /** Use this listener to trigger something between two animations. */ + @Override public void onAnimChange(AnimControl control, AnimChannel channel, String animName) { // unused } @@ -101,6 +103,7 @@ public class HelloAnimation extends SimpleApplication /** Definining the named action that can be triggered by key inputs. */ private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("Walk") && !keyPressed) { if (!channel.getAnimationName().equals("Walk")) { diff --git a/jme3-examples/src/main/java/jme3test/helloworld/HelloCollision.java b/jme3-examples/src/main/java/jme3test/helloworld/HelloCollision.java index 7d96f9744..656108344 100644 --- a/jme3-examples/src/main/java/jme3test/helloworld/HelloCollision.java +++ b/jme3-examples/src/main/java/jme3test/helloworld/HelloCollision.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -75,6 +75,7 @@ public class HelloCollision extends SimpleApplication app.start(); } + @Override public void simpleInitApp() { /** Set up Physics */ bulletAppState = new BulletAppState(); @@ -149,6 +150,7 @@ public class HelloCollision extends SimpleApplication /** These are our custom actions triggered by key presses. * We do not walk yet, we just keep track of the direction the user pressed. */ + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Left")) { if (value) { left = true; } else { left = false; } diff --git a/jme3-examples/src/main/java/jme3test/helloworld/HelloInput.java b/jme3-examples/src/main/java/jme3test/helloworld/HelloInput.java index c01bfb31c..cecb08b02 100644 --- a/jme3-examples/src/main/java/jme3test/helloworld/HelloInput.java +++ b/jme3-examples/src/main/java/jme3test/helloworld/HelloInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,6 +81,7 @@ public class HelloInput extends SimpleApplication { /** Use this listener for KeyDown/KeyUp events */ private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("Pause") && !keyPressed) { isRunning = !isRunning; @@ -90,6 +91,7 @@ public class HelloInput extends SimpleApplication { /** Use this listener for continuous events */ private AnalogListener analogListener = new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { if (isRunning) { if (name.equals("Rotate")) { diff --git a/jme3-examples/src/main/java/jme3test/helloworld/HelloPhysics.java b/jme3-examples/src/main/java/jme3test/helloworld/HelloPhysics.java index 0da38215d..086bf0b6a 100644 --- a/jme3-examples/src/main/java/jme3test/helloworld/HelloPhysics.java +++ b/jme3-examples/src/main/java/jme3test/helloworld/HelloPhysics.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -123,6 +123,7 @@ public class HelloPhysics extends SimpleApplication { * The ball is set up to fly from the camera position in the camera direction. */ private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("shoot") && !keyPressed) { makeCannonBall(); diff --git a/jme3-examples/src/main/java/jme3test/helloworld/HelloPicking.java b/jme3-examples/src/main/java/jme3test/helloworld/HelloPicking.java index 4c74b9012..502e31cfe 100644 --- a/jme3-examples/src/main/java/jme3test/helloworld/HelloPicking.java +++ b/jme3-examples/src/main/java/jme3test/helloworld/HelloPicking.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -90,6 +90,7 @@ public class HelloPicking extends SimpleApplication { /** Defining the "Shoot" action: Determine what was hit and how to respond. */ private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("Shoot") && !keyPressed) { // 1. Reset results list. diff --git a/jme3-examples/src/main/java/jme3test/helloworld/HelloTerrainCollision.java b/jme3-examples/src/main/java/jme3test/helloworld/HelloTerrainCollision.java index d7ea68f63..16c80b3e9 100644 --- a/jme3-examples/src/main/java/jme3test/helloworld/HelloTerrainCollision.java +++ b/jme3-examples/src/main/java/jme3test/helloworld/HelloTerrainCollision.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -185,6 +185,7 @@ public class HelloTerrainCollision extends SimpleApplication /** These are our custom actions triggered by key presses. * We do not walk yet, we just keep track of the direction the user pressed. */ + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Left")) { if (value) { left = true; } else { left = false; } diff --git a/jme3-examples/src/main/java/jme3test/input/TestCameraNode.java b/jme3-examples/src/main/java/jme3test/input/TestCameraNode.java index c1ebfeb8f..f1ecfe68c 100644 --- a/jme3-examples/src/main/java/jme3test/input/TestCameraNode.java +++ b/jme3-examples/src/main/java/jme3test/input/TestCameraNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine All rights reserved. + * Copyright (c) 2009-2020 jMonkeyEngine All rights reserved. *

* Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -63,6 +63,7 @@ public class TestCameraNode extends SimpleApplication implements AnalogListener, app.start(); } + @Override public void simpleInitApp() { // load a teapot model teaGeom = (Geometry) assetManager.loadModel("Models/Teapot/Teapot.obj"); @@ -110,6 +111,7 @@ public class TestCameraNode extends SimpleApplication implements AnalogListener, inputManager.addListener(this, "rotateRight", "rotateLeft", "toggleRotate"); } + @Override public void onAnalog(String name, float value, float tpf) { //computing the normalized direction of the cam to move the teaNode direction.set(cam.getDirection()).normalizeLocal(); @@ -138,6 +140,7 @@ public class TestCameraNode extends SimpleApplication implements AnalogListener, } + @Override public void onAction(String name, boolean keyPressed, float tpf) { //toggling rotation on or off if (name.equals("toggleRotate") && keyPressed) { diff --git a/jme3-examples/src/main/java/jme3test/input/TestChaseCamera.java b/jme3-examples/src/main/java/jme3test/input/TestChaseCamera.java index d933f9638..126f3eef0 100644 --- a/jme3-examples/src/main/java/jme3test/input/TestChaseCamera.java +++ b/jme3-examples/src/main/java/jme3test/input/TestChaseCamera.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,6 +55,7 @@ public class TestChaseCamera extends SimpleApplication implements AnalogListener app.start(); } + @Override public void simpleInitApp() { // Load a teapot model teaGeom = (Geometry) assetManager.loadModel("Models/Teapot/Teapot.obj"); @@ -116,6 +117,7 @@ public class TestChaseCamera extends SimpleApplication implements AnalogListener inputManager.addListener(this, "displayPosition"); } + @Override public void onAnalog(String name, float value, float tpf) { if (name.equals("moveForward")) { teaGeom.move(0, 0, -5 * tpf); @@ -133,6 +135,7 @@ public class TestChaseCamera extends SimpleApplication implements AnalogListener } + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("displayPosition") && keyPressed) { teaGeom.move(10, 10, 10); diff --git a/jme3-examples/src/main/java/jme3test/input/TestChaseCameraAppState.java b/jme3-examples/src/main/java/jme3test/input/TestChaseCameraAppState.java index 00d6dd81a..94c99da1d 100644 --- a/jme3-examples/src/main/java/jme3test/input/TestChaseCameraAppState.java +++ b/jme3-examples/src/main/java/jme3test/input/TestChaseCameraAppState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,6 +56,7 @@ public class TestChaseCameraAppState extends SimpleApplication implements Analog app.start(); } + @Override public void simpleInitApp() { // Load a teapot model teaGeom = (Geometry) assetManager.loadModel("Models/Teapot/Teapot.obj"); @@ -109,6 +110,7 @@ public class TestChaseCameraAppState extends SimpleApplication implements Analog inputManager.addListener(this, "displayPosition"); } + @Override public void onAnalog(String name, float value, float tpf) { if (name.equals("moveForward")) { teaGeom.move(0, 0, -5 * tpf); @@ -126,6 +128,7 @@ public class TestChaseCameraAppState extends SimpleApplication implements Analog } + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("displayPosition") && keyPressed) { teaGeom.move(10, 10, 10); diff --git a/jme3-examples/src/main/java/jme3test/input/TestControls.java b/jme3-examples/src/main/java/jme3test/input/TestControls.java index 07568b2b5..50ac11ea3 100644 --- a/jme3-examples/src/main/java/jme3test/input/TestControls.java +++ b/jme3-examples/src/main/java/jme3test/input/TestControls.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,11 +43,13 @@ import com.jme3.input.controls.MouseAxisTrigger; public class TestControls extends SimpleApplication { private ActionListener actionListener = new ActionListener(){ + @Override public void onAction(String name, boolean pressed, float tpf){ System.out.println(name + " = " + pressed); } }; public AnalogListener analogListener = new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { System.out.println(name + " = " + value); } diff --git a/jme3-examples/src/main/java/jme3test/input/TestJoystick.java b/jme3-examples/src/main/java/jme3test/input/TestJoystick.java index fbc8ea198..afb269eca 100644 --- a/jme3-examples/src/main/java/jme3test/input/TestJoystick.java +++ b/jme3-examples/src/main/java/jme3test/input/TestJoystick.java @@ -165,6 +165,7 @@ public class TestJoystick extends SimpleApplication { private Map lastValues = new HashMap<>(); + @Override public void onJoyAxisEvent(JoyAxisEvent evt) { Float last = lastValues.remove(evt.getAxis()); float value = evt.getValue(); @@ -188,16 +189,23 @@ public class TestJoystick extends SimpleApplication { } } + @Override public void onJoyButtonEvent(JoyButtonEvent evt) { setViewedJoystick( evt.getButton().getJoystick() ); gamepad.setButtonValue( evt.getButton(), evt.isPressed() ); } + @Override public void beginInput() {} + @Override public void endInput() {} + @Override public void onMouseMotionEvent(MouseMotionEvent evt) {} + @Override public void onMouseButtonEvent(MouseButtonEvent evt) {} + @Override public void onKeyEvent(KeyInputEvent evt) {} + @Override public void onTouchEvent(TouchEvent evt) {} } diff --git a/jme3-examples/src/main/java/jme3test/input/combomoves/TestComboMoves.java b/jme3-examples/src/main/java/jme3test/input/combomoves/TestComboMoves.java index 3ca46dbd3..24d113087 100644 --- a/jme3-examples/src/main/java/jme3test/input/combomoves/TestComboMoves.java +++ b/jme3-examples/src/main/java/jme3test/input/combomoves/TestComboMoves.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -168,6 +168,7 @@ public class TestComboMoves extends SimpleApplication implements ActionListener } } + @Override public void onAction(String name, boolean isPressed, float tpf) { if (isPressed){ pressedMappings.add(name); diff --git a/jme3-examples/src/main/java/jme3test/light/ShadowTestUIManager.java b/jme3-examples/src/main/java/jme3test/light/ShadowTestUIManager.java index 4c8ae5ff9..c8c978c26 100644 --- a/jme3-examples/src/main/java/jme3test/light/ShadowTestUIManager.java +++ b/jme3-examples/src/main/java/jme3test/light/ShadowTestUIManager.java @@ -80,6 +80,7 @@ public class ShadowTestUIManager implements ActionListener { } + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("toggle") && keyPressed) { renderModeIndex += 1; diff --git a/jme3-examples/src/main/java/jme3test/light/TestConeVSFrustum.java b/jme3-examples/src/main/java/jme3test/light/TestConeVSFrustum.java index d96edf706..119fac8ca 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestConeVSFrustum.java +++ b/jme3-examples/src/main/java/jme3test/light/TestConeVSFrustum.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -140,6 +140,7 @@ public class TestConeVSFrustum extends SimpleApplication { flyCam.setEnabled(false); inputManager.addListener(new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { Spatial s = null; float mult = 1; @@ -184,6 +185,7 @@ public class TestConeVSFrustum extends SimpleApplication { }, "up", "down", "left", "right"); inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (name.equals("click")) { if (isPressed) { diff --git a/jme3-examples/src/main/java/jme3test/light/TestDirectionalLightShadow.java b/jme3-examples/src/main/java/jme3test/light/TestDirectionalLightShadow.java index 3f3ac9127..96e61de29 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestDirectionalLightShadow.java +++ b/jme3-examples/src/main/java/jme3test/light/TestDirectionalLightShadow.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -78,6 +78,7 @@ public class TestDirectionalLightShadow extends SimpleApplication implements Act } private float frustumSize = 100; + @Override public void onAnalog(String name, float value, float tpf) { if (cam.isParallelProjection()) { // Instead of moving closer/farther to object, we zoom in/out. @@ -245,6 +246,7 @@ public class TestDirectionalLightShadow extends SimpleApplication implements Act private BitmapText shadowStabilizationText; private BitmapText shadowZfarText; + @Override public void onAction(String name, boolean keyPressed, float tpf) { diff --git a/jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java b/jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java index 005634bcd..bc28ffd26 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java +++ b/jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -157,6 +157,7 @@ public class TestManyLightsSingle extends SimpleApplication { stateManager.attach(debug); inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (name.equals("toggle") && isPressed) { if (lm == TechniqueDef.LightMode.SinglePass) { diff --git a/jme3-examples/src/main/java/jme3test/light/TestObbVsBounds.java b/jme3-examples/src/main/java/jme3test/light/TestObbVsBounds.java index 9e5db8948..c0c7d511a 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestObbVsBounds.java +++ b/jme3-examples/src/main/java/jme3test/light/TestObbVsBounds.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -134,6 +134,7 @@ public class TestObbVsBounds extends SimpleApplication { flyCam.setEnabled(false); inputManager.addListener(new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { Spatial s = null; float mult = 1; @@ -178,6 +179,7 @@ public class TestObbVsBounds extends SimpleApplication { }, "up", "down", "left", "right"); inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (name.equals("click")) { if (isPressed) { diff --git a/jme3-examples/src/main/java/jme3test/light/TestShadowsPerf.java b/jme3-examples/src/main/java/jme3test/light/TestShadowsPerf.java index a631f9eac..8cd2eb5aa 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestShadowsPerf.java +++ b/jme3-examples/src/main/java/jme3test/light/TestShadowsPerf.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -130,6 +130,7 @@ public class TestShadowsPerf extends SimpleApplication { inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (name.equals("display") && isPressed) { //pssmRenderer.debugFrustrums(); diff --git a/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java b/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java index 254bfb028..610f08eb6 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java +++ b/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -120,6 +120,7 @@ public class TestSpotLightShadows extends SimpleApplication { ShadowTestUIManager uiMan = new ShadowTestUIManager(assetManager, slsr, slsf, guiNode, inputManager, viewPort); inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (name.equals("stop") && isPressed) { stop = !stop; diff --git a/jme3-examples/src/main/java/jme3test/light/TestTangentGenBadModels.java b/jme3-examples/src/main/java/jme3test/light/TestTangentGenBadModels.java index 21817e7c8..63f2c23aa 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestTangentGenBadModels.java +++ b/jme3-examples/src/main/java/jme3test/light/TestTangentGenBadModels.java @@ -105,6 +105,7 @@ public class TestTangentGenBadModels extends SimpleApplication { private boolean isLit = true; + @Override public void onAction(String name, boolean isPressed, float tpf) { if (isPressed) return; Material mat; diff --git a/jme3-examples/src/main/java/jme3test/light/TestTransparentShadow.java b/jme3-examples/src/main/java/jme3test/light/TestTransparentShadow.java index 23fe73c12..ce632604b 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestTransparentShadow.java +++ b/jme3-examples/src/main/java/jme3test/light/TestTransparentShadow.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,6 +59,7 @@ public class TestTransparentShadow extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { cam.setLocation(new Vector3f(5.700248f, 6.161693f, 5.1404157f)); cam.setRotation(new Quaternion(-0.09441641f, 0.8993388f, -0.24089815f, -0.35248178f)); diff --git a/jme3-examples/src/main/java/jme3test/material/TestParallaxPBR.java b/jme3-examples/src/main/java/jme3test/material/TestParallaxPBR.java index 2a97a7054..013bea20b 100644 --- a/jme3-examples/src/main/java/jme3test/material/TestParallaxPBR.java +++ b/jme3-examples/src/main/java/jme3test/material/TestParallaxPBR.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -116,6 +116,7 @@ public class TestParallaxPBR extends SimpleApplication { inputManager.addListener(new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { if ("heightUP".equals(name)) { parallaxHeigh += 0.01; @@ -134,6 +135,7 @@ public class TestParallaxPBR extends SimpleApplication { inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (isPressed && "toggleSteep".equals(name)) { steep = !steep; diff --git a/jme3-examples/src/main/java/jme3test/model/TestObjLoading.java b/jme3-examples/src/main/java/jme3test/model/TestObjLoading.java index 2546fdd79..2788f1289 100644 --- a/jme3-examples/src/main/java/jme3test/model/TestObjLoading.java +++ b/jme3-examples/src/main/java/jme3test/model/TestObjLoading.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,7 @@ public class TestObjLoading extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { // create the geometry and attach it Geometry teaGeom = (Geometry) assetManager.loadModel("Models/Teapot/Teapot.obj"); diff --git a/jme3-examples/src/main/java/jme3test/model/TestOgreLoading.java b/jme3-examples/src/main/java/jme3test/model/TestOgreLoading.java index f8d1e85f1..bcd4a5dc9 100644 --- a/jme3-examples/src/main/java/jme3test/model/TestOgreLoading.java +++ b/jme3-examples/src/main/java/jme3test/model/TestOgreLoading.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,6 +55,7 @@ public class TestOgreLoading extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { // PointLight pl = new PointLight(); // pl.setPosition(new Vector3f(10, 10, -10)); diff --git a/jme3-examples/src/main/java/jme3test/model/anim/EraseTimer.java b/jme3-examples/src/main/java/jme3test/model/anim/EraseTimer.java index ba6189195..c20b729be 100644 --- a/jme3-examples/src/main/java/jme3test/model/anim/EraseTimer.java +++ b/jme3-examples/src/main/java/jme3test/model/anim/EraseTimer.java @@ -38,23 +38,28 @@ public class EraseTimer extends Timer { return getTime() * INVERSE_TIMER_RESOLUTION; } + @Override public long getTime() { //return System.currentTimeMillis() - startTime; return System.nanoTime() - startTime; } + @Override public long getResolution() { return TIMER_RESOLUTION; } + @Override public float getFrameRate() { return fps; } + @Override public float getTimePerFrame() { return tpf; } + @Override public void update() { tpf = (getTime() - previousTime) * (1.0f / TIMER_RESOLUTION); if (tpf >= 0.2) { @@ -66,6 +71,7 @@ public class EraseTimer extends Timer { previousTime = getTime(); } + @Override public void reset() { //startTime = System.currentTimeMillis(); startTime = System.nanoTime(); diff --git a/jme3-examples/src/main/java/jme3test/model/anim/TestOgreAnim.java b/jme3-examples/src/main/java/jme3test/model/anim/TestOgreAnim.java index a7616f7b5..5e1274c8a 100644 --- a/jme3-examples/src/main/java/jme3test/model/anim/TestOgreAnim.java +++ b/jme3-examples/src/main/java/jme3test/model/anim/TestOgreAnim.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -101,6 +101,7 @@ public class TestOgreAnim extends SimpleApplication } + @Override public void onAnimCycleDone(AnimControl control, AnimChannel channel, String animName) { if (animName.equals("Dodge")){ channel.setAnim("stand", 0.50f); @@ -109,9 +110,11 @@ public class TestOgreAnim extends SimpleApplication } } + @Override public void onAnimChange(AnimControl control, AnimChannel channel, String animName) { } + @Override public void onAction(String binding, boolean value, float tpf) { if (binding.equals("Attack") && value){ if (!channel.getAnimationName().equals("Dodge")){ diff --git a/jme3-examples/src/main/java/jme3test/model/shape/TestBillboard.java b/jme3-examples/src/main/java/jme3test/model/shape/TestBillboard.java index 8fa8a66f1..e105d58f7 100644 --- a/jme3-examples/src/main/java/jme3test/model/shape/TestBillboard.java +++ b/jme3-examples/src/main/java/jme3test/model/shape/TestBillboard.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,6 +48,7 @@ import com.jme3.scene.shape.Quad; */ public class TestBillboard extends SimpleApplication { + @Override public void simpleInitApp() { flyCam.setMoveSpeed(10); diff --git a/jme3-examples/src/main/java/jme3test/network/TestLatency.java b/jme3-examples/src/main/java/jme3test/network/TestLatency.java index c47ae0556..5f33f49c1 100644 --- a/jme3-examples/src/main/java/jme3test/network/TestLatency.java +++ b/jme3-examples/src/main/java/jme3test/network/TestLatency.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -79,6 +79,7 @@ public class TestLatency { client.start(); client.addMessageListener(new MessageListener(){ + @Override public void messageReceived(Client source, Message m) { TimestampMessage timeMsg = (TimestampMessage) m; @@ -103,6 +104,7 @@ public class TestLatency { }, TimestampMessage.class); server.addMessageListener(new MessageListener(){ + @Override public void messageReceived(HostedConnection source, Message m) { TimestampMessage timeMsg = (TimestampMessage) m; TimestampMessage outMsg = new TimestampMessage(timeMsg.timeSent, getTime()); diff --git a/jme3-examples/src/main/java/jme3test/network/TestMessages.java b/jme3-examples/src/main/java/jme3test/network/TestMessages.java index 361f097ec..b67476ae1 100644 --- a/jme3-examples/src/main/java/jme3test/network/TestMessages.java +++ b/jme3-examples/src/main/java/jme3test/network/TestMessages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,6 +48,7 @@ public class TestMessages { } private static class ServerPingResponder implements MessageListener { + @Override public void messageReceived(HostedConnection source, com.jme3.network.Message message) { if (message instanceof PingMessage){ System.out.println("Server: Received ping message!"); @@ -57,6 +58,7 @@ public class TestMessages { } private static class ClientPingResponder implements MessageListener { + @Override public void messageReceived(Client source, com.jme3.network.Message message) { if (message instanceof PongMessage){ System.out.println("Client: Received pong message!"); diff --git a/jme3-examples/src/main/java/jme3test/network/TestNetworkStress.java b/jme3-examples/src/main/java/jme3test/network/TestNetworkStress.java index dab33c597..13bf63c8e 100644 --- a/jme3-examples/src/main/java/jme3test/network/TestNetworkStress.java +++ b/jme3-examples/src/main/java/jme3test/network/TestNetworkStress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,11 +39,13 @@ import java.util.logging.Logger; public class TestNetworkStress implements ConnectionListener { + @Override public void connectionAdded(Server server, HostedConnection conn) { System.out.println("Client Connected: "+conn.getId()); //conn.close("goodbye"); } + @Override public void connectionRemoved(Server server, HostedConnection conn) { } diff --git a/jme3-examples/src/main/java/jme3test/network/TestRemoteCall.java b/jme3-examples/src/main/java/jme3test/network/TestRemoteCall.java index 4335bb325..208af7b68 100644 --- a/jme3-examples/src/main/java/jme3test/network/TestRemoteCall.java +++ b/jme3-examples/src/main/java/jme3test/network/TestRemoteCall.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,12 +66,14 @@ public class TestRemoteCall { } public static class ServerAccessImpl implements ServerAccess { + @Override public boolean attachChild(String model) { if (model == null) throw new RuntimeException("Cannot be null. .. etc"); final String finalModel = model; serverApp.enqueue(new Callable() { + @Override public Void call() throws Exception { Spatial spatial = serverApp.getAssetManager().loadModel(finalModel); serverApp.getRootNode().attachChild(spatial); diff --git a/jme3-examples/src/main/java/jme3test/network/TestSerialization.java b/jme3-examples/src/main/java/jme3test/network/TestSerialization.java index cbdeb6697..8e7ef59da 100644 --- a/jme3-examples/src/main/java/jme3test/network/TestSerialization.java +++ b/jme3-examples/src/main/java/jme3test/network/TestSerialization.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -121,6 +121,7 @@ public class TestSerialization implements MessageListener { } } + @Override public void messageReceived(HostedConnection source, Message m) { TestSerializationMessage cm = (TestSerializationMessage) m; System.out.println(cm.z); diff --git a/jme3-examples/src/main/java/jme3test/niftygui/TestNiftyExamples.java b/jme3-examples/src/main/java/jme3test/niftygui/TestNiftyExamples.java index 19246e4f5..9d7019b29 100644 --- a/jme3-examples/src/main/java/jme3test/niftygui/TestNiftyExamples.java +++ b/jme3-examples/src/main/java/jme3test/niftygui/TestNiftyExamples.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,7 @@ public class TestNiftyExamples extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { NiftyJmeDisplay niftyDisplay = new NiftyJmeDisplay(assetManager, inputManager, diff --git a/jme3-examples/src/main/java/jme3test/niftygui/TestNiftyToMesh.java b/jme3-examples/src/main/java/jme3test/niftygui/TestNiftyToMesh.java index 9ec915f53..bac441214 100644 --- a/jme3-examples/src/main/java/jme3test/niftygui/TestNiftyToMesh.java +++ b/jme3-examples/src/main/java/jme3test/niftygui/TestNiftyToMesh.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,6 +55,7 @@ public class TestNiftyToMesh extends SimpleApplication{ app.start(); } + @Override public void simpleInitApp() { ViewPort niftyView = renderManager.createPreView("NiftyView", new Camera(1024, 768)); niftyView.setClearFlags(true, true, true); diff --git a/jme3-examples/src/main/java/jme3test/opencl/TestMultipleApplications.java b/jme3-examples/src/main/java/jme3test/opencl/TestMultipleApplications.java index d0045ff20..d5ddf9e4b 100644 --- a/jme3-examples/src/main/java/jme3test/opencl/TestMultipleApplications.java +++ b/jme3-examples/src/main/java/jme3test/opencl/TestMultipleApplications.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2016 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -74,6 +74,7 @@ public class TestMultipleApplications extends SimpleApplication { settings.setRenderer(AppSettings.JOGL_OPENGL_FORWARD_COMPATIBLE); for (int i=0; i<2; ++i) { new Thread() { + @Override public void run() { if (currentDeviceIndex == -1) { return; diff --git a/jme3-examples/src/main/java/jme3test/post/BloomUI.java b/jme3-examples/src/main/java/jme3test/post/BloomUI.java index f4878c197..a4da8b12f 100644 --- a/jme3-examples/src/main/java/jme3test/post/BloomUI.java +++ b/jme3-examples/src/main/java/jme3test/post/BloomUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -64,6 +64,7 @@ public class BloomUI { AnalogListener anl = new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { if (name.equals("blurScaleUp")) { filter.setBlurScale(filter.getBlurScale() + 0.01f); diff --git a/jme3-examples/src/main/java/jme3test/post/LightScatteringUI.java b/jme3-examples/src/main/java/jme3test/post/LightScatteringUI.java index 4cf252716..10545be03 100644 --- a/jme3-examples/src/main/java/jme3test/post/LightScatteringUI.java +++ b/jme3-examples/src/main/java/jme3test/post/LightScatteringUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public class LightScatteringUI { ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("sampleUp")) { @@ -97,6 +98,7 @@ public class LightScatteringUI { AnalogListener anl = new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { if (name.equals("blurStartUp")) { diff --git a/jme3-examples/src/main/java/jme3test/post/SSAOUI.java b/jme3-examples/src/main/java/jme3test/post/SSAOUI.java index c736b2598..7948a2840 100644 --- a/jme3-examples/src/main/java/jme3test/post/SSAOUI.java +++ b/jme3-examples/src/main/java/jme3test/post/SSAOUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,6 +77,7 @@ public class SSAOUI { ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("toggleUseAO") && keyPressed) { @@ -102,6 +103,7 @@ public class SSAOUI { AnalogListener anl = new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { if (name.equals("sampleRadiusUp")) { filter.setSampleRadius(filter.getSampleRadius() + 0.01f); diff --git a/jme3-examples/src/main/java/jme3test/post/TestBloom.java b/jme3-examples/src/main/java/jme3test/post/TestBloom.java index 9572568ea..ba3943756 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestBloom.java +++ b/jme3-examples/src/main/java/jme3test/post/TestBloom.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -148,6 +148,7 @@ public class TestBloom extends SimpleApplication { ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("toggle") && keyPressed) { if(active){ diff --git a/jme3-examples/src/main/java/jme3test/post/TestCrossHatch.java b/jme3-examples/src/main/java/jme3test/post/TestCrossHatch.java index 5cc3669ae..4dc576179 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestCrossHatch.java +++ b/jme3-examples/src/main/java/jme3test/post/TestCrossHatch.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -143,6 +143,7 @@ public class TestCrossHatch extends SimpleApplication { ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("toggle") && keyPressed) { if(active){ diff --git a/jme3-examples/src/main/java/jme3test/post/TestDepthOfField.java b/jme3-examples/src/main/java/jme3test/post/TestDepthOfField.java index 6fee9e404..71fc093b9 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestDepthOfField.java +++ b/jme3-examples/src/main/java/jme3test/post/TestDepthOfField.java @@ -89,6 +89,7 @@ public class TestDepthOfField extends SimpleApplication { inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (isPressed) { if (name.equals("toggle")) { @@ -101,6 +102,7 @@ public class TestDepthOfField extends SimpleApplication { }, "toggle"); inputManager.addListener(new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { if (name.equals("blurScaleUp")) { dofFilter.setBlurScale(dofFilter.getBlurScale() + 0.01f); diff --git a/jme3-examples/src/main/java/jme3test/post/TestFog.java b/jme3-examples/src/main/java/jme3test/post/TestFog.java index 3ecac03a0..d52ba5533 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestFog.java +++ b/jme3-examples/src/main/java/jme3test/post/TestFog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,6 +66,7 @@ public class TestFog extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { this.flyCam.setMoveSpeed(50); Node mainScene=new Node(); @@ -113,6 +114,7 @@ public class TestFog extends SimpleApplication { ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("toggle") && keyPressed) { if(enabled){ @@ -129,6 +131,7 @@ public class TestFog extends SimpleApplication { AnalogListener anl=new AnalogListener() { + @Override public void onAnalog(String name, float isPressed, float tpf) { if(name.equals("DensityUp")){ fog.setFogDensity(fog.getFogDensity()+0.001f); diff --git a/jme3-examples/src/main/java/jme3test/post/TestMultiRenderTarget.java b/jme3-examples/src/main/java/jme3test/post/TestMultiRenderTarget.java index ccb073a33..96b6fbefb 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestMultiRenderTarget.java +++ b/jme3-examples/src/main/java/jme3test/post/TestMultiRenderTarget.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -121,6 +121,7 @@ public class TestMultiRenderTarget extends SimpleApplication implements ScenePro FastMath.sin(angle)*3f)); } } + @Override public void initialize(RenderManager rm, ViewPort vp) { reshape(vp, vp.getCamera().getWidth(), vp.getCamera().getHeight()); viewPort.setOutputFrameBuffer(fb); @@ -133,6 +134,7 @@ public class TestMultiRenderTarget extends SimpleApplication implements ScenePro guiNode.updateGeometricState(); } + @Override public void reshape(ViewPort vp, int w, int h) { diffuseData = new Texture2D(w, h, Format.RGBA8); normalData = new Texture2D(w, h, Format.RGBA8); @@ -211,10 +213,12 @@ public class TestMultiRenderTarget extends SimpleApplication implements ScenePro */ } + @Override public boolean isInitialized() { return diffuseData != null; } + @Override public void preFrame(float tpf) { Matrix4f inverseViewProj = cam.getViewProjectionMatrix().invert(); mat.setMatrix4("ViewProjectionMatrixInverse", inverseViewProj); @@ -222,13 +226,16 @@ public class TestMultiRenderTarget extends SimpleApplication implements ScenePro renderManager.setForcedTechnique("GBuf"); } + @Override public void postQueue(RenderQueue rq) { } + @Override public void postFrame(FrameBuffer out) { renderManager.setForcedTechnique(techOrig); } + @Override public void cleanup() { } diff --git a/jme3-examples/src/main/java/jme3test/post/TestMultiViewsFilters.java b/jme3-examples/src/main/java/jme3test/post/TestMultiViewsFilters.java index adbc036c7..cd5bffc4d 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestMultiViewsFilters.java +++ b/jme3-examples/src/main/java/jme3test/post/TestMultiViewsFilters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,6 +55,7 @@ public class TestMultiViewsFilters extends SimpleApplication { } private boolean filterEnabled = true; + @Override public void simpleInitApp() { // create the geometry and attach it Geometry teaGeom = (Geometry) assetManager.loadModel("Models/Teapot/Teapot.obj"); @@ -165,6 +166,7 @@ public class TestMultiViewsFilters extends SimpleApplication { inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (name.equals("press") && isPressed) { if (filterEnabled) { diff --git a/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java b/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java index f2aa6032e..c83ecdf84 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java +++ b/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,6 +66,7 @@ public class TestMultiplesFilters extends SimpleApplication { FilterPostProcessor fpp; boolean en = true; + @Override public void simpleInitApp() { this.flyCam.setMoveSpeed(10); cam.setLocation(new Vector3f(6.0344796f, 1.5054002f, 55.572033f)); @@ -117,6 +118,7 @@ public class TestMultiplesFilters extends SimpleApplication { inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if ("toggleSSAO".equals(name) && isPressed) { if (ssaoFilter.isEnabled()) { diff --git a/jme3-examples/src/main/java/jme3test/post/TestPostFilters.java b/jme3-examples/src/main/java/jme3test/post/TestPostFilters.java index 7bd807073..128258b7f 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestPostFilters.java +++ b/jme3-examples/src/main/java/jme3test/post/TestPostFilters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -159,6 +159,7 @@ public class TestPostFilters extends SimpleApplication implements ActionListener } + @Override public void onAction(String name, boolean value, float tpf) { if (name.equals("fadein") && value) { fade.fadeIn(); diff --git a/jme3-examples/src/main/java/jme3test/post/TestPostFiltersCompositing.java b/jme3-examples/src/main/java/jme3test/post/TestPostFiltersCompositing.java index 5a2353e38..b26b8fd66 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestPostFiltersCompositing.java +++ b/jme3-examples/src/main/java/jme3test/post/TestPostFiltersCompositing.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,6 +61,7 @@ public class TestPostFiltersCompositing extends SimpleApplication { } + @Override public void simpleInitApp() { this.flyCam.setMoveSpeed(10); cam.setLocation(new Vector3f(0.028406568f, 2.015769f, 7.386517f)); diff --git a/jme3-examples/src/main/java/jme3test/post/TestPosterization.java b/jme3-examples/src/main/java/jme3test/post/TestPosterization.java index c35236bc2..8e6fb6a6e 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestPosterization.java +++ b/jme3-examples/src/main/java/jme3test/post/TestPosterization.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -121,6 +121,7 @@ public class TestPosterization extends SimpleApplication { ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("toggle") && keyPressed) { pf.setEnabled(!pf.isEnabled()); diff --git a/jme3-examples/src/main/java/jme3test/post/TestRenderToMemory.java b/jme3-examples/src/main/java/jme3test/post/TestRenderToMemory.java index c46448efb..f37069897 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestRenderToMemory.java +++ b/jme3-examples/src/main/java/jme3test/post/TestRenderToMemory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -138,6 +138,7 @@ public class TestRenderToMemory extends SimpleApplication implements SceneProces public void createDisplayFrame(){ SwingUtilities.invokeLater(new Runnable(){ + @Override public void run(){ JFrame frame = new JFrame("Render Display"); display = new ImageDisplay(); @@ -145,6 +146,7 @@ public class TestRenderToMemory extends SimpleApplication implements SceneProces frame.getContentPane().add(display); frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); frame.addWindowListener(new WindowAdapter(){ + @Override public void windowClosed(WindowEvent e){ stop(); } @@ -229,19 +231,24 @@ public class TestRenderToMemory extends SimpleApplication implements SceneProces offBox.updateGeometricState(); } + @Override public void initialize(RenderManager rm, ViewPort vp) { } + @Override public void reshape(ViewPort vp, int w, int h) { } + @Override public boolean isInitialized() { return true; } + @Override public void preFrame(float tpf) { } + @Override public void postQueue(RenderQueue rq) { } @@ -249,10 +256,12 @@ public class TestRenderToMemory extends SimpleApplication implements SceneProces * Update the CPU image's contents after the scene has * been rendered to the framebuffer. */ + @Override public void postFrame(FrameBuffer out) { updateImageContents(); } + @Override public void cleanup() { } diff --git a/jme3-examples/src/main/java/jme3test/post/TestToneMapFilter.java b/jme3-examples/src/main/java/jme3test/post/TestToneMapFilter.java index 2d1295800..b88682965 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestToneMapFilter.java +++ b/jme3-examples/src/main/java/jme3test/post/TestToneMapFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -99,6 +99,7 @@ public class TestToneMapFilter extends SimpleApplication { ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("toggle") && keyPressed) { if (enabled) { @@ -116,6 +117,7 @@ public class TestToneMapFilter extends SimpleApplication { AnalogListener anl = new AnalogListener() { + @Override public void onAnalog(String name, float isPressed, float tpf) { if (name.equals("WhitePointUp")) { whitePointLog += tpf * 1.0; diff --git a/jme3-examples/src/main/java/jme3test/post/TestTransparentCartoonEdge.java b/jme3-examples/src/main/java/jme3test/post/TestTransparentCartoonEdge.java index 46ba0ac49..a5f0c8265 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestTransparentCartoonEdge.java +++ b/jme3-examples/src/main/java/jme3test/post/TestTransparentCartoonEdge.java @@ -22,6 +22,7 @@ public class TestTransparentCartoonEdge extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { renderManager.setAlphaToCoverage(true); cam.setLocation(new Vector3f(0.14914267f, 0.58147097f, 4.7686534f)); diff --git a/jme3-examples/src/main/java/jme3test/post/TestTransparentSSAO.java b/jme3-examples/src/main/java/jme3test/post/TestTransparentSSAO.java index 310cc2de1..20a805fc8 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestTransparentSSAO.java +++ b/jme3-examples/src/main/java/jme3test/post/TestTransparentSSAO.java @@ -21,6 +21,7 @@ public class TestTransparentSSAO extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { renderManager.setAlphaToCoverage(true); cam.setLocation(new Vector3f(0.14914267f, 0.58147097f, 4.7686534f)); diff --git a/jme3-examples/src/main/java/jme3test/renderer/TestBlendEquations.java b/jme3-examples/src/main/java/jme3test/renderer/TestBlendEquations.java index 04eded427..4af730a20 100644 --- a/jme3-examples/src/main/java/jme3test/renderer/TestBlendEquations.java +++ b/jme3-examples/src/main/java/jme3test/renderer/TestBlendEquations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,6 +61,7 @@ public class TestBlendEquations extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { cam.setLocation(new Vector3f(0f, 0.5f, 3f)); viewPort.setBackgroundColor(ColorRGBA.LightGray); diff --git a/jme3-examples/src/main/java/jme3test/renderer/TestDepthFuncChange.java b/jme3-examples/src/main/java/jme3test/renderer/TestDepthFuncChange.java index 9f4f4cef8..3c00f40ad 100644 --- a/jme3-examples/src/main/java/jme3test/renderer/TestDepthFuncChange.java +++ b/jme3-examples/src/main/java/jme3test/renderer/TestDepthFuncChange.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,7 @@ public class TestDepthFuncChange extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { viewPort.setBackgroundColor(ColorRGBA.DarkGray); flyCam.setMoveSpeed(20); diff --git a/jme3-examples/src/main/java/jme3test/renderer/TestDepthStencil.java b/jme3-examples/src/main/java/jme3test/renderer/TestDepthStencil.java index 77528893a..29c76631b 100644 --- a/jme3-examples/src/main/java/jme3test/renderer/TestDepthStencil.java +++ b/jme3-examples/src/main/java/jme3test/renderer/TestDepthStencil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2014 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -110,6 +110,7 @@ public class TestDepthStencil extends SimpleApplication { inputManager.addMapping("toggle", new KeyTrigger(KeyInput.KEY_SPACE)); ActionListener acl = new ActionListener() { + @Override public void onAction(String name, boolean keyPressed, float tpf) { if (name.equals("toggle") && keyPressed) { if (enableStencil) { diff --git a/jme3-examples/src/main/java/jme3test/renderer/TestInconsistentCompareDetection.java b/jme3-examples/src/main/java/jme3test/renderer/TestInconsistentCompareDetection.java index c1f99b35d..dbb2eaad8 100644 --- a/jme3-examples/src/main/java/jme3test/renderer/TestInconsistentCompareDetection.java +++ b/jme3-examples/src/main/java/jme3test/renderer/TestInconsistentCompareDetection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2014 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -92,6 +92,7 @@ public class TestInconsistentCompareDetection extends SimpleApplication { } Thread evilThread = new Thread(new Runnable() { + @Override public void run() { try { Thread.sleep(1000); diff --git a/jme3-examples/src/main/java/jme3test/renderer/TestMultiViews.java b/jme3-examples/src/main/java/jme3test/renderer/TestMultiViews.java index b098eaddd..ae8e51dca 100644 --- a/jme3-examples/src/main/java/jme3test/renderer/TestMultiViews.java +++ b/jme3-examples/src/main/java/jme3test/renderer/TestMultiViews.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -47,6 +47,7 @@ public class TestMultiViews extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { // create the geometry and attach it Geometry teaGeom = (Geometry) assetManager.loadModel("Models/Teapot/Teapot.obj"); diff --git a/jme3-examples/src/main/java/jme3test/renderer/TestParallelProjection.java b/jme3-examples/src/main/java/jme3test/renderer/TestParallelProjection.java index 5fc7ab099..990da8015 100644 --- a/jme3-examples/src/main/java/jme3test/renderer/TestParallelProjection.java +++ b/jme3-examples/src/main/java/jme3test/renderer/TestParallelProjection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -50,6 +50,7 @@ public class TestParallelProjection extends SimpleApplication implements Analog app.start(); } + @Override public void simpleInitApp() { Geometry teaGeom = (Geometry) assetManager.loadModel("Models/Teapot/Teapot.obj"); @@ -70,6 +71,7 @@ public class TestParallelProjection extends SimpleApplication implements Analog inputManager.addMapping("Size-", new KeyTrigger(KeyInput.KEY_S)); } + @Override public void onAnalog(String name, float value, float tpf) { // Instead of moving closer/farther to object, we zoom in/out. if (name.equals("Size-")) diff --git a/jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java b/jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java index 2567d94fa..b3bc05d90 100644 --- a/jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java +++ b/jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,6 +62,7 @@ public class TestSceneLoading extends SimpleApplication { sphere.setLocalTranslation(cam.getLocation()); } + @Override public void simpleInitApp() { this.flyCam.setMoveSpeed(10); diff --git a/jme3-examples/src/main/java/jme3test/scene/TestUserData.java b/jme3-examples/src/main/java/jme3test/scene/TestUserData.java index 59cf6d374..b482f1906 100644 --- a/jme3-examples/src/main/java/jme3test/scene/TestUserData.java +++ b/jme3-examples/src/main/java/jme3test/scene/TestUserData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ public class TestUserData extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { Node scene = (Node) assetManager.loadModel("Scenes/DotScene/DotScene.scene"); System.out.println("Scene: " + scene); diff --git a/jme3-examples/src/main/java/jme3test/stress/TestBatchLod.java b/jme3-examples/src/main/java/jme3test/stress/TestBatchLod.java index 08ef772a3..cdf193c0b 100644 --- a/jme3-examples/src/main/java/jme3test/stress/TestBatchLod.java +++ b/jme3-examples/src/main/java/jme3test/stress/TestBatchLod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -50,6 +50,7 @@ public class TestBatchLod extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { // inputManager.registerKeyBinding("USELOD", KeyInput.KEY_L); diff --git a/jme3-examples/src/main/java/jme3test/stress/TestLeakingGL.java b/jme3-examples/src/main/java/jme3test/stress/TestLeakingGL.java index bd2bd485b..24861464a 100644 --- a/jme3-examples/src/main/java/jme3test/stress/TestLeakingGL.java +++ b/jme3-examples/src/main/java/jme3test/stress/TestLeakingGL.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,6 +59,7 @@ public class TestLeakingGL extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { original = new Sphere(4, 4, 1); original.setStatic(); diff --git a/jme3-examples/src/main/java/jme3test/stress/TestLodGeneration.java b/jme3-examples/src/main/java/jme3test/stress/TestLodGeneration.java index 5400e98d8..10094dfcb 100644 --- a/jme3-examples/src/main/java/jme3test/stress/TestLodGeneration.java +++ b/jme3-examples/src/main/java/jme3test/stress/TestLodGeneration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,6 +66,7 @@ public class TestLodGeneration extends SimpleApplication { private ScheduledThreadPoolExecutor exec = new ScheduledThreadPoolExecutor(5); private AnimChannel ch; + @Override public void simpleInitApp() { DirectionalLight dl = new DirectionalLight(); @@ -124,6 +125,7 @@ public class TestLodGeneration extends SimpleApplication { guiNode.attachChild(hudText); inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (isPressed) { if (name.equals("plus")) { @@ -211,12 +213,14 @@ public class TestLodGeneration extends SimpleApplication { private void makeLod(final LodGenerator.TriangleReductionMethod method, final float value, final int ll) { exec.execute(new Runnable() { + @Override public void run() { for (final Geometry geometry : listGeoms) { LodGenerator lODGenerator = new LodGenerator(geometry); final VertexBuffer[] lods = lODGenerator.computeLods(method, value); enqueue(new Callable() { + @Override public Void call() throws Exception { geometry.getMesh().setLodLevels(lods); lodLevel = 0; diff --git a/jme3-examples/src/main/java/jme3test/stress/TestLodStress.java b/jme3-examples/src/main/java/jme3test/stress/TestLodStress.java index 21b8e9d53..8fa033a5e 100644 --- a/jme3-examples/src/main/java/jme3test/stress/TestLodStress.java +++ b/jme3-examples/src/main/java/jme3test/stress/TestLodStress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -50,6 +50,7 @@ public class TestLodStress extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { DirectionalLight dl = new DirectionalLight(); dl.setDirection(new Vector3f(-1,-1,-1).normalizeLocal()); diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainGridAlphaMapTest.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainGridAlphaMapTest.java index cf5e9d75c..737fe33fd 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainGridAlphaMapTest.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainGridAlphaMapTest.java @@ -182,9 +182,11 @@ public class TerrainGridAlphaMapTest extends SimpleApplication { } terrain.addListener(new TerrainGridListener() { + @Override public void gridMoved(Vector3f newCenter) { } + @Override public void tileAttached(Vector3f cell, TerrainQuad quad) { Texture alpha = null; try { @@ -200,6 +202,7 @@ public class TerrainGridAlphaMapTest extends SimpleApplication { updateMarkerElevations(); } + @Override public void tileDetached(Vector3f cell, TerrainQuad quad) { if (usePhysics) { if (quad.getControl(RigidBodyControl.class) != null) { diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainGridSerializationTest.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainGridSerializationTest.java index b20357ded..8cf5a92d0 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainGridSerializationTest.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainGridSerializationTest.java @@ -74,9 +74,11 @@ public class TerrainGridSerializationTest extends SimpleApplication { terrain.addListener(new TerrainGridListener() { + @Override public void gridMoved(Vector3f newCenter) { } + @Override public void tileAttached(Vector3f cell, TerrainQuad quad) { //workaround for bugged test j3o's while(quad.getControl(RigidBodyControl.class)!=null){ @@ -86,6 +88,7 @@ public class TerrainGridSerializationTest extends SimpleApplication { bulletAppState.getPhysicsSpace().add(quad); } + @Override public void tileDetached(Vector3f cell, TerrainQuad quad) { if (quad.getControl(RigidBodyControl.class) != null) { bulletAppState.getPhysicsSpace().remove(quad); diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainGridTest.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainGridTest.java index 1781b7106..425190d1d 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainGridTest.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainGridTest.java @@ -91,6 +91,7 @@ public class TerrainGridTest extends SimpleApplication { this.terrain = new TerrainGrid("terrain", 65, 257, new ImageTileLoader(assetManager, new Namer() { + @Override public String getName(int x, int y) { return "Scenes/TerrainMountains/terrain_" + x + "_" + y + ".png"; } @@ -130,9 +131,11 @@ public class TerrainGridTest extends SimpleApplication { terrain.addListener(new TerrainGridListener() { + @Override public void gridMoved(Vector3f newCenter) { } + @Override public void tileAttached(Vector3f cell, TerrainQuad quad) { while(quad.getControl(RigidBodyControl.class)!=null){ quad.removeControl(RigidBodyControl.class); @@ -141,6 +144,7 @@ public class TerrainGridTest extends SimpleApplication { bulletAppState.getPhysicsSpace().add(quad); } + @Override public void tileDetached(Vector3f cell, TerrainQuad quad) { if (quad.getControl(RigidBodyControl.class) != null) { bulletAppState.getPhysicsSpace().remove(quad); diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainGridTileLoaderTest.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainGridTileLoaderTest.java index 3485e4dc8..114b1068e 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainGridTileLoaderTest.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainGridTileLoaderTest.java @@ -136,9 +136,11 @@ public class TerrainGridTileLoaderTest extends SimpleApplication { terrain.addListener(new TerrainGridListener() { + @Override public void gridMoved(Vector3f newCenter) { } + @Override public void tileAttached(Vector3f cell, TerrainQuad quad) { while(quad.getControl(RigidBodyControl.class)!=null){ quad.removeControl(RigidBodyControl.class); @@ -147,6 +149,7 @@ public class TerrainGridTileLoaderTest extends SimpleApplication { bulletAppState.getPhysicsSpace().add(quad); } + @Override public void tileDetached(Vector3f cell, TerrainQuad quad) { if (quad.getControl(RigidBodyControl.class) != null) { bulletAppState.getPhysicsSpace().remove(quad); diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainTest.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainTest.java index 5da9d9d2b..0cf8ed7a2 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainTest.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -189,6 +189,7 @@ public class TerrainTest extends SimpleApplication { } private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean pressed, float tpf) { if (name.equals("wireframe") && !pressed) { wireframe = !wireframe; diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestAdvanced.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestAdvanced.java index afd83ac31..33964af1b 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestAdvanced.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestAdvanced.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -251,6 +251,7 @@ public class TerrainTestAdvanced extends SimpleApplication { } private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean pressed, float tpf) { if (name.equals("wireframe") && !pressed) { wireframe = !wireframe; diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestAndroid.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestAndroid.java index d5b74b291..d1c525576 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestAndroid.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestAndroid.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -170,6 +170,7 @@ public class TerrainTestAndroid extends SimpleApplication { } private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean pressed, float tpf) { if (name.equals("wireframe") && !pressed) { wireframe = !wireframe; diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestCollision.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestCollision.java index faa67fd13..6b6fe8cda 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestCollision.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestCollision.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -248,6 +248,7 @@ public class TerrainTestCollision extends SimpleApplication { private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String binding, boolean keyPressed, float tpf) { if (binding.equals("wireframe") && !keyPressed) { wireframe = !wireframe; diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestModifyHeight.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestModifyHeight.java index b68761593..de371ccb9 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestModifyHeight.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestModifyHeight.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -193,6 +193,7 @@ public class TerrainTestModifyHeight extends SimpleApplication { } private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean pressed, float tpf) { if (name.equals("wireframe") && !pressed) { wireframe = !wireframe; diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestReadWrite.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestReadWrite.java index 861096298..313188e60 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestReadWrite.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestReadWrite.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -195,6 +195,7 @@ public class TerrainTestReadWrite extends SimpleApplication { } private ActionListener saveActionListener = new ActionListener() { + @Override public void onAction(String name, boolean pressed, float tpf) { if (name.equals("save") && !pressed) { @@ -267,6 +268,7 @@ public class TerrainTestReadWrite extends SimpleApplication { } private ActionListener loadActionListener = new ActionListener() { + @Override public void onAction(String name, boolean pressed, float tpf) { if (name.equals("load") && !pressed) { loadTerrain(); @@ -275,6 +277,7 @@ public class TerrainTestReadWrite extends SimpleApplication { }; private ActionListener cloneActionListener = new ActionListener() { + @Override public void onAction(String name, boolean pressed, float tpf) { if (name.equals("clone") && !pressed) { diff --git a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestTile.java b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestTile.java index 454846b8c..20f279fa1 100644 --- a/jme3-examples/src/main/java/jme3test/terrain/TerrainTestTile.java +++ b/jme3-examples/src/main/java/jme3test/terrain/TerrainTestTile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -147,6 +147,7 @@ public class TerrainTestTile extends SimpleApplication { } private ActionListener actionListener = new ActionListener() { + @Override public void onAction(String name, boolean pressed, float tpf) { if (name.equals("wireframe") && !pressed) { wireframe = !wireframe; @@ -231,6 +232,7 @@ public class TerrainTestTile extends SimpleApplication { * 1 3 * 2 4 */ + @Override public TerrainQuad getRightQuad(TerrainQuad center) { //System.out.println("lookup neighbour"); if (center == terrain1) @@ -245,6 +247,7 @@ public class TerrainTestTile extends SimpleApplication { * 1 3 * 2 4 */ + @Override public TerrainQuad getLeftQuad(TerrainQuad center) { //System.out.println("lookup neighbour"); if (center == terrain3) @@ -259,6 +262,7 @@ public class TerrainTestTile extends SimpleApplication { * 1 3 * 2 4 */ + @Override public TerrainQuad getTopQuad(TerrainQuad center) { //System.out.println("lookup neighbour"); if (center == terrain2) @@ -273,6 +277,7 @@ public class TerrainTestTile extends SimpleApplication { * 1 3 * 2 4 */ + @Override public TerrainQuad getDownQuad(TerrainQuad center) { //System.out.println("lookup neighbour"); if (center == terrain1) @@ -283,69 +288,84 @@ public class TerrainTestTile extends SimpleApplication { return null; } + @Override public float getHeight(Vector2f xz) { // you will have to offset the coordinate for each terrain, to center on it throw new UnsupportedOperationException("Not supported yet."); } + @Override public Vector3f getNormal(Vector2f xz) { // you will have to offset the coordinate for each terrain, to center on it throw new UnsupportedOperationException("Not supported yet."); } + @Override public float getHeightmapHeight(Vector2f xz) { // you will have to offset the coordinate for each terrain, to center on it throw new UnsupportedOperationException("Not supported yet."); } + @Override public void setHeight(Vector2f xzCoordinate, float height) { // you will have to offset the coordinate for each terrain, to center on it throw new UnsupportedOperationException("Not supported yet."); } + @Override public void setHeight(List xz, List height) { // you will have to offset the coordinate for each terrain, to center on it throw new UnsupportedOperationException("Not supported yet."); } + @Override public void adjustHeight(Vector2f xzCoordinate, float delta) { // you will have to offset the coordinate for each terrain, to center on it throw new UnsupportedOperationException("Not supported yet."); } + @Override public void adjustHeight(List xz, List height) { // you will have to offset the coordinate for each terrain, to center on it throw new UnsupportedOperationException("Not supported yet."); } + @Override public float[] getHeightMap() { throw new UnsupportedOperationException("Not supported yet."); } + @Override public int getMaxLod() { throw new UnsupportedOperationException("Not supported yet."); } + @Override public void setLocked(boolean locked) { throw new UnsupportedOperationException("Not supported yet."); } + @Override public void generateEntropy(ProgressMonitor monitor) { throw new UnsupportedOperationException("Not supported yet."); } + @Override public Material getMaterial() { throw new UnsupportedOperationException("Not supported yet."); } + @Override public Material getMaterial(Vector3f worldLocation) { throw new UnsupportedOperationException("Not supported yet."); } + @Override public int getTerrainSize() { throw new UnsupportedOperationException("Not supported yet."); } + @Override public int getNumMajorSubdivisions() { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/jme3-examples/src/main/java/jme3test/texture/TestSkyLoading.java b/jme3-examples/src/main/java/jme3test/texture/TestSkyLoading.java index 7991bd067..21c1b590b 100644 --- a/jme3-examples/src/main/java/jme3test/texture/TestSkyLoading.java +++ b/jme3-examples/src/main/java/jme3test/texture/TestSkyLoading.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,6 +44,7 @@ public class TestSkyLoading extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { Texture west = assetManager.loadTexture("Textures/Sky/Lagoon/lagoon_west.jpg"); Texture east = assetManager.loadTexture("Textures/Sky/Lagoon/lagoon_east.jpg"); diff --git a/jme3-examples/src/main/java/jme3test/tools/TestSaveGame.java b/jme3-examples/src/main/java/jme3test/tools/TestSaveGame.java index 8e90d181a..e0200247c 100644 --- a/jme3-examples/src/main/java/jme3test/tools/TestSaveGame.java +++ b/jme3-examples/src/main/java/jme3test/tools/TestSaveGame.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -49,6 +49,7 @@ public class TestSaveGame extends SimpleApplication { public void simpleUpdate(float tpf) { } + @Override public void simpleInitApp() { //node that is used to store player data diff --git a/jme3-examples/src/main/java/jme3test/water/TestPostWater.java b/jme3-examples/src/main/java/jme3test/water/TestPostWater.java index 3d650c170..0f3531dbb 100644 --- a/jme3-examples/src/main/java/jme3test/water/TestPostWater.java +++ b/jme3-examples/src/main/java/jme3test/water/TestPostWater.java @@ -166,6 +166,7 @@ public class TestPostWater extends SimpleApplication { viewPort.addProcessor(fpp); inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if (isPressed) { if (name.equals("foam1")) { diff --git a/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java b/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java index d5a6df5f2..8437290e5 100644 --- a/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java +++ b/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -58,6 +58,7 @@ public class TestPostWaterLake extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { this.flyCam.setMoveSpeed(10); cam.setLocation(new Vector3f(-27.0f, 1.0f, 75.0f)); @@ -112,6 +113,7 @@ public class TestPostWaterLake extends SimpleApplication { inputManager.addListener(new ActionListener() { + @Override public void onAction(String name, boolean isPressed, float tpf) { if(isPressed){ if(water.isUseHQShoreline()){ diff --git a/jme3-examples/src/main/java/jme3test/water/TestSceneWater.java b/jme3-examples/src/main/java/jme3test/water/TestSceneWater.java index 4e0d8d6fc..62584e545 100644 --- a/jme3-examples/src/main/java/jme3test/water/TestSceneWater.java +++ b/jme3-examples/src/main/java/jme3test/water/TestSceneWater.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,6 +59,7 @@ public class TestSceneWater extends SimpleApplication { app.start(); } + @Override public void simpleInitApp() { this.flyCam.setMoveSpeed(10); Node mainScene=new Node(); diff --git a/jme3-examples/src/main/java/jme3test/water/TestSimpleWater.java b/jme3-examples/src/main/java/jme3test/water/TestSimpleWater.java index c8ba06fed..cbb500623 100644 --- a/jme3-examples/src/main/java/jme3test/water/TestSimpleWater.java +++ b/jme3-examples/src/main/java/jme3test/water/TestSimpleWater.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -142,6 +142,7 @@ public class TestSimpleWater extends SimpleApplication implements ActionListener waterProcessor.setLightPosition(lightPos); } + @Override public void onAction(String name, boolean value, float tpf) { if (name.equals("use_water") && value) { if (!useWater) { diff --git a/jme3-examples/src/main/java/jme3test/water/WaterUI.java b/jme3-examples/src/main/java/jme3test/water/WaterUI.java index c09732089..cd2d0dfc5 100644 --- a/jme3-examples/src/main/java/jme3test/water/WaterUI.java +++ b/jme3-examples/src/main/java/jme3test/water/WaterUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -92,6 +92,7 @@ public class WaterUI { AnalogListener anl = new AnalogListener() { + @Override public void onAnalog(String name, float value, float tpf) { if (name.equals("transparencyUp")) { processor.setWaterTransparency(processor.getWaterTransparency()+0.001f); diff --git a/jme3-ios/src/main/java/com/jme3/audio/ios/IosAL.java b/jme3-ios/src/main/java/com/jme3/audio/ios/IosAL.java index 7812dc748..0b807f5d9 100644 --- a/jme3-ios/src/main/java/com/jme3/audio/ios/IosAL.java +++ b/jme3-ios/src/main/java/com/jme3/audio/ios/IosAL.java @@ -10,44 +10,64 @@ public final class IosAL implements AL { public IosAL() { } + @Override public native String alGetString(int parameter); + @Override public native int alGenSources(); + @Override public native int alGetError(); + @Override public native void alDeleteSources(int numSources, IntBuffer sources); + @Override public native void alGenBuffers(int numBuffers, IntBuffer buffers); + @Override public native void alDeleteBuffers(int numBuffers, IntBuffer buffers); + @Override public native void alSourceStop(int source); + @Override public native void alSourcei(int source, int param, int value); + @Override public native void alBufferData(int buffer, int format, ByteBuffer data, int size, int frequency); + @Override public native void alSourcePlay(int source); + @Override public native void alSourcePause(int source); + @Override public native void alSourcef(int source, int param, float value); + @Override public native void alSource3f(int source, int param, float value1, float value2, float value3); + @Override public native int alGetSourcei(int source, int param); + @Override public native void alSourceUnqueueBuffers(int source, int numBuffers, IntBuffer buffers); + @Override public native void alSourceQueueBuffers(int source, int numBuffers, IntBuffer buffers); + @Override public native void alListener(int param, FloatBuffer data); + @Override public native void alListenerf(int param, float value); + @Override public native void alListener3f(int param, float value1, float value2, float value3); + @Override public native void alSource3i(int source, int param, int value1, int value2, int value3); } diff --git a/jme3-ios/src/main/java/com/jme3/audio/ios/IosALC.java b/jme3-ios/src/main/java/com/jme3/audio/ios/IosALC.java index f1579c9e5..775fd5581 100644 --- a/jme3-ios/src/main/java/com/jme3/audio/ios/IosALC.java +++ b/jme3-ios/src/main/java/com/jme3/audio/ios/IosALC.java @@ -8,19 +8,27 @@ public final class IosALC implements ALC { public IosALC() { } + @Override public native void createALC(); + @Override public native void destroyALC(); + @Override public native boolean isCreated(); + @Override public native String alcGetString(int parameter); + @Override public native boolean alcIsExtensionPresent(String extension); + @Override public native void alcGetInteger(int param, IntBuffer buffer, int size); + @Override public native void alcDevicePauseSOFT(); + @Override public native void alcDeviceResumeSOFT(); } diff --git a/jme3-ios/src/main/java/com/jme3/audio/ios/IosEFX.java b/jme3-ios/src/main/java/com/jme3/audio/ios/IosEFX.java index d7a569c1f..e050626ce 100644 --- a/jme3-ios/src/main/java/com/jme3/audio/ios/IosEFX.java +++ b/jme3-ios/src/main/java/com/jme3/audio/ios/IosEFX.java @@ -8,25 +8,36 @@ public class IosEFX implements EFX { public IosEFX() { } + @Override public native void alGenAuxiliaryEffectSlots(int numSlots, IntBuffer buffers); + @Override public native void alGenEffects(int numEffects, IntBuffer buffers); + @Override public native void alEffecti(int effect, int param, int value); + @Override public native void alAuxiliaryEffectSloti(int effectSlot, int param, int value); + @Override public native void alDeleteEffects(int numEffects, IntBuffer buffers); + @Override public native void alDeleteAuxiliaryEffectSlots(int numEffectSlots, IntBuffer buffers); + @Override public native void alGenFilters(int numFilters, IntBuffer buffers); + @Override public native void alFilteri(int filter, int param, int value); + @Override public native void alFilterf(int filter, int param, float value); + @Override public native void alDeleteFilters(int numFilters, IntBuffer buffers); + @Override public native void alEffectf(int effect, int param, float value); } diff --git a/jme3-ios/src/main/java/com/jme3/input/ios/IosInputHandler.java b/jme3-ios/src/main/java/com/jme3/input/ios/IosInputHandler.java index 725fe1454..f7c073341 100644 --- a/jme3-ios/src/main/java/com/jme3/input/ios/IosInputHandler.java +++ b/jme3-ios/src/main/java/com/jme3/input/ios/IosInputHandler.java @@ -107,6 +107,7 @@ public class IosInputHandler implements TouchInput { this.keyboardEventsEnabled = simulate; } + @Override public boolean isSimulateKeyboard() { return keyboardEventsEnabled; } diff --git a/jme3-ios/src/main/java/com/jme3/renderer/ios/IosGL.java b/jme3-ios/src/main/java/com/jme3/renderer/ios/IosGL.java index 826ce82a2..39f20a41a 100644 --- a/jme3-ios/src/main/java/com/jme3/renderer/ios/IosGL.java +++ b/jme3-ios/src/main/java/com/jme3/renderer/ios/IosGL.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2015 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,6 +51,7 @@ public class IosGL implements GL, GLExt, GLFbo { private final int[] temp_array = new int[16]; + @Override public void resetStats() { } @@ -116,10 +117,12 @@ public class IosGL implements GL, GLExt, GLFbo { } } + @Override public void glActiveTexture(int texture) { JmeIosGLES.glActiveTexture(texture); } + @Override public void glAttachShader(int program, int shader) { JmeIosGLES.glAttachShader(program, shader); } @@ -129,147 +132,182 @@ public class IosGL implements GL, GLExt, GLFbo { throw new UnsupportedOperationException("Today is not a good day for this"); } + @Override public void glBindBuffer(int target, int buffer) { JmeIosGLES.glBindBuffer(target, buffer); } + @Override public void glBindTexture(int target, int texture) { JmeIosGLES.glBindTexture(target, texture); } + @Override public void glBlendFunc(int sfactor, int dfactor) { JmeIosGLES.glBlendFunc(sfactor, dfactor); } + @Override public void glBlendFuncSeparate(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha) { JmeIosGLES.glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); } + @Override public void glBufferData(int target, FloatBuffer data, int usage) { JmeIosGLES.glBufferData(target, getLimitBytes(data), data, usage); } + @Override public void glBufferData(int target, ShortBuffer data, int usage) { JmeIosGLES.glBufferData(target, getLimitBytes(data), data, usage); } + @Override public void glBufferData(int target, ByteBuffer data, int usage) { JmeIosGLES.glBufferData(target, getLimitBytes(data), data, usage); } + @Override public void glBufferData(int target, long data_size, int usage) { JmeIosGLES.glBufferData(target, (int) data_size, null, usage); } + @Override public void glBufferSubData(int target, long offset, FloatBuffer data) { JmeIosGLES.glBufferSubData(target, (int) offset, getLimitBytes(data), data); } + @Override public void glBufferSubData(int target, long offset, ShortBuffer data) { JmeIosGLES.glBufferSubData(target, (int) offset, getLimitBytes(data), data); } + @Override public void glBufferSubData(int target, long offset, ByteBuffer data) { JmeIosGLES.glBufferSubData(target, (int) offset, getLimitBytes(data), data); } + @Override public void glGetBufferSubData(int target, long offset, ByteBuffer data) { throw new UnsupportedOperationException("OpenGL ES 2 does not support glGetBufferSubData"); } + @Override public void glClear(int mask) { JmeIosGLES.glClear(mask); } + @Override public void glClearColor(float red, float green, float blue, float alpha) { JmeIosGLES.glClearColor(red, green, blue, alpha); } + @Override public void glColorMask(boolean red, boolean green, boolean blue, boolean alpha) { JmeIosGLES.glColorMask(red, green, blue, alpha); } + @Override public void glCompileShader(int shader) { JmeIosGLES.glCompileShader(shader); } + @Override public void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, ByteBuffer data) { JmeIosGLES.glCompressedTexImage2D(target, level, internalformat, width, height, 0, getLimitBytes(data), data); } + @Override public void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, ByteBuffer data) { JmeIosGLES.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, getLimitBytes(data), data); } + @Override public int glCreateProgram() { return JmeIosGLES.glCreateProgram(); } + @Override public int glCreateShader(int shaderType) { return JmeIosGLES.glCreateShader(shaderType); } + @Override public void glCullFace(int mode) { JmeIosGLES.glCullFace(mode); } + @Override public void glDeleteBuffers(IntBuffer buffers) { checkLimit(buffers); int n = toArray(buffers); JmeIosGLES.glDeleteBuffers(n, temp_array, 0); } + @Override public void glDeleteProgram(int program) { JmeIosGLES.glDeleteProgram(program); } + @Override public void glDeleteShader(int shader) { JmeIosGLES.glDeleteShader(shader); } + @Override public void glDeleteTextures(IntBuffer textures) { checkLimit(textures); int n = toArray(textures); JmeIosGLES.glDeleteTextures(n, temp_array, 0); } + @Override public void glDepthFunc(int func) { JmeIosGLES.glDepthFunc(func); } + @Override public void glDepthMask(boolean flag) { JmeIosGLES.glDepthMask(flag); } + @Override public void glDepthRange(double nearVal, double farVal) { JmeIosGLES.glDepthRangef((float)nearVal, (float)farVal); } + @Override public void glDetachShader(int program, int shader) { JmeIosGLES.glDetachShader(program, shader); } + @Override public void glDisable(int cap) { JmeIosGLES.glDisable(cap); } + @Override public void glDisableVertexAttribArray(int index) { JmeIosGLES.glDisableVertexAttribArray(index); } + @Override public void glDrawArrays(int mode, int first, int count) { JmeIosGLES.glDrawArrays(mode, first, count); } + @Override public void glDrawRangeElements(int mode, int start, int end, int count, int type, long indices) { JmeIosGLES.glDrawElementsIndex(mode, count, type, (int)indices); } + @Override public void glEnable(int cap) { JmeIosGLES.glEnable(cap); } + @Override public void glEnableVertexAttribArray(int index) { JmeIosGLES.glEnableVertexAttribArray(index); } @@ -279,12 +317,14 @@ public class IosGL implements GL, GLExt, GLFbo { throw new UnsupportedOperationException("Today is not a good day for this"); } + @Override public void glGenBuffers(IntBuffer buffers) { checkLimit(buffers); JmeIosGLES.glGenBuffers(buffers.remaining(), temp_array, 0); fromArray(buffers.remaining(), temp_array, buffers); } + @Override public void glGenTextures(IntBuffer textures) { checkLimit(textures); JmeIosGLES.glGenTextures(textures.remaining(), temp_array, 0); @@ -296,32 +336,38 @@ public class IosGL implements GL, GLExt, GLFbo { throw new UnsupportedOperationException("Today is not a good day for this"); } + @Override public int glGetAttribLocation(int program, String name) { return JmeIosGLES.glGetAttribLocation(program, name); } + @Override public void glGetBoolean(int pname, ByteBuffer params) { // TODO: fix me!!! // JmeIosGLES.glGetBoolean(pname, params); throw new UnsupportedOperationException("Today is not a good day for this"); } + @Override public int glGetError() { return JmeIosGLES.glGetError(); } + @Override public void glGetInteger(int pname, IntBuffer params) { checkLimit(params); JmeIosGLES.glGetIntegerv(pname, temp_array, 0); fromArray(params.remaining(), temp_array, params); } + @Override public void glGetProgram(int program, int pname, IntBuffer params) { checkLimit(params); JmeIosGLES.glGetProgramiv(program, pname, temp_array, 0); fromArray(params.remaining(), temp_array, params); } + @Override public String glGetProgramInfoLog(int program, int maxLength) { return JmeIosGLES.glGetProgramInfoLog(program); } @@ -336,24 +382,29 @@ public class IosGL implements GL, GLExt, GLFbo { throw new UnsupportedOperationException("Today is not a good day for this"); } + @Override public void glGetShader(int shader, int pname, IntBuffer params) { checkLimit(params); JmeIosGLES.glGetShaderiv(shader, pname, temp_array, 0); fromArray(params.remaining(), temp_array, params); } + @Override public String glGetShaderInfoLog(int shader, int maxLength) { return JmeIosGLES.glGetShaderInfoLog(shader); } + @Override public String glGetString(int name) { return JmeIosGLES.glGetString(name); } + @Override public int glGetUniformLocation(int program, String name) { return JmeIosGLES.glGetUniformLocation(program, name); } + @Override public boolean glIsEnabled(int cap) { // TODO: fix me!!! if (cap == GLExt.GL_MULTISAMPLE_ARB) { @@ -363,30 +414,37 @@ public class IosGL implements GL, GLExt, GLFbo { } } + @Override public void glLineWidth(float width) { JmeIosGLES.glLineWidth(width); } + @Override public void glLinkProgram(int program) { JmeIosGLES.glLinkProgram(program); } + @Override public void glPixelStorei(int pname, int param) { JmeIosGLES.glPixelStorei(pname, param); } + @Override public void glPolygonOffset(float factor, float units) { JmeIosGLES.glPolygonOffset(factor, units); } + @Override public void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer data) { JmeIosGLES.glReadPixels(x, y, width, height, format, type, data); } + @Override public void glScissor(int x, int y, int width, int height) { JmeIosGLES.glScissor(x, y, width, height); } + @Override public void glShaderSource(int shader, String[] string, IntBuffer length) { if (string.length != 1) { throw new UnsupportedOperationException("Today is not a good day"); @@ -394,199 +452,244 @@ public class IosGL implements GL, GLExt, GLFbo { JmeIosGLES.glShaderSource(shader, string[0]); } + @Override public void glStencilFuncSeparate(int face, int func, int ref, int mask) { // TODO: fix me!!! // JmeIosGLES.glStencilFuncSeparate(face, func, ref, mask); } + @Override public void glStencilOpSeparate(int face, int sfail, int dpfail, int dppass) { // TODO: fix me!!! // JmeIosGLES.glStencilOpSeparate(face, sfail, dpfail, dppass); } + @Override public void glTexImage2D(int target, int level, int internalFormat, int width, int height, int border, int format, int type, ByteBuffer data) { JmeIosGLES.glTexImage2D(target, level, format, width, height, 0, format, type, data); } + @Override public void glTexParameterf(int target, int pname, float param) { // TODO: fix me!!! // JmeIosGLES.glTexParameterf(target, pname, param); } + @Override public void glTexParameteri(int target, int pname, int param) { JmeIosGLES.glTexParameteri(target, pname, param); } + @Override public void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer data) { JmeIosGLES.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, data); } + @Override public void glUniform1(int location, FloatBuffer value) { JmeIosGLES.glUniform1fv(location, getLimitCount(value, 1), value); } + @Override public void glUniform1(int location, IntBuffer value) { JmeIosGLES.glUniform1iv(location, getLimitCount(value, 1), value); } + @Override public void glUniform1f(int location, float v0) { JmeIosGLES.glUniform1f(location, v0); } + @Override public void glUniform1i(int location, int v0) { JmeIosGLES.glUniform1i(location, v0); } + @Override public void glUniform2(int location, IntBuffer value) { // TODO: fix me!!! // JmeIosGLES.glUniform2iv(location, getLimitCount(value, 2), value); throw new UnsupportedOperationException(); } + @Override public void glUniform2(int location, FloatBuffer value) { JmeIosGLES.glUniform2fv(location, getLimitCount(value, 2), value); } + @Override public void glUniform2f(int location, float v0, float v1) { JmeIosGLES.glUniform2f(location, v0, v1); } + @Override public void glUniform3(int location, IntBuffer value) { // TODO: fix me!!! // JmeIosGLES.glUniform3iv(location, getLimitCount(value, 3), value); throw new UnsupportedOperationException(); } + @Override public void glUniform3(int location, FloatBuffer value) { JmeIosGLES.glUniform3fv(location, getLimitCount(value, 3), value); } + @Override public void glUniform3f(int location, float v0, float v1, float v2) { JmeIosGLES.glUniform3f(location, v0, v1, v2); } + @Override public void glUniform4(int location, FloatBuffer value) { JmeIosGLES.glUniform4fv(location, getLimitCount(value, 4), value); } + @Override public void glUniform4(int location, IntBuffer value) { // TODO: fix me!!! // JmeIosGLES.glUniform4iv(location, getLimitCount(value, 4), value); throw new UnsupportedOperationException(); } + @Override public void glUniform4f(int location, float v0, float v1, float v2, float v3) { JmeIosGLES.glUniform4f(location, v0, v1, v2, v3); } + @Override public void glUniformMatrix3(int location, boolean transpose, FloatBuffer value) { JmeIosGLES.glUniformMatrix3fv(location, getLimitCount(value, 3 * 3), transpose, value); } + @Override public void glUniformMatrix4(int location, boolean transpose, FloatBuffer value) { JmeIosGLES.glUniformMatrix4fv(location, getLimitCount(value, 4 * 4), transpose, value); } + @Override public void glUseProgram(int program) { JmeIosGLES.glUseProgram(program); } + @Override public void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, long pointer) { JmeIosGLES.glVertexAttribPointer2(index, size, type, normalized, stride, (int)pointer); } + @Override public void glViewport(int x, int y, int width, int height) { JmeIosGLES.glViewport(x, y, width, height); } + @Override public void glBlitFramebufferEXT(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) { throw new UnsupportedOperationException("FBO blit not available on iOS"); } + @Override public void glBufferData(int target, IntBuffer data, int usage) { JmeIosGLES.glBufferData(target, getLimitBytes(data), data, usage); } + @Override public void glBufferSubData(int target, long offset, IntBuffer data) { JmeIosGLES.glBufferSubData(target, (int)offset, getLimitBytes(data), data); } + @Override public void glDrawArraysInstancedARB(int mode, int first, int count, int primcount) { throw new UnsupportedOperationException("Instancing not available on iOS"); } + @Override public void glDrawBuffers(IntBuffer bufs) { throw new UnsupportedOperationException("MRT not available on iOS"); } + @Override public void glDrawElementsInstancedARB(int mode, int indices_count, int type, long indices_buffer_offset, int primcount) { throw new UnsupportedOperationException("Instancing not available on iOS"); } + @Override public void glGetMultisample(int pname, int index, FloatBuffer val) { throw new UnsupportedOperationException("Multisample renderbuffers not available on iOS"); } + @Override public void glRenderbufferStorageMultisampleEXT(int target, int samples, int internalformat, int width, int height) { throw new UnsupportedOperationException("Multisample renderbuffers not available on iOS"); } + @Override public void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height, boolean fixedsamplelocations) { throw new UnsupportedOperationException("Multisample textures not available on iOS"); } + @Override public void glVertexAttribDivisorARB(int index, int divisor) { throw new UnsupportedOperationException("Instancing not available on iOS"); } + @Override public void glBindFramebufferEXT(int param1, int param2) { JmeIosGLES.glBindFramebuffer(param1, param2); } + @Override public void glBindRenderbufferEXT(int param1, int param2) { JmeIosGLES.glBindRenderbuffer(param1, param2); } + @Override public int glCheckFramebufferStatusEXT(int param1) { return JmeIosGLES.glCheckFramebufferStatus(param1); } + @Override public void glDeleteFramebuffersEXT(IntBuffer param1) { checkLimit(param1); int n = toArray(param1); JmeIosGLES.glDeleteFramebuffers(n, temp_array, 0); } + @Override public void glDeleteRenderbuffersEXT(IntBuffer param1) { checkLimit(param1); int n = toArray(param1); JmeIosGLES.glDeleteRenderbuffers(n, temp_array, 0); } + @Override public void glFramebufferRenderbufferEXT(int param1, int param2, int param3, int param4) { JmeIosGLES.glFramebufferRenderbuffer(param1, param2, param3, param4); } + @Override public void glFramebufferTexture2DEXT(int param1, int param2, int param3, int param4, int param5) { JmeIosGLES.glFramebufferTexture2D(param1, param2, param3, param4, param5); } + @Override public void glGenFramebuffersEXT(IntBuffer param1) { checkLimit(param1); JmeIosGLES.glGenFramebuffers(param1.remaining(), temp_array, 0); fromArray(param1.remaining(), temp_array, param1); } + @Override public void glGenRenderbuffersEXT(IntBuffer param1) { checkLimit(param1); JmeIosGLES.glGenRenderbuffers(param1.remaining(), temp_array, 0); fromArray(param1.remaining(), temp_array, param1); } + @Override public void glGenerateMipmapEXT(int param1) { JmeIosGLES.glGenerateMipmap(param1); } + @Override public void glRenderbufferStorageEXT(int param1, int param2, int param3, int param4) { JmeIosGLES.glRenderbufferStorage(param1, param2, param3, param4); } diff --git a/jme3-ios/src/main/java/com/jme3/system/ios/IosImageLoader.java b/jme3-ios/src/main/java/com/jme3/system/ios/IosImageLoader.java index e47de3a50..cef2cfdd2 100644 --- a/jme3-ios/src/main/java/com/jme3/system/ios/IosImageLoader.java +++ b/jme3-ios/src/main/java/com/jme3/system/ios/IosImageLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,6 +45,7 @@ import java.io.InputStream; */ public class IosImageLoader implements AssetLoader { + @Override public Object load(AssetInfo info) throws IOException { boolean flip = ((TextureKey) info.getKey()).isFlipY(); Image img = null; diff --git a/jme3-ios/src/main/java/com/jme3/util/RingBuffer.java b/jme3-ios/src/main/java/com/jme3/util/RingBuffer.java index 1d3c22d7e..f4b50c24d 100644 --- a/jme3-ios/src/main/java/com/jme3/util/RingBuffer.java +++ b/jme3-ios/src/main/java/com/jme3/util/RingBuffer.java @@ -49,6 +49,7 @@ public class RingBuffer implements Iterable { return item; } + @Override public Iterator iterator() { return new RingBufferIterator(); } @@ -58,14 +59,17 @@ public class RingBuffer implements Iterable { private int i = 0; + @Override public boolean hasNext() { return i < count; } + @Override public void remove() { throw new UnsupportedOperationException(); } + @Override public T next() { if (!hasNext()) { throw new NoSuchElementException(); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java b/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java index 42ac5040a..819eb578b 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -259,6 +259,7 @@ public class PhysicsSpace { private void setOverlapFilterCallback() { OverlapFilterCallback callback = new OverlapFilterCallback() { + @Override public boolean needBroadphaseCollision(BroadphaseProxy bp, BroadphaseProxy bp1) { boolean collides = (bp.collisionFilterGroup & bp1.collisionFilterMask) != 0; if (collides) { @@ -334,6 +335,7 @@ public class PhysicsSpace { private void setContactCallbacks() { BulletGlobals.setContactAddedCallback(new ContactAddedCallback() { + @Override public boolean contactAdded(ManifoldPoint cp, com.bulletphysics.collision.dispatch.CollisionObject colObj0, int partId0, int index0, com.bulletphysics.collision.dispatch.CollisionObject colObj1, int partId1, int index1) { @@ -344,6 +346,7 @@ public class PhysicsSpace { BulletGlobals.setContactProcessedCallback(new ContactProcessedCallback() { + @Override public boolean contactProcessed(ManifoldPoint cp, Object body0, Object body1) { if (body0 instanceof CollisionObject && body1 instanceof CollisionObject) { PhysicsCollisionObject node = null, node1 = null; @@ -359,6 +362,7 @@ public class PhysicsSpace { BulletGlobals.setContactDestroyedCallback(new ContactDestroyedCallback() { + @Override public boolean contactDestroyed(Object userPersistentData) { System.out.println("contact destroyed"); return true; diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java index 596756f19..a8c47006f 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -64,12 +64,14 @@ public class BoxCollisionShape extends CollisionShape { return halfExtents; } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); capsule.write(halfExtents, "halfExtents", new Vector3f(1, 1, 1)); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java index d6e517b1c..a1a3742a0 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -91,6 +91,7 @@ public class CapsuleCollisionShape extends CollisionShape{ return axis; } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -99,6 +100,7 @@ public class CapsuleCollisionShape extends CollisionShape{ capsule.write(axis, "axis", 1); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java index 70a082a06..9cb8ea864 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -125,12 +125,14 @@ public abstract class CollisionShape implements Savable { return scale; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule capsule = ex.getCapsule(this); capsule.write(scale, "scale", new Vector3f(1, 1, 1)); capsule.write(getMargin(), "margin", 0.0f); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule capsule = im.getCapsule(this); this.scale = (Vector3f) capsule.readSavable("scale", new Vector3f(1, 1, 1)); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java index 5cbc208d4..7dffb5293 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -125,12 +125,14 @@ public class CompoundCollisionShape extends CollisionShape { Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "CompoundCollisionShape cannot be scaled"); } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); capsule.writeSavableArrayList(children, "children", new ArrayList()); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java index 4e87559d2..f82ce96ea 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -101,6 +101,7 @@ public class ConeCollisionShape extends CollisionShape { return axis; } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -109,6 +110,7 @@ public class ConeCollisionShape extends CollisionShape { capsule.write(axis, "axis", PhysicsSpace.AXIS_Y); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java index 82245facb..8425da79d 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -95,6 +95,7 @@ public class CylinderCollisionShape extends CollisionShape { } } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -102,6 +103,7 @@ public class CylinderCollisionShape extends CollisionShape { capsule.write(axis, "axis", 1); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java index 3d828d03d..6f6f7ed42 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -86,6 +86,7 @@ public class GImpactCollisionShape extends CollisionShape{ return Converter.convert(bulletMesh); } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -99,6 +100,7 @@ public class GImpactCollisionShape extends CollisionShape{ capsule.write(vertexBase.array(), "vertexBase", new byte[0]); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java index 2df872888..85e7c2caf 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -129,6 +129,7 @@ public class HeightfieldCollisionShape extends CollisionShape { return null; } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -142,6 +143,7 @@ public class HeightfieldCollisionShape extends CollisionShape { capsule.write(flipQuadEdges, "flipQuadEdges", false); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java index 072a7a4ae..dfd35ccd5 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -96,6 +96,7 @@ public class MeshCollisionShape extends CollisionShape { return Converter.convert(bulletMesh); } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -108,6 +109,7 @@ public class MeshCollisionShape extends CollisionShape { capsule.write(vertexBase.array(), "vertexBase", new byte[0]); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java index d7551ae1a..e5f6b304d 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,12 +63,14 @@ public class PlaneCollisionShape extends CollisionShape{ return plane; } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); capsule.write(plane, "collisionPlane", new Plane()); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java index 4f8a352a0..2ae60bcee 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,6 +77,7 @@ public class SimplexCollisionShape extends CollisionShape { createShape(); } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -86,6 +87,7 @@ public class SimplexCollisionShape extends CollisionShape { capsule.write(vector4, "simplexPoint4", null); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java index 1169f8f2f..0310c1362 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,12 +63,14 @@ public class SphereCollisionShape extends CollisionShape { return radius; } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); capsule.write(radius, "radius", 0.5f); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java index b918b5d31..ed5fd1119 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -125,6 +125,7 @@ public class HingeJoint extends PhysicsJoint { return ((HingeConstraint) constraint).getHingeAngle(); } + @Override public void write(JmeExporter ex) throws IOException { super.write(ex); OutputCapsule capsule = ex.getCapsule(this); @@ -145,6 +146,7 @@ public class HingeJoint extends PhysicsJoint { capsule.write(((HingeConstraint) constraint).getMaxMotorImpulse(), "maxMotorImpulse", 0.0f); } + @Override public void read(JmeImporter im) throws IOException { super.read(im); InputCapsule capsule = im.getCapsule(this); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java index 314c8b4c9..2bf7ecee8 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -117,6 +117,7 @@ public abstract class PhysicsJoint implements Savable { getBodyB().removeJoint(this); } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule capsule = ex.getCapsule(this); capsule.write(nodeA, "nodeA", null); @@ -125,6 +126,7 @@ public abstract class PhysicsJoint implements Savable { capsule.write(pivotB, "pivotB", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule capsule = im.getCapsule(this); this.nodeA = ((PhysicsRigidBody) capsule.readSavable("nodeA", null)); diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java index de8adefc6..f69a36d4e 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -539,6 +539,7 @@ public class PhysicsRigidBody extends PhysicsCollisionObject { rBody.clearForces(); } + @Override public void setCollisionShape(CollisionShape collisionShape) { super.setCollisionShape(collisionShape); if(collisionShape instanceof MeshCollisionShape && mass!=0){ diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/infos/RigidBodyMotionState.java b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/infos/RigidBodyMotionState.java index 3249e9607..43f95abe5 100644 --- a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/infos/RigidBodyMotionState.java +++ b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/infos/RigidBodyMotionState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public class RigidBodyMotionState extends MotionState { * @param t caller-provided storage for the Transform * @return t */ + @Override public Transform getWorldTransform(Transform t) { t.set(motionStateTrans); return t; @@ -80,6 +81,7 @@ public class RigidBodyMotionState extends MotionState { * called from bullet when the transform of the rigidbody changes * @param worldTrans */ + @Override public void setWorldTransform(Transform worldTrans) { if (jmeLocationDirty) { return; diff --git a/jme3-jogg/src/main/java/com/jme3/audio/plugins/CachedOggStream.java b/jme3-jogg/src/main/java/com/jme3/audio/plugins/CachedOggStream.java index 9ac18a602..76b119847 100644 --- a/jme3-jogg/src/main/java/com/jme3/audio/plugins/CachedOggStream.java +++ b/jme3-jogg/src/main/java/com/jme3/audio/plugins/CachedOggStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -84,23 +84,28 @@ public class CachedOggStream implements PhysicalOggStream { return logicalStreams.get(Integer.valueOf(serialNumber)); } + @Override public Collection getLogicalStreams() { return logicalStreams.values(); } + @Override public boolean isOpen() { return !closed; } + @Override public void close() throws IOException { closed = true; sourceStream.close(); } + @Override public OggPage getOggPage(int index) throws IOException { return oggPages.get(index); } + @Override public void setTime(long granulePosition) throws IOException { for (LogicalOggStream los : getLogicalStreams()){ los.setTime(granulePosition); @@ -150,6 +155,7 @@ public class CachedOggStream implements PhysicalOggStream { return pageNumber-1; } + @Override public boolean isSeekable() { return true; } diff --git a/jme3-jogg/src/main/java/com/jme3/audio/plugins/OGGLoader.java b/jme3-jogg/src/main/java/com/jme3/audio/plugins/OGGLoader.java index 2302c5f4e..5250362d9 100644 --- a/jme3-jogg/src/main/java/com/jme3/audio/plugins/OGGLoader.java +++ b/jme3-jogg/src/main/java/com/jme3/audio/plugins/OGGLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -143,6 +143,7 @@ public class OGGLoader implements AssetLoader { super(ps, ls, vs, maximum); } + @Override public void setTime(float time) { if (time != 0.0) { throw new UnsupportedOperationException("OGG/Vorbis seeking only supported for time = 0"); @@ -294,6 +295,7 @@ public class OGGLoader implements AssetLoader { } } + @Override public Object load(AssetInfo info) throws IOException { if (!(info.getKey() instanceof AudioKey)){ throw new IllegalArgumentException("Audio assets must be loaded using an AudioKey"); diff --git a/jme3-jogg/src/main/java/com/jme3/audio/plugins/UncachedOggStream.java b/jme3-jogg/src/main/java/com/jme3/audio/plugins/UncachedOggStream.java index 7c3e7ced9..b221c1c8e 100644 --- a/jme3-jogg/src/main/java/com/jme3/audio/plugins/UncachedOggStream.java +++ b/jme3-jogg/src/main/java/com/jme3/audio/plugins/UncachedOggStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -91,6 +91,7 @@ public class UncachedOggStream implements PhysicalOggStream { pageCache.add(op); } + @Override public OggPage getOggPage(int index) throws IOException { if (eos){ return null; @@ -117,21 +118,26 @@ public class UncachedOggStream implements PhysicalOggStream { return logicalStreams.get(Integer.valueOf(serialNumber)); } + @Override public Collection getLogicalStreams() { return logicalStreams.values(); } + @Override public void setTime(long granulePosition) throws IOException { } + @Override public boolean isSeekable() { return false; } + @Override public boolean isOpen() { return !closed; } + @Override public void close() throws IOException { closed = true; sourceStream.close(); diff --git a/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalAL.java b/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalAL.java index cde0e01d7..a487c3bfe 100644 --- a/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalAL.java +++ b/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalAL.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2014 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -52,86 +52,106 @@ public final class JoalAL implements com.jme3.audio.openal.AL { this.joalAl = ALFactory.getAL(); } + @Override public String alGetString(int parameter) { return joalAl.alGetString(parameter); } + @Override public int alGenSources() { IntBuffer ib = BufferUtils.createIntBuffer(1); joalAl.alGenSources(1, ib); return ib.get(0); } + @Override public int alGetError() { return joalAl.alGetError(); } + @Override public void alDeleteSources(int numSources, IntBuffer sources) { joalAl.alDeleteSources(numSources, sources); } + @Override public void alGenBuffers(int numBuffers, IntBuffer buffers) { joalAl.alGenBuffers(numBuffers, buffers); } + @Override public void alDeleteBuffers(int numBuffers, IntBuffer buffers) { joalAl.alDeleteBuffers(numBuffers, buffers); } + @Override public void alSourceStop(int source) { joalAl.alSourceStop(source); } + @Override public void alSourcei(int source, int param, int value) { joalAl.alSourcei(source, param, value); } + @Override public void alBufferData(int buffer, int format, ByteBuffer data, int size, int frequency) { joalAl.alBufferData(buffer, format, data, size, frequency); } + @Override public void alSourcePlay(int source) { joalAl.alSourcePlay(source); } + @Override public void alSourcePause(int source) { joalAl.alSourcePause(source); } + @Override public void alSourcef(int source, int param, float value) { joalAl.alSourcef(source, param, value); } + @Override public void alSource3f(int source, int param, float value1, float value2, float value3) { joalAl.alSource3f(source, param, value1, value2, value3); } + @Override public int alGetSourcei(int source, int param) { IntBuffer ib = BufferUtils.createIntBuffer(1); joalAl.alGetSourcei(source, param, ib); return ib.get(0); } + @Override public void alSourceUnqueueBuffers(int source, int numBuffers, IntBuffer buffers) { joalAl.alSourceUnqueueBuffers(source, numBuffers, buffers); } + @Override public void alSourceQueueBuffers(int source, int numBuffers, IntBuffer buffers) { joalAl.alSourceQueueBuffers(source, numBuffers, buffers); } + @Override public void alListener(int param, FloatBuffer data) { joalAl.alListenerfv(param, data); } + @Override public void alListenerf(int param, float value) { joalAl.alListenerf(param, value); } + @Override public void alListener3f(int param, float value1, float value2, float value3) { joalAl.alListener3f(param, value1, value2, value3); } + @Override public void alSource3i(int source, int param, int value1, int value2, int value3) { joalAl.alSource3i(source, param, value1, value2, value3); } diff --git a/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalALC.java b/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalALC.java index 3d6c69e2d..4e1e05bb1 100644 --- a/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalALC.java +++ b/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalALC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2014 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -67,6 +67,7 @@ public final class JoalALC implements com.jme3.audio.openal.ALC { return device; } + @Override public void createALC() { ALut.alutInit(); @@ -95,6 +96,7 @@ public final class JoalALC implements com.jme3.audio.openal.ALC { */ } + @Override public void destroyALC() { /* ALCcontext ctx = joalAlc.alcGetCurrentContext(); @@ -120,25 +122,31 @@ public final class JoalALC implements com.jme3.audio.openal.ALC { ALut.alutExit(); } + @Override public boolean isCreated() { return getALCDevice() != null; } + @Override public String alcGetString(int parameter) { return joalAlc.alcGetString(getALCDevice(), parameter); } + @Override public boolean alcIsExtensionPresent(String extension) { return joalAlc.alcIsExtensionPresent(getALCDevice(), extension); } + @Override public void alcGetInteger(int param, IntBuffer buffer, int size) { joalAlc.alcGetIntegerv(getALCDevice(), param, size, buffer); } + @Override public void alcDevicePauseSOFT() { } + @Override public void alcDeviceResumeSOFT() { } } diff --git a/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalEFX.java b/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalEFX.java index d7271fc3b..dbaf2c4d7 100644 --- a/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalEFX.java +++ b/jme3-jogl/src/main/java/com/jme3/audio/joal/JoalEFX.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2014 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -50,46 +50,57 @@ public final class JoalEFX implements EFX { joalAlext = ALFactory.getALExt(); } + @Override public void alGenAuxiliaryEffectSlots(int numSlots, IntBuffer buffers) { joalAlext.alGenAuxiliaryEffectSlots(numSlots, buffers); } + @Override public void alGenEffects(int numEffects, IntBuffer buffers) { joalAlext.alGenEffects(numEffects, buffers); } + @Override public void alEffecti(int effect, int param, int value) { joalAlext.alEffecti(effect, param, value); } + @Override public void alAuxiliaryEffectSloti(int effectSlot, int param, int value) { joalAlext.alAuxiliaryEffectSloti(effectSlot, param, value); } + @Override public void alDeleteEffects(int numEffects, IntBuffer buffers) { joalAlext.alDeleteEffects(numEffects, buffers); } + @Override public void alDeleteAuxiliaryEffectSlots(int numEffectSlots, IntBuffer buffers) { joalAlext.alDeleteAuxiliaryEffectSlots(numEffectSlots, buffers); } + @Override public void alGenFilters(int numFilters, IntBuffer buffers) { joalAlext.alGenFilters(numFilters, buffers); } + @Override public void alFilteri(int filter, int param, int value) { joalAlext.alFilteri(filter, param, value); } + @Override public void alFilterf(int filter, int param, float value) { joalAlext.alFilterf(filter, param, value); } + @Override public void alDeleteFilters(int numFilters, IntBuffer buffers) { joalAlext.alDeleteFilters(numFilters, buffers); } + @Override public void alEffectf(int effect, int param, float value) { joalAlext.alEffectf(effect, param, value); } diff --git a/jme3-jogl/src/main/java/com/jme3/input/jogl/NewtKeyInput.java b/jme3-jogl/src/main/java/com/jme3/input/jogl/NewtKeyInput.java index 8ae427074..9f6e91fe0 100644 --- a/jme3-jogl/src/main/java/com/jme3/input/jogl/NewtKeyInput.java +++ b/jme3-jogl/src/main/java/com/jme3/input/jogl/NewtKeyInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -53,9 +53,11 @@ public class NewtKeyInput implements KeyInput, KeyListener { public NewtKeyInput() { } + @Override public void initialize() { } + @Override public void destroy() { } @@ -70,10 +72,12 @@ public class NewtKeyInput implements KeyInput, KeyListener { } } + @Override public long getInputTimeNanos() { return System.nanoTime(); } + @Override public void update() { synchronized (eventQueue){ // flush events to listener @@ -84,10 +88,12 @@ public class NewtKeyInput implements KeyInput, KeyListener { } } + @Override public boolean isInitialized() { return true; } + @Override public void setInputListener(RawInputListener listener) { this.listener = listener; } @@ -95,6 +101,7 @@ public class NewtKeyInput implements KeyInput, KeyListener { public void keyTyped(KeyEvent evt) { } + @Override public void keyPressed(KeyEvent evt) { int code = convertNewtKey(evt.getKeySymbol()); KeyInputEvent keyEvent = new KeyInputEvent(code, evt.getKeyChar(), true, evt.isAutoRepeat()); @@ -104,6 +111,7 @@ public class NewtKeyInput implements KeyInput, KeyListener { } } + @Override public void keyReleased(KeyEvent evt) { int code = convertNewtKey(evt.getKeySymbol()); KeyInputEvent keyEvent = new KeyInputEvent(code, evt.getKeyChar(), false, evt.isAutoRepeat()); diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java index c4f38f970..976ba8515 100644 --- a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java +++ b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -110,6 +110,7 @@ public abstract class JoglAbstractDisplay extends JoglContext implements GLEvent } }; canvas.invoke(false, new GLRunnable() { + @Override public boolean run(GLAutoDrawable glad) { canvas.getGL().setSwapInterval(settings.isVSync() ? 1 : 0); return true; @@ -163,10 +164,12 @@ public abstract class JoglAbstractDisplay extends JoglContext implements GLEvent return mouseInput; } + @Override public TouchInput getTouchInput() { return null; } + @Override public void setAutoFlushFrames(boolean enabled) { autoFlush.set(enabled); } @@ -174,6 +177,7 @@ public abstract class JoglAbstractDisplay extends JoglContext implements GLEvent /** * Callback. */ + @Override public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { listener.reshape(width, height); } @@ -187,6 +191,7 @@ public abstract class JoglAbstractDisplay extends JoglContext implements GLEvent /** * Callback */ + @Override public void dispose(GLAutoDrawable drawable) { } diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglDisplay.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglDisplay.java index 3bac0ab53..c6ebcc809 100644 --- a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglDisplay.java +++ b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglDisplay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,6 +59,7 @@ public class JoglDisplay extends JoglAbstractDisplay { protected volatile boolean wasInited = false; protected Frame frame; + @Override public Type getType() { return Type.Display; } @@ -238,6 +239,7 @@ public class JoglDisplay extends JoglAbstractDisplay { startGLCanvas(); } + @Override public void init(GLAutoDrawable drawable){ // prevent initializing twice on restart if (!wasInited){ @@ -253,6 +255,7 @@ public class JoglDisplay extends JoglAbstractDisplay { } } + @Override public void create(boolean waitFor){ if (SwingUtilities.isEventDispatchThread()) { initInEDT(); @@ -261,6 +264,7 @@ public class JoglDisplay extends JoglAbstractDisplay { if (waitFor) { try { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { initInEDT(); } @@ -270,6 +274,7 @@ public class JoglDisplay extends JoglAbstractDisplay { } } else { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { initInEDT(); } @@ -281,6 +286,7 @@ public class JoglDisplay extends JoglAbstractDisplay { } } + @Override public void destroy(boolean waitFor){ needClose.set(true); if (waitFor){ @@ -288,6 +294,7 @@ public class JoglDisplay extends JoglAbstractDisplay { } } + @Override public void restart() { if (created.get()){ needRestart.set(true); @@ -296,6 +303,7 @@ public class JoglDisplay extends JoglAbstractDisplay { } } + @Override public void setTitle(String title){ if (frame != null) frame.setTitle(title); @@ -304,6 +312,7 @@ public class JoglDisplay extends JoglAbstractDisplay { /** * Callback. */ + @Override public void display(GLAutoDrawable drawable) { if (needClose.get()) { listener.destroy(); diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java index 48f191cb3..7f103be17 100644 --- a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java +++ b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -90,6 +90,7 @@ public abstract class JoglNewtAbstractDisplay extends JoglContext implements GLE } canvas = GLWindow.create(caps); canvas.invoke(false, new GLRunnable() { + @Override public boolean run(GLAutoDrawable glad) { canvas.getGL().setSwapInterval(settings.isVSync() ? 1 : 0); return true; @@ -141,10 +142,12 @@ public abstract class JoglNewtAbstractDisplay extends JoglContext implements GLE return mouseInput; } + @Override public TouchInput getTouchInput() { return null; } + @Override public void setAutoFlushFrames(boolean enabled) { autoFlush.set(enabled); } @@ -152,6 +155,7 @@ public abstract class JoglNewtAbstractDisplay extends JoglContext implements GLE /** * Callback. */ + @Override public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { listener.reshape(width, height); } @@ -165,6 +169,7 @@ public abstract class JoglNewtAbstractDisplay extends JoglContext implements GLE /** * Callback */ + @Override public void dispose(GLAutoDrawable drawable) { } diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtDisplay.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtDisplay.java index 56eab406a..87b001914 100644 --- a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtDisplay.java +++ b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtDisplay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -54,6 +54,7 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay { protected AtomicBoolean needRestart = new AtomicBoolean(false); protected volatile boolean wasInited = false; + @Override public Type getType() { return Type.Display; } @@ -149,6 +150,7 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay { startGLCanvas(); } + @Override public void init(GLAutoDrawable drawable){ // prevent initializing twice on restart if (!wasInited){ @@ -164,10 +166,12 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay { } } + @Override public void create(boolean waitFor){ privateInit(); } + @Override public void destroy(boolean waitFor){ needClose.set(true); if (waitFor){ @@ -177,6 +181,7 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay { animator.stop(); } + @Override public void restart() { if (created.get()){ needRestart.set(true); @@ -185,6 +190,7 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay { } } + @Override public void setTitle(String title){ if (canvas != null) { canvas.setTitle(title); @@ -194,6 +200,7 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay { /** * Callback. */ + @Override public void display(GLAutoDrawable drawable) { if (needClose.get()) { listener.destroy(); diff --git a/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglAL.java b/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglAL.java index 9cb52c688..247f5b6da 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglAL.java +++ b/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglAL.java @@ -12,94 +12,114 @@ public final class LwjglAL implements AL { public LwjglAL() { } + @Override public String alGetString(int parameter) { return AL10.alGetString(parameter); } + @Override public int alGenSources() { return AL10.alGenSources(); } + @Override public int alGetError() { return AL10.alGetError(); } + @Override public void alDeleteSources(int numSources, IntBuffer sources) { if (sources.position() != 0) throw new AssertionError(); if (sources.limit() != numSources) throw new AssertionError(); AL10.alDeleteSources(sources); } + @Override public void alGenBuffers(int numBuffers, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numBuffers) throw new AssertionError(); AL10.alGenBuffers(buffers); } + @Override public void alDeleteBuffers(int numBuffers, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numBuffers) throw new AssertionError(); AL10.alDeleteBuffers(buffers); } + @Override public void alSourceStop(int source) { AL10.alSourceStop(source); } + @Override public void alSourcei(int source, int param, int value) { AL10.alSourcei(source, param, value); } + @Override public void alBufferData(int buffer, int format, ByteBuffer data, int size, int frequency) { if (data.position() != 0) throw new AssertionError(); if (data.limit() != size) throw new AssertionError(); AL10.alBufferData(buffer, format, data, frequency); } + @Override public void alSourcePlay(int source) { AL10.alSourcePlay(source); } + @Override public void alSourcePause(int source) { AL10.alSourcePause(source); } + @Override public void alSourcef(int source, int param, float value) { AL10.alSourcef(source, param, value); } + @Override public void alSource3f(int source, int param, float value1, float value2, float value3) { AL10.alSource3f(source, param, value1, value2, value3); } + @Override public int alGetSourcei(int source, int param) { return AL10.alGetSourcei(source, param); } + @Override public void alSourceUnqueueBuffers(int source, int numBuffers, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numBuffers) throw new AssertionError(); AL10.alSourceUnqueueBuffers(source, buffers); } + @Override public void alSourceQueueBuffers(int source, int numBuffers, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numBuffers) throw new AssertionError(); AL10.alSourceQueueBuffers(source, buffers); } + @Override public void alListener(int param, FloatBuffer data) { AL10.alListener(param, data); } + @Override public void alListenerf(int param, float value) { AL10.alListenerf(param, value); } + @Override public void alListener3f(int param, float value1, float value2, float value3) { AL10.alListener3f(param, value1, value2, value3); } + @Override public void alSource3i(int source, int param, int value1, int value2, int value3) { AL11.alSource3i(source, param, value1, value2, value3); } diff --git a/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglALC.java b/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglALC.java index ffce940b0..f0e3bfef6 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglALC.java +++ b/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglALC.java @@ -10,6 +10,7 @@ import org.lwjgl.openal.ALCdevice; public class LwjglALC implements ALC { + @Override public void createALC() { try { AL.create(); @@ -18,26 +19,31 @@ public class LwjglALC implements ALC { } } + @Override public void destroyALC() { AL.destroy(); } + @Override public boolean isCreated() { return AL.isCreated(); } + @Override public String alcGetString(int parameter) { ALCcontext context = ALC10.alcGetCurrentContext(); ALCdevice device = ALC10.alcGetContextsDevice(context); return ALC10.alcGetString(device, parameter); } + @Override public boolean alcIsExtensionPresent(String extension) { ALCcontext context = ALC10.alcGetCurrentContext(); ALCdevice device = ALC10.alcGetContextsDevice(context); return ALC10.alcIsExtensionPresent(device, extension); } + @Override public void alcGetInteger(int param, IntBuffer buffer, int size) { if (buffer.position() != 0) throw new AssertionError(); if (buffer.limit() != size) throw new AssertionError(); @@ -47,9 +53,11 @@ public class LwjglALC implements ALC { ALC10.alcGetInteger(device, param, buffer); } + @Override public void alcDevicePauseSOFT() { } + @Override public void alcDeviceResumeSOFT() { } diff --git a/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglEFX.java b/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglEFX.java index 639758c4e..01292a128 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglEFX.java +++ b/jme3-lwjgl/src/main/java/com/jme3/audio/lwjgl/LwjglEFX.java @@ -6,58 +6,69 @@ import org.lwjgl.openal.EFX10; public class LwjglEFX implements EFX { + @Override public void alGenAuxiliaryEffectSlots(int numSlots, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numSlots) throw new AssertionError(); EFX10.alGenAuxiliaryEffectSlots(buffers); } + @Override public void alGenEffects(int numEffects, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numEffects) throw new AssertionError(); EFX10.alGenEffects(buffers); } + @Override public void alEffecti(int effect, int param, int value) { EFX10.alEffecti(effect, param, value); } + @Override public void alAuxiliaryEffectSloti(int effectSlot, int param, int value) { EFX10.alAuxiliaryEffectSloti(effectSlot, param, value); } + @Override public void alDeleteEffects(int numEffects, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numEffects) throw new AssertionError(); EFX10.alDeleteEffects(buffers); } + @Override public void alDeleteAuxiliaryEffectSlots(int numEffectSlots, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numEffectSlots) throw new AssertionError(); EFX10.alDeleteAuxiliaryEffectSlots(buffers); } + @Override public void alGenFilters(int numFilters, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numFilters) throw new AssertionError(); EFX10.alGenFilters(buffers); } + @Override public void alFilteri(int filter, int param, int value) { EFX10.alFilteri(filter, param, value); } + @Override public void alFilterf(int filter, int param, float value) { EFX10.alFilterf(filter, param, value); } + @Override public void alDeleteFilters(int numFilters, IntBuffer buffers) { if (buffers.position() != 0) throw new AssertionError(); if (buffers.limit() != numFilters) throw new AssertionError(); EFX10.alDeleteFilters(buffers); } + @Override public void alEffectf(int effect, int param, float value) { EFX10.alEffectf(effect, param, value); } diff --git a/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/JInputJoyInput.java b/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/JInputJoyInput.java index d89a07af5..928fb4338 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/JInputJoyInput.java +++ b/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/JInputJoyInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2016 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,6 +66,7 @@ public class JInputJoyInput implements JoyInput { private Map joystickIndex = new HashMap(); + @Override public void setJoyRumble(int joyId, float amount){ if( joyId >= joysticks.length ) @@ -77,6 +78,7 @@ public class JInputJoyInput implements JoyInput { } } + @Override public Joystick[] loadJoysticks(InputManager inputManager){ ControllerEnvironment ce = ControllerEnvironment.getDefaultEnvironment(); @@ -113,10 +115,12 @@ public class JInputJoyInput implements JoyInput { return joysticks; } + @Override public void initialize() { inited = true; } + @Override public void update() { ControllerEnvironment ce = ControllerEnvironment.getDefaultEnvironment(); @@ -182,18 +186,22 @@ public class JInputJoyInput implements JoyInput { } } + @Override public void destroy() { inited = false; } + @Override public boolean isInitialized() { return inited; } + @Override public void setInputListener(RawInputListener listener) { this.listener = listener; } + @Override public long getInputTimeNanos() { return 0; } diff --git a/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/LwjglKeyInput.java b/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/LwjglKeyInput.java index e7b9f9268..ab8397b15 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/LwjglKeyInput.java +++ b/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/LwjglKeyInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,6 +55,7 @@ public class LwjglKeyInput implements KeyInput { this.context = context; } + @Override public void initialize() { if (!context.isRenderable()) return; @@ -72,6 +73,7 @@ public class LwjglKeyInput implements KeyInput { return Keyboard.KEYBOARD_SIZE; } + @Override public void update() { if (!context.isRenderable()) return; @@ -89,6 +91,7 @@ public class LwjglKeyInput implements KeyInput { } } + @Override public void destroy() { if (!context.isRenderable()) return; @@ -97,14 +100,17 @@ public class LwjglKeyInput implements KeyInput { logger.fine("Keyboard destroyed."); } + @Override public boolean isInitialized() { return Keyboard.isCreated(); } + @Override public void setInputListener(RawInputListener listener) { this.listener = listener; } + @Override public long getInputTimeNanos() { return Sys.getTime() * LwjglTimer.LWJGL_TIME_TO_NANOS; } diff --git a/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/LwjglMouseInput.java b/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/LwjglMouseInput.java index b53d93660..7f9106bfa 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/LwjglMouseInput.java +++ b/jme3-lwjgl/src/main/java/com/jme3/input/lwjgl/LwjglMouseInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public class LwjglMouseInput implements MouseInput { this.context = context; } + @Override public void initialize() { if (!context.isRenderable()) return; @@ -91,14 +92,17 @@ public class LwjglMouseInput implements MouseInput { } } + @Override public boolean isInitialized(){ return Mouse.isCreated(); } + @Override public int getButtonCount(){ return Mouse.getButtonCount(); } + @Override public void update() { if (!context.isRenderable()) return; @@ -139,6 +143,7 @@ public class LwjglMouseInput implements MouseInput { } } + @Override public void destroy() { if (!context.isRenderable()) return; @@ -154,6 +159,7 @@ public class LwjglMouseInput implements MouseInput { logger.fine("Mouse destroyed."); } + @Override public void setCursorVisible(boolean visible){ cursorVisible = visible; if (!context.isRenderable()) @@ -190,10 +196,12 @@ public class LwjglMouseInput implements MouseInput { listener.onMouseMotionEvent(evt); } + @Override public long getInputTimeNanos() { return Sys.getTime() * LwjglTimer.LWJGL_TIME_TO_NANOS; } + @Override public void setNativeCursor(JmeCursor jmeCursor) { try { Cursor newCursor = null; diff --git a/jme3-lwjgl/src/main/java/com/jme3/opencl/lwjgl/Utils.java b/jme3-lwjgl/src/main/java/com/jme3/opencl/lwjgl/Utils.java index 29b141325..54bb94883 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/opencl/lwjgl/Utils.java +++ b/jme3-lwjgl/src/main/java/com/jme3/opencl/lwjgl/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2016 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,6 +56,7 @@ public class Utils { Taken directly from org.lwjgl.opencl.Util */ private static final Map CL_ERROR_TOKENS = LWJGLUtil.getClassTokens(new LWJGLUtil.TokenFilter() { + @Override public boolean accept(final Field field, final int value) { return value < 0; // Currently, all OpenCL errors have negative values. } diff --git a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL.java b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL.java index bca6d0dbb..e08461a56 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL.java +++ b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL.java @@ -26,17 +26,21 @@ public final class LwjglGL implements GL, GL2, GL3, GL4 { } } + @Override public void resetStats() { } + @Override public void glActiveTexture(int param1) { GL13.glActiveTexture(param1); } + @Override public void glAlphaFunc(int param1, float param2) { GL11.glAlphaFunc(param1, param2); } + @Override public void glAttachShader(int param1, int param2) { GL20.glAttachShader(param1, param2); } @@ -46,166 +50,204 @@ public final class LwjglGL implements GL, GL2, GL3, GL4 { GL15.glBeginQuery(target, query); } + @Override public void glBindBuffer(int param1, int param2) { GL15.glBindBuffer(param1, param2); } + @Override public void glBindTexture(int param1, int param2) { GL11.glBindTexture(param1, param2); } + @Override public void glBlendEquationSeparate(int colorMode, int alphaMode){ GL20.glBlendEquationSeparate(colorMode,alphaMode); } + @Override public void glBlendFunc(int param1, int param2) { GL11.glBlendFunc(param1, param2); } + @Override public void glBlendFuncSeparate(int param1, int param2, int param3, int param4) { GL14.glBlendFuncSeparate(param1, param2, param3, param4); } + @Override public void glBufferData(int param1, long param2, int param3) { GL15.glBufferData(param1, param2, param3); } + @Override public void glBufferData(int param1, FloatBuffer param2, int param3) { checkLimit(param2); GL15.glBufferData(param1, param2, param3); } + @Override public void glBufferData(int param1, ShortBuffer param2, int param3) { checkLimit(param2); GL15.glBufferData(param1, param2, param3); } + @Override public void glBufferData(int param1, ByteBuffer param2, int param3) { checkLimit(param2); GL15.glBufferData(param1, param2, param3); } + @Override public void glBufferSubData(int param1, long param2, FloatBuffer param3) { checkLimit(param3); GL15.glBufferSubData(param1, param2, param3); } + @Override public void glBufferSubData(int param1, long param2, ShortBuffer param3) { checkLimit(param3); GL15.glBufferSubData(param1, param2, param3); } + @Override public void glBufferSubData(int param1, long param2, ByteBuffer param3) { checkLimit(param3); GL15.glBufferSubData(param1, param2, param3); } + @Override public void glClear(int param1) { GL11.glClear(param1); } + @Override public void glClearColor(float param1, float param2, float param3, float param4) { GL11.glClearColor(param1, param2, param3, param4); } + @Override public void glColorMask(boolean param1, boolean param2, boolean param3, boolean param4) { GL11.glColorMask(param1, param2, param3, param4); } + @Override public void glCompileShader(int param1) { GL20.glCompileShader(param1); } + @Override public void glCompressedTexImage2D(int param1, int param2, int param3, int param4, int param5, int param6, ByteBuffer param7) { checkLimit(param7); GL13.glCompressedTexImage2D(param1, param2, param3, param4, param5, param6, param7); } + @Override public void glCompressedTexImage3D(int param1, int param2, int param3, int param4, int param5, int param6, int param7, ByteBuffer param8) { checkLimit(param8); GL13.glCompressedTexImage3D(param1, param2, param3, param4, param5, param6, param7, param8); } + @Override public void glCompressedTexSubImage2D(int param1, int param2, int param3, int param4, int param5, int param6, int param7, ByteBuffer param8) { checkLimit(param8); GL13.glCompressedTexSubImage2D(param1, param2, param3, param4, param5, param6, param7, param8); } + @Override public void glCompressedTexSubImage3D(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, ByteBuffer param10) { checkLimit(param10); GL13.glCompressedTexSubImage3D(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); } + @Override public int glCreateProgram() { return GL20.glCreateProgram(); } + @Override public int glCreateShader(int param1) { return GL20.glCreateShader(param1); } + @Override public void glCullFace(int param1) { GL11.glCullFace(param1); } + @Override public void glDeleteBuffers(IntBuffer param1) { checkLimit(param1); GL15.glDeleteBuffers(param1); } + @Override public void glDeleteProgram(int param1) { GL20.glDeleteProgram(param1); } + @Override public void glDeleteShader(int param1) { GL20.glDeleteShader(param1); } + @Override public void glDeleteTextures(IntBuffer param1) { checkLimit(param1); GL11.glDeleteTextures(param1); } + @Override public void glDepthFunc(int param1) { GL11.glDepthFunc(param1); } + @Override public void glDepthMask(boolean param1) { GL11.glDepthMask(param1); } + @Override public void glDepthRange(double param1, double param2) { GL11.glDepthRange(param1, param2); } + @Override public void glDetachShader(int param1, int param2) { GL20.glDetachShader(param1, param2); } + @Override public void glDisable(int param1) { GL11.glDisable(param1); } + @Override public void glDisableVertexAttribArray(int param1) { GL20.glDisableVertexAttribArray(param1); } + @Override public void glDrawArrays(int param1, int param2, int param3) { GL11.glDrawArrays(param1, param2, param3); } + @Override public void glDrawBuffer(int param1) { GL11.glDrawBuffer(param1); } + @Override public void glDrawRangeElements(int param1, int param2, int param3, int param4, int param5, long param6) { GL12.glDrawRangeElements(param1, param2, param3, param4, param5, param6); } + @Override public void glEnable(int param1) { GL11.glEnable(param1); } + @Override public void glEnableVertexAttribArray(int param1) { GL20.glEnableVertexAttribArray(param1); } @@ -215,6 +257,7 @@ public final class LwjglGL implements GL, GL2, GL3, GL4 { GL15.glEndQuery(target); } + @Override public void glGenBuffers(IntBuffer param1) { checkLimit(param1); GL15.glGenBuffers(param1); @@ -225,226 +268,276 @@ public final class LwjglGL implements GL, GL2, GL3, GL4 { GL15.glGenQueries(ids); } + @Override public void glGenTextures(IntBuffer param1) { checkLimit(param1); GL11.glGenTextures(param1); } + @Override public void glGetBoolean(int param1, ByteBuffer param2) { checkLimit(param2); GL11.glGetBoolean(param1, param2); } + @Override public void glGetBufferSubData(int target, long offset, ByteBuffer data) { checkLimit(data); GL15.glGetBufferSubData(target, offset, data); } + @Override public int glGetError() { return GL11.glGetError(); } + @Override public void glGetInteger(int param1, IntBuffer param2) { checkLimit(param2); GL11.glGetInteger(param1, param2); } + @Override public void glGetProgram(int param1, int param2, IntBuffer param3) { checkLimit(param3); GL20.glGetProgram(param1, param2, param3); } + @Override public void glGetShader(int param1, int param2, IntBuffer param3) { checkLimit(param3); GL20.glGetShader(param1, param2, param3); } + @Override public String glGetString(int param1) { return GL11.glGetString(param1); } + @Override public String glGetString(int param1, int param2) { return GL30.glGetStringi(param1, param2); } + @Override public boolean glIsEnabled(int param1) { return GL11.glIsEnabled(param1); } + @Override public void glLineWidth(float param1) { GL11.glLineWidth(param1); } + @Override public void glLinkProgram(int param1) { GL20.glLinkProgram(param1); } + @Override public void glPixelStorei(int param1, int param2) { GL11.glPixelStorei(param1, param2); } + @Override public void glPointSize(float param1) { GL11.glPointSize(param1); } + @Override public void glPolygonMode(int param1, int param2) { GL11.glPolygonMode(param1, param2); } + @Override public void glPolygonOffset(float param1, float param2) { GL11.glPolygonOffset(param1, param2); } + @Override public void glReadBuffer(int param1) { GL11.glReadBuffer(param1); } + @Override public void glReadPixels(int param1, int param2, int param3, int param4, int param5, int param6, ByteBuffer param7) { checkLimit(param7); GL11.glReadPixels(param1, param2, param3, param4, param5, param6, param7); } + @Override public void glReadPixels(int param1, int param2, int param3, int param4, int param5, int param6, long param7) { GL11.glReadPixels(param1, param2, param3, param4, param5, param6, param7); } + @Override public void glScissor(int param1, int param2, int param3, int param4) { GL11.glScissor(param1, param2, param3, param4); } + @Override public void glStencilFuncSeparate(int param1, int param2, int param3, int param4) { GL20.glStencilFuncSeparate(param1, param2, param3, param4); } + @Override public void glStencilOpSeparate(int param1, int param2, int param3, int param4) { GL20.glStencilOpSeparate(param1, param2, param3, param4); } + @Override public void glTexImage2D(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, ByteBuffer param9) { checkLimit(param9); GL11.glTexImage2D(param1, param2, param3, param4, param5, param6, param7, param8, param9); } + @Override public void glTexImage3D(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, ByteBuffer param10) { checkLimit(param10); GL12.glTexImage3D(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); } + @Override public void glTexParameterf(int param1, int param2, float param3) { GL11.glTexParameterf(param1, param2, param3); } + @Override public void glTexParameteri(int param1, int param2, int param3) { GL11.glTexParameteri(param1, param2, param3); } + @Override public void glTexSubImage2D(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, ByteBuffer param9) { checkLimit(param9); GL11.glTexSubImage2D(param1, param2, param3, param4, param5, param6, param7, param8, param9); } + @Override public void glTexSubImage3D(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, ByteBuffer param11) { checkLimit(param11); GL12.glTexSubImage3D(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11); } + @Override public void glUniform1(int param1, FloatBuffer param2) { checkLimit(param2); GL20.glUniform1(param1, param2); } + @Override public void glUniform1(int param1, IntBuffer param2) { checkLimit(param2); GL20.glUniform1(param1, param2); } + @Override public void glUniform1f(int param1, float param2) { GL20.glUniform1f(param1, param2); } + @Override public void glUniform1i(int param1, int param2) { GL20.glUniform1i(param1, param2); } + @Override public void glUniform2(int param1, IntBuffer param2) { checkLimit(param2); GL20.glUniform2(param1, param2); } + @Override public void glUniform2(int param1, FloatBuffer param2) { checkLimit(param2); GL20.glUniform2(param1, param2); } + @Override public void glUniform2f(int param1, float param2, float param3) { GL20.glUniform2f(param1, param2, param3); } + @Override public void glUniform3(int param1, IntBuffer param2) { checkLimit(param2); GL20.glUniform3(param1, param2); } + @Override public void glUniform3(int param1, FloatBuffer param2) { checkLimit(param2); GL20.glUniform3(param1, param2); } + @Override public void glUniform3f(int param1, float param2, float param3, float param4) { GL20.glUniform3f(param1, param2, param3, param4); } + @Override public void glUniform4(int param1, FloatBuffer param2) { checkLimit(param2); GL20.glUniform4(param1, param2); } + @Override public void glUniform4(int param1, IntBuffer param2) { checkLimit(param2); GL20.glUniform4(param1, param2); } + @Override public void glUniform4f(int param1, float param2, float param3, float param4, float param5) { GL20.glUniform4f(param1, param2, param3, param4, param5); } + @Override public void glUniformMatrix3(int param1, boolean param2, FloatBuffer param3) { checkLimit(param3); GL20.glUniformMatrix3(param1, param2, param3); } + @Override public void glUniformMatrix4(int param1, boolean param2, FloatBuffer param3) { checkLimit(param3); GL20.glUniformMatrix4(param1, param2, param3); } + @Override public void glUseProgram(int param1) { GL20.glUseProgram(param1); } + @Override public void glVertexAttribPointer(int param1, int param2, int param3, boolean param4, int param5, long param6) { GL20.glVertexAttribPointer(param1, param2, param3, param4, param5, param6); } + @Override public void glViewport(int param1, int param2, int param3, int param4) { GL11.glViewport(param1, param2, param3, param4); } + @Override public int glGetAttribLocation(int param1, String param2) { // NOTE: LWJGL requires null-terminated strings return GL20.glGetAttribLocation(param1, param2 + "\0"); } + @Override public int glGetUniformLocation(int param1, String param2) { // NOTE: LWJGL requires null-terminated strings return GL20.glGetUniformLocation(param1, param2 + "\0"); } + @Override public void glShaderSource(int param1, String[] param2, IntBuffer param3) { checkLimit(param3); GL20.glShaderSource(param1, param2); } + @Override public String glGetProgramInfoLog(int program, int maxSize) { return GL20.glGetProgramInfoLog(program, maxSize); } @@ -459,6 +552,7 @@ public final class LwjglGL implements GL, GL2, GL3, GL4 { return GL15.glGetQueryObjecti(query, pname); } + @Override public String glGetShaderInfoLog(int shader, int maxSize) { return GL20.glGetShaderInfoLog(shader, maxSize); } diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java index e2be6a78d..dfc0f28a5 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,17 +63,20 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna /** * @return Type.Display or Type.Canvas */ + @Override public abstract Type getType(); /** * Set the title if it's a windowed display * @param title */ + @Override public abstract void setTitle(String title); /** * Restart if it's a windowed or full-screen display. */ + @Override public abstract void restart(); /** @@ -95,6 +98,7 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna if (!JmeSystem.isLowPermissions()){ // Enable uncaught exception handler only for current thread Thread.currentThread().setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { + @Override public void uncaughtException(Thread thread, Throwable thrown) { listener.handleError("Uncaught exception thrown in "+thread.toString(), thrown); if (needClose.get()){ @@ -200,6 +204,7 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna super.internalDestroy(); } + @Override public void run(){ if (listener == null) { throw new IllegalStateException("SystemListener is not set on context!" @@ -237,6 +242,7 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna deinitInThread(); } + @Override public JoyInput getJoyInput() { if (joyInput == null){ joyInput = new JInputJoyInput(); @@ -244,6 +250,7 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna return joyInput; } + @Override public MouseInput getMouseInput() { if (mouseInput == null){ mouseInput = new LwjglMouseInput(this); @@ -251,6 +258,7 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna return mouseInput; } + @Override public KeyInput getKeyInput() { if (keyInput == null){ keyInput = new LwjglKeyInput(this); @@ -258,14 +266,17 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna return keyInput; } + @Override public TouchInput getTouchInput() { return null; } + @Override public void setAutoFlushFrames(boolean enabled){ this.autoFlush = enabled; } + @Override public void destroy(boolean waitFor) { if (needClose.get()) { return; // Already destroyed diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglCanvas.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglCanvas.java index 0c5392b19..6100ae514 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglCanvas.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglCanvas.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -158,6 +158,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex return Type.Canvas; } + @Override public void create(boolean waitFor){ if (renderThread == null){ logger.log(Level.FINE, "MAIN: Creating OGL thread."); @@ -182,6 +183,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex // TODO: Handle other cases, like change of pixel format, etc. } + @Override public Canvas getCanvas(){ return canvas; } @@ -285,6 +287,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex } SwingUtilities.invokeLater(new Runnable(){ + @Override public void run(){ canvas.requestFocus(); } @@ -369,6 +372,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex * 1) When the context thread ends * 2) Any time the canvas becomes non-displayable */ + @Override protected void destroyContext(){ try { // invalidate the state so renderer can resume operation diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java index 4d2d776c5..20a049c64 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -92,6 +92,7 @@ public abstract class LwjglContext implements JmeContext { protected LwjglPlatform clPlatform; protected com.jme3.opencl.lwjgl.LwjglContext clContext; + @Override public void setSystemListener(SystemListener listener) { this.listener = listener; } @@ -446,25 +447,31 @@ public abstract class LwjglContext implements JmeContext { } } + @Override public boolean isCreated() { return created.get(); } + @Override public boolean isRenderable() { return renderable.get(); } + @Override public void setSettings(AppSettings settings) { this.settings.copyFrom(settings); } + @Override public AppSettings getSettings() { return settings; } + @Override public Renderer getRenderer() { return renderer; } + @Override public Timer getTimer() { return timer; } diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java index 0fb787efe..a8bb164ef 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -67,6 +67,7 @@ public class LwjglDisplay extends LwjglAbstractDisplay { return null; } + @Override protected void createContext(AppSettings settings) throws LWJGLException{ DisplayMode displayMode; if (settings.getWidth() <= 0 || settings.getHeight() <= 0){ @@ -155,6 +156,7 @@ public class LwjglDisplay extends LwjglAbstractDisplay { } } + @Override protected void destroyContext(){ try { renderer.cleanup(); @@ -165,6 +167,7 @@ public class LwjglDisplay extends LwjglAbstractDisplay { } } + @Override public void create(boolean waitFor){ if (created.get()){ logger.warning("create() called when display is already created!"); @@ -206,10 +209,12 @@ public class LwjglDisplay extends LwjglAbstractDisplay { } } + @Override public Type getType() { return Type.Display; } + @Override public void setTitle(String title){ if (created.get()) Display.setTitle(title); diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java index d4c86a780..48f327be8 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable { height = settings.getHeight(); try{ Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { + @Override public void uncaughtException(Thread thread, Throwable thrown) { listener.handleError("Uncaught exception thrown in "+thread.toString(), thrown); } @@ -148,6 +149,7 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable { super.internalDestroy(); } + @Override public void run(){ loadNatives(); logger.log(Level.FINE, "Using LWJGL {0}", Sys.getVersion()); @@ -158,12 +160,14 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable { deinitInThread(); } + @Override public void destroy(boolean waitFor){ needClose.set(true); if (waitFor) waitFor(false); } + @Override public void create(boolean waitFor){ if (created.get()){ logger.warning("create() called when pbuffer is already created!"); @@ -175,32 +179,40 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable { waitFor(true); } + @Override public void restart() { } + @Override public void setAutoFlushFrames(boolean enabled){ } + @Override public Type getType() { return Type.OffscreenSurface; } + @Override public MouseInput getMouseInput() { return new DummyMouseInput(); } + @Override public KeyInput getKeyInput() { return new DummyKeyInput(); } + @Override public JoyInput getJoyInput() { return null; } + @Override public TouchInput getTouchInput() { return null; } + @Override public void setTitle(String title) { } diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglSmoothingTimer.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglSmoothingTimer.java index 213d472c5..8c4da71b2 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglSmoothingTimer.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglSmoothingTimer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -85,6 +85,7 @@ public class LwjglSmoothingTimer extends Timer { logger.log(Level.FINE, "Timer resolution: {0} ticks per second", LWJGL_TIMER_RES); } + @Override public void reset() { lastFrameDiff = 0; lastFPS = 0; @@ -108,6 +109,7 @@ public class LwjglSmoothingTimer extends Timer { /** * @see Timer#getTime() */ + @Override public long getTime() { return Sys.getTime() - startTime; } @@ -115,6 +117,7 @@ public class LwjglSmoothingTimer extends Timer { /** * @see Timer#getResolution() */ + @Override public long getResolution() { return LWJGL_TIMER_RES; } @@ -125,10 +128,12 @@ public class LwjglSmoothingTimer extends Timer { * * @return the current frame rate. */ + @Override public float getFrameRate() { return lastFPS; } + @Override public float getTimePerFrame() { return lastTPF; } @@ -137,6 +142,7 @@ public class LwjglSmoothingTimer extends Timer { * update recalulates the frame rate based on the previous * call to update. It is assumed that update is called each frame. */ + @Override public void update() { long newTime = Sys.getTime(); long oldTime = this.oldTime; diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglTimer.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglTimer.java index fb69a5550..efa339ef9 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglTimer.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglTimer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -70,6 +70,7 @@ public class LwjglTimer extends Timer { logger.log(Level.FINE, "Timer resolution: {0} ticks per second", LWJGL_TIMER_RES); } + @Override public void reset() { startTime = Sys.getTime(); oldTime = getTime(); @@ -83,6 +84,7 @@ public class LwjglTimer extends Timer { /** * @see Timer#getTime() */ + @Override public long getTime() { return Sys.getTime() - startTime; } @@ -90,6 +92,7 @@ public class LwjglTimer extends Timer { /** * @see Timer#getResolution() */ + @Override public long getResolution() { return LWJGL_TIMER_RES; } @@ -100,10 +103,12 @@ public class LwjglTimer extends Timer { * * @return the current frame rate. */ + @Override public float getFrameRate() { return lastFPS; } + @Override public float getTimePerFrame() { return lastTPF; } @@ -112,6 +117,7 @@ public class LwjglTimer extends Timer { * update recalulates the frame rate based on the previous * call to update. It is assumed that update is called each frame. */ + @Override public void update() { long curTime = getTime(); lastTPF = (curTime - oldTime) * (1.0f / LWJGL_TIMER_RES); diff --git a/jme3-lwjgl3/src/main/java/com/jme3/renderer/lwjgl/LwjglGL.java b/jme3-lwjgl3/src/main/java/com/jme3/renderer/lwjgl/LwjglGL.java index 0d8c32a8d..618b123b4 100644 --- a/jme3-lwjgl3/src/main/java/com/jme3/renderer/lwjgl/LwjglGL.java +++ b/jme3-lwjgl3/src/main/java/com/jme3/renderer/lwjgl/LwjglGL.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -591,6 +591,7 @@ public class LwjglGL extends LwjglRender implements GL, GL2, GL3, GL4 { return GL15.glGetQueryObjecti(query, pname); } + @Override public String glGetShaderInfoLog(int shader, int maxSize) { return GL20.glGetShaderInfoLog(shader, maxSize); } diff --git a/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java b/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java index e84c5c3ce..906cd5df2 100644 --- a/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java +++ b/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -145,6 +145,7 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable { /** * @return Type.Display or Type.Canvas */ + @Override public JmeContext.Type getType() { return type; } @@ -154,6 +155,7 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable { * * @param title the title to set */ + @Override public void setTitle(final String title) { if (created.get() && window != NULL) { glfwSetWindowTitle(window, title); @@ -163,6 +165,7 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable { /** * Restart if it's a windowed or full-screen display. */ + @Override public void restart() { if (created.get()) { needRestart.set(true); diff --git a/jme3-networking/src/main/java/com/jme3/network/AbstractMessage.java b/jme3-networking/src/main/java/com/jme3/network/AbstractMessage.java index 5a13a6823..2fe7b20b0 100644 --- a/jme3-networking/src/main/java/com/jme3/network/AbstractMessage.java +++ b/jme3-networking/src/main/java/com/jme3/network/AbstractMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,6 +57,7 @@ public abstract class AbstractMessage implements Message * Sets this message to 'reliable' or not and returns this * message. */ + @Override public Message setReliable(boolean f) { this.reliable = f; @@ -67,6 +68,7 @@ public abstract class AbstractMessage implements Message * Indicates which way an outgoing message should be sent * or which way an incoming message was sent. */ + @Override public boolean isReliable() { return reliable; diff --git a/jme3-networking/src/main/java/com/jme3/network/Client.java b/jme3-networking/src/main/java/com/jme3/network/Client.java index 3ef9134df..28c966cb8 100644 --- a/jme3-networking/src/main/java/com/jme3/network/Client.java +++ b/jme3-networking/src/main/java/com/jme3/network/Client.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -90,12 +90,14 @@ public interface Client extends MessageConnection /** * Sends a message to the server. */ + @Override public void send( Message message ); /** * Sends a message to the other end of the connection using * the specified alternate channel. */ + @Override public void send( int channel, Message message ); /** diff --git a/jme3-networking/src/main/java/com/jme3/network/Filters.java b/jme3-networking/src/main/java/com/jme3/network/Filters.java index 1cc45e017..ebcc52b22 100644 --- a/jme3-networking/src/main/java/com/jme3/network/Filters.java +++ b/jme3-networking/src/main/java/com/jme3/network/Filters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -118,6 +118,7 @@ public class Filters this.value = value; } + @Override public boolean apply( T input ) { return value == input || (value != null && value.equals(input)); @@ -133,6 +134,7 @@ public class Filters this.collection = collection; } + @Override public boolean apply( T input ) { return collection.contains(input); @@ -148,6 +150,7 @@ public class Filters this.delegate = delegate; } + @Override public boolean apply( T input ) { return !delegate.apply(input); diff --git a/jme3-networking/src/main/java/com/jme3/network/Network.java b/jme3-networking/src/main/java/com/jme3/network/Network.java index 9dac8eae8..6b968a601 100644 --- a/jme3-networking/src/main/java/com/jme3/network/Network.java +++ b/jme3-networking/src/main/java/com/jme3/network/Network.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -175,11 +175,13 @@ public class Network super( gameName, version ); } + @Override public void connectToServer( String host, int port, int remoteUdpPort ) throws IOException { connectToServer( InetAddress.getByName(host), port, remoteUdpPort ); } + @Override public void connectToServer( InetAddress address, int port, int remoteUdpPort ) throws IOException { UdpConnector fast = new UdpConnector( address, remoteUdpPort ); diff --git a/jme3-networking/src/main/java/com/jme3/network/base/ConnectorAdapter.java b/jme3-networking/src/main/java/com/jme3/network/base/ConnectorAdapter.java index 100747ffd..592d69f49 100644 --- a/jme3-networking/src/main/java/com/jme3/network/base/ConnectorAdapter.java +++ b/jme3-networking/src/main/java/com/jme3/network/base/ConnectorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -152,6 +152,7 @@ public class ConnectorAdapter extends Thread errorHandler.handleError( this, e ); } + @Override public void run() { MessageBuffer messageBuffer = protocol.createBuffer(); @@ -203,6 +204,7 @@ public class ConnectorAdapter extends Thread } } + @Override public void run() { while( go.get() ) { diff --git a/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java b/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java index cb2dd2192..97fb42583 100644 --- a/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java +++ b/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -264,6 +264,7 @@ public class KernelAdapter extends Thread } } + @Override public void run() { while( go.get() ) { diff --git a/jme3-networking/src/main/java/com/jme3/network/base/NioKernelFactory.java b/jme3-networking/src/main/java/com/jme3/network/base/NioKernelFactory.java index 024c4d009..6f1a552c6 100644 --- a/jme3-networking/src/main/java/com/jme3/network/base/NioKernelFactory.java +++ b/jme3-networking/src/main/java/com/jme3/network/base/NioKernelFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,6 +45,7 @@ import java.io.IOException; */ public class NioKernelFactory implements KernelFactory { + @Override public Kernel createKernel( int channel, int port ) throws IOException { return new SelectorKernel(port); diff --git a/jme3-networking/src/main/java/com/jme3/network/base/TcpConnectorFactory.java b/jme3-networking/src/main/java/com/jme3/network/base/TcpConnectorFactory.java index 1166dd32e..5a952e040 100644 --- a/jme3-networking/src/main/java/com/jme3/network/base/TcpConnectorFactory.java +++ b/jme3-networking/src/main/java/com/jme3/network/base/TcpConnectorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -52,6 +52,7 @@ public class TcpConnectorFactory implements ConnectorFactory this.remoteAddress = remoteAddress; } + @Override public Connector createConnector( int channel, int port ) throws IOException { return new SocketConnector( remoteAddress, port ); diff --git a/jme3-networking/src/main/java/com/jme3/network/base/protocol/GreedyMessageBuffer.java b/jme3-networking/src/main/java/com/jme3/network/base/protocol/GreedyMessageBuffer.java index 14831dfda..6385b0c08 100644 --- a/jme3-networking/src/main/java/com/jme3/network/base/protocol/GreedyMessageBuffer.java +++ b/jme3-networking/src/main/java/com/jme3/network/base/protocol/GreedyMessageBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,6 +69,7 @@ public class GreedyMessageBuffer implements MessageBuffer { * Returns the next message in the buffer or null if there are no more * messages in the buffer. */ + @Override public Message pollMessage() { if( messages.isEmpty() ) { return null; @@ -79,6 +80,7 @@ public class GreedyMessageBuffer implements MessageBuffer { /** * Returns true if there is a message waiting in the buffer. */ + @Override public boolean hasMessages() { return !messages.isEmpty(); } @@ -87,6 +89,7 @@ public class GreedyMessageBuffer implements MessageBuffer { * Adds byte data to the message buffer. Returns true if there is * a message waiting after this call. */ + @Override public boolean addBytes( ByteBuffer buffer ) { // push the data from the buffer into as // many messages as we can diff --git a/jme3-networking/src/main/java/com/jme3/network/base/protocol/LazyMessageBuffer.java b/jme3-networking/src/main/java/com/jme3/network/base/protocol/LazyMessageBuffer.java index fc66cb148..f3a41ce06 100644 --- a/jme3-networking/src/main/java/com/jme3/network/base/protocol/LazyMessageBuffer.java +++ b/jme3-networking/src/main/java/com/jme3/network/base/protocol/LazyMessageBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,6 +66,7 @@ public class LazyMessageBuffer implements MessageBuffer { * Returns the next message in the buffer or null if there are no more * messages in the buffer. */ + @Override public Message pollMessage() { if( messages.isEmpty() ) { return null; @@ -77,6 +78,7 @@ public class LazyMessageBuffer implements MessageBuffer { /** * Returns true if there is a message waiting in the buffer. */ + @Override public boolean hasMessages() { return !messages.isEmpty(); } @@ -85,6 +87,7 @@ public class LazyMessageBuffer implements MessageBuffer { * Adds byte data to the message buffer. Returns true if there is * a message waiting after this call. */ + @Override public boolean addBytes( ByteBuffer buffer ) { // push the data from the buffer into as // many messages as we can diff --git a/jme3-networking/src/main/java/com/jme3/network/base/protocol/SerializerMessageProtocol.java b/jme3-networking/src/main/java/com/jme3/network/base/protocol/SerializerMessageProtocol.java index 80493660e..6344b7d5a 100644 --- a/jme3-networking/src/main/java/com/jme3/network/base/protocol/SerializerMessageProtocol.java +++ b/jme3-networking/src/main/java/com/jme3/network/base/protocol/SerializerMessageProtocol.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,6 +61,7 @@ public class SerializerMessageProtocol implements MessageProtocol { * and the (short length) + data protocol. If target is null * then a 32k byte buffer will be created and filled. */ + @Override public ByteBuffer toByteBuffer( Message message, ByteBuffer target ) { // Could let the caller pass their own in @@ -84,6 +85,7 @@ public class SerializerMessageProtocol implements MessageProtocol { * Creates and returns a message from the properly sized byte buffer * using com.jme3.network.serializing.Serializer. */ + @Override public Message toMessage( ByteBuffer bytes ) { try { return (Message)Serializer.readClassAndObject(bytes); @@ -92,6 +94,7 @@ public class SerializerMessageProtocol implements MessageProtocol { } } + @Override public MessageBuffer createBuffer() { // Defaulting to LazyMessageBuffer return new LazyMessageBuffer(this); diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/AbstractKernel.java b/jme3-networking/src/main/java/com/jme3/network/kernel/AbstractKernel.java index 7f992e94a..ca1909570 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/AbstractKernel.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/AbstractKernel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -96,6 +96,7 @@ public abstract class AbstractKernel implements Kernel /** * Returns true if there are waiting envelopes. */ + @Override public boolean hasEnvelopes() { return !envelopes.isEmpty(); @@ -105,6 +106,7 @@ public abstract class AbstractKernel implements Kernel * Removes one envelope from the received messages queue or * blocks until one is available. */ + @Override public Envelope read() throws InterruptedException { return envelopes.take(); @@ -114,6 +116,7 @@ public abstract class AbstractKernel implements Kernel * Removes and returnsn one endpoint event from the event queue or * null if there are no endpoint events. */ + @Override public EndpointEvent nextEvent() { return endpointEvents.poll(); diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/EndpointEvent.java b/jme3-networking/src/main/java/com/jme3/network/kernel/EndpointEvent.java index b43f2aaf3..86599da77 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/EndpointEvent.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/EndpointEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -79,6 +79,7 @@ public class EndpointEvent return type; } + @Override public String toString() { return "EndpointEvent[" + type + ", " + endpoint + "]"; diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/Envelope.java b/jme3-networking/src/main/java/com/jme3/network/kernel/Envelope.java index 9b92a1b6d..3739c8611 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/Envelope.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/Envelope.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public class Envelope return reliable; } + @Override public String toString() { return "Envelope[" + source + ", " + (reliable?"reliable":"unreliable") + ", " + data.length + "]"; diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/NamedThreadFactory.java b/jme3-networking/src/main/java/com/jme3/network/kernel/NamedThreadFactory.java index 59dedd883..efc055d63 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/NamedThreadFactory.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/NamedThreadFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -70,6 +70,7 @@ public class NamedThreadFactory implements ThreadFactory this.delegate = delegate; } + @Override public Thread newThread( Runnable r ) { Thread result = delegate.newThread(r); diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/NioEndpoint.java b/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/NioEndpoint.java index 0a022758f..751d7c3c1 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/NioEndpoint.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/NioEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,16 +65,19 @@ public class NioEndpoint implements Endpoint this.kernel = kernel; } + @Override public Kernel getKernel() { return kernel; } + @Override public void close() { close(false); } + @Override public void close( boolean flushData ) { if( flushData ) { @@ -97,16 +100,19 @@ public class NioEndpoint implements Endpoint } } + @Override public long getId() { return id; } + @Override public String getAddress() { return String.valueOf(socket.socket().getRemoteSocketAddress()); } + @Override public boolean isConnected() { return socket.isConnected(); @@ -162,6 +168,7 @@ public class NioEndpoint implements Endpoint return !outbound.isEmpty(); } + @Override public void send( ByteBuffer data ) { if( data == null ) { @@ -173,6 +180,7 @@ public class NioEndpoint implements Endpoint send( data, true, true ); } + @Override public String toString() { return "NioEndpoint[" + id + ", " + socket + "]"; diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SelectorKernel.java b/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SelectorKernel.java index 4db90f68b..7713ca804 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SelectorKernel.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SelectorKernel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -83,6 +83,7 @@ public class SelectorKernel extends AbstractKernel return new SelectorThread(); } + @Override public void initialize() { if( thread != null ) @@ -98,6 +99,7 @@ public class SelectorKernel extends AbstractKernel } } + @Override public void terminate() throws InterruptedException { if( thread == null ) @@ -114,6 +116,7 @@ public class SelectorKernel extends AbstractKernel } } + @Override public void broadcast( Filter filter, ByteBuffer data, boolean reliable, boolean copy ) { @@ -439,6 +442,7 @@ public class SelectorKernel extends AbstractKernel } } + @Override public void run() { log.log( Level.FINE, "Kernel started for connection:{0}.", address ); diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SocketConnector.java b/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SocketConnector.java index 1cb237303..be4682bd9 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SocketConnector.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SocketConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,6 +81,7 @@ public class SocketConnector implements Connector throw new ConnectorException( "Connection is closed:" + remoteAddress ); } + @Override public boolean isConnected() { if( sock == null ) @@ -88,6 +89,7 @@ public class SocketConnector implements Connector return sock.isConnected(); } + @Override public void close() { checkClosed(); @@ -101,6 +103,7 @@ public class SocketConnector implements Connector } } + @Override public boolean available() { checkClosed(); @@ -111,6 +114,7 @@ public class SocketConnector implements Connector } } + @Override public ByteBuffer read() { checkClosed(); @@ -135,6 +139,7 @@ public class SocketConnector implements Connector } } + @Override public void write( ByteBuffer data ) { checkClosed(); diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpConnector.java b/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpConnector.java index bf0f7ddb1..9d27227cf 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpConnector.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,6 +81,7 @@ public class UdpConnector implements Connector throw new ConnectorException( "Connection is closed:" + remoteAddress ); } + @Override public boolean isConnected() { if( sock == null ) @@ -88,6 +89,7 @@ public class UdpConnector implements Connector return sock.isConnected(); } + @Override public void close() { checkClosed(); @@ -101,6 +103,7 @@ public class UdpConnector implements Connector * This always returns false since the simple DatagramSocket usage * cannot be run in a non-blocking way. */ + @Override public boolean available() { // It would take a separate thread or an NIO Selector based implementation to get this @@ -110,6 +113,7 @@ public class UdpConnector implements Connector return false; } + @Override public ByteBuffer read() { checkClosed(); @@ -128,6 +132,7 @@ public class UdpConnector implements Connector } } + @Override public void write( ByteBuffer data ) { checkClosed(); diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpEndpoint.java b/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpEndpoint.java index 0c915ff81..2540fe42e 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpEndpoint.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,6 +66,7 @@ public class UdpEndpoint implements Endpoint this.kernel = kernel; } + @Override public Kernel getKernel() { return kernel; @@ -76,11 +77,13 @@ public class UdpEndpoint implements Endpoint return address; } + @Override public void close() { close( false ); } + @Override public void close( boolean flush ) { // No real reason to flush UDP traffic yet... especially @@ -95,16 +98,19 @@ public class UdpEndpoint implements Endpoint } } + @Override public long getId() { return id; } + @Override public String getAddress() { return String.valueOf(address); } + @Override public boolean isConnected() { // The socket is always unconnected anyway so we track our @@ -112,6 +118,7 @@ public class UdpEndpoint implements Endpoint return connected; } + @Override public void send( ByteBuffer data ) { if( !isConnected() ) { @@ -139,6 +146,7 @@ public class UdpEndpoint implements Endpoint } } + @Override public String toString() { return "UdpEndpoint[" + id + ", " + address + "]"; diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpKernel.java b/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpKernel.java index 57ea17864..4f27385d5 100644 --- a/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpKernel.java +++ b/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpKernel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -84,6 +84,7 @@ public class UdpKernel extends AbstractKernel return new HostThread(); } + @Override public void initialize() { if( thread != null ) @@ -101,6 +102,7 @@ public class UdpKernel extends AbstractKernel } } + @Override public void terminate() throws InterruptedException { if( thread == null ) @@ -122,6 +124,7 @@ public class UdpKernel extends AbstractKernel * Dispatches the data to all endpoints managed by the * kernel. 'routing' is currently ignored. */ + @Override public void broadcast( Filter filter, ByteBuffer data, boolean reliable, boolean copy ) { @@ -209,6 +212,7 @@ public class UdpKernel extends AbstractKernel this.packet = packet; } + @Override public void run() { // Not guaranteed to always work but an extra datagram @@ -263,6 +267,7 @@ public class UdpKernel extends AbstractKernel join(); } + @Override public void run() { log.log( Level.FINE, "Kernel started for connection:{0}.", address ); diff --git a/jme3-networking/src/main/java/com/jme3/network/message/ChannelInfoMessage.java b/jme3-networking/src/main/java/com/jme3/network/message/ChannelInfoMessage.java index cbf435565..231fe19ff 100644 --- a/jme3-networking/src/main/java/com/jme3/network/message/ChannelInfoMessage.java +++ b/jme3-networking/src/main/java/com/jme3/network/message/ChannelInfoMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -67,6 +67,7 @@ public class ChannelInfoMessage extends AbstractMessage { return ports; } + @Override public String toString() { return "ChannelInfoMessage[" + id + ", " + Arrays.asList(ports) + "]"; } diff --git a/jme3-networking/src/main/java/com/jme3/network/message/ClientRegistrationMessage.java b/jme3-networking/src/main/java/com/jme3/network/message/ClientRegistrationMessage.java index d8c19a20c..50272e9de 100644 --- a/jme3-networking/src/main/java/com/jme3/network/message/ClientRegistrationMessage.java +++ b/jme3-networking/src/main/java/com/jme3/network/message/ClientRegistrationMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -79,6 +79,7 @@ public class ClientRegistrationMessage extends AbstractMessage { return version; } + @Override public String toString() { return getClass().getName() + "[id=" + id + ", gameName=" + gameName + ", version=" + version + "]"; } @@ -91,6 +92,7 @@ public class ClientRegistrationMessage extends AbstractMessage { */ public static class ClientRegistrationSerializer extends Serializer { + @Override public ClientRegistrationMessage readObject( ByteBuffer data, Class c ) throws IOException { // Read the null/non-null marker @@ -106,6 +108,7 @@ public class ClientRegistrationMessage extends AbstractMessage { return msg; } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { // Add the null/non-null marker diff --git a/jme3-networking/src/main/java/com/jme3/network/message/DisconnectMessage.java b/jme3-networking/src/main/java/com/jme3/network/message/DisconnectMessage.java index d514232f4..29f732768 100644 --- a/jme3-networking/src/main/java/com/jme3/network/message/DisconnectMessage.java +++ b/jme3-networking/src/main/java/com/jme3/network/message/DisconnectMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public class DisconnectMessage extends AbstractMessage { this.type = type; } + @Override public String toString() { return getClass().getName() + "[reason=" + reason + ", type=" + type + "]"; } @@ -83,6 +84,7 @@ public class DisconnectMessage extends AbstractMessage { */ public static class DisconnectSerializer extends Serializer { + @Override public DisconnectMessage readObject( ByteBuffer data, Class c ) throws IOException { // Read the null/non-null marker @@ -97,6 +99,7 @@ public class DisconnectMessage extends AbstractMessage { return msg; } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { // Add the null/non-null marker diff --git a/jme3-networking/src/main/java/com/jme3/network/rmi/ObjectStore.java b/jme3-networking/src/main/java/com/jme3/network/rmi/ObjectStore.java index 05634b3ab..7313be0d8 100644 --- a/jme3-networking/src/main/java/com/jme3/network/rmi/ObjectStore.java +++ b/jme3-networking/src/main/java/com/jme3/network/rmi/ObjectStore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -87,14 +87,17 @@ public class ObjectStore { public class ServerEventHandler implements MessageListener, ConnectionListener { + @Override public void messageReceived(HostedConnection source, Message m) { onMessage(source, m); } + @Override public void connectionAdded(Server server, HostedConnection conn) { onConnection(conn); } + @Override public void connectionRemoved(Server server, HostedConnection conn) { } @@ -103,14 +106,17 @@ public class ObjectStore { public class ClientEventHandler implements MessageListener, ClientStateListener { + @Override public void messageReceived(Object source, Message m) { onMessage(null, m); } + @Override public void clientConnected(Client c) { onConnection(null); } + @Override public void clientDisconnected(Client c, DisconnectInfo info) { } diff --git a/jme3-networking/src/main/java/com/jme3/network/rmi/RemoteObject.java b/jme3-networking/src/main/java/com/jme3/network/rmi/RemoteObject.java index 66f6c3531..7d822b929 100644 --- a/jme3-networking/src/main/java/com/jme3/network/rmi/RemoteObject.java +++ b/jme3-networking/src/main/java/com/jme3/network/rmi/RemoteObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -129,6 +129,7 @@ public class RemoteObject implements InvocationHandler { /** * Callback from InvocationHandler. */ + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { return store.invokeRemoteMethod(this, method, args); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/SerializerRegistration.java b/jme3-networking/src/main/java/com/jme3/network/serializing/SerializerRegistration.java index 373d969eb..7b1de5738 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/SerializerRegistration.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/SerializerRegistration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -75,6 +75,7 @@ public final class SerializerRegistration { return type; } + @Override public String toString() { return "SerializerRegistration[" + id + ", " + type + ", " + serializer + "]"; } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ArraySerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ArraySerializer.java index 564f4a06e..ade05a59f 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ArraySerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ArraySerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine, Java Game Networking + * Copyright (c) 2009-2020 jMonkeyEngine, Java Game Networking * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -67,6 +67,7 @@ public class ArraySerializer extends Serializer { } } + @Override public T readObject(ByteBuffer data, Class c) throws IOException { byte dimensionCount = data.get(); if (dimensionCount == 0) @@ -89,6 +90,7 @@ public class ArraySerializer extends Serializer { return array; } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { if (object == null){ buffer.put((byte)0); diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/BooleanSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/BooleanSerializer.java index 2bfb8e62b..7393edd1a 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/BooleanSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/BooleanSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,10 +43,12 @@ import java.nio.ByteBuffer; @SuppressWarnings("unchecked") public class BooleanSerializer extends Serializer { + @Override public Boolean readObject(ByteBuffer data, Class c) throws IOException { return data.get() == 1; } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { buffer.put(((Boolean)object) ? (byte)1 : (byte)0); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ByteSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ByteSerializer.java index 4e085bbe6..9c36954f9 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ByteSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ByteSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,10 +43,12 @@ import java.nio.ByteBuffer; @SuppressWarnings("unchecked") public class ByteSerializer extends Serializer { + @Override public Byte readObject(ByteBuffer data, Class c) throws IOException { return data.get(); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { buffer.put((Byte)object); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/CharSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/CharSerializer.java index 274bc30db..be3276565 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/CharSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/CharSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,10 +43,12 @@ import java.nio.ByteBuffer; @SuppressWarnings("unchecked") public class CharSerializer extends Serializer { + @Override public Character readObject(ByteBuffer data, Class c) throws IOException { return data.getChar(); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { buffer.putChar((Character)object); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/CollectionSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/CollectionSerializer.java index 960e8be10..c26185df7 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/CollectionSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/CollectionSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,6 +48,7 @@ import java.util.logging.Level; public class CollectionSerializer extends Serializer { @SuppressWarnings("unchecked") + @Override public T readObject(ByteBuffer data, Class c) throws IOException { int length = data.getInt(); @@ -77,6 +78,7 @@ public class CollectionSerializer extends Serializer { return (T)collection; } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { Collection collection = (Collection)object; int length = collection.size(); diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/DateSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/DateSerializer.java index 5bd8c465a..7ce507a70 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/DateSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/DateSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,10 +44,12 @@ import java.util.Date; @SuppressWarnings("unchecked") public class DateSerializer extends Serializer { + @Override public Date readObject(ByteBuffer data, Class c) throws IOException { return new Date(data.getLong()); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { buffer.putLong(((Date)object).getTime()); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/DoubleSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/DoubleSerializer.java index cb7494d9e..5472d7b06 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/DoubleSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/DoubleSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,10 +43,12 @@ import java.nio.ByteBuffer; @SuppressWarnings("unchecked") public class DoubleSerializer extends Serializer { + @Override public Double readObject(ByteBuffer data, Class c) throws IOException { return data.getDouble(); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { buffer.putDouble((Double)object); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/EnumSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/EnumSerializer.java index 3b89f7d5a..6740ea038 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/EnumSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/EnumSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ import java.nio.ByteBuffer; * @author Lars Wesselius */ public class EnumSerializer extends Serializer { + @Override public T readObject(ByteBuffer data, Class c) throws IOException { try { int ordinal = data.getInt(); @@ -57,6 +58,7 @@ public class EnumSerializer extends Serializer { } } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { if (object == null) { buffer.putInt(-1); diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/FieldSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/FieldSerializer.java index 0d410bb4d..b4abceaa8 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/FieldSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/FieldSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine, Java Game Networking + * Copyright (c) 2009-2020 jMonkeyEngine, Java Game Networking * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -80,6 +80,7 @@ public class FieldSerializer extends Serializer { throw new RuntimeException( "Registration error: no-argument constructor not found on:" + clazz ); } + @Override public void initialize(Class clazz) { checkClass(clazz); @@ -123,6 +124,7 @@ public class FieldSerializer extends Serializer { } Collections.sort(cachedFields, new Comparator() { + @Override public int compare (SavedField o1, SavedField o2) { return o1.field.getName().compareTo(o2.field.getName()); } @@ -133,6 +135,7 @@ public class FieldSerializer extends Serializer { } @SuppressWarnings("unchecked") + @Override public T readObject(ByteBuffer data, Class c) throws IOException { // Read the null/non-null marker @@ -171,6 +174,7 @@ public class FieldSerializer extends Serializer { return object; } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { // Add the null/non-null marker diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/FloatSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/FloatSerializer.java index 519b43550..42e65487f 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/FloatSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/FloatSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,10 +43,12 @@ import java.nio.ByteBuffer; @SuppressWarnings("unchecked") public class FloatSerializer extends Serializer { + @Override public Float readObject(ByteBuffer data, Class c) throws IOException { return data.getFloat(); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { buffer.putFloat((Float)object); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/GZIPSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/GZIPSerializer.java index 7579e84c5..63b264e6c 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/GZIPSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/GZIPSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -49,6 +49,7 @@ import java.util.zip.GZIPOutputStream; public class GZIPSerializer extends Serializer { @SuppressWarnings("unchecked") + @Override public T readObject(ByteBuffer data, Class c) throws IOException { try { @@ -77,6 +78,7 @@ public class GZIPSerializer extends Serializer { } } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { if (!(object instanceof GZIPCompressedMessage)) return; Message message = ((GZIPCompressedMessage)object).getMessage(); diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/IntSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/IntSerializer.java index db8a4954c..373ab89db 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/IntSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/IntSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,10 +43,12 @@ import java.nio.ByteBuffer; @SuppressWarnings("unchecked") public class IntSerializer extends Serializer { + @Override public Integer readObject(ByteBuffer data, Class c) throws IOException { return data.getInt(); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { buffer.putInt((Integer)object); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/LongSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/LongSerializer.java index 28ebb28ca..6545d4b4d 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/LongSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/LongSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,10 +43,12 @@ import java.nio.ByteBuffer; @SuppressWarnings("unchecked") public class LongSerializer extends Serializer { + @Override public Long readObject(ByteBuffer data, Class c) throws IOException { return data.getLong(); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { buffer.putLong((Long)object); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/MapSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/MapSerializer.java index 4d41c57f0..a83e506f3 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/MapSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/MapSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ public class MapSerializer extends Serializer { */ @SuppressWarnings("unchecked") + @Override public T readObject(ByteBuffer data, Class c) throws IOException { int length = data.getInt(); @@ -124,6 +125,7 @@ public class MapSerializer extends Serializer { } @SuppressWarnings("unchecked") + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { Map map = (Map)object; int length = map.size(); diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/SerializableSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/SerializableSerializer.java index 32eb2af2e..927053e55 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/SerializableSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/SerializableSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,10 +45,12 @@ import java.nio.ByteBuffer; @SuppressWarnings("unchecked") public class SerializableSerializer extends Serializer { + @Override public Serializable readObject(ByteBuffer data, Class c) throws IOException { throw new UnsupportedOperationException( "Serializable serialization not supported." ); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { throw new UnsupportedOperationException( "Serializable serialization not supported." ); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ShortSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ShortSerializer.java index 513162666..c30633516 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ShortSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ShortSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,10 +42,12 @@ import java.nio.ByteBuffer; */ @SuppressWarnings("unchecked") public class ShortSerializer extends Serializer { + @Override public Short readObject(ByteBuffer data, Class c) throws IOException { return data.getShort(); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { buffer.putShort((Short)object); } diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/StringSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/StringSerializer.java index 3452bfa37..2f3bd8002 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/StringSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/StringSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -93,10 +93,12 @@ public class StringSerializer extends Serializer { return new String(buffer, "UTF-8"); } + @Override public String readObject(ByteBuffer data, Class c) throws IOException { return readString(data); } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { String string = (String)object; diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/Vector3Serializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/Vector3Serializer.java index 685dc5b9e..8c4251acb 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/Vector3Serializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/Vector3Serializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ import java.nio.ByteBuffer; @SuppressWarnings("unchecked") public class Vector3Serializer extends Serializer { + @Override public Vector3f readObject(ByteBuffer data, Class c) throws IOException { Vector3f vec3 = new Vector3f(); vec3.x = data.getFloat(); @@ -50,6 +51,7 @@ public class Vector3Serializer extends Serializer { return vec3; } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { Vector3f vec3 = (Vector3f) object; buffer.putFloat(vec3.x); diff --git a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ZIPSerializer.java b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ZIPSerializer.java index ad7d7162d..cb8bd2a18 100644 --- a/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ZIPSerializer.java +++ b/jme3-networking/src/main/java/com/jme3/network/serializing/serializers/ZIPSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -50,6 +50,7 @@ import java.util.zip.ZipOutputStream; public class ZIPSerializer extends Serializer { @SuppressWarnings("unchecked") + @Override public T readObject(ByteBuffer data, Class c) throws IOException { try { @@ -83,6 +84,7 @@ public class ZIPSerializer extends Serializer { } } + @Override public void writeObject(ByteBuffer buffer, Object object) throws IOException { if (!(object instanceof ZIPCompressedMessage)) return; diff --git a/jme3-networking/src/main/java/com/jme3/network/util/SessionDataDelegator.java b/jme3-networking/src/main/java/com/jme3/network/util/SessionDataDelegator.java index f2bee3373..6bad70951 100644 --- a/jme3-networking/src/main/java/com/jme3/network/util/SessionDataDelegator.java +++ b/jme3-networking/src/main/java/com/jme3/network/util/SessionDataDelegator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 jMonkeyEngine + * Copyright (c) 2015-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -92,6 +92,7 @@ public class SessionDataDelegator extends AbstractMessageDelegator unusedJoints = new ArrayList<>(); + @Override public void startElement(String uri, String localName, String qName, Attributes attribs) throws SAXException { if (qName.equals("position") || qName.equals("translate")) { position = SAXUtil.parseVector3(attribs); @@ -132,6 +133,7 @@ public class SkeletonLoader extends DefaultHandler implements AssetLoader { elementStack.add(qName); } + @Override public void endElement(String uri, String name, String qName) { if (qName.equals("translate") || qName.equals("position") || qName.equals("scale")) { } else if (qName.equals("axis")) { @@ -288,6 +290,7 @@ public class SkeletonLoader extends DefaultHandler implements AssetLoader { } + @Override public Object load(AssetInfo info) throws IOException { //AssetManager assetManager = info.getManager(); InputStream in = null; diff --git a/jme3-plugins/src/xml/java/com/jme3/export/xml/DOMInputCapsule.java b/jme3-plugins/src/xml/java/com/jme3/export/xml/DOMInputCapsule.java index 22779cf25..0fdc7f210 100644 --- a/jme3-plugins/src/xml/java/com/jme3/export/xml/DOMInputCapsule.java +++ b/jme3-plugins/src/xml/java/com/jme3/export/xml/DOMInputCapsule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -76,6 +76,7 @@ public class DOMInputCapsule implements InputCapsule { importer.formatVersion = version.equals("") ? 0 : Integer.parseInt(version); } + @Override public int getSavableVersion(Class desiredClass) { if (classHierarchyVersions != null){ return SavableClassUtil.getSavedSavableVersion(savable, desiredClass, @@ -123,6 +124,7 @@ public class DOMInputCapsule implements InputCapsule { return null; } + @Override public byte readByte(String name, byte defVal) throws IOException { String tmpString = currentElem.getAttribute(name); if (tmpString == null || tmpString.length() < 1) return defVal; @@ -139,6 +141,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public byte[] readByteArray(String name, byte[] defVal) throws IOException { try { Element tmpEl; @@ -178,6 +181,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public byte[][] readByteArray2D(String name, byte[][] defVal) throws IOException { try { Element tmpEl; @@ -224,6 +228,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public int readInt(String name, int defVal) throws IOException { String tmpString = currentElem.getAttribute(name); if (tmpString == null || tmpString.length() < 1) return defVal; @@ -240,6 +245,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public int[] readIntArray(String name, int[] defVal) throws IOException { try { Element tmpEl; @@ -278,6 +284,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public int[][] readIntArray2D(String name, int[][] defVal) throws IOException { try { Element tmpEl; @@ -327,6 +334,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public float readFloat(String name, float defVal) throws IOException { String tmpString = currentElem.getAttribute(name); if (tmpString == null || tmpString.length() < 1) return defVal; @@ -343,6 +351,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public float[] readFloatArray(String name, float[] defVal) throws IOException { try { Element tmpEl; @@ -377,6 +386,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public float[][] readFloatArray2D(String name, float[][] defVal) throws IOException { /* Why does this one method ignore the 'size attr.? */ try { @@ -413,6 +423,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public double readDouble(String name, double defVal) throws IOException { String tmpString = currentElem.getAttribute(name); if (tmpString == null || tmpString.length() < 1) return defVal; @@ -429,6 +440,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public double[] readDoubleArray(String name, double[] defVal) throws IOException { try { Element tmpEl; @@ -467,6 +479,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public double[][] readDoubleArray2D(String name, double[][] defVal) throws IOException { try { Element tmpEl; @@ -512,6 +525,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public long readLong(String name, long defVal) throws IOException { String tmpString = currentElem.getAttribute(name); if (tmpString == null || tmpString.length() < 1) return defVal; @@ -528,6 +542,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public long[] readLongArray(String name, long[] defVal) throws IOException { try { Element tmpEl; @@ -566,6 +581,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public long[][] readLongArray2D(String name, long[][] defVal) throws IOException { try { Element tmpEl; @@ -611,6 +627,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public short readShort(String name, short defVal) throws IOException { String tmpString = currentElem.getAttribute(name); if (tmpString == null || tmpString.length() < 1) return defVal; @@ -627,6 +644,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public short[] readShortArray(String name, short[] defVal) throws IOException { try { Element tmpEl; @@ -665,6 +683,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public short[][] readShortArray2D(String name, short[][] defVal) throws IOException { try { Element tmpEl; @@ -711,6 +730,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public boolean readBoolean(String name, boolean defVal) throws IOException { String tmpString = currentElem.getAttribute(name); if (tmpString == null || tmpString.length() < 1) return defVal; @@ -723,6 +743,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public boolean[] readBooleanArray(String name, boolean[] defVal) throws IOException { try { Element tmpEl; @@ -757,6 +778,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public boolean[][] readBooleanArray2D(String name, boolean[][] defVal) throws IOException { try { Element tmpEl; @@ -802,6 +824,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public String readString(String name, String defVal) throws IOException { String tmpString = currentElem.getAttribute(name); if (tmpString == null || tmpString.length() < 1) return defVal; @@ -814,6 +837,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public String[] readStringArray(String name, String[] defVal) throws IOException { try { Element tmpEl; @@ -858,6 +882,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public String[][] readStringArray2D(String name, String[][] defVal) throws IOException { try { Element tmpEl; @@ -903,6 +928,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public BitSet readBitSet(String name, BitSet defVal) throws IOException { String tmpString = currentElem.getAttribute(name); if (tmpString == null || tmpString.length() < 1) return defVal; @@ -927,6 +953,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public Savable readSavable(String name, Savable defVal) throws IOException { Savable ret = defVal; if (name != null && name.equals("")) @@ -1007,6 +1034,7 @@ public class DOMInputCapsule implements InputCapsule { return ret; } + @Override public Savable[] readSavableArray(String name, Savable[] defVal) throws IOException { Savable[] ret = defVal; try { @@ -1041,6 +1069,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public Savable[][] readSavableArray2D(String name, Savable[][] defVal) throws IOException { Savable[][] ret = defVal; try { @@ -1075,6 +1104,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public ArrayList readSavableArrayList(String name, ArrayList defVal) throws IOException { try { Element tmpEl = findChildElement(currentElem, name); @@ -1108,6 +1138,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public ArrayList[] readSavableArrayListArray( String name, ArrayList[] defVal) throws IOException { try { @@ -1153,6 +1184,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public ArrayList[][] readSavableArrayListArray2D(String name, ArrayList[][] defVal) throws IOException { try { Element tmpEl = findChildElement(currentElem, name); @@ -1186,6 +1218,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public ArrayList readFloatBufferArrayList( String name, ArrayList defVal) throws IOException { try { @@ -1224,6 +1257,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public Map readSavableMap(String name, Map defVal) throws IOException { Map ret; Element tempEl; @@ -1250,6 +1284,7 @@ public class DOMInputCapsule implements InputCapsule { return ret; } + @Override public Map readStringSavableMap(String name, Map defVal) throws IOException { Map ret = null; Element tempEl; @@ -1280,6 +1315,7 @@ public class DOMInputCapsule implements InputCapsule { return ret; } + @Override public IntMap readIntSavableMap(String name, IntMap defVal) throws IOException { IntMap ret = null; Element tempEl; @@ -1313,6 +1349,7 @@ public class DOMInputCapsule implements InputCapsule { /** * reads from currentElem if name is null */ + @Override public FloatBuffer readFloatBuffer(String name, FloatBuffer defVal) throws IOException { try { Element tmpEl; @@ -1350,6 +1387,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public IntBuffer readIntBuffer(String name, IntBuffer defVal) throws IOException { try { Element tmpEl = findChildElement(currentElem, name); @@ -1383,6 +1421,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public ByteBuffer readByteBuffer(String name, ByteBuffer defVal) throws IOException { try { Element tmpEl = findChildElement(currentElem, name); @@ -1416,6 +1455,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public ShortBuffer readShortBuffer(String name, ShortBuffer defVal) throws IOException { try { Element tmpEl = findChildElement(currentElem, name); @@ -1449,6 +1489,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public ArrayList readByteBufferArrayList(String name, ArrayList defVal) throws IOException { try { Element tmpEl = findChildElement(currentElem, name); @@ -1485,6 +1526,7 @@ public class DOMInputCapsule implements InputCapsule { } } + @Override public > T readEnum(String name, Class enumType, T defVal) throws IOException { T ret = defVal; diff --git a/jme3-plugins/src/xml/java/com/jme3/export/xml/XMLImporter.java b/jme3-plugins/src/xml/java/com/jme3/export/xml/XMLImporter.java index d531a0840..b8f1867c0 100644 --- a/jme3-plugins/src/xml/java/com/jme3/export/xml/XMLImporter.java +++ b/jme3-plugins/src/xml/java/com/jme3/export/xml/XMLImporter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,10 +59,12 @@ public class XMLImporter implements JmeImporter { public XMLImporter() { } + @Override public int getFormatVersion() { return formatVersion; } + @Override public AssetManager getAssetManager(){ return assetManager; } @@ -71,6 +73,7 @@ public class XMLImporter implements JmeImporter { this.assetManager = assetManager; } + @Override public Object load(AssetInfo info) throws IOException { assetManager = info.getManager(); InputStream in = info.openStream(); @@ -108,6 +111,7 @@ public class XMLImporter implements JmeImporter { } } + @Override public InputCapsule getCapsule(Savable id) { return domIn; } diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/GeoMap.java b/jme3-terrain/src/main/java/com/jme3/terrain/GeoMap.java index a6774400a..d0db8082a 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/GeoMap.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/GeoMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -323,6 +323,7 @@ public class GeoMap implements Savable { return m; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(hdata, "hdataarray", null); @@ -331,6 +332,7 @@ public class GeoMap implements Savable { oc.write(maxval, "maxval", 0); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); hdata = ic.readFloatArray("hdataarray", null); diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainGrid.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainGrid.java index fe754242e..b2e145b42 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainGrid.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainGrid.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -140,6 +140,7 @@ public class TerrainGrid extends TerrainQuad { * attachQuadAt() method. It also resets any cached values in TerrainQuad (such as * neighbours). */ + @Override public void run() { for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { @@ -164,6 +165,7 @@ public class TerrainGrid extends TerrainQuad { // if it should be attached as a child right now, attach it getControl(UpdateControl.class).enqueue(new Callable() { // back on the OpenGL thread: + @Override public Object call() throws Exception { if (newQuad.getParent() != null) { attachQuadAt(newQuad, quadrant, quadCell, true); @@ -176,6 +178,7 @@ public class TerrainGrid extends TerrainQuad { }); } else { getControl(UpdateControl.class).enqueue(new Callable() { + @Override public Object call() throws Exception { removeQuad(newQuad); return null; @@ -187,6 +190,7 @@ public class TerrainGrid extends TerrainQuad { getControl(UpdateControl.class).enqueue(new Callable() { // back on the OpenGL thread: + @Override public Object call() throws Exception { for (Spatial s : getChildren()) { if (s instanceof TerrainQuad) { @@ -489,6 +493,7 @@ public class TerrainGrid extends TerrainQuad { */ protected ExecutorService createExecutorService() { final ThreadFactory threadFactory = new ThreadFactory() { + @Override public Thread newThread(Runnable r) { Thread th = new Thread(r); th.setName("jME TerrainGrid Thread"); @@ -500,6 +505,7 @@ public class TerrainGrid extends TerrainQuad { 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), threadFactory) { + @Override protected void afterExecute(Runnable r, Throwable t) { super.afterExecute(r, t); if (t == null && r instanceof Future) { diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainLodControl.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainLodControl.java index 7bab7f207..9e0e3e1e0 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainLodControl.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainLodControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -462,6 +462,7 @@ public class TerrainLodControl extends AbstractControl { this.lodCalculator = lodCalculator; } + @Override public HashMap call() throws Exception { TerrainQuad terrainQuad = (TerrainQuad) getSpatial(); diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainQuad.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainQuad.java index e60ffb7bf..ad90e7661 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainQuad.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainQuad.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -282,6 +282,7 @@ public class TerrainQuad extends Node implements Terrain { * calculator. This routine can take a long time to run! * @param progressMonitor optional */ + @Override public void generateEntropy(ProgressMonitor progressMonitor) { // only check this on the root quad if (isRootQuad()) @@ -313,10 +314,12 @@ public class TerrainQuad extends Node implements Terrain { return (getParent() != null && !(getParent() instanceof TerrainQuad) ); } + @Override public Material getMaterial() { return getMaterial(null); } + @Override public Material getMaterial(Vector3f worldLocation) { // get the material from one of the children. They all share the same material if (children != null) { @@ -332,6 +335,7 @@ public class TerrainQuad extends Node implements Terrain { return null; } + @Override public int getNumMajorSubdivisions() { return 1; } @@ -873,6 +877,7 @@ public class TerrainQuad extends Node implements Terrain { affectedAreaBBox = new BoundingBox(getWorldTranslation(), Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE); } + @Override public float getHeightmapHeight(Vector2f xz) { // offset int halfSize = totalSize / 2; @@ -1048,6 +1053,7 @@ public class TerrainQuad extends Node implements Terrain { * @param xz the location to get the height for * @return Float.NAN if the value does not exist, or the coordinates are outside of the terrain */ + @Override public float getHeight(Vector2f xz) { // offset float x = (float)(((xz.x - getWorldTranslation().x) / getWorldScale().x) + (float)(totalSize-1) / 2f); @@ -1075,6 +1081,7 @@ public class TerrainQuad extends Node implements Terrain { return Float.NaN; } + @Override public Vector3f getNormal(Vector2f xz) { // offset float x = (float)(((xz.x - getWorldTranslation().x) / getWorldScale().x) + (float)(totalSize-1) / 2f); @@ -1107,6 +1114,7 @@ public class TerrainQuad extends Node implements Terrain { return n1.add(n2).add(n3).add(n4).normalize(); } + @Override public void setHeight(Vector2f xz, float height) { List coord = new ArrayList(); coord.add(xz); @@ -1116,6 +1124,7 @@ public class TerrainQuad extends Node implements Terrain { setHeight(coord, h); } + @Override public void adjustHeight(Vector2f xz, float delta) { List coord = new ArrayList(); coord.add(xz); @@ -1125,10 +1134,12 @@ public class TerrainQuad extends Node implements Terrain { adjustHeight(coord, h); } + @Override public void setHeight(List xz, List height) { setHeight(xz, height, true); } + @Override public void adjustHeight(List xz, List height) { setHeight(xz, height, false); } @@ -1265,6 +1276,7 @@ public class TerrainQuad extends Node implements Terrain { } + @Override public int getTerrainSize() { return totalSize; } @@ -1290,6 +1302,7 @@ public class TerrainQuad extends Node implements Terrain { * Locked meshes are uneditable but have better performance. * @param locked or unlocked */ + @Override public void setLocked(boolean locked) { for (int i = 0; i < this.getQuantity(); i++) { if (this.getChild(i) instanceof TerrainQuad) { @@ -1827,6 +1840,7 @@ public class TerrainQuad extends Node implements Terrain { } } + @Override public int getMaxLod() { if (maxLod < 0) maxLod = Math.max(1, (int) (FastMath.log(size-1)/FastMath.log(2)) -1); // -1 forces our minimum of 4 triangles wide @@ -1842,6 +1856,7 @@ public class TerrainQuad extends Node implements Terrain { return totalSize; } + @Override public float[] getHeightMap() { float[] hm = null; diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/AssetTileLoader.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/AssetTileLoader.java index 54cd15c00..1d04afb04 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/AssetTileLoader.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/AssetTileLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,6 +65,7 @@ public class AssetTileLoader implements TerrainGridTileLoader { this.assetPath = assetPath; } + @Override public TerrainQuad getTerrainQuadAt(Vector3f location) { String modelName = assetPath + "/" + name + "_" + Math.round(location.x) + "_" + Math.round(location.y) + "_" + Math.round(location.z) + ".j3o"; Logger.getLogger(this.getClass().getName()).log(Level.FINE, "Load terrain grid tile: {0}", modelName); @@ -91,10 +92,12 @@ public class AssetTileLoader implements TerrainGridTileLoader { return name; } + @Override public void setPatchSize(int patchSize) { this.patchSize = patchSize; } + @Override public void setQuadSize(int quadSize) { this.quadSize = quadSize; } @@ -104,12 +107,14 @@ public class AssetTileLoader implements TerrainGridTileLoader { return q; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule c = ex.getCapsule(this); c.write(assetPath, "assetPath", null); c.write(name, "name", null); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule c = im.getCapsule(this); manager = im.getAssetManager(); diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java index 60f01afcd..da0b66621 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -89,24 +89,29 @@ public class FractalTileLoader implements TerrainGridTileLoader{ return heightmap; } + @Override public TerrainQuad getTerrainQuadAt(Vector3f location) { HeightMap heightMapAt = getHeightMapAt(location); TerrainQuad q = new TerrainQuad("Quad" + location, patchSize, quadSize, heightMapAt == null ? null : heightMapAt.getHeightMap()); return q; } + @Override public void setPatchSize(int patchSize) { this.patchSize = patchSize; } + @Override public void setQuadSize(int quadSize) { this.quadSize = quadSize; } + @Override public void write(JmeExporter ex) throws IOException { //TODO: serialization } + @Override public void read(JmeImporter im) throws IOException { //TODO: serialization } diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/ImageTileLoader.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/ImageTileLoader.java index ffd77c0c7..16442798f 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/ImageTileLoader.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/grid/ImageTileLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,6 +62,7 @@ public class ImageTileLoader implements TerrainGridTileLoader{ public ImageTileLoader(final String textureBase, final String textureExt, AssetManager assetManager) { this(assetManager, new Namer() { + @Override public String getName(int x, int y) { return textureBase + "_" + x + "_" + y + "." + textureExt; } @@ -156,24 +157,29 @@ public class ImageTileLoader implements TerrainGridTileLoader{ this.patchSize = size - 1; } + @Override public TerrainQuad getTerrainQuadAt(Vector3f location) { HeightMap heightMapAt = getHeightMapAt(location); TerrainQuad q = new TerrainQuad("Quad" + location, patchSize, quadSize, heightMapAt == null ? null : heightMapAt.getHeightMap()); return q; } + @Override public void setPatchSize(int patchSize) { this.patchSize = patchSize; } + @Override public void setQuadSize(int quadSize) { this.quadSize = quadSize; } + @Override public void write(JmeExporter ex) throws IOException { //TODO: serialization } + @Override public void read(JmeImporter im) throws IOException { //TODO: serialization } diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/DistanceLodCalculator.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/DistanceLodCalculator.java index e60d80b56..6e84bea57 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/DistanceLodCalculator.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/DistanceLodCalculator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,6 +62,7 @@ public class DistanceLodCalculator implements LodCalculator { this.lodMultiplier = multiplier; } + @Override public boolean calculateLod(TerrainPatch terrainPatch, List locations, HashMap updates) { if (locations == null || locations.isEmpty()) return false;// no camera yet @@ -114,12 +115,14 @@ public class DistanceLodCalculator implements LodCalculator { return loc; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(size, "patchSize", 32); oc.write(lodMultiplier, "lodMultiplier", 32); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); size = ic.readInt("patchSize", 32); @@ -148,6 +151,7 @@ public class DistanceLodCalculator implements LodCalculator { * Does this calculator require the terrain to have the difference of * LOD levels of neighbours to be more than 1. */ + @Override public boolean usesVariableLod() { return false; } @@ -168,14 +172,17 @@ public class DistanceLodCalculator implements LodCalculator { this.size = size; } + @Override public void turnOffLod() { turnOffLod = true; } + @Override public boolean isLodOff() { return turnOffLod; } + @Override public void turnOnLod() { turnOffLod = false; } diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/PerspectiveLodCalculator.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/PerspectiveLodCalculator.java index b26699631..e2441503c 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/PerspectiveLodCalculator.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/PerspectiveLodCalculator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -72,6 +72,7 @@ public class PerspectiveLodCalculator implements LodCalculator { return A / T; } + @Override public boolean calculateLod(TerrainPatch patch, List locations, HashMap updates) { if (turnOffLod) { // set to full detail @@ -139,13 +140,16 @@ public class PerspectiveLodCalculator implements LodCalculator { } } + @Override public void write(JmeExporter ex) throws IOException { } + @Override public void read(JmeImporter im) throws IOException { } + @Override public boolean usesVariableLod() { return true; } @@ -162,14 +166,17 @@ public class PerspectiveLodCalculator implements LodCalculator { this.cam = cam; } + @Override public void turnOffLod() { turnOffLod = true; } + @Override public boolean isLodOff() { return turnOffLod; } + @Override public void turnOnLod() { turnOffLod = false; } diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/SimpleLodThreshold.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/SimpleLodThreshold.java index 6f7ea57dc..7ac6aa85b 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/SimpleLodThreshold.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/lodcalc/SimpleLodThreshold.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -83,16 +83,19 @@ public class SimpleLodThreshold implements LodThreshold { } + @Override public float getLodDistanceThreshold() { return size*lodMultiplier; } + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = ex.getCapsule(this); oc.write(size, "size", 16); oc.write(lodMultiplier, "lodMultiplier", 2); } + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = im.getCapsule(this); size = ic.readInt("size", 16); diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/picking/BresenhamTerrainPicker.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/picking/BresenhamTerrainPicker.java index 5adf4f2bd..08d354088 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/picking/BresenhamTerrainPicker.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/picking/BresenhamTerrainPicker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -82,6 +82,7 @@ public class BresenhamTerrainPicker implements TerrainPicker { return multipleCollisions; } + @Override public int getTerrainIntersection(Ray worldPick, CollisionResults results) { int numCollisions = 0; worldPickRay.set(worldPick); diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/picking/TerrainPickData.java b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/picking/TerrainPickData.java index 576dd15ca..9edcf1138 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/picking/TerrainPickData.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/picking/TerrainPickData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -53,6 +53,7 @@ public class TerrainPickData implements Comparable { this.cr = cr; } + @Override public int compareTo(Object o) { if (o instanceof TerrainPickData) { TerrainPickData tpd = (TerrainPickData) o; diff --git a/jme3-terrain/src/main/java/com/jme3/terrain/heightmap/AbstractHeightMap.java b/jme3-terrain/src/main/java/com/jme3/terrain/heightmap/AbstractHeightMap.java index c6466c17b..e656bd2aa 100644 --- a/jme3-terrain/src/main/java/com/jme3/terrain/heightmap/AbstractHeightMap.java +++ b/jme3-terrain/src/main/java/com/jme3/terrain/heightmap/AbstractHeightMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,6 +69,7 @@ public abstract class AbstractHeightMap implements HeightMap { * unloadHeightMap clears the data of the height map. This * insures it is ready for reloading. */ + @Override public void unloadHeightMap() { heightData = null; } @@ -81,6 +82,7 @@ public abstract class AbstractHeightMap implements HeightMap { * @param scale * the scale to multiply height values by. */ + @Override public void setHeightScale(float scale) { heightScale = scale; } @@ -97,6 +99,7 @@ public abstract class AbstractHeightMap implements HeightMap { * @param z * the z (north/south) coordinate. */ + @Override public void setHeightAtPoint(float height, int x, int z) { heightData[x + (z * size)] = height; } @@ -112,6 +115,7 @@ public abstract class AbstractHeightMap implements HeightMap { * @throws JmeException * if the size is less than or equal to zero. */ + @Override public void setSize(int size) throws Exception { if (size <= 0) { throw new Exception("size must be greater than zero."); @@ -131,6 +135,7 @@ public abstract class AbstractHeightMap implements HeightMap { * @throws JmeException * if filter is less than 0 or greater than 1. */ + @Override public void setMagnificationFilter(float filter) throws Exception { if (filter < 0 || filter >= 1) { throw new Exception("filter must be between 0 and 1"); @@ -148,6 +153,7 @@ public abstract class AbstractHeightMap implements HeightMap { * the z (north/south) coordinate. * @return the value at (x,z). */ + @Override public float getTrueHeightAtPoint(int x, int z) { //logger.fine( heightData[x + (z*size)]); return heightData[x + (z * size)]; @@ -163,6 +169,7 @@ public abstract class AbstractHeightMap implements HeightMap { * the z (north/south) coordinate. * @return the scaled value at (x, z). */ + @Override public float getScaledHeightAtPoint(int x, int z) { return ((heightData[x + (z * size)]) * heightScale); } @@ -177,6 +184,7 @@ public abstract class AbstractHeightMap implements HeightMap { * the y coordinate of the point. * @return the interpolated height at this point. */ + @Override public float getInterpolatedHeight(float x, float z) { float low, highX, highZ; float intX, intZ; @@ -210,6 +218,7 @@ public abstract class AbstractHeightMap implements HeightMap { * * @return the grid of height data. */ + @Override public float[] getHeightMap() { return heightData; } @@ -218,6 +227,7 @@ public abstract class AbstractHeightMap implements HeightMap { * Build a new array of height data with the scaled values. * @return a new array */ + @Override public float[] getScaledHeightMap() { float[] hm = new float[heightData.length]; for (int i=0; iload is recommended if attributes have changed using * the set methods. */ + @Override public boolean load() { int x, y; int calderaX, calderaY; diff --git a/jme3-vr/src/main/java/com/jme3/app/VRApplication.java b/jme3-vr/src/main/java/com/jme3/app/VRApplication.java index c81d9b882..b609530d9 100644 --- a/jme3-vr/src/main/java/com/jme3/app/VRApplication.java +++ b/jme3-vr/src/main/java/com/jme3/app/VRApplication.java @@ -463,6 +463,7 @@ public abstract class VRApplication implements Application, SystemListener { /** * Handle the error given in parameters by creating a log entry and a dialog window. Internal use only. */ + @Override public void handleError(String errMsg, Throwable t){ // Print error to log. logger.log(Level.SEVERE, errMsg, t); @@ -483,6 +484,7 @@ public abstract class VRApplication implements Application, SystemListener { /** * Force the focus gain for the application. Internal use only. */ + @Override public void gainFocus(){ if (lostFocusBehavior != LostFocusBehavior.Disabled) { if (lostFocusBehavior == LostFocusBehavior.PauseOnLostFocus) { @@ -498,6 +500,7 @@ public abstract class VRApplication implements Application, SystemListener { /** * Force the focus lost for the application. Internal use only. */ + @Override public void loseFocus(){ if (lostFocusBehavior != LostFocusBehavior.Disabled){ if (lostFocusBehavior == LostFocusBehavior.PauseOnLostFocus) { @@ -510,6 +513,7 @@ public abstract class VRApplication implements Application, SystemListener { /** * Reshape the display window. Internal use only. */ + @Override public void reshape(int w, int h){ if (renderManager != null) { renderManager.notifyReshape(w, h); @@ -519,6 +523,7 @@ public abstract class VRApplication implements Application, SystemListener { /** * Request the application to close. Internal use only. */ + @Override public void requestClose(boolean esc){ context.destroy(false); } @@ -533,6 +538,7 @@ public abstract class VRApplication implements Application, SystemListener { * * @param settings The settings to set. */ + @Override public void setSettings(AppSettings settings){ this.settings = settings; if (context != null && settings.useInput() != inputEnabled){ @@ -555,6 +561,7 @@ public abstract class VRApplication implements Application, SystemListener { * By default, Application will use the Timer as returned by the current {@link JmeContext} implementation. * @param timer the timer to use. */ + @Override public void setTimer(Timer timer){ this.timer = timer; @@ -572,6 +579,7 @@ public abstract class VRApplication implements Application, SystemListener { * Determine the application's behavior when unfocused. * @return The lost focus behavior of the application. */ + @Override public LostFocusBehavior getLostFocusBehavior() { return lostFocusBehavior; } @@ -584,6 +592,7 @@ public abstract class VRApplication implements Application, SystemListener { * * @param lostFocusBehavior The new {@link LostFocusBehavior lost focus behavior} to use. */ + @Override public void setLostFocusBehavior(LostFocusBehavior lostFocusBehavior) { this.lostFocusBehavior = lostFocusBehavior; } @@ -593,6 +602,7 @@ public abstract class VRApplication implements Application, SystemListener { * @return true if pause on lost focus is enabled, false otherwise. * @see #getLostFocusBehavior() */ + @Override public boolean isPauseOnLostFocus() { return getLostFocusBehavior() == LostFocusBehavior.PauseOnLostFocus; } @@ -613,6 +623,7 @@ public abstract class VRApplication implements Application, SystemListener { * * @see #setLostFocusBehavior(com.jme3.app.LostFocusBehavior) */ + @Override public void setPauseOnLostFocus(boolean pauseOnLostFocus) { if (pauseOnLostFocus) { setLostFocusBehavior(LostFocusBehavior.PauseOnLostFocus); @@ -784,6 +795,7 @@ public abstract class VRApplication implements Application, SystemListener { * @param waitFor if true, the method will wait until the application is started. * @see #start(com.jme3.system.JmeContext.Type, boolean) */ + @Override public void start(boolean waitFor){ start(JmeContext.Type.Display, waitFor); } @@ -1401,6 +1413,7 @@ public abstract class VRApplication implements Application, SystemListener { /** * Destroy the application (release all resources). */ + @Override public void destroy() { if( VRhardware != null ) { VRhardware.destroy(); @@ -1460,6 +1473,7 @@ public abstract class VRApplication implements Application, SystemListener { * * @param runnable The runnable to run in the main jME3 thread */ + @Override public void enqueue(Runnable runnable){ enqueue(new RunnableWrapper(runnable)); } @@ -1522,6 +1536,7 @@ public abstract class VRApplication implements Application, SystemListener { * to null. */ + @Override public void setAppProfiler(AppProfiler prof) { return; } @@ -1529,6 +1544,7 @@ public abstract class VRApplication implements Application, SystemListener { /** * Returns the current AppProfiler hook, or null if none is set. */ + @Override public AppProfiler getAppProfiler() { return null; } diff --git a/jme3-vr/src/main/java/com/jme3/input/lwjgl/GlfwKeyInputVR.java b/jme3-vr/src/main/java/com/jme3/input/lwjgl/GlfwKeyInputVR.java index e551f0fdc..e5509312c 100644 --- a/jme3-vr/src/main/java/com/jme3/input/lwjgl/GlfwKeyInputVR.java +++ b/jme3-vr/src/main/java/com/jme3/input/lwjgl/GlfwKeyInputVR.java @@ -1,7 +1,7 @@ package com.jme3.input.lwjgl; /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,6 +69,7 @@ public class GlfwKeyInputVR implements KeyInput { this.context = context; } + @Override public void initialize() { if (!context.isRenderable()) { return; @@ -106,6 +107,7 @@ public class GlfwKeyInputVR implements KeyInput { return GLFW_KEY_LAST - GLFW_KEY_SPACE; } + @Override public void update() { if (!context.isRenderable()) { return; @@ -116,6 +118,7 @@ public class GlfwKeyInputVR implements KeyInput { } } + @Override public void destroy() { if (!context.isRenderable()) { return; @@ -126,14 +129,17 @@ public class GlfwKeyInputVR implements KeyInput { logger.fine("Keyboard destroyed."); } + @Override public boolean isInitialized() { return initialized; } + @Override public void setInputListener(RawInputListener listener) { this.listener = listener; } + @Override public long getInputTimeNanos() { return (long) (glfwGetTime() * 1000000000); } diff --git a/jme3-vr/src/main/java/com/jme3/input/lwjgl/GlfwMouseInputVR.java b/jme3-vr/src/main/java/com/jme3/input/lwjgl/GlfwMouseInputVR.java index 5dbb958fb..2ae187d42 100644 --- a/jme3-vr/src/main/java/com/jme3/input/lwjgl/GlfwMouseInputVR.java +++ b/jme3-vr/src/main/java/com/jme3/input/lwjgl/GlfwMouseInputVR.java @@ -1,7 +1,7 @@ package com.jme3.input.lwjgl; /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -131,6 +131,7 @@ public class GlfwMouseInputVR implements MouseInput { mouseButtonEvents.add(mouseButtonEvent); } + @Override public void initialize() { glfwSetCursorPosCallback(context.getWindowHandle(), cursorPosCallback = new GLFWCursorPosCallback() { @Override @@ -216,6 +217,7 @@ public class GlfwMouseInputVR implements MouseInput { * Check if the input is initialized. * @return true if the input is initialized and false otherwise. */ + @Override public boolean isInitialized() { return initialized; } @@ -291,6 +293,7 @@ public class GlfwMouseInputVR implements MouseInput { return glfwCreateCursor(glfwImage, jmeCursor.getXHotSpot(), jmeCursor.getYHotSpot()); } + @Override public void setNativeCursor(JmeCursor jmeCursor) { if (jmeCursor != null) { Long glfwCursor = jmeToGlfwCursorMap.get(jmeCursor); diff --git a/jme3-vr/src/main/java/com/jme3/input/vr/AbstractVRViewManager.java b/jme3-vr/src/main/java/com/jme3/input/vr/AbstractVRViewManager.java index 54251fadf..f49bf98d3 100644 --- a/jme3-vr/src/main/java/com/jme3/input/vr/AbstractVRViewManager.java +++ b/jme3-vr/src/main/java/com/jme3/input/vr/AbstractVRViewManager.java @@ -69,6 +69,7 @@ public abstract class AbstractVRViewManager implements VRViewManager { * Get the {@link ViewPort view port} attached to the mirror display. * @return the view port attached to the mirror display. */ + @Override public ViewPort getMirrorViewPort() { return mirrorViewPort; } @@ -132,6 +133,7 @@ public abstract class AbstractVRViewManager implements VRViewManager { /** * Handles moving filters from the main view to each eye */ + @Override public void moveScreenProcessingToEyes() { if (environment != null){ diff --git a/jme3-vr/src/main/java/com/jme3/input/vr/oculus/OculusVR.java b/jme3-vr/src/main/java/com/jme3/input/vr/oculus/OculusVR.java index a3a506d5c..3329702f5 100644 --- a/jme3-vr/src/main/java/com/jme3/input/vr/oculus/OculusVR.java +++ b/jme3-vr/src/main/java/com/jme3/input/vr/oculus/OculusVR.java @@ -412,6 +412,7 @@ public class OculusVR implements VRAPI { return HmdType.OCULUS_RIFT; } + @Override public boolean initVRCompositor(boolean set) { if (!set) { throw new UnsupportedOperationException("Cannot use LibOVR without compositor!"); @@ -427,18 +428,22 @@ public class OculusVR implements VRAPI { return true; } + @Override public void printLatencyInfoToConsole(boolean set) { throw new UnsupportedOperationException("Not yet implemented!"); } + @Override public void setFlipEyes(boolean set) { throw new UnsupportedOperationException("Not yet implemented!"); } + @Override public Void getCompositor() { throw new UnsupportedOperationException("Not yet implemented!"); } + @Override public Void getVRSystem() { throw new UnsupportedOperationException("Not yet implemented!"); } diff --git a/jme3-vr/src/main/java/com/jme3/input/vr/osvr/OSVRViewManager.java b/jme3-vr/src/main/java/com/jme3/input/vr/osvr/OSVRViewManager.java index 12eef2ca9..dd4a2a6bd 100644 --- a/jme3-vr/src/main/java/com/jme3/input/vr/osvr/OSVRViewManager.java +++ b/jme3-vr/src/main/java/com/jme3/input/vr/osvr/OSVRViewManager.java @@ -172,6 +172,7 @@ public class OSVRViewManager extends AbstractVRViewManager{ /** * Send the textures to the two eyes. */ + @Override public void postRender() { if (environment != null){ @@ -268,6 +269,7 @@ public class OSVRViewManager extends AbstractVRViewManager{ /** * Initialize the VR view manager. */ + @Override public void initialize() { logger.config("Initializing VR view manager."); @@ -444,6 +446,7 @@ public class OSVRViewManager extends AbstractVRViewManager{ * This method is called by the attached VR application and should not be called manually. * @param tpf the time per frame. */ + @Override public void update(float tpf) { if (environment != null){ @@ -512,6 +515,7 @@ public class OSVRViewManager extends AbstractVRViewManager{ /** * Handles moving filters from the main view to each eye */ + @Override public void moveScreenProcessingToEyes() { if( getRightViewPort() == null ){ return; @@ -534,6 +538,7 @@ public class OSVRViewManager extends AbstractVRViewManager{ * Sets the two views to use the list of {@link SceneProcessor processors}. * @param sourceViewport the {@link ViewPort viewport} that contains the processors to use. */ + @Override public void syncScreenProcessing(ViewPort sourceViewport) { if( getRightViewPort() == null ){ return; diff --git a/jme3-vr/src/main/java/com/jme3/shadow/AbstractShadowRendererVR.java b/jme3-vr/src/main/java/com/jme3/shadow/AbstractShadowRendererVR.java index 6b30a2812..b7586b0f3 100644 --- a/jme3-vr/src/main/java/com/jme3/shadow/AbstractShadowRendererVR.java +++ b/jme3-vr/src/main/java/com/jme3/shadow/AbstractShadowRendererVR.java @@ -1,7 +1,7 @@ package com.jme3.shadow; /* - * Copyright (c) 2009-2019 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -327,6 +327,7 @@ public abstract class AbstractShadowRendererVR implements SceneProcessor, Savabl * @param rm the render manager * @param vp the viewport */ + @Override public void initialize(RenderManager rm, ViewPort vp) { renderManager = rm; viewPort = vp; @@ -346,6 +347,7 @@ public abstract class AbstractShadowRendererVR implements SceneProcessor, Savabl * * @return true if initialized, otherwise false */ + @Override public boolean isInitialized() { return viewPort != null; } @@ -392,6 +394,7 @@ public abstract class AbstractShadowRendererVR implements SceneProcessor, Savabl } @SuppressWarnings("fallthrough") + @Override public void postQueue(RenderQueue rq) { lightReceivers.clear(); skipPostPass = false; @@ -476,6 +479,7 @@ public abstract class AbstractShadowRendererVR implements SceneProcessor, Savabl protected abstract void getReceivers(GeometryList lightReceivers); + @Override public void postFrame(FrameBuffer out) { if (skipPostPass) { return; @@ -688,12 +692,15 @@ public abstract class AbstractShadowRendererVR implements SceneProcessor, Savabl */ protected abstract boolean checkCulling(Camera viewCam); + @Override public void preFrame(float tpf) { } + @Override public void cleanup() { } + @Override public void reshape(ViewPort vp, int w, int h) { } @@ -804,6 +811,7 @@ public abstract class AbstractShadowRendererVR implements SceneProcessor, Savabl * * @param im importer (not null) */ + @Override public void read(JmeImporter im) throws IOException { InputCapsule ic = (InputCapsule) im.getCapsule(this); assetManager = im.getAssetManager(); @@ -823,6 +831,7 @@ public abstract class AbstractShadowRendererVR implements SceneProcessor, Savabl * * @param ex exporter (not null) */ + @Override public void write(JmeExporter ex) throws IOException { OutputCapsule oc = (OutputCapsule) ex.getCapsule(this); oc.write(nbShadowMaps, "nbShadowMaps", 1); diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/AppOverrideKeys_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/AppOverrideKeys_t.java index add3d5d9a..f88400e2b 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/AppOverrideKeys_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/AppOverrideKeys_t.java @@ -4,46 +4,47 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1485
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class AppOverrideKeys_t extends Structure { + * native declaration : headers\openvr_capi.h:1485
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class AppOverrideKeys_t extends Structure { /** - * const char *
- * C type : char* - */ - public Pointer pchKey; + * const char *
+ * C type : char* + */ + public Pointer pchKey; /** - * const char *
- * C type : char* - */ - public Pointer pchValue; - public AppOverrideKeys_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("pchKey", "pchValue"); - } + * const char *
+ * C type : char* + */ + public Pointer pchValue; + public AppOverrideKeys_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("pchKey", "pchValue"); + } /** - * @param pchKey const char *
- * C type : char*
- * @param pchValue const char *
- * C type : char* - */ - public AppOverrideKeys_t(Pointer pchKey, Pointer pchValue) { - super(); - this.pchKey = pchKey; - this.pchValue = pchValue; - } - public AppOverrideKeys_t(Pointer peer) { - super(peer); - } - public static class ByReference extends AppOverrideKeys_t implements Structure.ByReference { - - }; - public static class ByValue extends AppOverrideKeys_t implements Structure.ByValue { - - }; + * @param pchKey const char *
+ * C type : char*
+ * @param pchValue const char *
+ * C type : char* + */ + public AppOverrideKeys_t(Pointer pchKey, Pointer pchValue) { + super(); + this.pchKey = pchKey; + this.pchValue = pchValue; + } + public AppOverrideKeys_t(Pointer peer) { + super(peer); + } + public static class ByReference extends AppOverrideKeys_t implements Structure.ByReference { + + }; + public static class ByValue extends AppOverrideKeys_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/COpenVRContext.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/COpenVRContext.java index b57646031..5c3d4fc08 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/COpenVRContext.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/COpenVRContext.java @@ -5,105 +5,106 @@ import com.sun.jna.ptr.IntByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1670
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class COpenVRContext extends Structure { - /** - * class vr::IVRSystem *
- * C type : intptr_t - */ - public IntByReference m_pVRSystem; - /** - * class vr::IVRChaperone *
- * C type : intptr_t - */ - public IntByReference m_pVRChaperone; - /** - * class vr::IVRChaperoneSetup *
- * C type : intptr_t - */ - public IntByReference m_pVRChaperoneSetup; - /** - * class vr::IVRCompositor *
- * C type : intptr_t - */ - public IntByReference m_pVRCompositor; - /** - * class vr::IVROverlay *
- * C type : intptr_t - */ - public IntByReference m_pVROverlay; - /** - * class vr::IVRResources *
- * C type : intptr_t - */ - public IntByReference m_pVRResources; - /** - * class vr::IVRRenderModels *
- * C type : intptr_t - */ - public IntByReference m_pVRRenderModels; - /** - * class vr::IVRExtendedDisplay *
- * C type : intptr_t - */ - public IntByReference m_pVRExtendedDisplay; - /** - * class vr::IVRSettings *
- * C type : intptr_t - */ - public IntByReference m_pVRSettings; - /** - * class vr::IVRApplications *
- * C type : intptr_t - */ - public IntByReference m_pVRApplications; - /** - * class vr::IVRTrackedCamera *
- * C type : intptr_t - */ - public IntByReference m_pVRTrackedCamera; - /** - * class vr::IVRScreenshots *
- * C type : intptr_t - */ - public IntByReference m_pVRScreenshots; - /** - * class vr::IVRDriverManager *
- * C type : intptr_t - */ - public IntByReference m_pVRDriverManager; - /** - * class vr::IVRInput *
- * C type : intptr_t - */ - public IntByReference m_pVRInput; - /** - * class vr::IVRIOBuffer *
- * C type : intptr_t - */ - public IntByReference m_pVRIOBuffer; - /** - * class vr::IVRSpatialAnchors *
- * C type : intptr_t - */ - public IntByReference m_pVRSpatialAnchors; - public COpenVRContext() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_pVRSystem", "m_pVRChaperone", "m_pVRChaperoneSetup", "m_pVRCompositor", "m_pVROverlay", "m_pVRResources", "m_pVRRenderModels", "m_pVRExtendedDisplay", "m_pVRSettings", "m_pVRApplications", "m_pVRTrackedCamera", "m_pVRScreenshots", "m_pVRDriverManager", "m_pVRInput", "m_pVRIOBuffer", "m_pVRSpatialAnchors"); - } - public COpenVRContext(Pointer peer) { - super(peer); - } - public static class ByReference extends COpenVRContext implements Structure.ByReference { - - }; - public static class ByValue extends COpenVRContext implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1670
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class COpenVRContext extends Structure { + /** + * class vr::IVRSystem *
+ * C type : intptr_t + */ + public IntByReference m_pVRSystem; + /** + * class vr::IVRChaperone *
+ * C type : intptr_t + */ + public IntByReference m_pVRChaperone; + /** + * class vr::IVRChaperoneSetup *
+ * C type : intptr_t + */ + public IntByReference m_pVRChaperoneSetup; + /** + * class vr::IVRCompositor *
+ * C type : intptr_t + */ + public IntByReference m_pVRCompositor; + /** + * class vr::IVROverlay *
+ * C type : intptr_t + */ + public IntByReference m_pVROverlay; + /** + * class vr::IVRResources *
+ * C type : intptr_t + */ + public IntByReference m_pVRResources; + /** + * class vr::IVRRenderModels *
+ * C type : intptr_t + */ + public IntByReference m_pVRRenderModels; + /** + * class vr::IVRExtendedDisplay *
+ * C type : intptr_t + */ + public IntByReference m_pVRExtendedDisplay; + /** + * class vr::IVRSettings *
+ * C type : intptr_t + */ + public IntByReference m_pVRSettings; + /** + * class vr::IVRApplications *
+ * C type : intptr_t + */ + public IntByReference m_pVRApplications; + /** + * class vr::IVRTrackedCamera *
+ * C type : intptr_t + */ + public IntByReference m_pVRTrackedCamera; + /** + * class vr::IVRScreenshots *
+ * C type : intptr_t + */ + public IntByReference m_pVRScreenshots; + /** + * class vr::IVRDriverManager *
+ * C type : intptr_t + */ + public IntByReference m_pVRDriverManager; + /** + * class vr::IVRInput *
+ * C type : intptr_t + */ + public IntByReference m_pVRInput; + /** + * class vr::IVRIOBuffer *
+ * C type : intptr_t + */ + public IntByReference m_pVRIOBuffer; + /** + * class vr::IVRSpatialAnchors *
+ * C type : intptr_t + */ + public IntByReference m_pVRSpatialAnchors; + public COpenVRContext() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_pVRSystem", "m_pVRChaperone", "m_pVRChaperoneSetup", "m_pVRCompositor", "m_pVROverlay", "m_pVRResources", "m_pVRRenderModels", "m_pVRExtendedDisplay", "m_pVRSettings", "m_pVRApplications", "m_pVRTrackedCamera", "m_pVRScreenshots", "m_pVRDriverManager", "m_pVRInput", "m_pVRIOBuffer", "m_pVRSpatialAnchors"); + } + public COpenVRContext(Pointer peer) { + super(peer); + } + public static class ByReference extends COpenVRContext implements Structure.ByReference { + + }; + public static class ByValue extends COpenVRContext implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/CVRSettingHelper.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/CVRSettingHelper.java index d2c37f9df..5be90516c 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/CVRSettingHelper.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/CVRSettingHelper.java @@ -19,6 +19,7 @@ public class CVRSettingHelper extends Structure { public CVRSettingHelper() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("m_pSettings"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/CameraVideoStreamFrameHeader_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/CameraVideoStreamFrameHeader_t.java index d8476324d..ebbc398bd 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/CameraVideoStreamFrameHeader_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/CameraVideoStreamFrameHeader_t.java @@ -23,6 +23,7 @@ public class CameraVideoStreamFrameHeader_t extends Structure { public CameraVideoStreamFrameHeader_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("eFrameType", "nWidth", "nHeight", "nBytesPerPixel", "nFrameSequence", "standingTrackedDevicePose"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_CumulativeStats.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_CumulativeStats.java index c2e741fa4..3b426b7b8 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_CumulativeStats.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_CumulativeStats.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1528
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class Compositor_CumulativeStats extends Structure { - public int m_nPid; - public int m_nNumFramePresents; - public int m_nNumDroppedFrames; - public int m_nNumReprojectedFrames; - public int m_nNumFramePresentsOnStartup; - public int m_nNumDroppedFramesOnStartup; - public int m_nNumReprojectedFramesOnStartup; - public int m_nNumLoading; - public int m_nNumFramePresentsLoading; - public int m_nNumDroppedFramesLoading; - public int m_nNumReprojectedFramesLoading; - public int m_nNumTimedOut; - public int m_nNumFramePresentsTimedOut; - public int m_nNumDroppedFramesTimedOut; - public int m_nNumReprojectedFramesTimedOut; - public Compositor_CumulativeStats() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_nPid", "m_nNumFramePresents", "m_nNumDroppedFrames", "m_nNumReprojectedFrames", "m_nNumFramePresentsOnStartup", "m_nNumDroppedFramesOnStartup", "m_nNumReprojectedFramesOnStartup", "m_nNumLoading", "m_nNumFramePresentsLoading", "m_nNumDroppedFramesLoading", "m_nNumReprojectedFramesLoading", "m_nNumTimedOut", "m_nNumFramePresentsTimedOut", "m_nNumDroppedFramesTimedOut", "m_nNumReprojectedFramesTimedOut"); - } - public Compositor_CumulativeStats(Pointer peer) { - super(peer); - } - public static class ByReference extends Compositor_CumulativeStats implements Structure.ByReference { - - }; - public static class ByValue extends Compositor_CumulativeStats implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1528
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class Compositor_CumulativeStats extends Structure { + public int m_nPid; + public int m_nNumFramePresents; + public int m_nNumDroppedFrames; + public int m_nNumReprojectedFrames; + public int m_nNumFramePresentsOnStartup; + public int m_nNumDroppedFramesOnStartup; + public int m_nNumReprojectedFramesOnStartup; + public int m_nNumLoading; + public int m_nNumFramePresentsLoading; + public int m_nNumDroppedFramesLoading; + public int m_nNumReprojectedFramesLoading; + public int m_nNumTimedOut; + public int m_nNumFramePresentsTimedOut; + public int m_nNumDroppedFramesTimedOut; + public int m_nNumReprojectedFramesTimedOut; + public Compositor_CumulativeStats() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_nPid", "m_nNumFramePresents", "m_nNumDroppedFrames", "m_nNumReprojectedFrames", "m_nNumFramePresentsOnStartup", "m_nNumDroppedFramesOnStartup", "m_nNumReprojectedFramesOnStartup", "m_nNumLoading", "m_nNumFramePresentsLoading", "m_nNumDroppedFramesLoading", "m_nNumReprojectedFramesLoading", "m_nNumTimedOut", "m_nNumFramePresentsTimedOut", "m_nNumDroppedFramesTimedOut", "m_nNumReprojectedFramesTimedOut"); + } + public Compositor_CumulativeStats(Pointer peer) { + super(peer); + } + public static class ByReference extends Compositor_CumulativeStats implements Structure.ByReference { + + }; + public static class ByValue extends Compositor_CumulativeStats implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_FrameTiming.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_FrameTiming.java index 8157254c5..ede38a055 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_FrameTiming.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_FrameTiming.java @@ -4,50 +4,51 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1511
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class Compositor_FrameTiming extends Structure { - public int m_nSize; - public int m_nFrameIndex; - public int m_nNumFramePresents; - public int m_nNumMisPresented; - public int m_nNumDroppedFrames; - public int m_nReprojectionFlags; - public double m_flSystemTimeInSeconds; - public float m_flPreSubmitGpuMs; - public float m_flPostSubmitGpuMs; - public float m_flTotalRenderGpuMs; - public float m_flCompositorRenderGpuMs; - public float m_flCompositorRenderCpuMs; - public float m_flCompositorIdleCpuMs; - public float m_flClientFrameIntervalMs; - public float m_flPresentCallCpuMs; - public float m_flWaitForPresentCpuMs; - public float m_flSubmitFrameMs; - public float m_flWaitGetPosesCalledMs; - public float m_flNewPosesReadyMs; - public float m_flNewFrameReadyMs; - public float m_flCompositorUpdateStartMs; - public float m_flCompositorUpdateEndMs; - public float m_flCompositorRenderStartMs; - /** C type : TrackedDevicePose_t */ - public TrackedDevicePose_t m_HmdPose; - public Compositor_FrameTiming() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_nSize", "m_nFrameIndex", "m_nNumFramePresents", "m_nNumMisPresented", "m_nNumDroppedFrames", "m_nReprojectionFlags", "m_flSystemTimeInSeconds", "m_flPreSubmitGpuMs", "m_flPostSubmitGpuMs", "m_flTotalRenderGpuMs", "m_flCompositorRenderGpuMs", "m_flCompositorRenderCpuMs", "m_flCompositorIdleCpuMs", "m_flClientFrameIntervalMs", "m_flPresentCallCpuMs", "m_flWaitForPresentCpuMs", "m_flSubmitFrameMs", "m_flWaitGetPosesCalledMs", "m_flNewPosesReadyMs", "m_flNewFrameReadyMs", "m_flCompositorUpdateStartMs", "m_flCompositorUpdateEndMs", "m_flCompositorRenderStartMs", "m_HmdPose"); - } - public Compositor_FrameTiming(Pointer peer) { - super(peer); - } - public static class ByReference extends Compositor_FrameTiming implements Structure.ByReference { - - }; - public static class ByValue extends Compositor_FrameTiming implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1511
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class Compositor_FrameTiming extends Structure { + public int m_nSize; + public int m_nFrameIndex; + public int m_nNumFramePresents; + public int m_nNumMisPresented; + public int m_nNumDroppedFrames; + public int m_nReprojectionFlags; + public double m_flSystemTimeInSeconds; + public float m_flPreSubmitGpuMs; + public float m_flPostSubmitGpuMs; + public float m_flTotalRenderGpuMs; + public float m_flCompositorRenderGpuMs; + public float m_flCompositorRenderCpuMs; + public float m_flCompositorIdleCpuMs; + public float m_flClientFrameIntervalMs; + public float m_flPresentCallCpuMs; + public float m_flWaitForPresentCpuMs; + public float m_flSubmitFrameMs; + public float m_flWaitGetPosesCalledMs; + public float m_flNewPosesReadyMs; + public float m_flNewFrameReadyMs; + public float m_flCompositorUpdateStartMs; + public float m_flCompositorUpdateEndMs; + public float m_flCompositorRenderStartMs; + /** C type : TrackedDevicePose_t */ + public TrackedDevicePose_t m_HmdPose; + public Compositor_FrameTiming() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_nSize", "m_nFrameIndex", "m_nNumFramePresents", "m_nNumMisPresented", "m_nNumDroppedFrames", "m_nReprojectionFlags", "m_flSystemTimeInSeconds", "m_flPreSubmitGpuMs", "m_flPostSubmitGpuMs", "m_flTotalRenderGpuMs", "m_flCompositorRenderGpuMs", "m_flCompositorRenderCpuMs", "m_flCompositorIdleCpuMs", "m_flClientFrameIntervalMs", "m_flPresentCallCpuMs", "m_flWaitForPresentCpuMs", "m_flSubmitFrameMs", "m_flWaitGetPosesCalledMs", "m_flNewPosesReadyMs", "m_flNewFrameReadyMs", "m_flCompositorUpdateStartMs", "m_flCompositorUpdateEndMs", "m_flCompositorRenderStartMs", "m_HmdPose"); + } + public Compositor_FrameTiming(Pointer peer) { + super(peer); + } + public static class ByReference extends Compositor_FrameTiming implements Structure.ByReference { + + }; + public static class ByValue extends Compositor_FrameTiming implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_OverlaySettings.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_OverlaySettings.java index ebc1e88b7..3afba14f1 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_OverlaySettings.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/Compositor_OverlaySettings.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1452
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class Compositor_OverlaySettings extends Structure { - public int size; - public byte curved; - public byte antialias; - public float scale; - public float distance; - public float alpha; - public float uOffset; - public float vOffset; - public float uScale; - public float vScale; - public float gridDivs; - public float gridWidth; - public float gridScale; - /** C type : HmdMatrix44_t */ - public HmdMatrix44_t transform; - public Compositor_OverlaySettings() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("size", "curved", "antialias", "scale", "distance", "alpha", "uOffset", "vOffset", "uScale", "vScale", "gridDivs", "gridWidth", "gridScale", "transform"); - } - public Compositor_OverlaySettings(Pointer peer) { - super(peer); - } - public static class ByReference extends Compositor_OverlaySettings implements Structure.ByReference { - - }; - public static class ByValue extends Compositor_OverlaySettings implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1452
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class Compositor_OverlaySettings extends Structure { + public int size; + public byte curved; + public byte antialias; + public float scale; + public float distance; + public float alpha; + public float uOffset; + public float vOffset; + public float uScale; + public float vScale; + public float gridDivs; + public float gridWidth; + public float gridScale; + /** C type : HmdMatrix44_t */ + public HmdMatrix44_t transform; + public Compositor_OverlaySettings() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("size", "curved", "antialias", "scale", "distance", "alpha", "uOffset", "vOffset", "uScale", "vScale", "gridDivs", "gridWidth", "gridScale", "transform"); + } + public Compositor_OverlaySettings(Pointer peer) { + super(peer); + } + public static class ByReference extends Compositor_OverlaySettings implements Structure.ByReference { + + }; + public static class ByValue extends Compositor_OverlaySettings implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/D3D12TextureData_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/D3D12TextureData_t.java index f6769e3e1..c902ad237 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/D3D12TextureData_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/D3D12TextureData_t.java @@ -6,48 +6,49 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1301
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class D3D12TextureData_t extends Structure { + * native declaration : headers\openvr_capi.h:1301
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class D3D12TextureData_t extends Structure { /** - * struct ID3D12Resource *
- * C type : ID3D12Resource* - */ - public ID3D12Resource m_pResource; + * struct ID3D12Resource *
+ * C type : ID3D12Resource* + */ + public ID3D12Resource m_pResource; /** - * struct ID3D12CommandQueue *
- * C type : ID3D12CommandQueue* - */ - public ID3D12CommandQueue m_pCommandQueue; - public int m_nNodeMask; - public D3D12TextureData_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_pResource", "m_pCommandQueue", "m_nNodeMask"); - } + * struct ID3D12CommandQueue *
+ * C type : ID3D12CommandQueue* + */ + public ID3D12CommandQueue m_pCommandQueue; + public int m_nNodeMask; + public D3D12TextureData_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_pResource", "m_pCommandQueue", "m_nNodeMask"); + } /** - * @param m_pResource struct ID3D12Resource *
- * C type : ID3D12Resource*
- * @param m_pCommandQueue struct ID3D12CommandQueue *
- * C type : ID3D12CommandQueue* - */ - public D3D12TextureData_t(ID3D12Resource m_pResource, ID3D12CommandQueue m_pCommandQueue, int m_nNodeMask) { - super(); - this.m_pResource = m_pResource; - this.m_pCommandQueue = m_pCommandQueue; - this.m_nNodeMask = m_nNodeMask; - } - public D3D12TextureData_t(Pointer peer) { - super(peer); - } - public static class ByReference extends D3D12TextureData_t implements Structure.ByReference { - - }; - public static class ByValue extends D3D12TextureData_t implements Structure.ByValue { - - }; + * @param m_pResource struct ID3D12Resource *
+ * C type : ID3D12Resource*
+ * @param m_pCommandQueue struct ID3D12CommandQueue *
+ * C type : ID3D12CommandQueue* + */ + public D3D12TextureData_t(ID3D12Resource m_pResource, ID3D12CommandQueue m_pCommandQueue, int m_nNodeMask) { + super(); + this.m_pResource = m_pResource; + this.m_pCommandQueue = m_pCommandQueue; + this.m_nNodeMask = m_nNodeMask; + } + public D3D12TextureData_t(Pointer peer) { + super(peer); + } + public static class ByReference extends D3D12TextureData_t implements Structure.ByReference { + + }; + public static class ByValue extends D3D12TextureData_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/DistortionCoordinates_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/DistortionCoordinates_t.java index e2f61e38d..59e0ab3dd 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/DistortionCoordinates_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/DistortionCoordinates_t.java @@ -4,60 +4,61 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1237
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class DistortionCoordinates_t extends Structure { + * native declaration : headers\openvr_capi.h:1237
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class DistortionCoordinates_t extends Structure { /** - * float[2]
- * C type : float[2] - */ - public float[] rfRed = new float[2]; + * float[2]
+ * C type : float[2] + */ + public float[] rfRed = new float[2]; /** - * float[2]
- * C type : float[2] - */ - public float[] rfGreen = new float[2]; + * float[2]
+ * C type : float[2] + */ + public float[] rfGreen = new float[2]; /** - * float[2]
- * C type : float[2] - */ - public float[] rfBlue = new float[2]; - public DistortionCoordinates_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("rfRed", "rfGreen", "rfBlue"); - } + * float[2]
+ * C type : float[2] + */ + public float[] rfBlue = new float[2]; + public DistortionCoordinates_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("rfRed", "rfGreen", "rfBlue"); + } /** - * @param rfRed float[2]
- * C type : float[2]
- * @param rfGreen float[2]
- * C type : float[2]
- * @param rfBlue float[2]
- * C type : float[2] - */ - public DistortionCoordinates_t(float rfRed[], float rfGreen[], float rfBlue[]) { - super(); - if ((rfRed.length != this.rfRed.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.rfRed = rfRed; - if ((rfGreen.length != this.rfGreen.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.rfGreen = rfGreen; - if ((rfBlue.length != this.rfBlue.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.rfBlue = rfBlue; - } - public DistortionCoordinates_t(Pointer peer) { - super(peer); - } - public static class ByReference extends DistortionCoordinates_t implements Structure.ByReference { - - }; - public static class ByValue extends DistortionCoordinates_t implements Structure.ByValue { - - }; + * @param rfRed float[2]
+ * C type : float[2]
+ * @param rfGreen float[2]
+ * C type : float[2]
+ * @param rfBlue float[2]
+ * C type : float[2] + */ + public DistortionCoordinates_t(float rfRed[], float rfGreen[], float rfBlue[]) { + super(); + if ((rfRed.length != this.rfRed.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.rfRed = rfRed; + if ((rfGreen.length != this.rfGreen.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.rfGreen = rfGreen; + if ((rfBlue.length != this.rfBlue.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.rfBlue = rfBlue; + } + public DistortionCoordinates_t(Pointer peer) { + super(peer); + } + public static class ByReference extends DistortionCoordinates_t implements Structure.ByReference { + + }; + public static class ByValue extends DistortionCoordinates_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/DriverDirectMode_FrameTiming.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/DriverDirectMode_FrameTiming.java index ca52264ab..4b89bc474 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/DriverDirectMode_FrameTiming.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/DriverDirectMode_FrameTiming.java @@ -18,6 +18,7 @@ public class DriverDirectMode_FrameTiming extends Structure { public DriverDirectMode_FrameTiming() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("m_nSize", "m_nNumFramePresents", "m_nNumMisPresented", "m_nNumDroppedFrames", "m_nReprojectionFlags"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HiddenAreaMesh_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HiddenAreaMesh_t.java index a1850de73..2844685d1 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HiddenAreaMesh_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HiddenAreaMesh_t.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1425
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HiddenAreaMesh_t extends Structure { + * native declaration : headers\openvr_capi.h:1425
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HiddenAreaMesh_t extends Structure { /** - * const struct vr::HmdVector2_t *
- * C type : HmdVector2_t* - */ - public com.jme3.system.jopenvr.HmdVector2_t.ByReference pVertexData; - public int unTriangleCount; - public HiddenAreaMesh_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("pVertexData", "unTriangleCount"); - } + * const struct vr::HmdVector2_t *
+ * C type : HmdVector2_t* + */ + public com.jme3.system.jopenvr.HmdVector2_t.ByReference pVertexData; + public int unTriangleCount; + public HiddenAreaMesh_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("pVertexData", "unTriangleCount"); + } /** - * @param pVertexData const struct vr::HmdVector2_t *
- * C type : HmdVector2_t* - */ - public HiddenAreaMesh_t(com.jme3.system.jopenvr.HmdVector2_t.ByReference pVertexData, int unTriangleCount) { - super(); - this.pVertexData = pVertexData; - this.unTriangleCount = unTriangleCount; - } - public HiddenAreaMesh_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HiddenAreaMesh_t implements Structure.ByReference { - - }; - public static class ByValue extends HiddenAreaMesh_t implements Structure.ByValue { - - }; + * @param pVertexData const struct vr::HmdVector2_t *
+ * C type : HmdVector2_t* + */ + public HiddenAreaMesh_t(com.jme3.system.jopenvr.HmdVector2_t.ByReference pVertexData, int unTriangleCount) { + super(); + this.pVertexData = pVertexData; + this.unTriangleCount = unTriangleCount; + } + public HiddenAreaMesh_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HiddenAreaMesh_t implements Structure.ByReference { + + }; + public static class ByValue extends HiddenAreaMesh_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdColor_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdColor_t.java index 78bedfbcf..6387f1f0f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdColor_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdColor_t.java @@ -4,36 +4,37 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1221
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdColor_t extends Structure { - public float r; - public float g; - public float b; - public float a; - public HmdColor_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("r", "g", "b", "a"); - } - public HmdColor_t(float r, float g, float b, float a) { - super(); - this.r = r; - this.g = g; - this.b = b; - this.a = a; - } - public HmdColor_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdColor_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdColor_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1221
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdColor_t extends Structure { + public float r; + public float g; + public float b; + public float a; + public HmdColor_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("r", "g", "b", "a"); + } + public HmdColor_t(float r, float g, float b, float a) { + super(); + this.r = r; + this.g = g; + this.b = b; + this.a = a; + } + public HmdColor_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdColor_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdColor_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix33_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix33_t.java index df334358b..25e7f8d67 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix33_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix33_t.java @@ -18,6 +18,7 @@ public class HmdMatrix33_t extends Structure { public HmdMatrix33_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("m"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix34_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix34_t.java index 659393805..175bc07f7 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix34_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix34_t.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1179
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdMatrix34_t extends Structure { + * native declaration : headers\openvr_capi.h:1179
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdMatrix34_t extends Structure { /** - * float[3][4]
- * C type : float[3][4] - */ - public float[] m = new float[((3) * (4))]; - public HmdMatrix34_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m"); - } + * float[3][4]
+ * C type : float[3][4] + */ + public float[] m = new float[((3) * (4))]; + public HmdMatrix34_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m"); + } /** - * @param m float[3][4]
- * C type : float[3][4] - */ - public HmdMatrix34_t(float m[]) { - super(); - if ((m.length != this.m.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.m = m; - } - public HmdMatrix34_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdMatrix34_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdMatrix34_t implements Structure.ByValue { - - }; + * @param m float[3][4]
+ * C type : float[3][4] + */ + public HmdMatrix34_t(float m[]) { + super(); + if ((m.length != this.m.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.m = m; + } + public HmdMatrix34_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdMatrix34_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdMatrix34_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix44_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix44_t.java index 216aa7341..2243e8f5f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix44_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdMatrix44_t.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1187
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdMatrix44_t extends Structure { + * native declaration : headers\openvr_capi.h:1187
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdMatrix44_t extends Structure { /** - * float[4][4]
- * C type : float[4][4] - */ - public float[] m = new float[((4) * (4))]; - public HmdMatrix44_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m"); - } + * float[4][4]
+ * C type : float[4][4] + */ + public float[] m = new float[((4) * (4))]; + public HmdMatrix44_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m"); + } /** - * @param m float[4][4]
- * C type : float[4][4] - */ - public HmdMatrix44_t(float m[]) { - super(); - if ((m.length != this.m.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.m = m; - } - public HmdMatrix44_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdMatrix44_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdMatrix44_t implements Structure.ByValue { - - }; + * @param m float[4][4]
+ * C type : float[4][4] + */ + public HmdMatrix44_t(float m[]) { + super(); + if ((m.length != this.m.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.m = m; + } + public HmdMatrix44_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdMatrix44_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdMatrix44_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuad_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuad_t.java index 0142d8ef1..28abf8f75 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuad_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuad_t.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1225
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdQuad_t extends Structure { + * native declaration : headers\openvr_capi.h:1225
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdQuad_t extends Structure { /** - * struct vr::HmdVector3_t[4]
- * C type : HmdVector3_t[4] - */ - public HmdVector3_t[] vCorners = new HmdVector3_t[4]; - public HmdQuad_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("vCorners"); - } + * struct vr::HmdVector3_t[4]
+ * C type : HmdVector3_t[4] + */ + public HmdVector3_t[] vCorners = new HmdVector3_t[4]; + public HmdQuad_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("vCorners"); + } /** - * @param vCorners struct vr::HmdVector3_t[4]
- * C type : HmdVector3_t[4] - */ - public HmdQuad_t(HmdVector3_t vCorners[]) { - super(); - if ((vCorners.length != this.vCorners.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.vCorners = vCorners; - } - public HmdQuad_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdQuad_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdQuad_t implements Structure.ByValue { - - }; + * @param vCorners struct vr::HmdVector3_t[4]
+ * C type : HmdVector3_t[4] + */ + public HmdQuad_t(HmdVector3_t vCorners[]) { + super(); + if ((vCorners.length != this.vCorners.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.vCorners = vCorners; + } + public HmdQuad_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdQuad_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdQuad_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuaternion_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuaternion_t.java index fb0073ee7..d26c2acfe 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuaternion_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuaternion_t.java @@ -4,36 +4,37 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1209
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdQuaternion_t extends Structure { - public double w; - public double x; - public double y; - public double z; - public HmdQuaternion_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("w", "x", "y", "z"); - } - public HmdQuaternion_t(double w, double x, double y, double z) { - super(); - this.w = w; - this.x = x; - this.y = y; - this.z = z; - } - public HmdQuaternion_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdQuaternion_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdQuaternion_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1209
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdQuaternion_t extends Structure { + public double w; + public double x; + public double y; + public double z; + public HmdQuaternion_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("w", "x", "y", "z"); + } + public HmdQuaternion_t(double w, double x, double y, double z) { + super(); + this.w = w; + this.x = x; + this.y = y; + this.z = z; + } + public HmdQuaternion_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdQuaternion_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdQuaternion_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuaternionf_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuaternionf_t.java index 6a7b963d6..b24d5c071 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuaternionf_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdQuaternionf_t.java @@ -17,6 +17,7 @@ public class HmdQuaternionf_t extends Structure { public HmdQuaternionf_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("w", "x", "y", "z"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdRect2_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdRect2_t.java index 210843deb..a8c25431d 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdRect2_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdRect2_t.java @@ -4,38 +4,39 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1229
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdRect2_t extends Structure { - /** C type : HmdVector2_t */ - public HmdVector2_t vTopLeft; - /** C type : HmdVector2_t */ - public HmdVector2_t vBottomRight; - public HmdRect2_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("vTopLeft", "vBottomRight"); - } + * native declaration : headers\openvr_capi.h:1229
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdRect2_t extends Structure { + /** C type : HmdVector2_t */ + public HmdVector2_t vTopLeft; + /** C type : HmdVector2_t */ + public HmdVector2_t vBottomRight; + public HmdRect2_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("vTopLeft", "vBottomRight"); + } /** - * @param vTopLeft C type : HmdVector2_t
- * @param vBottomRight C type : HmdVector2_t - */ - public HmdRect2_t(HmdVector2_t vTopLeft, HmdVector2_t vBottomRight) { - super(); - this.vTopLeft = vTopLeft; - this.vBottomRight = vBottomRight; - } - public HmdRect2_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdRect2_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdRect2_t implements Structure.ByValue { - - }; + * @param vTopLeft C type : HmdVector2_t
+ * @param vBottomRight C type : HmdVector2_t + */ + public HmdRect2_t(HmdVector2_t vTopLeft, HmdVector2_t vBottomRight) { + super(); + this.vTopLeft = vTopLeft; + this.vBottomRight = vBottomRight; + } + public HmdRect2_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdRect2_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdRect2_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector2_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector2_t.java index 7a885d4c7..f66240574 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector2_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector2_t.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1203
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdVector2_t extends Structure { + * native declaration : headers\openvr_capi.h:1203
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdVector2_t extends Structure { /** - * float[2]
- * C type : float[2] - */ - public float[] v = new float[2]; - public HmdVector2_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("v"); - } + * float[2]
+ * C type : float[2] + */ + public float[] v = new float[2]; + public HmdVector2_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("v"); + } /** - * @param v float[2]
- * C type : float[2] - */ - public HmdVector2_t(float v[]) { - super(); - if ((v.length != this.v.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.v = v; - } - public HmdVector2_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdVector2_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdVector2_t implements Structure.ByValue { - - }; + * @param v float[2]
+ * C type : float[2] + */ + public HmdVector2_t(float v[]) { + super(); + if ((v.length != this.v.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.v = v; + } + public HmdVector2_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdVector2_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdVector2_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector3_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector3_t.java index ed87e6991..92ad29960 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector3_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector3_t.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1191
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdVector3_t extends Structure { + * native declaration : headers\openvr_capi.h:1191
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdVector3_t extends Structure { /** - * float[3]
- * C type : float[3] - */ - public float[] v = new float[3]; - public HmdVector3_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("v"); - } + * float[3]
+ * C type : float[3] + */ + public float[] v = new float[3]; + public HmdVector3_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("v"); + } /** - * @param v float[3]
- * C type : float[3] - */ - public HmdVector3_t(float v[]) { - super(); - if ((v.length != this.v.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.v = v; - } - public HmdVector3_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdVector3_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdVector3_t implements Structure.ByValue { - - }; + * @param v float[3]
+ * C type : float[3] + */ + public HmdVector3_t(float v[]) { + super(); + if ((v.length != this.v.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.v = v; + } + public HmdVector3_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdVector3_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdVector3_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector3d_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector3d_t.java index 1b1bfe2b9..7bde50647 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector3d_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector3d_t.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1199
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdVector3d_t extends Structure { + * native declaration : headers\openvr_capi.h:1199
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdVector3d_t extends Structure { /** - * double[3]
- * C type : double[3] - */ - public double[] v = new double[3]; - public HmdVector3d_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("v"); - } + * double[3]
+ * C type : double[3] + */ + public double[] v = new double[3]; + public HmdVector3d_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("v"); + } /** - * @param v double[3]
- * C type : double[3] - */ - public HmdVector3d_t(double v[]) { - super(); - if ((v.length != this.v.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.v = v; - } - public HmdVector3d_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdVector3d_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdVector3d_t implements Structure.ByValue { - - }; + * @param v double[3]
+ * C type : double[3] + */ + public HmdVector3d_t(double v[]) { + super(); + if ((v.length != this.v.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.v = v; + } + public HmdVector3d_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdVector3d_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdVector3d_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector4_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector4_t.java index b022e05d6..1db01177c 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector4_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/HmdVector4_t.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1195
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class HmdVector4_t extends Structure { + * native declaration : headers\openvr_capi.h:1195
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class HmdVector4_t extends Structure { /** - * float[4]
- * C type : float[4] - */ - public float[] v = new float[4]; - public HmdVector4_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("v"); - } + * float[4]
+ * C type : float[4] + */ + public float[] v = new float[4]; + public HmdVector4_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("v"); + } /** - * @param v float[4]
- * C type : float[4] - */ - public HmdVector4_t(float v[]) { - super(); - if ((v.length != this.v.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.v = v; - } - public HmdVector4_t(Pointer peer) { - super(peer); - } - public static class ByReference extends HmdVector4_t implements Structure.ByReference { - - }; - public static class ByValue extends HmdVector4_t implements Structure.ByValue { - - }; + * @param v float[4]
+ * C type : float[4] + */ + public HmdVector4_t(float v[]) { + super(); + if ((v.length != this.v.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.v = v; + } + public HmdVector4_t(Pointer peer) { + super(peer); + } + public static class ByReference extends HmdVector4_t implements Structure.ByReference { + + }; + public static class ByValue extends HmdVector4_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/ImuSample_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/ImuSample_t.java index 799893d2e..1cadc4b7f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/ImuSample_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/ImuSample_t.java @@ -19,6 +19,7 @@ public class ImuSample_t extends Structure { public ImuSample_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("fSampleTime", "vAccel", "vGyro", "unOffScaleFlags"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputAnalogActionData_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputAnalogActionData_t.java index 61fee6243..7f7a2a692 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputAnalogActionData_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputAnalogActionData_t.java @@ -23,6 +23,7 @@ public class InputAnalogActionData_t extends Structure { public InputAnalogActionData_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("bActive", "activeOrigin", "x", "y", "z", "deltaX", "deltaY", "deltaZ", "fUpdateTime"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputDigitalActionData_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputDigitalActionData_t.java index 7325022ee..3b212e44a 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputDigitalActionData_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputDigitalActionData_t.java @@ -19,6 +19,7 @@ public class InputDigitalActionData_t extends Structure { public InputDigitalActionData_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("bActive", "activeOrigin", "bState", "bChanged", "fUpdateTime"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputOriginInfo_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputOriginInfo_t.java index f63555b8c..eff72867a 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputOriginInfo_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputOriginInfo_t.java @@ -22,6 +22,7 @@ public class InputOriginInfo_t extends Structure { public InputOriginInfo_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("devicePath", "trackedDeviceIndex", "rchRenderModelComponentName"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputPoseActionData_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputPoseActionData_t.java index 747493078..bc375f1a5 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputPoseActionData_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputPoseActionData_t.java @@ -18,6 +18,7 @@ public class InputPoseActionData_t extends Structure { public InputPoseActionData_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("bActive", "activeOrigin", "pose"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputSkeletalActionData_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputSkeletalActionData_t.java index d9d32b951..8d1f26514 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputSkeletalActionData_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/InputSkeletalActionData_t.java @@ -17,6 +17,7 @@ public class InputSkeletalActionData_t extends Structure { public InputSkeletalActionData_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("bActive", "activeOrigin", "boneCount"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/IntersectionMaskCircle_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/IntersectionMaskCircle_t.java index 631a127a9..8c994f84b 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/IntersectionMaskCircle_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/IntersectionMaskCircle_t.java @@ -4,34 +4,35 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1552
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class IntersectionMaskCircle_t extends Structure { - public float m_flCenterX; - public float m_flCenterY; - public float m_flRadius; - public IntersectionMaskCircle_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_flCenterX", "m_flCenterY", "m_flRadius"); - } - public IntersectionMaskCircle_t(float m_flCenterX, float m_flCenterY, float m_flRadius) { - super(); - this.m_flCenterX = m_flCenterX; - this.m_flCenterY = m_flCenterY; - this.m_flRadius = m_flRadius; - } - public IntersectionMaskCircle_t(Pointer peer) { - super(peer); - } - public static class ByReference extends IntersectionMaskCircle_t implements Structure.ByReference { - - }; - public static class ByValue extends IntersectionMaskCircle_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1552
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class IntersectionMaskCircle_t extends Structure { + public float m_flCenterX; + public float m_flCenterY; + public float m_flRadius; + public IntersectionMaskCircle_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_flCenterX", "m_flCenterY", "m_flRadius"); + } + public IntersectionMaskCircle_t(float m_flCenterX, float m_flCenterY, float m_flRadius) { + super(); + this.m_flCenterX = m_flCenterX; + this.m_flCenterY = m_flCenterY; + this.m_flRadius = m_flRadius; + } + public IntersectionMaskCircle_t(Pointer peer) { + super(peer); + } + public static class ByReference extends IntersectionMaskCircle_t implements Structure.ByReference { + + }; + public static class ByValue extends IntersectionMaskCircle_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/IntersectionMaskRectangle_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/IntersectionMaskRectangle_t.java index bbb4c0f57..e33a836db 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/IntersectionMaskRectangle_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/IntersectionMaskRectangle_t.java @@ -4,36 +4,37 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1547
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class IntersectionMaskRectangle_t extends Structure { - public float m_flTopLeftX; - public float m_flTopLeftY; - public float m_flWidth; - public float m_flHeight; - public IntersectionMaskRectangle_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_flTopLeftX", "m_flTopLeftY", "m_flWidth", "m_flHeight"); - } - public IntersectionMaskRectangle_t(float m_flTopLeftX, float m_flTopLeftY, float m_flWidth, float m_flHeight) { - super(); - this.m_flTopLeftX = m_flTopLeftX; - this.m_flTopLeftY = m_flTopLeftY; - this.m_flWidth = m_flWidth; - this.m_flHeight = m_flHeight; - } - public IntersectionMaskRectangle_t(Pointer peer) { - super(peer); - } - public static class ByReference extends IntersectionMaskRectangle_t implements Structure.ByReference { - - }; - public static class ByValue extends IntersectionMaskRectangle_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1547
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class IntersectionMaskRectangle_t extends Structure { + public float m_flTopLeftX; + public float m_flTopLeftY; + public float m_flWidth; + public float m_flHeight; + public IntersectionMaskRectangle_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_flTopLeftX", "m_flTopLeftY", "m_flWidth", "m_flHeight"); + } + public IntersectionMaskRectangle_t(float m_flTopLeftX, float m_flTopLeftY, float m_flWidth, float m_flHeight) { + super(); + this.m_flTopLeftX = m_flTopLeftX; + this.m_flTopLeftY = m_flTopLeftY; + this.m_flWidth = m_flWidth; + this.m_flHeight = m_flHeight; + } + public IntersectionMaskRectangle_t(Pointer peer) { + super(peer); + } + public static class ByReference extends IntersectionMaskRectangle_t implements Structure.ByReference { + + }; + public static class ByValue extends IntersectionMaskRectangle_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/NotificationBitmap_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/NotificationBitmap_t.java index 217eedb2c..b9aaffe31 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/NotificationBitmap_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/NotificationBitmap_t.java @@ -4,44 +4,45 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1588
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class NotificationBitmap_t extends Structure { + * native declaration : headers\openvr_capi.h:1588
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class NotificationBitmap_t extends Structure { /** - * void *
- * C type : void* - */ - public Pointer m_pImageData; - public int m_nWidth; - public int m_nHeight; - public int m_nBytesPerPixel; - public NotificationBitmap_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_pImageData", "m_nWidth", "m_nHeight", "m_nBytesPerPixel"); - } + * void *
+ * C type : void* + */ + public Pointer m_pImageData; + public int m_nWidth; + public int m_nHeight; + public int m_nBytesPerPixel; + public NotificationBitmap_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_pImageData", "m_nWidth", "m_nHeight", "m_nBytesPerPixel"); + } /** - * @param m_pImageData void *
- * C type : void* - */ - public NotificationBitmap_t(Pointer m_pImageData, int m_nWidth, int m_nHeight, int m_nBytesPerPixel) { - super(); - this.m_pImageData = m_pImageData; - this.m_nWidth = m_nWidth; - this.m_nHeight = m_nHeight; - this.m_nBytesPerPixel = m_nBytesPerPixel; - } - public NotificationBitmap_t(Pointer peer) { - super(peer); - } - public static class ByReference extends NotificationBitmap_t implements Structure.ByReference { - - }; - public static class ByValue extends NotificationBitmap_t implements Structure.ByValue { - - }; + * @param m_pImageData void *
+ * C type : void* + */ + public NotificationBitmap_t(Pointer m_pImageData, int m_nWidth, int m_nHeight, int m_nBytesPerPixel) { + super(); + this.m_pImageData = m_pImageData; + this.m_nWidth = m_nWidth; + this.m_nHeight = m_nHeight; + this.m_nBytesPerPixel = m_nBytesPerPixel; + } + public NotificationBitmap_t(Pointer peer) { + super(peer); + } + public static class ByReference extends NotificationBitmap_t implements Structure.ByReference { + + }; + public static class ByValue extends NotificationBitmap_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_ComponentState_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_ComponentState_t.java index a55f51b93..7e72d93c8 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_ComponentState_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_ComponentState_t.java @@ -4,42 +4,43 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1557
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class RenderModel_ComponentState_t extends Structure { - /** C type : HmdMatrix34_t */ - public HmdMatrix34_t mTrackingToComponentRenderModel; - /** C type : HmdMatrix34_t */ - public HmdMatrix34_t mTrackingToComponentLocal; - /** C type : VRComponentProperties */ - public int uProperties; - public RenderModel_ComponentState_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("mTrackingToComponentRenderModel", "mTrackingToComponentLocal", "uProperties"); - } + * native declaration : headers\openvr_capi.h:1557
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class RenderModel_ComponentState_t extends Structure { + /** C type : HmdMatrix34_t */ + public HmdMatrix34_t mTrackingToComponentRenderModel; + /** C type : HmdMatrix34_t */ + public HmdMatrix34_t mTrackingToComponentLocal; + /** C type : VRComponentProperties */ + public int uProperties; + public RenderModel_ComponentState_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("mTrackingToComponentRenderModel", "mTrackingToComponentLocal", "uProperties"); + } /** - * @param mTrackingToComponentRenderModel C type : HmdMatrix34_t
- * @param mTrackingToComponentLocal C type : HmdMatrix34_t
- * @param uProperties C type : VRComponentProperties - */ - public RenderModel_ComponentState_t(HmdMatrix34_t mTrackingToComponentRenderModel, HmdMatrix34_t mTrackingToComponentLocal, int uProperties) { - super(); - this.mTrackingToComponentRenderModel = mTrackingToComponentRenderModel; - this.mTrackingToComponentLocal = mTrackingToComponentLocal; - this.uProperties = uProperties; - } - public RenderModel_ComponentState_t(Pointer peer) { - super(peer); - } - public static class ByReference extends RenderModel_ComponentState_t implements Structure.ByReference { - - }; - public static class ByValue extends RenderModel_ComponentState_t implements Structure.ByValue { - - }; + * @param mTrackingToComponentRenderModel C type : HmdMatrix34_t
+ * @param mTrackingToComponentLocal C type : HmdMatrix34_t
+ * @param uProperties C type : VRComponentProperties + */ + public RenderModel_ComponentState_t(HmdMatrix34_t mTrackingToComponentRenderModel, HmdMatrix34_t mTrackingToComponentLocal, int uProperties) { + super(); + this.mTrackingToComponentRenderModel = mTrackingToComponentRenderModel; + this.mTrackingToComponentLocal = mTrackingToComponentLocal; + this.uProperties = uProperties; + } + public RenderModel_ComponentState_t(Pointer peer) { + super(peer); + } + public static class ByReference extends RenderModel_ComponentState_t implements Structure.ByReference { + + }; + public static class ByValue extends RenderModel_ComponentState_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_ControllerMode_State_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_ControllerMode_State_t.java index 5d5e45d57..cf1eac008 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_ControllerMode_State_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_ControllerMode_State_t.java @@ -4,30 +4,31 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1581
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class RenderModel_ControllerMode_State_t extends Structure { - public byte bScrollWheelVisible; - public RenderModel_ControllerMode_State_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("bScrollWheelVisible"); - } - public RenderModel_ControllerMode_State_t(byte bScrollWheelVisible) { - super(); - this.bScrollWheelVisible = bScrollWheelVisible; - } - public RenderModel_ControllerMode_State_t(Pointer peer) { - super(peer); - } - public static class ByReference extends RenderModel_ControllerMode_State_t implements Structure.ByReference { - - }; - public static class ByValue extends RenderModel_ControllerMode_State_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1581
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class RenderModel_ControllerMode_State_t extends Structure { + public byte bScrollWheelVisible; + public RenderModel_ControllerMode_State_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("bScrollWheelVisible"); + } + public RenderModel_ControllerMode_State_t(byte bScrollWheelVisible) { + super(); + this.bScrollWheelVisible = bScrollWheelVisible; + } + public RenderModel_ControllerMode_State_t(Pointer peer) { + super(peer); + } + public static class ByReference extends RenderModel_ControllerMode_State_t implements Structure.ByReference { + + }; + public static class ByValue extends RenderModel_ControllerMode_State_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_TextureMap_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_TextureMap_t.java index c6baff6fe..41670df53 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_TextureMap_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_TextureMap_t.java @@ -4,42 +4,43 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1569
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class RenderModel_TextureMap_t extends Structure { - public short unWidth; - public short unHeight; + * native declaration : headers\openvr_capi.h:1569
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class RenderModel_TextureMap_t extends Structure { + public short unWidth; + public short unHeight; /** - * const uint8_t *
- * C type : uint8_t* - */ - public Pointer rubTextureMapData; - public RenderModel_TextureMap_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("unWidth", "unHeight", "rubTextureMapData"); - } + * const uint8_t *
+ * C type : uint8_t* + */ + public Pointer rubTextureMapData; + public RenderModel_TextureMap_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("unWidth", "unHeight", "rubTextureMapData"); + } /** - * @param rubTextureMapData const uint8_t *
- * C type : uint8_t* - */ - public RenderModel_TextureMap_t(short unWidth, short unHeight, Pointer rubTextureMapData) { - super(); - this.unWidth = unWidth; - this.unHeight = unHeight; - this.rubTextureMapData = rubTextureMapData; - } - public RenderModel_TextureMap_t(Pointer peer) { - super(peer); - } - public static class ByReference extends RenderModel_TextureMap_t implements Structure.ByReference { - - }; - public static class ByValue extends RenderModel_TextureMap_t implements Structure.ByValue { - - }; + * @param rubTextureMapData const uint8_t *
+ * C type : uint8_t* + */ + public RenderModel_TextureMap_t(short unWidth, short unHeight, Pointer rubTextureMapData) { + super(); + this.unWidth = unWidth; + this.unHeight = unHeight; + this.rubTextureMapData = rubTextureMapData; + } + public RenderModel_TextureMap_t(Pointer peer) { + super(peer); + } + public static class ByReference extends RenderModel_TextureMap_t implements Structure.ByReference { + + }; + public static class ByValue extends RenderModel_TextureMap_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_Vertex_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_Vertex_t.java index 12e9217d8..17fac6dd5 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_Vertex_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_Vertex_t.java @@ -4,48 +4,49 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1563
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class RenderModel_Vertex_t extends Structure { - /** C type : HmdVector3_t */ - public HmdVector3_t vPosition; - /** C type : HmdVector3_t */ - public HmdVector3_t vNormal; + * native declaration : headers\openvr_capi.h:1563
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class RenderModel_Vertex_t extends Structure { + /** C type : HmdVector3_t */ + public HmdVector3_t vPosition; + /** C type : HmdVector3_t */ + public HmdVector3_t vNormal; /** - * float[2]
- * C type : float[2] - */ - public float[] rfTextureCoord = new float[2]; - public RenderModel_Vertex_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("vPosition", "vNormal", "rfTextureCoord"); - } + * float[2]
+ * C type : float[2] + */ + public float[] rfTextureCoord = new float[2]; + public RenderModel_Vertex_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("vPosition", "vNormal", "rfTextureCoord"); + } /** - * @param vPosition C type : HmdVector3_t
- * @param vNormal C type : HmdVector3_t
- * @param rfTextureCoord float[2]
- * C type : float[2] - */ - public RenderModel_Vertex_t(HmdVector3_t vPosition, HmdVector3_t vNormal, float rfTextureCoord[]) { - super(); - this.vPosition = vPosition; - this.vNormal = vNormal; - if ((rfTextureCoord.length != this.rfTextureCoord.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.rfTextureCoord = rfTextureCoord; - } - public RenderModel_Vertex_t(Pointer peer) { - super(peer); - } - public static class ByReference extends RenderModel_Vertex_t implements Structure.ByReference { - - }; - public static class ByValue extends RenderModel_Vertex_t implements Structure.ByValue { - - }; + * @param vPosition C type : HmdVector3_t
+ * @param vNormal C type : HmdVector3_t
+ * @param rfTextureCoord float[2]
+ * C type : float[2] + */ + public RenderModel_Vertex_t(HmdVector3_t vPosition, HmdVector3_t vNormal, float rfTextureCoord[]) { + super(); + this.vPosition = vPosition; + this.vNormal = vNormal; + if ((rfTextureCoord.length != this.rfTextureCoord.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.rfTextureCoord = rfTextureCoord; + } + public RenderModel_Vertex_t(Pointer peer) { + super(peer); + } + public static class ByReference extends RenderModel_Vertex_t implements Structure.ByReference { + + }; + public static class ByValue extends RenderModel_Vertex_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_t.java index 697c79cdf..9828f148f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/RenderModel_t.java @@ -5,54 +5,55 @@ import com.sun.jna.ptr.ShortByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1578
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class RenderModel_t extends Structure { + * native declaration : headers\openvr_capi.h:1578
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class RenderModel_t extends Structure { /** - * const struct vr::RenderModel_Vertex_t *
- * C type : RenderModel_Vertex_t* - */ - public com.jme3.system.jopenvr.RenderModel_Vertex_t.ByReference rVertexData; - public int unVertexCount; + * const struct vr::RenderModel_Vertex_t *
+ * C type : RenderModel_Vertex_t* + */ + public com.jme3.system.jopenvr.RenderModel_Vertex_t.ByReference rVertexData; + public int unVertexCount; /** - * const uint16_t *
- * C type : uint16_t* - */ - public ShortByReference rIndexData; - public int unTriangleCount; - /** C type : TextureID_t */ - public int diffuseTextureId; - public RenderModel_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("rVertexData", "unVertexCount", "rIndexData", "unTriangleCount", "diffuseTextureId"); - } + * const uint16_t *
+ * C type : uint16_t* + */ + public ShortByReference rIndexData; + public int unTriangleCount; + /** C type : TextureID_t */ + public int diffuseTextureId; + public RenderModel_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("rVertexData", "unVertexCount", "rIndexData", "unTriangleCount", "diffuseTextureId"); + } /** - * @param rVertexData const struct vr::RenderModel_Vertex_t *
- * C type : RenderModel_Vertex_t*
- * @param rIndexData const uint16_t *
- * C type : uint16_t*
- * @param diffuseTextureId C type : TextureID_t - */ - public RenderModel_t(com.jme3.system.jopenvr.RenderModel_Vertex_t.ByReference rVertexData, int unVertexCount, ShortByReference rIndexData, int unTriangleCount, int diffuseTextureId) { - super(); - this.rVertexData = rVertexData; - this.unVertexCount = unVertexCount; - this.rIndexData = rIndexData; - this.unTriangleCount = unTriangleCount; - this.diffuseTextureId = diffuseTextureId; - } - public RenderModel_t(Pointer peer) { - super(peer); - } - public static class ByReference extends RenderModel_t implements Structure.ByReference { - - }; - public static class ByValue extends RenderModel_t implements Structure.ByValue { - - }; + * @param rVertexData const struct vr::RenderModel_Vertex_t *
+ * C type : RenderModel_Vertex_t*
+ * @param rIndexData const uint16_t *
+ * C type : uint16_t*
+ * @param diffuseTextureId C type : TextureID_t + */ + public RenderModel_t(com.jme3.system.jopenvr.RenderModel_Vertex_t.ByReference rVertexData, int unVertexCount, ShortByReference rIndexData, int unTriangleCount, int diffuseTextureId) { + super(); + this.rVertexData = rVertexData; + this.unVertexCount = unVertexCount; + this.rIndexData = rIndexData; + this.unTriangleCount = unTriangleCount; + this.diffuseTextureId = diffuseTextureId; + } + public RenderModel_t(Pointer peer) { + super(peer); + } + public static class ByReference extends RenderModel_t implements Structure.ByReference { + + }; + public static class ByValue extends RenderModel_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/SpatialAnchorPose_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/SpatialAnchorPose_t.java index 3bc24a3ad..2d3fc2cfd 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/SpatialAnchorPose_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/SpatialAnchorPose_t.java @@ -15,6 +15,7 @@ public class SpatialAnchorPose_t extends Structure { public SpatialAnchorPose_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("mAnchorToAbsoluteTracking"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/Texture_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/Texture_t.java index ad0cc5c13..fc6cfeb95 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/Texture_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/Texture_t.java @@ -26,6 +26,7 @@ public class Texture_t extends Structure { public Texture_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("handle", "eType", "eColorSpace"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/TrackedDevicePose_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/TrackedDevicePose_t.java index 81eaf4151..d2a39b118 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/TrackedDevicePose_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/TrackedDevicePose_t.java @@ -25,6 +25,7 @@ public class TrackedDevicePose_t extends Structure { public TrackedDevicePose_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("mDeviceToAbsoluteTracking", "vVelocity", "vAngularVelocity", "eTrackingResult", "bPoseIsValid", "bDeviceIsConnected"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRActiveActionSet_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRActiveActionSet_t.java index 3a643b893..49720d038 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRActiveActionSet_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRActiveActionSet_t.java @@ -21,6 +21,7 @@ public class VRActiveActionSet_t extends Structure { public VRActiveActionSet_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("ulActionSet", "ulRestrictedToDevice", "ulSecondaryActionSet", "unPadding", "nPriority"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRBoneTransform_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRBoneTransform_t.java index 671e95d9b..e6e7626d2 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRBoneTransform_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRBoneTransform_t.java @@ -17,6 +17,7 @@ public class VRBoneTransform_t extends Structure { public VRBoneTransform_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("position", "orientation"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRControllerAxis_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRControllerAxis_t.java index 8114fdf94..41f0e1366 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRControllerAxis_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRControllerAxis_t.java @@ -4,32 +4,33 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1429
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VRControllerAxis_t extends Structure { - public float x; - public float y; - public VRControllerAxis_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("x", "y"); - } - public VRControllerAxis_t(float x, float y) { - super(); - this.x = x; - this.y = y; - } - public VRControllerAxis_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VRControllerAxis_t implements Structure.ByReference { - - }; - public static class ByValue extends VRControllerAxis_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1429
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VRControllerAxis_t extends Structure { + public float x; + public float y; + public VRControllerAxis_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("x", "y"); + } + public VRControllerAxis_t(float x, float y) { + super(); + this.x = x; + this.y = y; + } + public VRControllerAxis_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VRControllerAxis_t implements Structure.ByReference { + + }; + public static class ByValue extends VRControllerAxis_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRControllerState_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRControllerState_t.java index f1becb6fd..9adc41c7d 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRControllerState_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRControllerState_t.java @@ -4,46 +4,47 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1436
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VRControllerState_t extends Structure { - public int unPacketNum; - public long ulButtonPressed; - public long ulButtonTouched; + * native declaration : headers\openvr_capi.h:1436
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VRControllerState_t extends Structure { + public int unPacketNum; + public long ulButtonPressed; + public long ulButtonTouched; /** - * struct vr::VRControllerAxis_t[5]
- * C type : VRControllerAxis_t[5] - */ - public VRControllerAxis_t[] rAxis = new VRControllerAxis_t[5]; - public VRControllerState_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("unPacketNum", "ulButtonPressed", "ulButtonTouched", "rAxis"); - } + * struct vr::VRControllerAxis_t[5]
+ * C type : VRControllerAxis_t[5] + */ + public VRControllerAxis_t[] rAxis = new VRControllerAxis_t[5]; + public VRControllerState_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("unPacketNum", "ulButtonPressed", "ulButtonTouched", "rAxis"); + } /** - * @param rAxis struct vr::VRControllerAxis_t[5]
- * C type : VRControllerAxis_t[5] - */ - public VRControllerState_t(int unPacketNum, long ulButtonPressed, long ulButtonTouched, VRControllerAxis_t rAxis[]) { - super(); - this.unPacketNum = unPacketNum; - this.ulButtonPressed = ulButtonPressed; - this.ulButtonTouched = ulButtonTouched; - if ((rAxis.length != this.rAxis.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.rAxis = rAxis; - } - public VRControllerState_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VRControllerState_t implements Structure.ByReference { - - }; - public static class ByValue extends VRControllerState_t implements Structure.ByValue { - - }; + * @param rAxis struct vr::VRControllerAxis_t[5]
+ * C type : VRControllerAxis_t[5] + */ + public VRControllerState_t(int unPacketNum, long ulButtonPressed, long ulButtonTouched, VRControllerAxis_t rAxis[]) { + super(); + this.unPacketNum = unPacketNum; + this.ulButtonPressed = ulButtonPressed; + this.ulButtonTouched = ulButtonTouched; + if ((rAxis.length != this.rAxis.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.rAxis = rAxis; + } + public VRControllerState_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VRControllerState_t implements Structure.ByReference { + + }; + public static class ByValue extends VRControllerState_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_ApplicationLaunch_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_ApplicationLaunch_t.java index 675e0ac07..845ca8799 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_ApplicationLaunch_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_ApplicationLaunch_t.java @@ -4,32 +4,33 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1373
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_ApplicationLaunch_t extends Structure { - public int pid; - public int unArgsHandle; - public VREvent_ApplicationLaunch_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("pid", "unArgsHandle"); - } - public VREvent_ApplicationLaunch_t(int pid, int unArgsHandle) { - super(); - this.pid = pid; - this.unArgsHandle = unArgsHandle; - } - public VREvent_ApplicationLaunch_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_ApplicationLaunch_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_ApplicationLaunch_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1373
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_ApplicationLaunch_t extends Structure { + public int pid; + public int unArgsHandle; + public VREvent_ApplicationLaunch_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("pid", "unArgsHandle"); + } + public VREvent_ApplicationLaunch_t(int pid, int unArgsHandle) { + super(); + this.pid = pid; + this.unArgsHandle = unArgsHandle; + } + public VREvent_ApplicationLaunch_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_ApplicationLaunch_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_ApplicationLaunch_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Chaperone_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Chaperone_t.java index 65287c0d7..92e97a458 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Chaperone_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Chaperone_t.java @@ -4,32 +4,33 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1350
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Chaperone_t extends Structure { - public long m_nPreviousUniverse; - public long m_nCurrentUniverse; - public VREvent_Chaperone_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_nPreviousUniverse", "m_nCurrentUniverse"); - } - public VREvent_Chaperone_t(long m_nPreviousUniverse, long m_nCurrentUniverse) { - super(); - this.m_nPreviousUniverse = m_nPreviousUniverse; - this.m_nCurrentUniverse = m_nCurrentUniverse; - } - public VREvent_Chaperone_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Chaperone_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Chaperone_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1350
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Chaperone_t extends Structure { + public long m_nPreviousUniverse; + public long m_nCurrentUniverse; + public VREvent_Chaperone_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_nPreviousUniverse", "m_nCurrentUniverse"); + } + public VREvent_Chaperone_t(long m_nPreviousUniverse, long m_nCurrentUniverse) { + super(); + this.m_nPreviousUniverse = m_nPreviousUniverse; + this.m_nCurrentUniverse = m_nCurrentUniverse; + } + public VREvent_Chaperone_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Chaperone_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Chaperone_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Controller_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Controller_t.java index c2a632c69..e7959582c 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Controller_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Controller_t.java @@ -4,30 +4,31 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1304
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Controller_t extends Structure { - public int button; - public VREvent_Controller_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("button"); - } - public VREvent_Controller_t(int button) { - super(); - this.button = button; - } - public VREvent_Controller_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Controller_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Controller_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1304
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Controller_t extends Structure { + public int button; + public VREvent_Controller_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("button"); + } + public VREvent_Controller_t(int button) { + super(); + this.button = button; + } + public VREvent_Controller_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Controller_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Controller_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_DualAnalog_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_DualAnalog_t.java index a1fb2a523..f5e45f5b2 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_DualAnalog_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_DualAnalog_t.java @@ -21,6 +21,7 @@ public class VREvent_DualAnalog_t extends Structure { public VREvent_DualAnalog_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("x", "y", "transformedX", "transformedY", "which"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_EditingCameraSurface_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_EditingCameraSurface_t.java index 6a8f5c8c3..5a54cdd58 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_EditingCameraSurface_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_EditingCameraSurface_t.java @@ -4,32 +4,33 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1377
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_EditingCameraSurface_t extends Structure { - public long overlayHandle; - public int nVisualMode; - public VREvent_EditingCameraSurface_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("overlayHandle", "nVisualMode"); - } - public VREvent_EditingCameraSurface_t(long overlayHandle, int nVisualMode) { - super(); - this.overlayHandle = overlayHandle; - this.nVisualMode = nVisualMode; - } - public VREvent_EditingCameraSurface_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_EditingCameraSurface_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_EditingCameraSurface_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1377
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_EditingCameraSurface_t extends Structure { + public long overlayHandle; + public int nVisualMode; + public VREvent_EditingCameraSurface_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("overlayHandle", "nVisualMode"); + } + public VREvent_EditingCameraSurface_t(long overlayHandle, int nVisualMode) { + super(); + this.overlayHandle = overlayHandle; + this.nVisualMode = nVisualMode; + } + public VREvent_EditingCameraSurface_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_EditingCameraSurface_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_EditingCameraSurface_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_HapticVibration_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_HapticVibration_t.java index 1501bcbf4..7175e4c86 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_HapticVibration_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_HapticVibration_t.java @@ -18,6 +18,7 @@ public class VREvent_HapticVibration_t extends Structure { public VREvent_HapticVibration_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("containerHandle", "componentHandle", "fDurationSeconds", "fFrequency", "fAmplitude"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_InputActionManifestLoad_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_InputActionManifestLoad_t.java index 955ad7abd..427eddfbc 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_InputActionManifestLoad_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_InputActionManifestLoad_t.java @@ -17,6 +17,7 @@ public class VREvent_InputActionManifestLoad_t extends Structure { public VREvent_InputActionManifestLoad_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("pathAppKey", "pathMessage", "pathMessageParam", "pathManifestPath"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_InputBindingLoad_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_InputBindingLoad_t.java index f7a02b4bf..9b8890584 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_InputBindingLoad_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_InputBindingLoad_t.java @@ -18,6 +18,7 @@ public class VREvent_InputBindingLoad_t extends Structure { public VREvent_InputBindingLoad_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("ulAppContainer", "pathMessage", "pathUrl", "pathControllerType"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Ipd_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Ipd_t.java index 02b100e35..afc05f74e 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Ipd_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Ipd_t.java @@ -4,30 +4,31 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1346
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Ipd_t extends Structure { - public float ipdMeters; - public VREvent_Ipd_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("ipdMeters"); - } - public VREvent_Ipd_t(float ipdMeters) { - super(); - this.ipdMeters = ipdMeters; - } - public VREvent_Ipd_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Ipd_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Ipd_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1346
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Ipd_t extends Structure { + public float ipdMeters; + public VREvent_Ipd_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("ipdMeters"); + } + public VREvent_Ipd_t(float ipdMeters) { + super(); + this.ipdMeters = ipdMeters; + } + public VREvent_Ipd_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Ipd_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Ipd_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Keyboard_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Keyboard_t.java index a6fb1e6e9..9cf8c64ed 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Keyboard_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Keyboard_t.java @@ -4,42 +4,43 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1343
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Keyboard_t extends Structure { + * native declaration : headers\openvr_capi.h:1343
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Keyboard_t extends Structure { /** - * char[8]
- * C type : char*[8] - */ - public Pointer[] cNewInput = new Pointer[8]; - public long uUserValue; - public VREvent_Keyboard_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("cNewInput", "uUserValue"); - } + * char[8]
+ * C type : char*[8] + */ + public Pointer[] cNewInput = new Pointer[8]; + public long uUserValue; + public VREvent_Keyboard_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("cNewInput", "uUserValue"); + } /** - * @param cNewInput char[8]
- * C type : char*[8] - */ - public VREvent_Keyboard_t(Pointer cNewInput[], long uUserValue) { - super(); - if ((cNewInput.length != this.cNewInput.length)) - throw new IllegalArgumentException("Wrong array size !"); - this.cNewInput = cNewInput; - this.uUserValue = uUserValue; - } - public VREvent_Keyboard_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Keyboard_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Keyboard_t implements Structure.ByValue { - - }; + * @param cNewInput char[8]
+ * C type : char*[8] + */ + public VREvent_Keyboard_t(Pointer cNewInput[], long uUserValue) { + super(); + if ((cNewInput.length != this.cNewInput.length)) + throw new IllegalArgumentException("Wrong array size !"); + this.cNewInput = cNewInput; + this.uUserValue = uUserValue; + } + public VREvent_Keyboard_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Keyboard_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Keyboard_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_MessageOverlay_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_MessageOverlay_t.java index fc9e82c9b..b0fe1b8c2 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_MessageOverlay_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_MessageOverlay_t.java @@ -4,30 +4,31 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1380
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_MessageOverlay_t extends Structure { - public int unVRMessageOverlayResponse; - public VREvent_MessageOverlay_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("unVRMessageOverlayResponse"); - } - public VREvent_MessageOverlay_t(int unVRMessageOverlayResponse) { - super(); - this.unVRMessageOverlayResponse = unVRMessageOverlayResponse; - } - public VREvent_MessageOverlay_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_MessageOverlay_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_MessageOverlay_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1380
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_MessageOverlay_t extends Structure { + public int unVRMessageOverlayResponse; + public VREvent_MessageOverlay_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("unVRMessageOverlayResponse"); + } + public VREvent_MessageOverlay_t(int unVRMessageOverlayResponse) { + super(); + this.unVRMessageOverlayResponse = unVRMessageOverlayResponse; + } + public VREvent_MessageOverlay_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_MessageOverlay_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_MessageOverlay_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Mouse_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Mouse_t.java index b55c523c7..d20db8c84 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Mouse_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Mouse_t.java @@ -4,34 +4,35 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1309
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Mouse_t extends Structure { - public float x; - public float y; - public int button; - public VREvent_Mouse_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("x", "y", "button"); - } - public VREvent_Mouse_t(float x, float y, int button) { - super(); - this.x = x; - this.y = y; - this.button = button; - } - public VREvent_Mouse_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Mouse_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Mouse_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1309
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Mouse_t extends Structure { + public float x; + public float y; + public int button; + public VREvent_Mouse_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("x", "y", "button"); + } + public VREvent_Mouse_t(float x, float y, int button) { + super(); + this.x = x; + this.y = y; + this.button = button; + } + public VREvent_Mouse_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Mouse_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Mouse_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Notification_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Notification_t.java index 0f65ecfc3..fa67bd5e7 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Notification_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Notification_t.java @@ -4,32 +4,33 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1326
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Notification_t extends Structure { - public long ulUserValue; - public int notificationId; - public VREvent_Notification_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("ulUserValue", "notificationId"); - } - public VREvent_Notification_t(long ulUserValue, int notificationId) { - super(); - this.ulUserValue = ulUserValue; - this.notificationId = notificationId; - } - public VREvent_Notification_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Notification_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Notification_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1326
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Notification_t extends Structure { + public long ulUserValue; + public int notificationId; + public VREvent_Notification_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("ulUserValue", "notificationId"); + } + public VREvent_Notification_t(long ulUserValue, int notificationId) { + super(); + this.ulUserValue = ulUserValue; + this.notificationId = notificationId; + } + public VREvent_Notification_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Notification_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Notification_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Overlay_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Overlay_t.java index d112d92e2..683c485ab 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Overlay_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Overlay_t.java @@ -4,32 +4,33 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1335
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Overlay_t extends Structure { - public long overlayHandle; - public long devicePath; - public VREvent_Overlay_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("overlayHandle", "devicePath"); - } - public VREvent_Overlay_t(long overlayHandle, long devicePath) { - super(); - this.overlayHandle = overlayHandle; - this.devicePath = devicePath; - } - public VREvent_Overlay_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Overlay_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Overlay_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1335
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Overlay_t extends Structure { + public long overlayHandle; + public long devicePath; + public VREvent_Overlay_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("overlayHandle", "devicePath"); + } + public VREvent_Overlay_t(long overlayHandle, long devicePath) { + super(); + this.overlayHandle = overlayHandle; + this.devicePath = devicePath; + } + public VREvent_Overlay_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Overlay_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Overlay_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_PerformanceTest_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_PerformanceTest_t.java index 37e357bef..13f14852c 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_PerformanceTest_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_PerformanceTest_t.java @@ -4,30 +4,31 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1359
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_PerformanceTest_t extends Structure { - public int m_nFidelityLevel; - public VREvent_PerformanceTest_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_nFidelityLevel"); - } - public VREvent_PerformanceTest_t(int m_nFidelityLevel) { - super(); - this.m_nFidelityLevel = m_nFidelityLevel; - } - public VREvent_PerformanceTest_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_PerformanceTest_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_PerformanceTest_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1359
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_PerformanceTest_t extends Structure { + public int m_nFidelityLevel; + public VREvent_PerformanceTest_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_nFidelityLevel"); + } + public VREvent_PerformanceTest_t(int m_nFidelityLevel) { + super(); + this.m_nFidelityLevel = m_nFidelityLevel; + } + public VREvent_PerformanceTest_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_PerformanceTest_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_PerformanceTest_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Process_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Process_t.java index ad89d03c9..0e7f9ae2f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Process_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Process_t.java @@ -4,34 +4,35 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1331
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Process_t extends Structure { - public int pid; - public int oldPid; - public byte bForced; - public VREvent_Process_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("pid", "oldPid", "bForced"); - } - public VREvent_Process_t(int pid, int oldPid, byte bForced) { - super(); - this.pid = pid; - this.oldPid = oldPid; - this.bForced = bForced; - } - public VREvent_Process_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Process_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Process_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1331
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Process_t extends Structure { + public int pid; + public int oldPid; + public byte bForced; + public VREvent_Process_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("pid", "oldPid", "bForced"); + } + public VREvent_Process_t(int pid, int oldPid, byte bForced) { + super(); + this.pid = pid; + this.oldPid = oldPid; + this.bForced = bForced; + } + public VREvent_Process_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Process_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Process_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Property_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Property_t.java index 945d766cf..be84aa312 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Property_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Property_t.java @@ -19,6 +19,7 @@ public class VREvent_Property_t extends Structure { public VREvent_Property_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("container", "prop"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Reserved_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Reserved_t.java index 11dd3f849..13f0c8d82 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Reserved_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Reserved_t.java @@ -4,36 +4,37 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1356
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Reserved_t extends Structure { - public long reserved0; - public long reserved1; - public long reserved2; - public long reserved3; - public VREvent_Reserved_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("reserved0", "reserved1", "reserved2", "reserved3"); - } - public VREvent_Reserved_t(long reserved0, long reserved1, long reserved2, long reserved3) { - super(); - this.reserved0 = reserved0; - this.reserved1 = reserved1; - this.reserved2 = reserved2; - this.reserved3 = reserved3; - } - public VREvent_Reserved_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Reserved_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Reserved_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1356
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Reserved_t extends Structure { + public long reserved0; + public long reserved1; + public long reserved2; + public long reserved3; + public VREvent_Reserved_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("reserved0", "reserved1", "reserved2", "reserved3"); + } + public VREvent_Reserved_t(long reserved0, long reserved1, long reserved2, long reserved3) { + super(); + this.reserved0 = reserved0; + this.reserved1 = reserved1; + this.reserved2 = reserved2; + this.reserved3 = reserved3; + } + public VREvent_Reserved_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Reserved_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Reserved_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_ScreenshotProgress_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_ScreenshotProgress_t.java index 7d616dec6..b0511dbc2 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_ScreenshotProgress_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_ScreenshotProgress_t.java @@ -4,30 +4,31 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1369
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_ScreenshotProgress_t extends Structure { - public float progress; - public VREvent_ScreenshotProgress_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("progress"); - } - public VREvent_ScreenshotProgress_t(float progress) { - super(); - this.progress = progress; - } - public VREvent_ScreenshotProgress_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_ScreenshotProgress_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_ScreenshotProgress_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1369
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_ScreenshotProgress_t extends Structure { + public float progress; + public VREvent_ScreenshotProgress_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("progress"); + } + public VREvent_ScreenshotProgress_t(float progress) { + super(); + this.progress = progress; + } + public VREvent_ScreenshotProgress_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_ScreenshotProgress_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_ScreenshotProgress_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Screenshot_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Screenshot_t.java index d34f6e089..c35acd139 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Screenshot_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Screenshot_t.java @@ -4,32 +4,33 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1366
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Screenshot_t extends Structure { - public int handle; - public int type; - public VREvent_Screenshot_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("handle", "type"); - } - public VREvent_Screenshot_t(int handle, int type) { - super(); - this.handle = handle; - this.type = type; - } - public VREvent_Screenshot_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Screenshot_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Screenshot_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1366
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Screenshot_t extends Structure { + public int handle; + public int type; + public VREvent_Screenshot_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("handle", "type"); + } + public VREvent_Screenshot_t(int handle, int type) { + super(); + this.handle = handle; + this.type = type; + } + public VREvent_Screenshot_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Screenshot_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Screenshot_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Scroll_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Scroll_t.java index 8a428e8bb..1d29ea839 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Scroll_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Scroll_t.java @@ -4,34 +4,35 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1314
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Scroll_t extends Structure { - public float xdelta; - public float ydelta; - public int repeatCount; - public VREvent_Scroll_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("xdelta", "ydelta", "repeatCount"); - } - public VREvent_Scroll_t(float xdelta, float ydelta, int repeatCount) { - super(); - this.xdelta = xdelta; - this.ydelta = ydelta; - this.repeatCount = repeatCount; - } - public VREvent_Scroll_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Scroll_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Scroll_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1314
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Scroll_t extends Structure { + public float xdelta; + public float ydelta; + public int repeatCount; + public VREvent_Scroll_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("xdelta", "ydelta", "repeatCount"); + } + public VREvent_Scroll_t(float xdelta, float ydelta, int repeatCount) { + super(); + this.xdelta = xdelta; + this.ydelta = ydelta; + this.repeatCount = repeatCount; + } + public VREvent_Scroll_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Scroll_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Scroll_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_SeatedZeroPoseReset_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_SeatedZeroPoseReset_t.java index fb8edda62..cb7c9f62c 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_SeatedZeroPoseReset_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_SeatedZeroPoseReset_t.java @@ -4,30 +4,31 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1362
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_SeatedZeroPoseReset_t extends Structure { - public byte bResetBySystemMenu; - public VREvent_SeatedZeroPoseReset_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("bResetBySystemMenu"); - } - public VREvent_SeatedZeroPoseReset_t(byte bResetBySystemMenu) { - super(); - this.bResetBySystemMenu = bResetBySystemMenu; - } - public VREvent_SeatedZeroPoseReset_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_SeatedZeroPoseReset_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_SeatedZeroPoseReset_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1362
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_SeatedZeroPoseReset_t extends Structure { + public byte bResetBySystemMenu; + public VREvent_SeatedZeroPoseReset_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("bResetBySystemMenu"); + } + public VREvent_SeatedZeroPoseReset_t(byte bResetBySystemMenu) { + super(); + this.bResetBySystemMenu = bResetBySystemMenu; + } + public VREvent_SeatedZeroPoseReset_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_SeatedZeroPoseReset_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_SeatedZeroPoseReset_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_SpatialAnchor_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_SpatialAnchor_t.java index 5e26d5b4c..eeb51f2e2 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_SpatialAnchor_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_SpatialAnchor_t.java @@ -15,6 +15,7 @@ public class VREvent_SpatialAnchor_t extends Structure { public VREvent_SpatialAnchor_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("unHandle"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Status_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Status_t.java index 054b72f68..d16d2c072 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Status_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_Status_t.java @@ -4,30 +4,31 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1338
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_Status_t extends Structure { - public int statusState; - public VREvent_Status_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("statusState"); - } - public VREvent_Status_t(int statusState) { - super(); - this.statusState = statusState; - } - public VREvent_Status_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_Status_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_Status_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1338
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_Status_t extends Structure { + public int statusState; + public VREvent_Status_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("statusState"); + } + public VREvent_Status_t(int statusState) { + super(); + this.statusState = statusState; + } + public VREvent_Status_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_Status_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_Status_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_TouchPadMove_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_TouchPadMove_t.java index 58f4af112..dd123e0d3 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_TouchPadMove_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_TouchPadMove_t.java @@ -4,40 +4,41 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1322
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_TouchPadMove_t extends Structure { - public byte bFingerDown; - public float flSecondsFingerDown; - public float fValueXFirst; - public float fValueYFirst; - public float fValueXRaw; - public float fValueYRaw; - public VREvent_TouchPadMove_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("bFingerDown", "flSecondsFingerDown", "fValueXFirst", "fValueYFirst", "fValueXRaw", "fValueYRaw"); - } - public VREvent_TouchPadMove_t(byte bFingerDown, float flSecondsFingerDown, float fValueXFirst, float fValueYFirst, float fValueXRaw, float fValueYRaw) { - super(); - this.bFingerDown = bFingerDown; - this.flSecondsFingerDown = flSecondsFingerDown; - this.fValueXFirst = fValueXFirst; - this.fValueYFirst = fValueYFirst; - this.fValueXRaw = fValueXRaw; - this.fValueYRaw = fValueYRaw; - } - public VREvent_TouchPadMove_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_TouchPadMove_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_TouchPadMove_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1322
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_TouchPadMove_t extends Structure { + public byte bFingerDown; + public float flSecondsFingerDown; + public float fValueXFirst; + public float fValueYFirst; + public float fValueXRaw; + public float fValueYRaw; + public VREvent_TouchPadMove_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("bFingerDown", "flSecondsFingerDown", "fValueXFirst", "fValueYFirst", "fValueXRaw", "fValueYRaw"); + } + public VREvent_TouchPadMove_t(byte bFingerDown, float flSecondsFingerDown, float fValueXFirst, float fValueYFirst, float fValueXRaw, float fValueYRaw) { + super(); + this.bFingerDown = bFingerDown; + this.flSecondsFingerDown = flSecondsFingerDown; + this.fValueXFirst = fValueXFirst; + this.fValueYFirst = fValueYFirst; + this.fValueXRaw = fValueXRaw; + this.fValueYRaw = fValueYRaw; + } + public VREvent_TouchPadMove_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_TouchPadMove_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_TouchPadMove_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_WebConsole_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_WebConsole_t.java index bcde8c67c..21d9bdf39 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_WebConsole_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_WebConsole_t.java @@ -15,6 +15,7 @@ public class VREvent_WebConsole_t extends Structure { public VREvent_WebConsole_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("webConsoleHandle"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_t.java index e22ad5687..843f9da82 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VREvent_t.java @@ -4,45 +4,46 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * An event posted by the server to all running applications
- * native declaration : headers\openvr_capi.h:1694
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VREvent_t extends Structure { - /** EVREventType enum */ - public int eventType; - /** C type : TrackedDeviceIndex_t */ - public int trackedDeviceIndex; - public float eventAgeSeconds; - /** C type : VREvent_Data_t */ - public VREvent_Data_t data; - public VREvent_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("eventType", "trackedDeviceIndex", "eventAgeSeconds", "data"); - } + * An event posted by the server to all running applications
+ * native declaration : headers\openvr_capi.h:1694
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VREvent_t extends Structure { + /** EVREventType enum */ + public int eventType; + /** C type : TrackedDeviceIndex_t */ + public int trackedDeviceIndex; + public float eventAgeSeconds; + /** C type : VREvent_Data_t */ + public VREvent_Data_t data; + public VREvent_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("eventType", "trackedDeviceIndex", "eventAgeSeconds", "data"); + } /** - * @param eventType EVREventType enum
- * @param trackedDeviceIndex C type : TrackedDeviceIndex_t
- * @param data C type : VREvent_Data_t - */ - public VREvent_t(int eventType, int trackedDeviceIndex, float eventAgeSeconds, VREvent_Data_t data) { - super(); - this.eventType = eventType; - this.trackedDeviceIndex = trackedDeviceIndex; - this.eventAgeSeconds = eventAgeSeconds; - this.data = data; - } - public VREvent_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VREvent_t implements Structure.ByReference { - - }; - public static class ByValue extends VREvent_t implements Structure.ByValue { - - }; + * @param eventType EVREventType enum
+ * @param trackedDeviceIndex C type : TrackedDeviceIndex_t
+ * @param data C type : VREvent_Data_t + */ + public VREvent_t(int eventType, int trackedDeviceIndex, float eventAgeSeconds, VREvent_Data_t data) { + super(); + this.eventType = eventType; + this.trackedDeviceIndex = trackedDeviceIndex; + this.eventAgeSeconds = eventAgeSeconds; + this.data = data; + } + public VREvent_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VREvent_t implements Structure.ByReference { + + }; + public static class ByValue extends VREvent_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionMaskPrimitive_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionMaskPrimitive_t.java index 63ec6c5b7..e0396fda9 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionMaskPrimitive_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionMaskPrimitive_t.java @@ -19,6 +19,7 @@ public class VROverlayIntersectionMaskPrimitive_t extends Structure { public VROverlayIntersectionMaskPrimitive_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("m_nPrimitiveType", "m_Primitive"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionParams_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionParams_t.java index 872e6609f..053942a0e 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionParams_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionParams_t.java @@ -21,6 +21,7 @@ public class VROverlayIntersectionParams_t extends Structure { public VROverlayIntersectionParams_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("vSource", "vDirection", "eOrigin"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionResults_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionResults_t.java index 22374bacc..7fa5b020f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionResults_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VROverlayIntersectionResults_t.java @@ -4,44 +4,45 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1541
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VROverlayIntersectionResults_t extends Structure { - /** C type : HmdVector3_t */ - public HmdVector3_t vPoint; - /** C type : HmdVector3_t */ - public HmdVector3_t vNormal; - /** C type : HmdVector2_t */ - public HmdVector2_t vUVs; - public float fDistance; - public VROverlayIntersectionResults_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("vPoint", "vNormal", "vUVs", "fDistance"); - } + * native declaration : headers\openvr_capi.h:1541
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VROverlayIntersectionResults_t extends Structure { + /** C type : HmdVector3_t */ + public HmdVector3_t vPoint; + /** C type : HmdVector3_t */ + public HmdVector3_t vNormal; + /** C type : HmdVector2_t */ + public HmdVector2_t vUVs; + public float fDistance; + public VROverlayIntersectionResults_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("vPoint", "vNormal", "vUVs", "fDistance"); + } /** - * @param vPoint C type : HmdVector3_t
- * @param vNormal C type : HmdVector3_t
- * @param vUVs C type : HmdVector2_t - */ - public VROverlayIntersectionResults_t(HmdVector3_t vPoint, HmdVector3_t vNormal, HmdVector2_t vUVs, float fDistance) { - super(); - this.vPoint = vPoint; - this.vNormal = vNormal; - this.vUVs = vUVs; - this.fDistance = fDistance; - } - public VROverlayIntersectionResults_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VROverlayIntersectionResults_t implements Structure.ByReference { - - }; - public static class ByValue extends VROverlayIntersectionResults_t implements Structure.ByValue { - - }; + * @param vPoint C type : HmdVector3_t
+ * @param vNormal C type : HmdVector3_t
+ * @param vUVs C type : HmdVector2_t + */ + public VROverlayIntersectionResults_t(HmdVector3_t vPoint, HmdVector3_t vNormal, HmdVector2_t vUVs, float fDistance) { + super(); + this.vPoint = vPoint; + this.vNormal = vNormal; + this.vUVs = vUVs; + this.fDistance = fDistance; + } + public VROverlayIntersectionResults_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VROverlayIntersectionResults_t implements Structure.ByReference { + + }; + public static class ByValue extends VROverlayIntersectionResults_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureBounds_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureBounds_t.java index 3a0ce15df..88c779846 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureBounds_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureBounds_t.java @@ -4,36 +4,37 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1263
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VRTextureBounds_t extends Structure { - public float uMin; - public float vMin; - public float uMax; - public float vMax; - public VRTextureBounds_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("uMin", "vMin", "uMax", "vMax"); - } - public VRTextureBounds_t(float uMin, float vMin, float uMax, float vMax) { - super(); - this.uMin = uMin; - this.vMin = vMin; - this.uMax = uMax; - this.vMax = vMax; - } - public VRTextureBounds_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VRTextureBounds_t implements Structure.ByReference { - - }; - public static class ByValue extends VRTextureBounds_t implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1263
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VRTextureBounds_t extends Structure { + public float uMin; + public float vMin; + public float uMax; + public float vMax; + public VRTextureBounds_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("uMin", "vMin", "uMax", "vMax"); + } + public VRTextureBounds_t(float uMin, float vMin, float uMax, float vMax) { + super(); + this.uMin = uMin; + this.vMin = vMin; + this.uMax = uMax; + this.vMax = vMax; + } + public VRTextureBounds_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VRTextureBounds_t implements Structure.ByReference { + + }; + public static class ByValue extends VRTextureBounds_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureDepthInfo_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureDepthInfo_t.java index 6dc69f3fb..89f42f80b 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureDepthInfo_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureDepthInfo_t.java @@ -22,6 +22,7 @@ public class VRTextureDepthInfo_t extends Structure { public VRTextureDepthInfo_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("handle", "mProjection", "vRange"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithDepth_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithDepth_t.java index 2b58cfa60..0601b2b7a 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithDepth_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithDepth_t.java @@ -15,6 +15,7 @@ public class VRTextureWithDepth_t extends Structure { public VRTextureWithDepth_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("depth"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithPoseAndDepth_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithPoseAndDepth_t.java index 1ae24aa8b..bbe447ba2 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithPoseAndDepth_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithPoseAndDepth_t.java @@ -15,6 +15,7 @@ public class VRTextureWithPoseAndDepth_t extends Structure { public VRTextureWithPoseAndDepth_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("depth"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithPose_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithPose_t.java index 694562e44..8eff35c06 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithPose_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRTextureWithPose_t.java @@ -15,6 +15,7 @@ public class VRTextureWithPose_t extends Structure { public VRTextureWithPose_t() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("mDeviceToAbsoluteTracking"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRVulkanTextureData_t.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRVulkanTextureData_t.java index cf26144bc..9ac3eb08b 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRVulkanTextureData_t.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VRVulkanTextureData_t.java @@ -8,51 +8,52 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1294
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VRVulkanTextureData_t extends Structure { - public long m_nImage; + * native declaration : headers\openvr_capi.h:1294
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VRVulkanTextureData_t extends Structure { + public long m_nImage; /** - * struct VkDevice_T *
- * C type : VkDevice_T* - */ - public VkDevice_T m_pDevice; + * struct VkDevice_T *
+ * C type : VkDevice_T* + */ + public VkDevice_T m_pDevice; /** - * struct VkPhysicalDevice_T *
- * C type : VkPhysicalDevice_T* - */ - public VkPhysicalDevice_T m_pPhysicalDevice; + * struct VkPhysicalDevice_T *
+ * C type : VkPhysicalDevice_T* + */ + public VkPhysicalDevice_T m_pPhysicalDevice; /** - * struct VkInstance_T *
- * C type : VkInstance_T* - */ - public VkInstance_T m_pInstance; + * struct VkInstance_T *
+ * C type : VkInstance_T* + */ + public VkInstance_T m_pInstance; /** - * struct VkQueue_T *
- * C type : VkQueue_T* - */ - public VkQueue_T m_pQueue; - public int m_nQueueFamilyIndex; - public int m_nWidth; - public int m_nHeight; - public int m_nFormat; - public int m_nSampleCount; - public VRVulkanTextureData_t() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("m_nImage", "m_pDevice", "m_pPhysicalDevice", "m_pInstance", "m_pQueue", "m_nQueueFamilyIndex", "m_nWidth", "m_nHeight", "m_nFormat", "m_nSampleCount"); - } - public VRVulkanTextureData_t(Pointer peer) { - super(peer); - } - public static class ByReference extends VRVulkanTextureData_t implements Structure.ByReference { - - }; - public static class ByValue extends VRVulkanTextureData_t implements Structure.ByValue { - - }; + * struct VkQueue_T *
+ * C type : VkQueue_T* + */ + public VkQueue_T m_pQueue; + public int m_nQueueFamilyIndex; + public int m_nWidth; + public int m_nHeight; + public int m_nFormat; + public int m_nSampleCount; + public VRVulkanTextureData_t() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("m_nImage", "m_pDevice", "m_pPhysicalDevice", "m_pInstance", "m_pQueue", "m_nQueueFamilyIndex", "m_nWidth", "m_nHeight", "m_nFormat", "m_nSampleCount"); + } + public VRVulkanTextureData_t(Pointer peer) { + super(peer); + } + public static class ByReference extends VRVulkanTextureData_t implements Structure.ByReference { + + }; + public static class ByValue extends VRVulkanTextureData_t implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRApplications_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRApplications_FnTable.java index 8c4269894..eed61b3e0 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRApplications_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRApplications_FnTable.java @@ -6,211 +6,212 @@ import com.sun.jna.ptr.IntByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1897
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRApplications_FnTable extends Structure { - /** C type : AddApplicationManifest_callback* */ - public VR_IVRApplications_FnTable.AddApplicationManifest_callback AddApplicationManifest; - /** C type : RemoveApplicationManifest_callback* */ - public VR_IVRApplications_FnTable.RemoveApplicationManifest_callback RemoveApplicationManifest; - /** C type : IsApplicationInstalled_callback* */ - public VR_IVRApplications_FnTable.IsApplicationInstalled_callback IsApplicationInstalled; - /** C type : GetApplicationCount_callback* */ - public VR_IVRApplications_FnTable.GetApplicationCount_callback GetApplicationCount; - /** C type : GetApplicationKeyByIndex_callback* */ - public VR_IVRApplications_FnTable.GetApplicationKeyByIndex_callback GetApplicationKeyByIndex; - /** C type : GetApplicationKeyByProcessId_callback* */ - public VR_IVRApplications_FnTable.GetApplicationKeyByProcessId_callback GetApplicationKeyByProcessId; - /** C type : LaunchApplication_callback* */ - public VR_IVRApplications_FnTable.LaunchApplication_callback LaunchApplication; - /** C type : LaunchTemplateApplication_callback* */ - public VR_IVRApplications_FnTable.LaunchTemplateApplication_callback LaunchTemplateApplication; - /** C type : LaunchApplicationFromMimeType_callback* */ - public VR_IVRApplications_FnTable.LaunchApplicationFromMimeType_callback LaunchApplicationFromMimeType; - /** C type : LaunchDashboardOverlay_callback* */ - public VR_IVRApplications_FnTable.LaunchDashboardOverlay_callback LaunchDashboardOverlay; - /** C type : CancelApplicationLaunch_callback* */ - public VR_IVRApplications_FnTable.CancelApplicationLaunch_callback CancelApplicationLaunch; - /** C type : IdentifyApplication_callback* */ - public VR_IVRApplications_FnTable.IdentifyApplication_callback IdentifyApplication; - /** C type : GetApplicationProcessId_callback* */ - public VR_IVRApplications_FnTable.GetApplicationProcessId_callback GetApplicationProcessId; - /** C type : GetApplicationsErrorNameFromEnum_callback* */ - public VR_IVRApplications_FnTable.GetApplicationsErrorNameFromEnum_callback GetApplicationsErrorNameFromEnum; - /** C type : GetApplicationPropertyString_callback* */ - public VR_IVRApplications_FnTable.GetApplicationPropertyString_callback GetApplicationPropertyString; - /** C type : GetApplicationPropertyBool_callback* */ - public VR_IVRApplications_FnTable.GetApplicationPropertyBool_callback GetApplicationPropertyBool; - /** C type : GetApplicationPropertyUint64_callback* */ - public VR_IVRApplications_FnTable.GetApplicationPropertyUint64_callback GetApplicationPropertyUint64; - /** C type : SetApplicationAutoLaunch_callback* */ - public VR_IVRApplications_FnTable.SetApplicationAutoLaunch_callback SetApplicationAutoLaunch; - /** C type : GetApplicationAutoLaunch_callback* */ - public VR_IVRApplications_FnTable.GetApplicationAutoLaunch_callback GetApplicationAutoLaunch; - /** C type : SetDefaultApplicationForMimeType_callback* */ - public VR_IVRApplications_FnTable.SetDefaultApplicationForMimeType_callback SetDefaultApplicationForMimeType; - /** C type : GetDefaultApplicationForMimeType_callback* */ - public VR_IVRApplications_FnTable.GetDefaultApplicationForMimeType_callback GetDefaultApplicationForMimeType; - /** C type : GetApplicationSupportedMimeTypes_callback* */ - public VR_IVRApplications_FnTable.GetApplicationSupportedMimeTypes_callback GetApplicationSupportedMimeTypes; - /** C type : GetApplicationsThatSupportMimeType_callback* */ - public VR_IVRApplications_FnTable.GetApplicationsThatSupportMimeType_callback GetApplicationsThatSupportMimeType; - /** C type : GetApplicationLaunchArguments_callback* */ - public VR_IVRApplications_FnTable.GetApplicationLaunchArguments_callback GetApplicationLaunchArguments; - /** C type : GetStartingApplication_callback* */ - public VR_IVRApplications_FnTable.GetStartingApplication_callback GetStartingApplication; - /** C type : GetTransitionState_callback* */ - public VR_IVRApplications_FnTable.GetTransitionState_callback GetTransitionState; - /** C type : PerformApplicationPrelaunchCheck_callback* */ - public VR_IVRApplications_FnTable.PerformApplicationPrelaunchCheck_callback PerformApplicationPrelaunchCheck; - /** C type : GetApplicationsTransitionStateNameFromEnum_callback* */ - public VR_IVRApplications_FnTable.GetApplicationsTransitionStateNameFromEnum_callback GetApplicationsTransitionStateNameFromEnum; - /** C type : IsQuitUserPromptRequested_callback* */ - public VR_IVRApplications_FnTable.IsQuitUserPromptRequested_callback IsQuitUserPromptRequested; - /** C type : LaunchInternalProcess_callback* */ - public VR_IVRApplications_FnTable.LaunchInternalProcess_callback LaunchInternalProcess; - /** C type : GetCurrentSceneProcessId_callback* */ - public VR_IVRApplications_FnTable.GetCurrentSceneProcessId_callback GetCurrentSceneProcessId; - /** native declaration : headers\openvr_capi.h:1866 */ - public interface AddApplicationManifest_callback extends Callback { - int apply(Pointer pchApplicationManifestFullPath, byte bTemporary); - }; - /** native declaration : headers\openvr_capi.h:1867 */ - public interface RemoveApplicationManifest_callback extends Callback { - int apply(Pointer pchApplicationManifestFullPath); - }; - /** native declaration : headers\openvr_capi.h:1868 */ - public interface IsApplicationInstalled_callback extends Callback { - byte apply(Pointer pchAppKey); - }; - /** native declaration : headers\openvr_capi.h:1869 */ - public interface GetApplicationCount_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:1870 */ - public interface GetApplicationKeyByIndex_callback extends Callback { - int apply(int unApplicationIndex, Pointer pchAppKeyBuffer, int unAppKeyBufferLen); - }; - /** native declaration : headers\openvr_capi.h:1871 */ - public interface GetApplicationKeyByProcessId_callback extends Callback { - int apply(int unProcessId, Pointer pchAppKeyBuffer, int unAppKeyBufferLen); - }; - /** native declaration : headers\openvr_capi.h:1872 */ - public interface LaunchApplication_callback extends Callback { - int apply(Pointer pchAppKey); - }; - /** native declaration : headers\openvr_capi.h:1873 */ - public interface LaunchTemplateApplication_callback extends Callback { - int apply(Pointer pchTemplateAppKey, Pointer pchNewAppKey, AppOverrideKeys_t pKeys, int unKeys); - }; - /** native declaration : headers\openvr_capi.h:1874 */ - public interface LaunchApplicationFromMimeType_callback extends Callback { - int apply(Pointer pchMimeType, Pointer pchArgs); - }; - /** native declaration : headers\openvr_capi.h:1875 */ - public interface LaunchDashboardOverlay_callback extends Callback { - int apply(Pointer pchAppKey); - }; - /** native declaration : headers\openvr_capi.h:1876 */ - public interface CancelApplicationLaunch_callback extends Callback { - byte apply(Pointer pchAppKey); - }; - /** native declaration : headers\openvr_capi.h:1877 */ - public interface IdentifyApplication_callback extends Callback { - int apply(int unProcessId, Pointer pchAppKey); - }; - /** native declaration : headers\openvr_capi.h:1878 */ - public interface GetApplicationProcessId_callback extends Callback { - int apply(Pointer pchAppKey); - }; - /** native declaration : headers\openvr_capi.h:1879 */ - public interface GetApplicationsErrorNameFromEnum_callback extends Callback { - Pointer apply(int error); - }; - /** native declaration : headers\openvr_capi.h:1880 */ - public interface GetApplicationPropertyString_callback extends Callback { - int apply(Pointer pchAppKey, int eProperty, Pointer pchPropertyValueBuffer, int unPropertyValueBufferLen, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:1881 */ - public interface GetApplicationPropertyBool_callback extends Callback { - byte apply(Pointer pchAppKey, int eProperty, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:1882 */ - public interface GetApplicationPropertyUint64_callback extends Callback { - long apply(Pointer pchAppKey, int eProperty, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:1883 */ - public interface SetApplicationAutoLaunch_callback extends Callback { - int apply(Pointer pchAppKey, byte bAutoLaunch); - }; - /** native declaration : headers\openvr_capi.h:1884 */ - public interface GetApplicationAutoLaunch_callback extends Callback { - byte apply(Pointer pchAppKey); - }; - /** native declaration : headers\openvr_capi.h:1885 */ - public interface SetDefaultApplicationForMimeType_callback extends Callback { - int apply(Pointer pchAppKey, Pointer pchMimeType); - }; - /** native declaration : headers\openvr_capi.h:1886 */ - public interface GetDefaultApplicationForMimeType_callback extends Callback { - byte apply(Pointer pchMimeType, Pointer pchAppKeyBuffer, int unAppKeyBufferLen); - }; - /** native declaration : headers\openvr_capi.h:1887 */ - public interface GetApplicationSupportedMimeTypes_callback extends Callback { - byte apply(Pointer pchAppKey, Pointer pchMimeTypesBuffer, int unMimeTypesBuffer); - }; - /** native declaration : headers\openvr_capi.h:1888 */ - public interface GetApplicationsThatSupportMimeType_callback extends Callback { - int apply(Pointer pchMimeType, Pointer pchAppKeysThatSupportBuffer, int unAppKeysThatSupportBuffer); - }; - /** native declaration : headers\openvr_capi.h:1889 */ - public interface GetApplicationLaunchArguments_callback extends Callback { - int apply(int unHandle, Pointer pchArgs, int unArgs); - }; - /** native declaration : headers\openvr_capi.h:1890 */ - public interface GetStartingApplication_callback extends Callback { - int apply(Pointer pchAppKeyBuffer, int unAppKeyBufferLen); - }; - /** native declaration : headers\openvr_capi.h:1891 */ - public interface GetTransitionState_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:1892 */ - public interface PerformApplicationPrelaunchCheck_callback extends Callback { - int apply(Pointer pchAppKey); - }; - /** native declaration : headers\openvr_capi.h:1893 */ - public interface GetApplicationsTransitionStateNameFromEnum_callback extends Callback { - Pointer apply(int state); - }; - /** native declaration : headers\openvr_capi.h:1894 */ - public interface IsQuitUserPromptRequested_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:1895 */ - public interface LaunchInternalProcess_callback extends Callback { - int apply(Pointer pchBinaryPath, Pointer pchArguments, Pointer pchWorkingDirectory); - }; - /** native declaration : headers\openvr_capi.h:1896 */ - public interface GetCurrentSceneProcessId_callback extends Callback { - int apply(); - }; - public VR_IVRApplications_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("AddApplicationManifest", "RemoveApplicationManifest", "IsApplicationInstalled", "GetApplicationCount", "GetApplicationKeyByIndex", "GetApplicationKeyByProcessId", "LaunchApplication", "LaunchTemplateApplication", "LaunchApplicationFromMimeType", "LaunchDashboardOverlay", "CancelApplicationLaunch", "IdentifyApplication", "GetApplicationProcessId", "GetApplicationsErrorNameFromEnum", "GetApplicationPropertyString", "GetApplicationPropertyBool", "GetApplicationPropertyUint64", "SetApplicationAutoLaunch", "GetApplicationAutoLaunch", "SetDefaultApplicationForMimeType", "GetDefaultApplicationForMimeType", "GetApplicationSupportedMimeTypes", "GetApplicationsThatSupportMimeType", "GetApplicationLaunchArguments", "GetStartingApplication", "GetTransitionState", "PerformApplicationPrelaunchCheck", "GetApplicationsTransitionStateNameFromEnum", "IsQuitUserPromptRequested", "LaunchInternalProcess", "GetCurrentSceneProcessId"); - } - public VR_IVRApplications_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRApplications_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRApplications_FnTable implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1897
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRApplications_FnTable extends Structure { + /** C type : AddApplicationManifest_callback* */ + public VR_IVRApplications_FnTable.AddApplicationManifest_callback AddApplicationManifest; + /** C type : RemoveApplicationManifest_callback* */ + public VR_IVRApplications_FnTable.RemoveApplicationManifest_callback RemoveApplicationManifest; + /** C type : IsApplicationInstalled_callback* */ + public VR_IVRApplications_FnTable.IsApplicationInstalled_callback IsApplicationInstalled; + /** C type : GetApplicationCount_callback* */ + public VR_IVRApplications_FnTable.GetApplicationCount_callback GetApplicationCount; + /** C type : GetApplicationKeyByIndex_callback* */ + public VR_IVRApplications_FnTable.GetApplicationKeyByIndex_callback GetApplicationKeyByIndex; + /** C type : GetApplicationKeyByProcessId_callback* */ + public VR_IVRApplications_FnTable.GetApplicationKeyByProcessId_callback GetApplicationKeyByProcessId; + /** C type : LaunchApplication_callback* */ + public VR_IVRApplications_FnTable.LaunchApplication_callback LaunchApplication; + /** C type : LaunchTemplateApplication_callback* */ + public VR_IVRApplications_FnTable.LaunchTemplateApplication_callback LaunchTemplateApplication; + /** C type : LaunchApplicationFromMimeType_callback* */ + public VR_IVRApplications_FnTable.LaunchApplicationFromMimeType_callback LaunchApplicationFromMimeType; + /** C type : LaunchDashboardOverlay_callback* */ + public VR_IVRApplications_FnTable.LaunchDashboardOverlay_callback LaunchDashboardOverlay; + /** C type : CancelApplicationLaunch_callback* */ + public VR_IVRApplications_FnTable.CancelApplicationLaunch_callback CancelApplicationLaunch; + /** C type : IdentifyApplication_callback* */ + public VR_IVRApplications_FnTable.IdentifyApplication_callback IdentifyApplication; + /** C type : GetApplicationProcessId_callback* */ + public VR_IVRApplications_FnTable.GetApplicationProcessId_callback GetApplicationProcessId; + /** C type : GetApplicationsErrorNameFromEnum_callback* */ + public VR_IVRApplications_FnTable.GetApplicationsErrorNameFromEnum_callback GetApplicationsErrorNameFromEnum; + /** C type : GetApplicationPropertyString_callback* */ + public VR_IVRApplications_FnTable.GetApplicationPropertyString_callback GetApplicationPropertyString; + /** C type : GetApplicationPropertyBool_callback* */ + public VR_IVRApplications_FnTable.GetApplicationPropertyBool_callback GetApplicationPropertyBool; + /** C type : GetApplicationPropertyUint64_callback* */ + public VR_IVRApplications_FnTable.GetApplicationPropertyUint64_callback GetApplicationPropertyUint64; + /** C type : SetApplicationAutoLaunch_callback* */ + public VR_IVRApplications_FnTable.SetApplicationAutoLaunch_callback SetApplicationAutoLaunch; + /** C type : GetApplicationAutoLaunch_callback* */ + public VR_IVRApplications_FnTable.GetApplicationAutoLaunch_callback GetApplicationAutoLaunch; + /** C type : SetDefaultApplicationForMimeType_callback* */ + public VR_IVRApplications_FnTable.SetDefaultApplicationForMimeType_callback SetDefaultApplicationForMimeType; + /** C type : GetDefaultApplicationForMimeType_callback* */ + public VR_IVRApplications_FnTable.GetDefaultApplicationForMimeType_callback GetDefaultApplicationForMimeType; + /** C type : GetApplicationSupportedMimeTypes_callback* */ + public VR_IVRApplications_FnTable.GetApplicationSupportedMimeTypes_callback GetApplicationSupportedMimeTypes; + /** C type : GetApplicationsThatSupportMimeType_callback* */ + public VR_IVRApplications_FnTable.GetApplicationsThatSupportMimeType_callback GetApplicationsThatSupportMimeType; + /** C type : GetApplicationLaunchArguments_callback* */ + public VR_IVRApplications_FnTable.GetApplicationLaunchArguments_callback GetApplicationLaunchArguments; + /** C type : GetStartingApplication_callback* */ + public VR_IVRApplications_FnTable.GetStartingApplication_callback GetStartingApplication; + /** C type : GetTransitionState_callback* */ + public VR_IVRApplications_FnTable.GetTransitionState_callback GetTransitionState; + /** C type : PerformApplicationPrelaunchCheck_callback* */ + public VR_IVRApplications_FnTable.PerformApplicationPrelaunchCheck_callback PerformApplicationPrelaunchCheck; + /** C type : GetApplicationsTransitionStateNameFromEnum_callback* */ + public VR_IVRApplications_FnTable.GetApplicationsTransitionStateNameFromEnum_callback GetApplicationsTransitionStateNameFromEnum; + /** C type : IsQuitUserPromptRequested_callback* */ + public VR_IVRApplications_FnTable.IsQuitUserPromptRequested_callback IsQuitUserPromptRequested; + /** C type : LaunchInternalProcess_callback* */ + public VR_IVRApplications_FnTable.LaunchInternalProcess_callback LaunchInternalProcess; + /** C type : GetCurrentSceneProcessId_callback* */ + public VR_IVRApplications_FnTable.GetCurrentSceneProcessId_callback GetCurrentSceneProcessId; + /** native declaration : headers\openvr_capi.h:1866 */ + public interface AddApplicationManifest_callback extends Callback { + int apply(Pointer pchApplicationManifestFullPath, byte bTemporary); + }; + /** native declaration : headers\openvr_capi.h:1867 */ + public interface RemoveApplicationManifest_callback extends Callback { + int apply(Pointer pchApplicationManifestFullPath); + }; + /** native declaration : headers\openvr_capi.h:1868 */ + public interface IsApplicationInstalled_callback extends Callback { + byte apply(Pointer pchAppKey); + }; + /** native declaration : headers\openvr_capi.h:1869 */ + public interface GetApplicationCount_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:1870 */ + public interface GetApplicationKeyByIndex_callback extends Callback { + int apply(int unApplicationIndex, Pointer pchAppKeyBuffer, int unAppKeyBufferLen); + }; + /** native declaration : headers\openvr_capi.h:1871 */ + public interface GetApplicationKeyByProcessId_callback extends Callback { + int apply(int unProcessId, Pointer pchAppKeyBuffer, int unAppKeyBufferLen); + }; + /** native declaration : headers\openvr_capi.h:1872 */ + public interface LaunchApplication_callback extends Callback { + int apply(Pointer pchAppKey); + }; + /** native declaration : headers\openvr_capi.h:1873 */ + public interface LaunchTemplateApplication_callback extends Callback { + int apply(Pointer pchTemplateAppKey, Pointer pchNewAppKey, AppOverrideKeys_t pKeys, int unKeys); + }; + /** native declaration : headers\openvr_capi.h:1874 */ + public interface LaunchApplicationFromMimeType_callback extends Callback { + int apply(Pointer pchMimeType, Pointer pchArgs); + }; + /** native declaration : headers\openvr_capi.h:1875 */ + public interface LaunchDashboardOverlay_callback extends Callback { + int apply(Pointer pchAppKey); + }; + /** native declaration : headers\openvr_capi.h:1876 */ + public interface CancelApplicationLaunch_callback extends Callback { + byte apply(Pointer pchAppKey); + }; + /** native declaration : headers\openvr_capi.h:1877 */ + public interface IdentifyApplication_callback extends Callback { + int apply(int unProcessId, Pointer pchAppKey); + }; + /** native declaration : headers\openvr_capi.h:1878 */ + public interface GetApplicationProcessId_callback extends Callback { + int apply(Pointer pchAppKey); + }; + /** native declaration : headers\openvr_capi.h:1879 */ + public interface GetApplicationsErrorNameFromEnum_callback extends Callback { + Pointer apply(int error); + }; + /** native declaration : headers\openvr_capi.h:1880 */ + public interface GetApplicationPropertyString_callback extends Callback { + int apply(Pointer pchAppKey, int eProperty, Pointer pchPropertyValueBuffer, int unPropertyValueBufferLen, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:1881 */ + public interface GetApplicationPropertyBool_callback extends Callback { + byte apply(Pointer pchAppKey, int eProperty, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:1882 */ + public interface GetApplicationPropertyUint64_callback extends Callback { + long apply(Pointer pchAppKey, int eProperty, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:1883 */ + public interface SetApplicationAutoLaunch_callback extends Callback { + int apply(Pointer pchAppKey, byte bAutoLaunch); + }; + /** native declaration : headers\openvr_capi.h:1884 */ + public interface GetApplicationAutoLaunch_callback extends Callback { + byte apply(Pointer pchAppKey); + }; + /** native declaration : headers\openvr_capi.h:1885 */ + public interface SetDefaultApplicationForMimeType_callback extends Callback { + int apply(Pointer pchAppKey, Pointer pchMimeType); + }; + /** native declaration : headers\openvr_capi.h:1886 */ + public interface GetDefaultApplicationForMimeType_callback extends Callback { + byte apply(Pointer pchMimeType, Pointer pchAppKeyBuffer, int unAppKeyBufferLen); + }; + /** native declaration : headers\openvr_capi.h:1887 */ + public interface GetApplicationSupportedMimeTypes_callback extends Callback { + byte apply(Pointer pchAppKey, Pointer pchMimeTypesBuffer, int unMimeTypesBuffer); + }; + /** native declaration : headers\openvr_capi.h:1888 */ + public interface GetApplicationsThatSupportMimeType_callback extends Callback { + int apply(Pointer pchMimeType, Pointer pchAppKeysThatSupportBuffer, int unAppKeysThatSupportBuffer); + }; + /** native declaration : headers\openvr_capi.h:1889 */ + public interface GetApplicationLaunchArguments_callback extends Callback { + int apply(int unHandle, Pointer pchArgs, int unArgs); + }; + /** native declaration : headers\openvr_capi.h:1890 */ + public interface GetStartingApplication_callback extends Callback { + int apply(Pointer pchAppKeyBuffer, int unAppKeyBufferLen); + }; + /** native declaration : headers\openvr_capi.h:1891 */ + public interface GetTransitionState_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:1892 */ + public interface PerformApplicationPrelaunchCheck_callback extends Callback { + int apply(Pointer pchAppKey); + }; + /** native declaration : headers\openvr_capi.h:1893 */ + public interface GetApplicationsTransitionStateNameFromEnum_callback extends Callback { + Pointer apply(int state); + }; + /** native declaration : headers\openvr_capi.h:1894 */ + public interface IsQuitUserPromptRequested_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:1895 */ + public interface LaunchInternalProcess_callback extends Callback { + int apply(Pointer pchBinaryPath, Pointer pchArguments, Pointer pchWorkingDirectory); + }; + /** native declaration : headers\openvr_capi.h:1896 */ + public interface GetCurrentSceneProcessId_callback extends Callback { + int apply(); + }; + public VR_IVRApplications_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("AddApplicationManifest", "RemoveApplicationManifest", "IsApplicationInstalled", "GetApplicationCount", "GetApplicationKeyByIndex", "GetApplicationKeyByProcessId", "LaunchApplication", "LaunchTemplateApplication", "LaunchApplicationFromMimeType", "LaunchDashboardOverlay", "CancelApplicationLaunch", "IdentifyApplication", "GetApplicationProcessId", "GetApplicationsErrorNameFromEnum", "GetApplicationPropertyString", "GetApplicationPropertyBool", "GetApplicationPropertyUint64", "SetApplicationAutoLaunch", "GetApplicationAutoLaunch", "SetDefaultApplicationForMimeType", "GetDefaultApplicationForMimeType", "GetApplicationSupportedMimeTypes", "GetApplicationsThatSupportMimeType", "GetApplicationLaunchArguments", "GetStartingApplication", "GetTransitionState", "PerformApplicationPrelaunchCheck", "GetApplicationsTransitionStateNameFromEnum", "IsQuitUserPromptRequested", "LaunchInternalProcess", "GetCurrentSceneProcessId"); + } + public VR_IVRApplications_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRApplications_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRApplications_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRChaperoneSetup_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRChaperoneSetup_FnTable.java index 36be54ea5..5795f54df 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRChaperoneSetup_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRChaperoneSetup_FnTable.java @@ -7,145 +7,146 @@ import com.sun.jna.ptr.IntByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1957
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRChaperoneSetup_FnTable extends Structure { - /** C type : CommitWorkingCopy_callback* */ - public VR_IVRChaperoneSetup_FnTable.CommitWorkingCopy_callback CommitWorkingCopy; - /** C type : RevertWorkingCopy_callback* */ - public VR_IVRChaperoneSetup_FnTable.RevertWorkingCopy_callback RevertWorkingCopy; - /** C type : GetWorkingPlayAreaSize_callback* */ - public VR_IVRChaperoneSetup_FnTable.GetWorkingPlayAreaSize_callback GetWorkingPlayAreaSize; - /** C type : GetWorkingPlayAreaRect_callback* */ - public VR_IVRChaperoneSetup_FnTable.GetWorkingPlayAreaRect_callback GetWorkingPlayAreaRect; - /** C type : GetWorkingCollisionBoundsInfo_callback* */ - public VR_IVRChaperoneSetup_FnTable.GetWorkingCollisionBoundsInfo_callback GetWorkingCollisionBoundsInfo; - /** C type : GetLiveCollisionBoundsInfo_callback* */ - public VR_IVRChaperoneSetup_FnTable.GetLiveCollisionBoundsInfo_callback GetLiveCollisionBoundsInfo; - /** C type : GetWorkingSeatedZeroPoseToRawTrackingPose_callback* */ - public VR_IVRChaperoneSetup_FnTable.GetWorkingSeatedZeroPoseToRawTrackingPose_callback GetWorkingSeatedZeroPoseToRawTrackingPose; - /** C type : GetWorkingStandingZeroPoseToRawTrackingPose_callback* */ - public VR_IVRChaperoneSetup_FnTable.GetWorkingStandingZeroPoseToRawTrackingPose_callback GetWorkingStandingZeroPoseToRawTrackingPose; - /** C type : SetWorkingPlayAreaSize_callback* */ - public VR_IVRChaperoneSetup_FnTable.SetWorkingPlayAreaSize_callback SetWorkingPlayAreaSize; - /** C type : SetWorkingCollisionBoundsInfo_callback* */ - public VR_IVRChaperoneSetup_FnTable.SetWorkingCollisionBoundsInfo_callback SetWorkingCollisionBoundsInfo; - /** C type : SetWorkingSeatedZeroPoseToRawTrackingPose_callback* */ - public VR_IVRChaperoneSetup_FnTable.SetWorkingSeatedZeroPoseToRawTrackingPose_callback SetWorkingSeatedZeroPoseToRawTrackingPose; - /** C type : SetWorkingStandingZeroPoseToRawTrackingPose_callback* */ - public VR_IVRChaperoneSetup_FnTable.SetWorkingStandingZeroPoseToRawTrackingPose_callback SetWorkingStandingZeroPoseToRawTrackingPose; - /** C type : ReloadFromDisk_callback* */ - public VR_IVRChaperoneSetup_FnTable.ReloadFromDisk_callback ReloadFromDisk; - /** C type : GetLiveSeatedZeroPoseToRawTrackingPose_callback* */ - public VR_IVRChaperoneSetup_FnTable.GetLiveSeatedZeroPoseToRawTrackingPose_callback GetLiveSeatedZeroPoseToRawTrackingPose; - /** C type : SetWorkingCollisionBoundsTagsInfo_callback* */ - public VR_IVRChaperoneSetup_FnTable.SetWorkingCollisionBoundsTagsInfo_callback SetWorkingCollisionBoundsTagsInfo; - /** C type : GetLiveCollisionBoundsTagsInfo_callback* */ - public VR_IVRChaperoneSetup_FnTable.GetLiveCollisionBoundsTagsInfo_callback GetLiveCollisionBoundsTagsInfo; - /** C type : SetWorkingPhysicalBoundsInfo_callback* */ - public VR_IVRChaperoneSetup_FnTable.SetWorkingPhysicalBoundsInfo_callback SetWorkingPhysicalBoundsInfo; - /** C type : GetLivePhysicalBoundsInfo_callback* */ - public VR_IVRChaperoneSetup_FnTable.GetLivePhysicalBoundsInfo_callback GetLivePhysicalBoundsInfo; - /** C type : ExportLiveToBuffer_callback* */ - public VR_IVRChaperoneSetup_FnTable.ExportLiveToBuffer_callback ExportLiveToBuffer; - /** C type : ImportFromBufferToWorking_callback* */ - public VR_IVRChaperoneSetup_FnTable.ImportFromBufferToWorking_callback ImportFromBufferToWorking; - /** native declaration : headers\openvr_capi.h:1937 */ - public interface CommitWorkingCopy_callback extends Callback { - byte apply(int configFile); - }; - /** native declaration : headers\openvr_capi.h:1938 */ - public interface RevertWorkingCopy_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:1939 */ - public interface GetWorkingPlayAreaSize_callback extends Callback { - byte apply(FloatByReference pSizeX, FloatByReference pSizeZ); - }; - /** native declaration : headers\openvr_capi.h:1940 */ - public interface GetWorkingPlayAreaRect_callback extends Callback { - byte apply(HmdQuad_t rect); - }; - /** native declaration : headers\openvr_capi.h:1941 */ - public interface GetWorkingCollisionBoundsInfo_callback extends Callback { - byte apply(HmdQuad_t pQuadsBuffer, IntByReference punQuadsCount); - }; - /** native declaration : headers\openvr_capi.h:1942 */ - public interface GetLiveCollisionBoundsInfo_callback extends Callback { - byte apply(HmdQuad_t pQuadsBuffer, IntByReference punQuadsCount); - }; - /** native declaration : headers\openvr_capi.h:1943 */ - public interface GetWorkingSeatedZeroPoseToRawTrackingPose_callback extends Callback { - byte apply(HmdMatrix34_t pmatSeatedZeroPoseToRawTrackingPose); - }; - /** native declaration : headers\openvr_capi.h:1944 */ - public interface GetWorkingStandingZeroPoseToRawTrackingPose_callback extends Callback { - byte apply(HmdMatrix34_t pmatStandingZeroPoseToRawTrackingPose); - }; - /** native declaration : headers\openvr_capi.h:1945 */ - public interface SetWorkingPlayAreaSize_callback extends Callback { - void apply(float sizeX, float sizeZ); - }; - /** native declaration : headers\openvr_capi.h:1946 */ - public interface SetWorkingCollisionBoundsInfo_callback extends Callback { - void apply(HmdQuad_t pQuadsBuffer, int unQuadsCount); - }; - /** native declaration : headers\openvr_capi.h:1947 */ - public interface SetWorkingSeatedZeroPoseToRawTrackingPose_callback extends Callback { - void apply(HmdMatrix34_t pMatSeatedZeroPoseToRawTrackingPose); - }; - /** native declaration : headers\openvr_capi.h:1948 */ - public interface SetWorkingStandingZeroPoseToRawTrackingPose_callback extends Callback { - void apply(HmdMatrix34_t pMatStandingZeroPoseToRawTrackingPose); - }; - /** native declaration : headers\openvr_capi.h:1949 */ - public interface ReloadFromDisk_callback extends Callback { - void apply(int configFile); - }; - /** native declaration : headers\openvr_capi.h:1950 */ - public interface GetLiveSeatedZeroPoseToRawTrackingPose_callback extends Callback { - byte apply(HmdMatrix34_t pmatSeatedZeroPoseToRawTrackingPose); - }; - /** native declaration : headers\openvr_capi.h:1951 */ - public interface SetWorkingCollisionBoundsTagsInfo_callback extends Callback { - void apply(Pointer pTagsBuffer, int unTagCount); - }; - /** native declaration : headers\openvr_capi.h:1952 */ - public interface GetLiveCollisionBoundsTagsInfo_callback extends Callback { - byte apply(Pointer pTagsBuffer, IntByReference punTagCount); - }; - /** native declaration : headers\openvr_capi.h:1953 */ - public interface SetWorkingPhysicalBoundsInfo_callback extends Callback { - byte apply(HmdQuad_t pQuadsBuffer, int unQuadsCount); - }; - /** native declaration : headers\openvr_capi.h:1954 */ - public interface GetLivePhysicalBoundsInfo_callback extends Callback { - byte apply(HmdQuad_t pQuadsBuffer, IntByReference punQuadsCount); - }; - /** native declaration : headers\openvr_capi.h:1955 */ - public interface ExportLiveToBuffer_callback extends Callback { - byte apply(Pointer pBuffer, IntByReference pnBufferLength); - }; - /** native declaration : headers\openvr_capi.h:1956 */ - public interface ImportFromBufferToWorking_callback extends Callback { - byte apply(Pointer pBuffer, int nImportFlags); - }; - public VR_IVRChaperoneSetup_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("CommitWorkingCopy", "RevertWorkingCopy", "GetWorkingPlayAreaSize", "GetWorkingPlayAreaRect", "GetWorkingCollisionBoundsInfo", "GetLiveCollisionBoundsInfo", "GetWorkingSeatedZeroPoseToRawTrackingPose", "GetWorkingStandingZeroPoseToRawTrackingPose", "SetWorkingPlayAreaSize", "SetWorkingCollisionBoundsInfo", "SetWorkingSeatedZeroPoseToRawTrackingPose", "SetWorkingStandingZeroPoseToRawTrackingPose", "ReloadFromDisk", "GetLiveSeatedZeroPoseToRawTrackingPose", "SetWorkingCollisionBoundsTagsInfo", "GetLiveCollisionBoundsTagsInfo", "SetWorkingPhysicalBoundsInfo", "GetLivePhysicalBoundsInfo", "ExportLiveToBuffer", "ImportFromBufferToWorking"); - } - public VR_IVRChaperoneSetup_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRChaperoneSetup_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRChaperoneSetup_FnTable implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1957
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRChaperoneSetup_FnTable extends Structure { + /** C type : CommitWorkingCopy_callback* */ + public VR_IVRChaperoneSetup_FnTable.CommitWorkingCopy_callback CommitWorkingCopy; + /** C type : RevertWorkingCopy_callback* */ + public VR_IVRChaperoneSetup_FnTable.RevertWorkingCopy_callback RevertWorkingCopy; + /** C type : GetWorkingPlayAreaSize_callback* */ + public VR_IVRChaperoneSetup_FnTable.GetWorkingPlayAreaSize_callback GetWorkingPlayAreaSize; + /** C type : GetWorkingPlayAreaRect_callback* */ + public VR_IVRChaperoneSetup_FnTable.GetWorkingPlayAreaRect_callback GetWorkingPlayAreaRect; + /** C type : GetWorkingCollisionBoundsInfo_callback* */ + public VR_IVRChaperoneSetup_FnTable.GetWorkingCollisionBoundsInfo_callback GetWorkingCollisionBoundsInfo; + /** C type : GetLiveCollisionBoundsInfo_callback* */ + public VR_IVRChaperoneSetup_FnTable.GetLiveCollisionBoundsInfo_callback GetLiveCollisionBoundsInfo; + /** C type : GetWorkingSeatedZeroPoseToRawTrackingPose_callback* */ + public VR_IVRChaperoneSetup_FnTable.GetWorkingSeatedZeroPoseToRawTrackingPose_callback GetWorkingSeatedZeroPoseToRawTrackingPose; + /** C type : GetWorkingStandingZeroPoseToRawTrackingPose_callback* */ + public VR_IVRChaperoneSetup_FnTable.GetWorkingStandingZeroPoseToRawTrackingPose_callback GetWorkingStandingZeroPoseToRawTrackingPose; + /** C type : SetWorkingPlayAreaSize_callback* */ + public VR_IVRChaperoneSetup_FnTable.SetWorkingPlayAreaSize_callback SetWorkingPlayAreaSize; + /** C type : SetWorkingCollisionBoundsInfo_callback* */ + public VR_IVRChaperoneSetup_FnTable.SetWorkingCollisionBoundsInfo_callback SetWorkingCollisionBoundsInfo; + /** C type : SetWorkingSeatedZeroPoseToRawTrackingPose_callback* */ + public VR_IVRChaperoneSetup_FnTable.SetWorkingSeatedZeroPoseToRawTrackingPose_callback SetWorkingSeatedZeroPoseToRawTrackingPose; + /** C type : SetWorkingStandingZeroPoseToRawTrackingPose_callback* */ + public VR_IVRChaperoneSetup_FnTable.SetWorkingStandingZeroPoseToRawTrackingPose_callback SetWorkingStandingZeroPoseToRawTrackingPose; + /** C type : ReloadFromDisk_callback* */ + public VR_IVRChaperoneSetup_FnTable.ReloadFromDisk_callback ReloadFromDisk; + /** C type : GetLiveSeatedZeroPoseToRawTrackingPose_callback* */ + public VR_IVRChaperoneSetup_FnTable.GetLiveSeatedZeroPoseToRawTrackingPose_callback GetLiveSeatedZeroPoseToRawTrackingPose; + /** C type : SetWorkingCollisionBoundsTagsInfo_callback* */ + public VR_IVRChaperoneSetup_FnTable.SetWorkingCollisionBoundsTagsInfo_callback SetWorkingCollisionBoundsTagsInfo; + /** C type : GetLiveCollisionBoundsTagsInfo_callback* */ + public VR_IVRChaperoneSetup_FnTable.GetLiveCollisionBoundsTagsInfo_callback GetLiveCollisionBoundsTagsInfo; + /** C type : SetWorkingPhysicalBoundsInfo_callback* */ + public VR_IVRChaperoneSetup_FnTable.SetWorkingPhysicalBoundsInfo_callback SetWorkingPhysicalBoundsInfo; + /** C type : GetLivePhysicalBoundsInfo_callback* */ + public VR_IVRChaperoneSetup_FnTable.GetLivePhysicalBoundsInfo_callback GetLivePhysicalBoundsInfo; + /** C type : ExportLiveToBuffer_callback* */ + public VR_IVRChaperoneSetup_FnTable.ExportLiveToBuffer_callback ExportLiveToBuffer; + /** C type : ImportFromBufferToWorking_callback* */ + public VR_IVRChaperoneSetup_FnTable.ImportFromBufferToWorking_callback ImportFromBufferToWorking; + /** native declaration : headers\openvr_capi.h:1937 */ + public interface CommitWorkingCopy_callback extends Callback { + byte apply(int configFile); + }; + /** native declaration : headers\openvr_capi.h:1938 */ + public interface RevertWorkingCopy_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:1939 */ + public interface GetWorkingPlayAreaSize_callback extends Callback { + byte apply(FloatByReference pSizeX, FloatByReference pSizeZ); + }; + /** native declaration : headers\openvr_capi.h:1940 */ + public interface GetWorkingPlayAreaRect_callback extends Callback { + byte apply(HmdQuad_t rect); + }; + /** native declaration : headers\openvr_capi.h:1941 */ + public interface GetWorkingCollisionBoundsInfo_callback extends Callback { + byte apply(HmdQuad_t pQuadsBuffer, IntByReference punQuadsCount); + }; + /** native declaration : headers\openvr_capi.h:1942 */ + public interface GetLiveCollisionBoundsInfo_callback extends Callback { + byte apply(HmdQuad_t pQuadsBuffer, IntByReference punQuadsCount); + }; + /** native declaration : headers\openvr_capi.h:1943 */ + public interface GetWorkingSeatedZeroPoseToRawTrackingPose_callback extends Callback { + byte apply(HmdMatrix34_t pmatSeatedZeroPoseToRawTrackingPose); + }; + /** native declaration : headers\openvr_capi.h:1944 */ + public interface GetWorkingStandingZeroPoseToRawTrackingPose_callback extends Callback { + byte apply(HmdMatrix34_t pmatStandingZeroPoseToRawTrackingPose); + }; + /** native declaration : headers\openvr_capi.h:1945 */ + public interface SetWorkingPlayAreaSize_callback extends Callback { + void apply(float sizeX, float sizeZ); + }; + /** native declaration : headers\openvr_capi.h:1946 */ + public interface SetWorkingCollisionBoundsInfo_callback extends Callback { + void apply(HmdQuad_t pQuadsBuffer, int unQuadsCount); + }; + /** native declaration : headers\openvr_capi.h:1947 */ + public interface SetWorkingSeatedZeroPoseToRawTrackingPose_callback extends Callback { + void apply(HmdMatrix34_t pMatSeatedZeroPoseToRawTrackingPose); + }; + /** native declaration : headers\openvr_capi.h:1948 */ + public interface SetWorkingStandingZeroPoseToRawTrackingPose_callback extends Callback { + void apply(HmdMatrix34_t pMatStandingZeroPoseToRawTrackingPose); + }; + /** native declaration : headers\openvr_capi.h:1949 */ + public interface ReloadFromDisk_callback extends Callback { + void apply(int configFile); + }; + /** native declaration : headers\openvr_capi.h:1950 */ + public interface GetLiveSeatedZeroPoseToRawTrackingPose_callback extends Callback { + byte apply(HmdMatrix34_t pmatSeatedZeroPoseToRawTrackingPose); + }; + /** native declaration : headers\openvr_capi.h:1951 */ + public interface SetWorkingCollisionBoundsTagsInfo_callback extends Callback { + void apply(Pointer pTagsBuffer, int unTagCount); + }; + /** native declaration : headers\openvr_capi.h:1952 */ + public interface GetLiveCollisionBoundsTagsInfo_callback extends Callback { + byte apply(Pointer pTagsBuffer, IntByReference punTagCount); + }; + /** native declaration : headers\openvr_capi.h:1953 */ + public interface SetWorkingPhysicalBoundsInfo_callback extends Callback { + byte apply(HmdQuad_t pQuadsBuffer, int unQuadsCount); + }; + /** native declaration : headers\openvr_capi.h:1954 */ + public interface GetLivePhysicalBoundsInfo_callback extends Callback { + byte apply(HmdQuad_t pQuadsBuffer, IntByReference punQuadsCount); + }; + /** native declaration : headers\openvr_capi.h:1955 */ + public interface ExportLiveToBuffer_callback extends Callback { + byte apply(Pointer pBuffer, IntByReference pnBufferLength); + }; + /** native declaration : headers\openvr_capi.h:1956 */ + public interface ImportFromBufferToWorking_callback extends Callback { + byte apply(Pointer pBuffer, int nImportFlags); + }; + public VR_IVRChaperoneSetup_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("CommitWorkingCopy", "RevertWorkingCopy", "GetWorkingPlayAreaSize", "GetWorkingPlayAreaRect", "GetWorkingCollisionBoundsInfo", "GetLiveCollisionBoundsInfo", "GetWorkingSeatedZeroPoseToRawTrackingPose", "GetWorkingStandingZeroPoseToRawTrackingPose", "SetWorkingPlayAreaSize", "SetWorkingCollisionBoundsInfo", "SetWorkingSeatedZeroPoseToRawTrackingPose", "SetWorkingStandingZeroPoseToRawTrackingPose", "ReloadFromDisk", "GetLiveSeatedZeroPoseToRawTrackingPose", "SetWorkingCollisionBoundsTagsInfo", "GetLiveCollisionBoundsTagsInfo", "SetWorkingPhysicalBoundsInfo", "GetLivePhysicalBoundsInfo", "ExportLiveToBuffer", "ImportFromBufferToWorking"); + } + public VR_IVRChaperoneSetup_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRChaperoneSetup_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRChaperoneSetup_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRChaperone_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRChaperone_FnTable.java index 6d71c06af..1a575c6c0 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRChaperone_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRChaperone_FnTable.java @@ -6,94 +6,95 @@ import com.sun.jna.ptr.FloatByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1915
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRChaperone_FnTable extends Structure { - /** C type : GetCalibrationState_callback* */ - public VR_IVRChaperone_FnTable.GetCalibrationState_callback GetCalibrationState; - /** C type : GetPlayAreaSize_callback* */ - public VR_IVRChaperone_FnTable.GetPlayAreaSize_callback GetPlayAreaSize; - /** C type : GetPlayAreaRect_callback* */ - public VR_IVRChaperone_FnTable.GetPlayAreaRect_callback GetPlayAreaRect; - /** C type : ReloadInfo_callback* */ - public VR_IVRChaperone_FnTable.ReloadInfo_callback ReloadInfo; - /** C type : SetSceneColor_callback* */ - public VR_IVRChaperone_FnTable.SetSceneColor_callback SetSceneColor; - /** C type : GetBoundsColor_callback* */ - public VR_IVRChaperone_FnTable.GetBoundsColor_callback GetBoundsColor; - /** C type : AreBoundsVisible_callback* */ - public VR_IVRChaperone_FnTable.AreBoundsVisible_callback AreBoundsVisible; - /** C type : ForceBoundsVisible_callback* */ - public VR_IVRChaperone_FnTable.ForceBoundsVisible_callback ForceBoundsVisible; - /** native declaration : headers\openvr_capi.h:1907 */ - public interface GetCalibrationState_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:1908 */ - public interface GetPlayAreaSize_callback extends Callback { - byte apply(FloatByReference pSizeX, FloatByReference pSizeZ); - }; - /** native declaration : headers\openvr_capi.h:1909 */ - public interface GetPlayAreaRect_callback extends Callback { - byte apply(HmdQuad_t rect); - }; - /** native declaration : headers\openvr_capi.h:1910 */ - public interface ReloadInfo_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:1911 */ - public interface SetSceneColor_callback extends Callback { - void apply(HmdColor_t.ByValue color); - }; - /** native declaration : headers\openvr_capi.h:1912 */ - public interface GetBoundsColor_callback extends Callback { - void apply(HmdColor_t pOutputColorArray, int nNumOutputColors, float flCollisionBoundsFadeDistance, HmdColor_t pOutputCameraColor); - }; - /** native declaration : headers\openvr_capi.h:1913 */ - public interface AreBoundsVisible_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:1914 */ - public interface ForceBoundsVisible_callback extends Callback { - void apply(byte bForce); - }; - public VR_IVRChaperone_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("GetCalibrationState", "GetPlayAreaSize", "GetPlayAreaRect", "ReloadInfo", "SetSceneColor", "GetBoundsColor", "AreBoundsVisible", "ForceBoundsVisible"); - } + * native declaration : headers\openvr_capi.h:1915
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRChaperone_FnTable extends Structure { + /** C type : GetCalibrationState_callback* */ + public VR_IVRChaperone_FnTable.GetCalibrationState_callback GetCalibrationState; + /** C type : GetPlayAreaSize_callback* */ + public VR_IVRChaperone_FnTable.GetPlayAreaSize_callback GetPlayAreaSize; + /** C type : GetPlayAreaRect_callback* */ + public VR_IVRChaperone_FnTable.GetPlayAreaRect_callback GetPlayAreaRect; + /** C type : ReloadInfo_callback* */ + public VR_IVRChaperone_FnTable.ReloadInfo_callback ReloadInfo; + /** C type : SetSceneColor_callback* */ + public VR_IVRChaperone_FnTable.SetSceneColor_callback SetSceneColor; + /** C type : GetBoundsColor_callback* */ + public VR_IVRChaperone_FnTable.GetBoundsColor_callback GetBoundsColor; + /** C type : AreBoundsVisible_callback* */ + public VR_IVRChaperone_FnTable.AreBoundsVisible_callback AreBoundsVisible; + /** C type : ForceBoundsVisible_callback* */ + public VR_IVRChaperone_FnTable.ForceBoundsVisible_callback ForceBoundsVisible; + /** native declaration : headers\openvr_capi.h:1907 */ + public interface GetCalibrationState_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:1908 */ + public interface GetPlayAreaSize_callback extends Callback { + byte apply(FloatByReference pSizeX, FloatByReference pSizeZ); + }; + /** native declaration : headers\openvr_capi.h:1909 */ + public interface GetPlayAreaRect_callback extends Callback { + byte apply(HmdQuad_t rect); + }; + /** native declaration : headers\openvr_capi.h:1910 */ + public interface ReloadInfo_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:1911 */ + public interface SetSceneColor_callback extends Callback { + void apply(HmdColor_t.ByValue color); + }; + /** native declaration : headers\openvr_capi.h:1912 */ + public interface GetBoundsColor_callback extends Callback { + void apply(HmdColor_t pOutputColorArray, int nNumOutputColors, float flCollisionBoundsFadeDistance, HmdColor_t pOutputCameraColor); + }; + /** native declaration : headers\openvr_capi.h:1913 */ + public interface AreBoundsVisible_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:1914 */ + public interface ForceBoundsVisible_callback extends Callback { + void apply(byte bForce); + }; + public VR_IVRChaperone_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("GetCalibrationState", "GetPlayAreaSize", "GetPlayAreaRect", "ReloadInfo", "SetSceneColor", "GetBoundsColor", "AreBoundsVisible", "ForceBoundsVisible"); + } /** - * @param GetCalibrationState C type : GetCalibrationState_callback*
- * @param GetPlayAreaSize C type : GetPlayAreaSize_callback*
- * @param GetPlayAreaRect C type : GetPlayAreaRect_callback*
- * @param ReloadInfo C type : ReloadInfo_callback*
- * @param SetSceneColor C type : SetSceneColor_callback*
- * @param GetBoundsColor C type : GetBoundsColor_callback*
- * @param AreBoundsVisible C type : AreBoundsVisible_callback*
- * @param ForceBoundsVisible C type : ForceBoundsVisible_callback* - */ - public VR_IVRChaperone_FnTable(VR_IVRChaperone_FnTable.GetCalibrationState_callback GetCalibrationState, VR_IVRChaperone_FnTable.GetPlayAreaSize_callback GetPlayAreaSize, VR_IVRChaperone_FnTable.GetPlayAreaRect_callback GetPlayAreaRect, VR_IVRChaperone_FnTable.ReloadInfo_callback ReloadInfo, VR_IVRChaperone_FnTable.SetSceneColor_callback SetSceneColor, VR_IVRChaperone_FnTable.GetBoundsColor_callback GetBoundsColor, VR_IVRChaperone_FnTable.AreBoundsVisible_callback AreBoundsVisible, VR_IVRChaperone_FnTable.ForceBoundsVisible_callback ForceBoundsVisible) { - super(); - this.GetCalibrationState = GetCalibrationState; - this.GetPlayAreaSize = GetPlayAreaSize; - this.GetPlayAreaRect = GetPlayAreaRect; - this.ReloadInfo = ReloadInfo; - this.SetSceneColor = SetSceneColor; - this.GetBoundsColor = GetBoundsColor; - this.AreBoundsVisible = AreBoundsVisible; - this.ForceBoundsVisible = ForceBoundsVisible; - } - public VR_IVRChaperone_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRChaperone_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRChaperone_FnTable implements Structure.ByValue { - - }; + * @param GetCalibrationState C type : GetCalibrationState_callback*
+ * @param GetPlayAreaSize C type : GetPlayAreaSize_callback*
+ * @param GetPlayAreaRect C type : GetPlayAreaRect_callback*
+ * @param ReloadInfo C type : ReloadInfo_callback*
+ * @param SetSceneColor C type : SetSceneColor_callback*
+ * @param GetBoundsColor C type : GetBoundsColor_callback*
+ * @param AreBoundsVisible C type : AreBoundsVisible_callback*
+ * @param ForceBoundsVisible C type : ForceBoundsVisible_callback* + */ + public VR_IVRChaperone_FnTable(VR_IVRChaperone_FnTable.GetCalibrationState_callback GetCalibrationState, VR_IVRChaperone_FnTable.GetPlayAreaSize_callback GetPlayAreaSize, VR_IVRChaperone_FnTable.GetPlayAreaRect_callback GetPlayAreaRect, VR_IVRChaperone_FnTable.ReloadInfo_callback ReloadInfo, VR_IVRChaperone_FnTable.SetSceneColor_callback SetSceneColor, VR_IVRChaperone_FnTable.GetBoundsColor_callback GetBoundsColor, VR_IVRChaperone_FnTable.AreBoundsVisible_callback AreBoundsVisible, VR_IVRChaperone_FnTable.ForceBoundsVisible_callback ForceBoundsVisible) { + super(); + this.GetCalibrationState = GetCalibrationState; + this.GetPlayAreaSize = GetPlayAreaSize; + this.GetPlayAreaRect = GetPlayAreaRect; + this.ReloadInfo = ReloadInfo; + this.SetSceneColor = SetSceneColor; + this.GetBoundsColor = GetBoundsColor; + this.AreBoundsVisible = AreBoundsVisible; + this.ForceBoundsVisible = ForceBoundsVisible; + } + public VR_IVRChaperone_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRChaperone_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRChaperone_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRCompositor_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRCompositor_FnTable.java index f4154dfda..53a303943 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRCompositor_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRCompositor_FnTable.java @@ -8,283 +8,284 @@ import com.sun.jna.ptr.PointerByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:2045
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRCompositor_FnTable extends Structure { - /** C type : SetTrackingSpace_callback* */ - public VR_IVRCompositor_FnTable.SetTrackingSpace_callback SetTrackingSpace; - /** C type : GetTrackingSpace_callback* */ - public VR_IVRCompositor_FnTable.GetTrackingSpace_callback GetTrackingSpace; - /** C type : WaitGetPoses_callback* */ - public VR_IVRCompositor_FnTable.WaitGetPoses_callback WaitGetPoses; - /** C type : GetLastPoses_callback* */ - public VR_IVRCompositor_FnTable.GetLastPoses_callback GetLastPoses; - /** C type : GetLastPoseForTrackedDeviceIndex_callback* */ - public VR_IVRCompositor_FnTable.GetLastPoseForTrackedDeviceIndex_callback GetLastPoseForTrackedDeviceIndex; - /** C type : Submit_callback* */ - public VR_IVRCompositor_FnTable.Submit_callback Submit; - /** C type : ClearLastSubmittedFrame_callback* */ - public VR_IVRCompositor_FnTable.ClearLastSubmittedFrame_callback ClearLastSubmittedFrame; - /** C type : PostPresentHandoff_callback* */ - public VR_IVRCompositor_FnTable.PostPresentHandoff_callback PostPresentHandoff; - /** C type : GetFrameTiming_callback* */ - public VR_IVRCompositor_FnTable.GetFrameTiming_callback GetFrameTiming; - /** C type : GetFrameTimings_callback* */ - public VR_IVRCompositor_FnTable.GetFrameTimings_callback GetFrameTimings; - /** C type : GetFrameTimeRemaining_callback* */ - public VR_IVRCompositor_FnTable.GetFrameTimeRemaining_callback GetFrameTimeRemaining; - /** C type : GetCumulativeStats_callback* */ - public VR_IVRCompositor_FnTable.GetCumulativeStats_callback GetCumulativeStats; - /** C type : FadeToColor_callback* */ - public VR_IVRCompositor_FnTable.FadeToColor_callback FadeToColor; - /** C type : GetCurrentFadeColor_callback* */ - public VR_IVRCompositor_FnTable.GetCurrentFadeColor_callback GetCurrentFadeColor; - /** C type : FadeGrid_callback* */ - public VR_IVRCompositor_FnTable.FadeGrid_callback FadeGrid; - /** C type : GetCurrentGridAlpha_callback* */ - public VR_IVRCompositor_FnTable.GetCurrentGridAlpha_callback GetCurrentGridAlpha; - /** C type : SetSkyboxOverride_callback* */ - public VR_IVRCompositor_FnTable.SetSkyboxOverride_callback SetSkyboxOverride; - /** C type : ClearSkyboxOverride_callback* */ - public VR_IVRCompositor_FnTable.ClearSkyboxOverride_callback ClearSkyboxOverride; - /** C type : CompositorBringToFront_callback* */ - public VR_IVRCompositor_FnTable.CompositorBringToFront_callback CompositorBringToFront; - /** C type : CompositorGoToBack_callback* */ - public VR_IVRCompositor_FnTable.CompositorGoToBack_callback CompositorGoToBack; - /** C type : CompositorQuit_callback* */ - public VR_IVRCompositor_FnTable.CompositorQuit_callback CompositorQuit; - /** C type : IsFullscreen_callback* */ - public VR_IVRCompositor_FnTable.IsFullscreen_callback IsFullscreen; - /** C type : GetCurrentSceneFocusProcess_callback* */ - public VR_IVRCompositor_FnTable.GetCurrentSceneFocusProcess_callback GetCurrentSceneFocusProcess; - /** C type : GetLastFrameRenderer_callback* */ - public VR_IVRCompositor_FnTable.GetLastFrameRenderer_callback GetLastFrameRenderer; - /** C type : CanRenderScene_callback* */ - public VR_IVRCompositor_FnTable.CanRenderScene_callback CanRenderScene; - /** C type : ShowMirrorWindow_callback* */ - public VR_IVRCompositor_FnTable.ShowMirrorWindow_callback ShowMirrorWindow; - /** C type : HideMirrorWindow_callback* */ - public VR_IVRCompositor_FnTable.HideMirrorWindow_callback HideMirrorWindow; - /** C type : IsMirrorWindowVisible_callback* */ - public VR_IVRCompositor_FnTable.IsMirrorWindowVisible_callback IsMirrorWindowVisible; - /** C type : CompositorDumpImages_callback* */ - public VR_IVRCompositor_FnTable.CompositorDumpImages_callback CompositorDumpImages; - /** C type : ShouldAppRenderWithLowResources_callback* */ - public VR_IVRCompositor_FnTable.ShouldAppRenderWithLowResources_callback ShouldAppRenderWithLowResources; - /** C type : ForceInterleavedReprojectionOn_callback* */ - public VR_IVRCompositor_FnTable.ForceInterleavedReprojectionOn_callback ForceInterleavedReprojectionOn; - /** C type : ForceReconnectProcess_callback* */ - public VR_IVRCompositor_FnTable.ForceReconnectProcess_callback ForceReconnectProcess; - /** C type : SuspendRendering_callback* */ - public VR_IVRCompositor_FnTable.SuspendRendering_callback SuspendRendering; - /** C type : GetMirrorTextureD3D11_callback* */ - public VR_IVRCompositor_FnTable.GetMirrorTextureD3D11_callback GetMirrorTextureD3D11; - /** C type : ReleaseMirrorTextureD3D11_callback* */ - public VR_IVRCompositor_FnTable.ReleaseMirrorTextureD3D11_callback ReleaseMirrorTextureD3D11; - /** C type : GetMirrorTextureGL_callback* */ - public VR_IVRCompositor_FnTable.GetMirrorTextureGL_callback GetMirrorTextureGL; - /** C type : ReleaseSharedGLTexture_callback* */ - public VR_IVRCompositor_FnTable.ReleaseSharedGLTexture_callback ReleaseSharedGLTexture; - /** C type : LockGLSharedTextureForAccess_callback* */ - public VR_IVRCompositor_FnTable.LockGLSharedTextureForAccess_callback LockGLSharedTextureForAccess; - /** C type : UnlockGLSharedTextureForAccess_callback* */ - public VR_IVRCompositor_FnTable.UnlockGLSharedTextureForAccess_callback UnlockGLSharedTextureForAccess; - /** C type : GetVulkanInstanceExtensionsRequired_callback* */ - public VR_IVRCompositor_FnTable.GetVulkanInstanceExtensionsRequired_callback GetVulkanInstanceExtensionsRequired; - /** C type : GetVulkanDeviceExtensionsRequired_callback* */ - public VR_IVRCompositor_FnTable.GetVulkanDeviceExtensionsRequired_callback GetVulkanDeviceExtensionsRequired; - /** C type : SetExplicitTimingMode_callback* */ - public VR_IVRCompositor_FnTable.SetExplicitTimingMode_callback SetExplicitTimingMode; - /** C type : SubmitExplicitTimingData_callback* */ - public VR_IVRCompositor_FnTable.SubmitExplicitTimingData_callback SubmitExplicitTimingData; - /** native declaration : headers\openvr_capi.h:2002 */ - public interface SetTrackingSpace_callback extends Callback { - void apply(int eOrigin); - }; - /** native declaration : headers\openvr_capi.h:2003 */ - public interface GetTrackingSpace_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:2004 */ - public interface WaitGetPoses_callback extends Callback { - int apply(TrackedDevicePose_t pRenderPoseArray, int unRenderPoseArrayCount, TrackedDevicePose_t pGamePoseArray, int unGamePoseArrayCount); - }; - /** native declaration : headers\openvr_capi.h:2005 */ - public interface GetLastPoses_callback extends Callback { - int apply(TrackedDevicePose_t pRenderPoseArray, int unRenderPoseArrayCount, TrackedDevicePose_t pGamePoseArray, int unGamePoseArrayCount); - }; - /** native declaration : headers\openvr_capi.h:2006 */ - public interface GetLastPoseForTrackedDeviceIndex_callback extends Callback { - int apply(int unDeviceIndex, TrackedDevicePose_t pOutputPose, TrackedDevicePose_t pOutputGamePose); - }; - /** native declaration : headers\openvr_capi.h:2007 */ - public interface Submit_callback extends Callback { - int apply(int eEye, Texture_t pTexture, VRTextureBounds_t pBounds, int nSubmitFlags); - }; - /** native declaration : headers\openvr_capi.h:2008 */ - public interface ClearLastSubmittedFrame_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2009 */ - public interface PostPresentHandoff_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2010 */ - public interface GetFrameTiming_callback extends Callback { - byte apply(Compositor_FrameTiming pTiming, int unFramesAgo); - }; - /** native declaration : headers\openvr_capi.h:2011 */ - public interface GetFrameTimings_callback extends Callback { - int apply(Compositor_FrameTiming pTiming, int nFrames); - }; - /** native declaration : headers\openvr_capi.h:2012 */ - public interface GetFrameTimeRemaining_callback extends Callback { - float apply(); - }; - /** native declaration : headers\openvr_capi.h:2013 */ - public interface GetCumulativeStats_callback extends Callback { - void apply(Compositor_CumulativeStats pStats, int nStatsSizeInBytes); - }; - /** native declaration : headers\openvr_capi.h:2014 */ - public interface FadeToColor_callback extends Callback { - void apply(float fSeconds, float fRed, float fGreen, float fBlue, float fAlpha, byte bBackground); - }; - /** native declaration : headers\openvr_capi.h:2015 */ - public interface GetCurrentFadeColor_callback extends Callback { - com.jme3.system.jopenvr.HmdColor_t.ByValue apply(byte bBackground); - }; - /** native declaration : headers\openvr_capi.h:2016 */ - public interface FadeGrid_callback extends Callback { - void apply(float fSeconds, byte bFadeIn); - }; - /** native declaration : headers\openvr_capi.h:2017 */ - public interface GetCurrentGridAlpha_callback extends Callback { - float apply(); - }; - /** native declaration : headers\openvr_capi.h:2018 */ - public interface SetSkyboxOverride_callback extends Callback { - int apply(Texture_t pTextures, int unTextureCount); - }; - /** native declaration : headers\openvr_capi.h:2019 */ - public interface ClearSkyboxOverride_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2020 */ - public interface CompositorBringToFront_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2021 */ - public interface CompositorGoToBack_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2022 */ - public interface CompositorQuit_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2023 */ - public interface IsFullscreen_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:2024 */ - public interface GetCurrentSceneFocusProcess_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:2025 */ - public interface GetLastFrameRenderer_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:2026 */ - public interface CanRenderScene_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:2027 */ - public interface ShowMirrorWindow_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2028 */ - public interface HideMirrorWindow_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2029 */ - public interface IsMirrorWindowVisible_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:2030 */ - public interface CompositorDumpImages_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2031 */ - public interface ShouldAppRenderWithLowResources_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:2032 */ - public interface ForceInterleavedReprojectionOn_callback extends Callback { - void apply(byte bOverride); - }; - /** native declaration : headers\openvr_capi.h:2033 */ - public interface ForceReconnectProcess_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2034 */ - public interface SuspendRendering_callback extends Callback { - void apply(byte bSuspend); - }; - /** native declaration : headers\openvr_capi.h:2035 */ - public interface GetMirrorTextureD3D11_callback extends Callback { - int apply(int eEye, Pointer pD3D11DeviceOrResource, PointerByReference ppD3D11ShaderResourceView); - }; - /** native declaration : headers\openvr_capi.h:2036 */ - public interface ReleaseMirrorTextureD3D11_callback extends Callback { - void apply(Pointer pD3D11ShaderResourceView); - }; - /** native declaration : headers\openvr_capi.h:2037 */ - public interface GetMirrorTextureGL_callback extends Callback { - int apply(int eEye, IntByReference pglTextureId, PointerByReference pglSharedTextureHandle); - }; - /** native declaration : headers\openvr_capi.h:2038 */ - public interface ReleaseSharedGLTexture_callback extends Callback { - byte apply(int glTextureId, Pointer glSharedTextureHandle); - }; - /** native declaration : headers\openvr_capi.h:2039 */ - public interface LockGLSharedTextureForAccess_callback extends Callback { - void apply(Pointer glSharedTextureHandle); - }; - /** native declaration : headers\openvr_capi.h:2040 */ - public interface UnlockGLSharedTextureForAccess_callback extends Callback { - void apply(Pointer glSharedTextureHandle); - }; - /** native declaration : headers\openvr_capi.h:2041 */ - public interface GetVulkanInstanceExtensionsRequired_callback extends Callback { - int apply(Pointer pchValue, int unBufferSize); - }; - /** native declaration : headers\openvr_capi.h:2042 */ - public interface GetVulkanDeviceExtensionsRequired_callback extends Callback { - int apply(VkPhysicalDevice_T pPhysicalDevice, Pointer pchValue, int unBufferSize); - }; - /** native declaration : headers\openvr_capi.h:2043 */ - public interface SetExplicitTimingMode_callback extends Callback { - void apply(int eTimingMode); - }; - /** native declaration : headers\openvr_capi.h:2044 */ - public interface SubmitExplicitTimingData_callback extends Callback { - int apply(); - }; - public VR_IVRCompositor_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("SetTrackingSpace", "GetTrackingSpace", "WaitGetPoses", "GetLastPoses", "GetLastPoseForTrackedDeviceIndex", "Submit", "ClearLastSubmittedFrame", "PostPresentHandoff", "GetFrameTiming", "GetFrameTimings", "GetFrameTimeRemaining", "GetCumulativeStats", "FadeToColor", "GetCurrentFadeColor", "FadeGrid", "GetCurrentGridAlpha", "SetSkyboxOverride", "ClearSkyboxOverride", "CompositorBringToFront", "CompositorGoToBack", "CompositorQuit", "IsFullscreen", "GetCurrentSceneFocusProcess", "GetLastFrameRenderer", "CanRenderScene", "ShowMirrorWindow", "HideMirrorWindow", "IsMirrorWindowVisible", "CompositorDumpImages", "ShouldAppRenderWithLowResources", "ForceInterleavedReprojectionOn", "ForceReconnectProcess", "SuspendRendering", "GetMirrorTextureD3D11", "ReleaseMirrorTextureD3D11", "GetMirrorTextureGL", "ReleaseSharedGLTexture", "LockGLSharedTextureForAccess", "UnlockGLSharedTextureForAccess", "GetVulkanInstanceExtensionsRequired", "GetVulkanDeviceExtensionsRequired", "SetExplicitTimingMode", "SubmitExplicitTimingData"); - } - public VR_IVRCompositor_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRCompositor_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRCompositor_FnTable implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:2045
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRCompositor_FnTable extends Structure { + /** C type : SetTrackingSpace_callback* */ + public VR_IVRCompositor_FnTable.SetTrackingSpace_callback SetTrackingSpace; + /** C type : GetTrackingSpace_callback* */ + public VR_IVRCompositor_FnTable.GetTrackingSpace_callback GetTrackingSpace; + /** C type : WaitGetPoses_callback* */ + public VR_IVRCompositor_FnTable.WaitGetPoses_callback WaitGetPoses; + /** C type : GetLastPoses_callback* */ + public VR_IVRCompositor_FnTable.GetLastPoses_callback GetLastPoses; + /** C type : GetLastPoseForTrackedDeviceIndex_callback* */ + public VR_IVRCompositor_FnTable.GetLastPoseForTrackedDeviceIndex_callback GetLastPoseForTrackedDeviceIndex; + /** C type : Submit_callback* */ + public VR_IVRCompositor_FnTable.Submit_callback Submit; + /** C type : ClearLastSubmittedFrame_callback* */ + public VR_IVRCompositor_FnTable.ClearLastSubmittedFrame_callback ClearLastSubmittedFrame; + /** C type : PostPresentHandoff_callback* */ + public VR_IVRCompositor_FnTable.PostPresentHandoff_callback PostPresentHandoff; + /** C type : GetFrameTiming_callback* */ + public VR_IVRCompositor_FnTable.GetFrameTiming_callback GetFrameTiming; + /** C type : GetFrameTimings_callback* */ + public VR_IVRCompositor_FnTable.GetFrameTimings_callback GetFrameTimings; + /** C type : GetFrameTimeRemaining_callback* */ + public VR_IVRCompositor_FnTable.GetFrameTimeRemaining_callback GetFrameTimeRemaining; + /** C type : GetCumulativeStats_callback* */ + public VR_IVRCompositor_FnTable.GetCumulativeStats_callback GetCumulativeStats; + /** C type : FadeToColor_callback* */ + public VR_IVRCompositor_FnTable.FadeToColor_callback FadeToColor; + /** C type : GetCurrentFadeColor_callback* */ + public VR_IVRCompositor_FnTable.GetCurrentFadeColor_callback GetCurrentFadeColor; + /** C type : FadeGrid_callback* */ + public VR_IVRCompositor_FnTable.FadeGrid_callback FadeGrid; + /** C type : GetCurrentGridAlpha_callback* */ + public VR_IVRCompositor_FnTable.GetCurrentGridAlpha_callback GetCurrentGridAlpha; + /** C type : SetSkyboxOverride_callback* */ + public VR_IVRCompositor_FnTable.SetSkyboxOverride_callback SetSkyboxOverride; + /** C type : ClearSkyboxOverride_callback* */ + public VR_IVRCompositor_FnTable.ClearSkyboxOverride_callback ClearSkyboxOverride; + /** C type : CompositorBringToFront_callback* */ + public VR_IVRCompositor_FnTable.CompositorBringToFront_callback CompositorBringToFront; + /** C type : CompositorGoToBack_callback* */ + public VR_IVRCompositor_FnTable.CompositorGoToBack_callback CompositorGoToBack; + /** C type : CompositorQuit_callback* */ + public VR_IVRCompositor_FnTable.CompositorQuit_callback CompositorQuit; + /** C type : IsFullscreen_callback* */ + public VR_IVRCompositor_FnTable.IsFullscreen_callback IsFullscreen; + /** C type : GetCurrentSceneFocusProcess_callback* */ + public VR_IVRCompositor_FnTable.GetCurrentSceneFocusProcess_callback GetCurrentSceneFocusProcess; + /** C type : GetLastFrameRenderer_callback* */ + public VR_IVRCompositor_FnTable.GetLastFrameRenderer_callback GetLastFrameRenderer; + /** C type : CanRenderScene_callback* */ + public VR_IVRCompositor_FnTable.CanRenderScene_callback CanRenderScene; + /** C type : ShowMirrorWindow_callback* */ + public VR_IVRCompositor_FnTable.ShowMirrorWindow_callback ShowMirrorWindow; + /** C type : HideMirrorWindow_callback* */ + public VR_IVRCompositor_FnTable.HideMirrorWindow_callback HideMirrorWindow; + /** C type : IsMirrorWindowVisible_callback* */ + public VR_IVRCompositor_FnTable.IsMirrorWindowVisible_callback IsMirrorWindowVisible; + /** C type : CompositorDumpImages_callback* */ + public VR_IVRCompositor_FnTable.CompositorDumpImages_callback CompositorDumpImages; + /** C type : ShouldAppRenderWithLowResources_callback* */ + public VR_IVRCompositor_FnTable.ShouldAppRenderWithLowResources_callback ShouldAppRenderWithLowResources; + /** C type : ForceInterleavedReprojectionOn_callback* */ + public VR_IVRCompositor_FnTable.ForceInterleavedReprojectionOn_callback ForceInterleavedReprojectionOn; + /** C type : ForceReconnectProcess_callback* */ + public VR_IVRCompositor_FnTable.ForceReconnectProcess_callback ForceReconnectProcess; + /** C type : SuspendRendering_callback* */ + public VR_IVRCompositor_FnTable.SuspendRendering_callback SuspendRendering; + /** C type : GetMirrorTextureD3D11_callback* */ + public VR_IVRCompositor_FnTable.GetMirrorTextureD3D11_callback GetMirrorTextureD3D11; + /** C type : ReleaseMirrorTextureD3D11_callback* */ + public VR_IVRCompositor_FnTable.ReleaseMirrorTextureD3D11_callback ReleaseMirrorTextureD3D11; + /** C type : GetMirrorTextureGL_callback* */ + public VR_IVRCompositor_FnTable.GetMirrorTextureGL_callback GetMirrorTextureGL; + /** C type : ReleaseSharedGLTexture_callback* */ + public VR_IVRCompositor_FnTable.ReleaseSharedGLTexture_callback ReleaseSharedGLTexture; + /** C type : LockGLSharedTextureForAccess_callback* */ + public VR_IVRCompositor_FnTable.LockGLSharedTextureForAccess_callback LockGLSharedTextureForAccess; + /** C type : UnlockGLSharedTextureForAccess_callback* */ + public VR_IVRCompositor_FnTable.UnlockGLSharedTextureForAccess_callback UnlockGLSharedTextureForAccess; + /** C type : GetVulkanInstanceExtensionsRequired_callback* */ + public VR_IVRCompositor_FnTable.GetVulkanInstanceExtensionsRequired_callback GetVulkanInstanceExtensionsRequired; + /** C type : GetVulkanDeviceExtensionsRequired_callback* */ + public VR_IVRCompositor_FnTable.GetVulkanDeviceExtensionsRequired_callback GetVulkanDeviceExtensionsRequired; + /** C type : SetExplicitTimingMode_callback* */ + public VR_IVRCompositor_FnTable.SetExplicitTimingMode_callback SetExplicitTimingMode; + /** C type : SubmitExplicitTimingData_callback* */ + public VR_IVRCompositor_FnTable.SubmitExplicitTimingData_callback SubmitExplicitTimingData; + /** native declaration : headers\openvr_capi.h:2002 */ + public interface SetTrackingSpace_callback extends Callback { + void apply(int eOrigin); + }; + /** native declaration : headers\openvr_capi.h:2003 */ + public interface GetTrackingSpace_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:2004 */ + public interface WaitGetPoses_callback extends Callback { + int apply(TrackedDevicePose_t pRenderPoseArray, int unRenderPoseArrayCount, TrackedDevicePose_t pGamePoseArray, int unGamePoseArrayCount); + }; + /** native declaration : headers\openvr_capi.h:2005 */ + public interface GetLastPoses_callback extends Callback { + int apply(TrackedDevicePose_t pRenderPoseArray, int unRenderPoseArrayCount, TrackedDevicePose_t pGamePoseArray, int unGamePoseArrayCount); + }; + /** native declaration : headers\openvr_capi.h:2006 */ + public interface GetLastPoseForTrackedDeviceIndex_callback extends Callback { + int apply(int unDeviceIndex, TrackedDevicePose_t pOutputPose, TrackedDevicePose_t pOutputGamePose); + }; + /** native declaration : headers\openvr_capi.h:2007 */ + public interface Submit_callback extends Callback { + int apply(int eEye, Texture_t pTexture, VRTextureBounds_t pBounds, int nSubmitFlags); + }; + /** native declaration : headers\openvr_capi.h:2008 */ + public interface ClearLastSubmittedFrame_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2009 */ + public interface PostPresentHandoff_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2010 */ + public interface GetFrameTiming_callback extends Callback { + byte apply(Compositor_FrameTiming pTiming, int unFramesAgo); + }; + /** native declaration : headers\openvr_capi.h:2011 */ + public interface GetFrameTimings_callback extends Callback { + int apply(Compositor_FrameTiming pTiming, int nFrames); + }; + /** native declaration : headers\openvr_capi.h:2012 */ + public interface GetFrameTimeRemaining_callback extends Callback { + float apply(); + }; + /** native declaration : headers\openvr_capi.h:2013 */ + public interface GetCumulativeStats_callback extends Callback { + void apply(Compositor_CumulativeStats pStats, int nStatsSizeInBytes); + }; + /** native declaration : headers\openvr_capi.h:2014 */ + public interface FadeToColor_callback extends Callback { + void apply(float fSeconds, float fRed, float fGreen, float fBlue, float fAlpha, byte bBackground); + }; + /** native declaration : headers\openvr_capi.h:2015 */ + public interface GetCurrentFadeColor_callback extends Callback { + com.jme3.system.jopenvr.HmdColor_t.ByValue apply(byte bBackground); + }; + /** native declaration : headers\openvr_capi.h:2016 */ + public interface FadeGrid_callback extends Callback { + void apply(float fSeconds, byte bFadeIn); + }; + /** native declaration : headers\openvr_capi.h:2017 */ + public interface GetCurrentGridAlpha_callback extends Callback { + float apply(); + }; + /** native declaration : headers\openvr_capi.h:2018 */ + public interface SetSkyboxOverride_callback extends Callback { + int apply(Texture_t pTextures, int unTextureCount); + }; + /** native declaration : headers\openvr_capi.h:2019 */ + public interface ClearSkyboxOverride_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2020 */ + public interface CompositorBringToFront_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2021 */ + public interface CompositorGoToBack_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2022 */ + public interface CompositorQuit_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2023 */ + public interface IsFullscreen_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:2024 */ + public interface GetCurrentSceneFocusProcess_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:2025 */ + public interface GetLastFrameRenderer_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:2026 */ + public interface CanRenderScene_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:2027 */ + public interface ShowMirrorWindow_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2028 */ + public interface HideMirrorWindow_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2029 */ + public interface IsMirrorWindowVisible_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:2030 */ + public interface CompositorDumpImages_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2031 */ + public interface ShouldAppRenderWithLowResources_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:2032 */ + public interface ForceInterleavedReprojectionOn_callback extends Callback { + void apply(byte bOverride); + }; + /** native declaration : headers\openvr_capi.h:2033 */ + public interface ForceReconnectProcess_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2034 */ + public interface SuspendRendering_callback extends Callback { + void apply(byte bSuspend); + }; + /** native declaration : headers\openvr_capi.h:2035 */ + public interface GetMirrorTextureD3D11_callback extends Callback { + int apply(int eEye, Pointer pD3D11DeviceOrResource, PointerByReference ppD3D11ShaderResourceView); + }; + /** native declaration : headers\openvr_capi.h:2036 */ + public interface ReleaseMirrorTextureD3D11_callback extends Callback { + void apply(Pointer pD3D11ShaderResourceView); + }; + /** native declaration : headers\openvr_capi.h:2037 */ + public interface GetMirrorTextureGL_callback extends Callback { + int apply(int eEye, IntByReference pglTextureId, PointerByReference pglSharedTextureHandle); + }; + /** native declaration : headers\openvr_capi.h:2038 */ + public interface ReleaseSharedGLTexture_callback extends Callback { + byte apply(int glTextureId, Pointer glSharedTextureHandle); + }; + /** native declaration : headers\openvr_capi.h:2039 */ + public interface LockGLSharedTextureForAccess_callback extends Callback { + void apply(Pointer glSharedTextureHandle); + }; + /** native declaration : headers\openvr_capi.h:2040 */ + public interface UnlockGLSharedTextureForAccess_callback extends Callback { + void apply(Pointer glSharedTextureHandle); + }; + /** native declaration : headers\openvr_capi.h:2041 */ + public interface GetVulkanInstanceExtensionsRequired_callback extends Callback { + int apply(Pointer pchValue, int unBufferSize); + }; + /** native declaration : headers\openvr_capi.h:2042 */ + public interface GetVulkanDeviceExtensionsRequired_callback extends Callback { + int apply(VkPhysicalDevice_T pPhysicalDevice, Pointer pchValue, int unBufferSize); + }; + /** native declaration : headers\openvr_capi.h:2043 */ + public interface SetExplicitTimingMode_callback extends Callback { + void apply(int eTimingMode); + }; + /** native declaration : headers\openvr_capi.h:2044 */ + public interface SubmitExplicitTimingData_callback extends Callback { + int apply(); + }; + public VR_IVRCompositor_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("SetTrackingSpace", "GetTrackingSpace", "WaitGetPoses", "GetLastPoses", "GetLastPoseForTrackedDeviceIndex", "Submit", "ClearLastSubmittedFrame", "PostPresentHandoff", "GetFrameTiming", "GetFrameTimings", "GetFrameTimeRemaining", "GetCumulativeStats", "FadeToColor", "GetCurrentFadeColor", "FadeGrid", "GetCurrentGridAlpha", "SetSkyboxOverride", "ClearSkyboxOverride", "CompositorBringToFront", "CompositorGoToBack", "CompositorQuit", "IsFullscreen", "GetCurrentSceneFocusProcess", "GetLastFrameRenderer", "CanRenderScene", "ShowMirrorWindow", "HideMirrorWindow", "IsMirrorWindowVisible", "CompositorDumpImages", "ShouldAppRenderWithLowResources", "ForceInterleavedReprojectionOn", "ForceReconnectProcess", "SuspendRendering", "GetMirrorTextureD3D11", "ReleaseMirrorTextureD3D11", "GetMirrorTextureGL", "ReleaseSharedGLTexture", "LockGLSharedTextureForAccess", "UnlockGLSharedTextureForAccess", "GetVulkanInstanceExtensionsRequired", "GetVulkanDeviceExtensionsRequired", "SetExplicitTimingMode", "SubmitExplicitTimingData"); + } + public VR_IVRCompositor_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRCompositor_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRCompositor_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRDriverManager_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRDriverManager_FnTable.java index f8e926a1c..13e444730 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRDriverManager_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRDriverManager_FnTable.java @@ -5,54 +5,55 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:2313
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRDriverManager_FnTable extends Structure { - /** C type : GetDriverCount_callback* */ - public VR_IVRDriverManager_FnTable.GetDriverCount_callback GetDriverCount; - /** C type : GetDriverName_callback* */ - public VR_IVRDriverManager_FnTable.GetDriverName_callback GetDriverName; - /** C type : GetDriverHandle_callback* */ - public VR_IVRDriverManager_FnTable.GetDriverHandle_callback GetDriverHandle; - /** native declaration : headers\openvr_capi.h:2310 */ - public interface GetDriverCount_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:2311 */ - public interface GetDriverName_callback extends Callback { - int apply(int nDriver, Pointer pchValue, int unBufferSize); - }; - /** native declaration : headers\openvr_capi.h:2312 */ - public interface GetDriverHandle_callback extends Callback { - long apply(Pointer pchDriverName); - }; - public VR_IVRDriverManager_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("GetDriverCount", "GetDriverName", "GetDriverHandle"); - } + * native declaration : headers\openvr_capi.h:2313
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRDriverManager_FnTable extends Structure { + /** C type : GetDriverCount_callback* */ + public VR_IVRDriverManager_FnTable.GetDriverCount_callback GetDriverCount; + /** C type : GetDriverName_callback* */ + public VR_IVRDriverManager_FnTable.GetDriverName_callback GetDriverName; + /** C type : GetDriverHandle_callback* */ + public VR_IVRDriverManager_FnTable.GetDriverHandle_callback GetDriverHandle; + /** native declaration : headers\openvr_capi.h:2310 */ + public interface GetDriverCount_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:2311 */ + public interface GetDriverName_callback extends Callback { + int apply(int nDriver, Pointer pchValue, int unBufferSize); + }; + /** native declaration : headers\openvr_capi.h:2312 */ + public interface GetDriverHandle_callback extends Callback { + long apply(Pointer pchDriverName); + }; + public VR_IVRDriverManager_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("GetDriverCount", "GetDriverName", "GetDriverHandle"); + } /** - * @param GetDriverCount C type : GetDriverCount_callback*
- * @param GetDriverName C type : GetDriverName_callback*
- * @param GetDriverHandle C type : GetDriverHandle_callback* - */ - public VR_IVRDriverManager_FnTable(VR_IVRDriverManager_FnTable.GetDriverCount_callback GetDriverCount, VR_IVRDriverManager_FnTable.GetDriverName_callback GetDriverName, VR_IVRDriverManager_FnTable.GetDriverHandle_callback GetDriverHandle) { - super(); - this.GetDriverCount = GetDriverCount; - this.GetDriverName = GetDriverName; - this.GetDriverHandle = GetDriverHandle; - } - public VR_IVRDriverManager_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRDriverManager_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRDriverManager_FnTable implements Structure.ByValue { - - }; + * @param GetDriverCount C type : GetDriverCount_callback*
+ * @param GetDriverName C type : GetDriverName_callback*
+ * @param GetDriverHandle C type : GetDriverHandle_callback* + */ + public VR_IVRDriverManager_FnTable(VR_IVRDriverManager_FnTable.GetDriverCount_callback GetDriverCount, VR_IVRDriverManager_FnTable.GetDriverName_callback GetDriverName, VR_IVRDriverManager_FnTable.GetDriverHandle_callback GetDriverHandle) { + super(); + this.GetDriverCount = GetDriverCount; + this.GetDriverName = GetDriverName; + this.GetDriverHandle = GetDriverHandle; + } + public VR_IVRDriverManager_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRDriverManager_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRDriverManager_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRExtendedDisplay_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRExtendedDisplay_FnTable.java index de9b54af2..2b04732a7 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRExtendedDisplay_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRExtendedDisplay_FnTable.java @@ -6,54 +6,55 @@ import com.sun.jna.ptr.IntByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1807
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRExtendedDisplay_FnTable extends Structure { - /** C type : GetWindowBounds_callback* */ - public VR_IVRExtendedDisplay_FnTable.GetWindowBounds_callback GetWindowBounds; - /** C type : GetEyeOutputViewport_callback* */ - public VR_IVRExtendedDisplay_FnTable.GetEyeOutputViewport_callback GetEyeOutputViewport; - /** C type : GetDXGIOutputInfo_callback* */ - public VR_IVRExtendedDisplay_FnTable.GetDXGIOutputInfo_callback GetDXGIOutputInfo; - /** native declaration : headers\openvr_capi.h:1804 */ - public interface GetWindowBounds_callback extends Callback { - void apply(IntByReference pnX, IntByReference pnY, IntByReference pnWidth, IntByReference pnHeight); - }; - /** native declaration : headers\openvr_capi.h:1805 */ - public interface GetEyeOutputViewport_callback extends Callback { - void apply(int eEye, IntByReference pnX, IntByReference pnY, IntByReference pnWidth, IntByReference pnHeight); - }; - /** native declaration : headers\openvr_capi.h:1806 */ - public interface GetDXGIOutputInfo_callback extends Callback { - void apply(IntByReference pnAdapterIndex, IntByReference pnAdapterOutputIndex); - }; - public VR_IVRExtendedDisplay_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("GetWindowBounds", "GetEyeOutputViewport", "GetDXGIOutputInfo"); - } + * native declaration : headers\openvr_capi.h:1807
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRExtendedDisplay_FnTable extends Structure { + /** C type : GetWindowBounds_callback* */ + public VR_IVRExtendedDisplay_FnTable.GetWindowBounds_callback GetWindowBounds; + /** C type : GetEyeOutputViewport_callback* */ + public VR_IVRExtendedDisplay_FnTable.GetEyeOutputViewport_callback GetEyeOutputViewport; + /** C type : GetDXGIOutputInfo_callback* */ + public VR_IVRExtendedDisplay_FnTable.GetDXGIOutputInfo_callback GetDXGIOutputInfo; + /** native declaration : headers\openvr_capi.h:1804 */ + public interface GetWindowBounds_callback extends Callback { + void apply(IntByReference pnX, IntByReference pnY, IntByReference pnWidth, IntByReference pnHeight); + }; + /** native declaration : headers\openvr_capi.h:1805 */ + public interface GetEyeOutputViewport_callback extends Callback { + void apply(int eEye, IntByReference pnX, IntByReference pnY, IntByReference pnWidth, IntByReference pnHeight); + }; + /** native declaration : headers\openvr_capi.h:1806 */ + public interface GetDXGIOutputInfo_callback extends Callback { + void apply(IntByReference pnAdapterIndex, IntByReference pnAdapterOutputIndex); + }; + public VR_IVRExtendedDisplay_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("GetWindowBounds", "GetEyeOutputViewport", "GetDXGIOutputInfo"); + } /** - * @param GetWindowBounds C type : GetWindowBounds_callback*
- * @param GetEyeOutputViewport C type : GetEyeOutputViewport_callback*
- * @param GetDXGIOutputInfo C type : GetDXGIOutputInfo_callback* - */ - public VR_IVRExtendedDisplay_FnTable(VR_IVRExtendedDisplay_FnTable.GetWindowBounds_callback GetWindowBounds, VR_IVRExtendedDisplay_FnTable.GetEyeOutputViewport_callback GetEyeOutputViewport, VR_IVRExtendedDisplay_FnTable.GetDXGIOutputInfo_callback GetDXGIOutputInfo) { - super(); - this.GetWindowBounds = GetWindowBounds; - this.GetEyeOutputViewport = GetEyeOutputViewport; - this.GetDXGIOutputInfo = GetDXGIOutputInfo; - } - public VR_IVRExtendedDisplay_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRExtendedDisplay_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRExtendedDisplay_FnTable implements Structure.ByValue { - - }; + * @param GetWindowBounds C type : GetWindowBounds_callback*
+ * @param GetEyeOutputViewport C type : GetEyeOutputViewport_callback*
+ * @param GetDXGIOutputInfo C type : GetDXGIOutputInfo_callback* + */ + public VR_IVRExtendedDisplay_FnTable(VR_IVRExtendedDisplay_FnTable.GetWindowBounds_callback GetWindowBounds, VR_IVRExtendedDisplay_FnTable.GetEyeOutputViewport_callback GetEyeOutputViewport, VR_IVRExtendedDisplay_FnTable.GetDXGIOutputInfo_callback GetDXGIOutputInfo) { + super(); + this.GetWindowBounds = GetWindowBounds; + this.GetEyeOutputViewport = GetEyeOutputViewport; + this.GetDXGIOutputInfo = GetDXGIOutputInfo; + } + public VR_IVRExtendedDisplay_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRExtendedDisplay_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRExtendedDisplay_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRIOBuffer_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRIOBuffer_FnTable.java index 723738729..5a6b9291d 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRIOBuffer_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRIOBuffer_FnTable.java @@ -46,6 +46,7 @@ public class VR_IVRIOBuffer_FnTable extends Structure { public VR_IVRIOBuffer_FnTable() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("Open", "Close", "Read", "Write", "PropertyContainer"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRInput_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRInput_FnTable.java index c7fcb0aab..44987cc99 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRInput_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRInput_FnTable.java @@ -124,6 +124,7 @@ public class VR_IVRInput_FnTable extends Structure { public VR_IVRInput_FnTable() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("SetActionManifestPath", "GetActionSetHandle", "GetActionHandle", "GetInputSourceHandle", "UpdateActionState", "GetDigitalActionData", "GetAnalogActionData", "GetPoseActionData", "GetSkeletalActionData", "GetSkeletalBoneData", "GetSkeletalBoneDataCompressed", "DecompressSkeletalBoneData", "TriggerHapticVibrationAction", "GetActionOrigins", "GetOriginLocalizedName", "GetOriginTrackedDeviceInfo", "ShowActionOrigins", "ShowBindingsForActionSet"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRNotifications_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRNotifications_FnTable.java index 5456f6f08..7e15f3591 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRNotifications_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRNotifications_FnTable.java @@ -6,46 +6,47 @@ import com.sun.jna.ptr.IntByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:2257
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRNotifications_FnTable extends Structure { - /** C type : CreateNotification_callback* */ - public VR_IVRNotifications_FnTable.CreateNotification_callback CreateNotification; - /** C type : RemoveNotification_callback* */ - public VR_IVRNotifications_FnTable.RemoveNotification_callback RemoveNotification; - /** native declaration : headers\openvr_capi.h:2255 */ - public interface CreateNotification_callback extends Callback { - int apply(long ulOverlayHandle, long ulUserValue, int type, Pointer pchText, int style, NotificationBitmap_t pImage, IntByReference pNotificationId); - }; - /** native declaration : headers\openvr_capi.h:2256 */ - public interface RemoveNotification_callback extends Callback { - int apply(int notificationId); - }; - public VR_IVRNotifications_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("CreateNotification", "RemoveNotification"); - } + * native declaration : headers\openvr_capi.h:2257
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRNotifications_FnTable extends Structure { + /** C type : CreateNotification_callback* */ + public VR_IVRNotifications_FnTable.CreateNotification_callback CreateNotification; + /** C type : RemoveNotification_callback* */ + public VR_IVRNotifications_FnTable.RemoveNotification_callback RemoveNotification; + /** native declaration : headers\openvr_capi.h:2255 */ + public interface CreateNotification_callback extends Callback { + int apply(long ulOverlayHandle, long ulUserValue, int type, Pointer pchText, int style, NotificationBitmap_t pImage, IntByReference pNotificationId); + }; + /** native declaration : headers\openvr_capi.h:2256 */ + public interface RemoveNotification_callback extends Callback { + int apply(int notificationId); + }; + public VR_IVRNotifications_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("CreateNotification", "RemoveNotification"); + } /** - * @param CreateNotification C type : CreateNotification_callback*
- * @param RemoveNotification C type : RemoveNotification_callback* - */ - public VR_IVRNotifications_FnTable(VR_IVRNotifications_FnTable.CreateNotification_callback CreateNotification, VR_IVRNotifications_FnTable.RemoveNotification_callback RemoveNotification) { - super(); - this.CreateNotification = CreateNotification; - this.RemoveNotification = RemoveNotification; - } - public VR_IVRNotifications_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRNotifications_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRNotifications_FnTable implements Structure.ByValue { - - }; + * @param CreateNotification C type : CreateNotification_callback*
+ * @param RemoveNotification C type : RemoveNotification_callback* + */ + public VR_IVRNotifications_FnTable(VR_IVRNotifications_FnTable.CreateNotification_callback CreateNotification, VR_IVRNotifications_FnTable.RemoveNotification_callback RemoveNotification) { + super(); + this.CreateNotification = CreateNotification; + this.RemoveNotification = RemoveNotification; + } + public VR_IVRNotifications_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRNotifications_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRNotifications_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVROverlay_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVROverlay_FnTable.java index 7dc6a2d40..f9405bb07 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVROverlay_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVROverlay_FnTable.java @@ -9,517 +9,518 @@ import com.sun.jna.ptr.PointerByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:2211
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVROverlay_FnTable extends Structure { - /** C type : FindOverlay_callback* */ - public VR_IVROverlay_FnTable.FindOverlay_callback FindOverlay; - /** C type : CreateOverlay_callback* */ - public VR_IVROverlay_FnTable.CreateOverlay_callback CreateOverlay; - /** C type : DestroyOverlay_callback* */ - public VR_IVROverlay_FnTable.DestroyOverlay_callback DestroyOverlay; - /** C type : SetHighQualityOverlay_callback* */ - public VR_IVROverlay_FnTable.SetHighQualityOverlay_callback SetHighQualityOverlay; - /** C type : GetHighQualityOverlay_callback* */ - public VR_IVROverlay_FnTable.GetHighQualityOverlay_callback GetHighQualityOverlay; - /** C type : GetOverlayKey_callback* */ - public VR_IVROverlay_FnTable.GetOverlayKey_callback GetOverlayKey; - /** C type : GetOverlayName_callback* */ - public VR_IVROverlay_FnTable.GetOverlayName_callback GetOverlayName; - /** C type : SetOverlayName_callback* */ - public VR_IVROverlay_FnTable.SetOverlayName_callback SetOverlayName; - /** C type : GetOverlayImageData_callback* */ - public VR_IVROverlay_FnTable.GetOverlayImageData_callback GetOverlayImageData; - /** C type : GetOverlayErrorNameFromEnum_callback* */ - public VR_IVROverlay_FnTable.GetOverlayErrorNameFromEnum_callback GetOverlayErrorNameFromEnum; - /** C type : SetOverlayRenderingPid_callback* */ - public VR_IVROverlay_FnTable.SetOverlayRenderingPid_callback SetOverlayRenderingPid; - /** C type : GetOverlayRenderingPid_callback* */ - public VR_IVROverlay_FnTable.GetOverlayRenderingPid_callback GetOverlayRenderingPid; - /** C type : SetOverlayFlag_callback* */ - public VR_IVROverlay_FnTable.SetOverlayFlag_callback SetOverlayFlag; - /** C type : GetOverlayFlag_callback* */ - public VR_IVROverlay_FnTable.GetOverlayFlag_callback GetOverlayFlag; - /** C type : SetOverlayColor_callback* */ - public VR_IVROverlay_FnTable.SetOverlayColor_callback SetOverlayColor; - /** C type : GetOverlayColor_callback* */ - public VR_IVROverlay_FnTable.GetOverlayColor_callback GetOverlayColor; - /** C type : SetOverlayAlpha_callback* */ - public VR_IVROverlay_FnTable.SetOverlayAlpha_callback SetOverlayAlpha; - /** C type : GetOverlayAlpha_callback* */ - public VR_IVROverlay_FnTable.GetOverlayAlpha_callback GetOverlayAlpha; - /** C type : SetOverlayTexelAspect_callback* */ - public VR_IVROverlay_FnTable.SetOverlayTexelAspect_callback SetOverlayTexelAspect; - /** C type : GetOverlayTexelAspect_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTexelAspect_callback GetOverlayTexelAspect; - /** C type : SetOverlaySortOrder_callback* */ - public VR_IVROverlay_FnTable.SetOverlaySortOrder_callback SetOverlaySortOrder; - /** C type : GetOverlaySortOrder_callback* */ - public VR_IVROverlay_FnTable.GetOverlaySortOrder_callback GetOverlaySortOrder; - /** C type : SetOverlayWidthInMeters_callback* */ - public VR_IVROverlay_FnTable.SetOverlayWidthInMeters_callback SetOverlayWidthInMeters; - /** C type : GetOverlayWidthInMeters_callback* */ - public VR_IVROverlay_FnTable.GetOverlayWidthInMeters_callback GetOverlayWidthInMeters; - /** C type : SetOverlayAutoCurveDistanceRangeInMeters_callback* */ - public VR_IVROverlay_FnTable.SetOverlayAutoCurveDistanceRangeInMeters_callback SetOverlayAutoCurveDistanceRangeInMeters; - /** C type : GetOverlayAutoCurveDistanceRangeInMeters_callback* */ - public VR_IVROverlay_FnTable.GetOverlayAutoCurveDistanceRangeInMeters_callback GetOverlayAutoCurveDistanceRangeInMeters; - /** C type : SetOverlayTextureColorSpace_callback* */ - public VR_IVROverlay_FnTable.SetOverlayTextureColorSpace_callback SetOverlayTextureColorSpace; - /** C type : GetOverlayTextureColorSpace_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTextureColorSpace_callback GetOverlayTextureColorSpace; - /** C type : SetOverlayTextureBounds_callback* */ - public VR_IVROverlay_FnTable.SetOverlayTextureBounds_callback SetOverlayTextureBounds; - /** C type : GetOverlayTextureBounds_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTextureBounds_callback GetOverlayTextureBounds; - /** C type : GetOverlayRenderModel_callback* */ - public VR_IVROverlay_FnTable.GetOverlayRenderModel_callback GetOverlayRenderModel; - /** C type : SetOverlayRenderModel_callback* */ - public VR_IVROverlay_FnTable.SetOverlayRenderModel_callback SetOverlayRenderModel; - /** C type : GetOverlayTransformType_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTransformType_callback GetOverlayTransformType; - /** C type : SetOverlayTransformAbsolute_callback* */ - public VR_IVROverlay_FnTable.SetOverlayTransformAbsolute_callback SetOverlayTransformAbsolute; - /** C type : GetOverlayTransformAbsolute_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTransformAbsolute_callback GetOverlayTransformAbsolute; - /** C type : SetOverlayTransformTrackedDeviceRelative_callback* */ - public VR_IVROverlay_FnTable.SetOverlayTransformTrackedDeviceRelative_callback SetOverlayTransformTrackedDeviceRelative; - /** C type : GetOverlayTransformTrackedDeviceRelative_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTransformTrackedDeviceRelative_callback GetOverlayTransformTrackedDeviceRelative; - /** C type : SetOverlayTransformTrackedDeviceComponent_callback* */ - public VR_IVROverlay_FnTable.SetOverlayTransformTrackedDeviceComponent_callback SetOverlayTransformTrackedDeviceComponent; - /** C type : GetOverlayTransformTrackedDeviceComponent_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTransformTrackedDeviceComponent_callback GetOverlayTransformTrackedDeviceComponent; - /** C type : GetOverlayTransformOverlayRelative_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTransformOverlayRelative_callback GetOverlayTransformOverlayRelative; - /** C type : SetOverlayTransformOverlayRelative_callback* */ - public VR_IVROverlay_FnTable.SetOverlayTransformOverlayRelative_callback SetOverlayTransformOverlayRelative; - /** C type : ShowOverlay_callback* */ - public VR_IVROverlay_FnTable.ShowOverlay_callback ShowOverlay; - /** C type : HideOverlay_callback* */ - public VR_IVROverlay_FnTable.HideOverlay_callback HideOverlay; - /** C type : IsOverlayVisible_callback* */ - public VR_IVROverlay_FnTable.IsOverlayVisible_callback IsOverlayVisible; - /** C type : GetTransformForOverlayCoordinates_callback* */ - public VR_IVROverlay_FnTable.GetTransformForOverlayCoordinates_callback GetTransformForOverlayCoordinates; - /** C type : PollNextOverlayEvent_callback* */ - public VR_IVROverlay_FnTable.PollNextOverlayEvent_callback PollNextOverlayEvent; - /** C type : GetOverlayInputMethod_callback* */ - public VR_IVROverlay_FnTable.GetOverlayInputMethod_callback GetOverlayInputMethod; - /** C type : SetOverlayInputMethod_callback* */ - public VR_IVROverlay_FnTable.SetOverlayInputMethod_callback SetOverlayInputMethod; - /** C type : GetOverlayMouseScale_callback* */ - public VR_IVROverlay_FnTable.GetOverlayMouseScale_callback GetOverlayMouseScale; - /** C type : SetOverlayMouseScale_callback* */ - public VR_IVROverlay_FnTable.SetOverlayMouseScale_callback SetOverlayMouseScale; - /** C type : ComputeOverlayIntersection_callback* */ - public VR_IVROverlay_FnTable.ComputeOverlayIntersection_callback ComputeOverlayIntersection; - /** C type : IsHoverTargetOverlay_callback* */ - public VR_IVROverlay_FnTable.IsHoverTargetOverlay_callback IsHoverTargetOverlay; - /** C type : GetGamepadFocusOverlay_callback* */ - public VR_IVROverlay_FnTable.GetGamepadFocusOverlay_callback GetGamepadFocusOverlay; - /** C type : SetGamepadFocusOverlay_callback* */ - public VR_IVROverlay_FnTable.SetGamepadFocusOverlay_callback SetGamepadFocusOverlay; - /** C type : SetOverlayNeighbor_callback* */ - public VR_IVROverlay_FnTable.SetOverlayNeighbor_callback SetOverlayNeighbor; - /** C type : MoveGamepadFocusToNeighbor_callback* */ - public VR_IVROverlay_FnTable.MoveGamepadFocusToNeighbor_callback MoveGamepadFocusToNeighbor; - /** C type : SetOverlayDualAnalogTransform_callback* */ - public VR_IVROverlay_FnTable.SetOverlayDualAnalogTransform_callback SetOverlayDualAnalogTransform; - /** C type : GetOverlayDualAnalogTransform_callback* */ - public VR_IVROverlay_FnTable.GetOverlayDualAnalogTransform_callback GetOverlayDualAnalogTransform; - /** C type : SetOverlayTexture_callback* */ - public VR_IVROverlay_FnTable.SetOverlayTexture_callback SetOverlayTexture; - /** C type : ClearOverlayTexture_callback* */ - public VR_IVROverlay_FnTable.ClearOverlayTexture_callback ClearOverlayTexture; - /** C type : SetOverlayRaw_callback* */ - public VR_IVROverlay_FnTable.SetOverlayRaw_callback SetOverlayRaw; - /** C type : SetOverlayFromFile_callback* */ - public VR_IVROverlay_FnTable.SetOverlayFromFile_callback SetOverlayFromFile; - /** C type : GetOverlayTexture_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTexture_callback GetOverlayTexture; - /** C type : ReleaseNativeOverlayHandle_callback* */ - public VR_IVROverlay_FnTable.ReleaseNativeOverlayHandle_callback ReleaseNativeOverlayHandle; - /** C type : GetOverlayTextureSize_callback* */ - public VR_IVROverlay_FnTable.GetOverlayTextureSize_callback GetOverlayTextureSize; - /** C type : CreateDashboardOverlay_callback* */ - public VR_IVROverlay_FnTable.CreateDashboardOverlay_callback CreateDashboardOverlay; - /** C type : IsDashboardVisible_callback* */ - public VR_IVROverlay_FnTable.IsDashboardVisible_callback IsDashboardVisible; - /** C type : IsActiveDashboardOverlay_callback* */ - public VR_IVROverlay_FnTable.IsActiveDashboardOverlay_callback IsActiveDashboardOverlay; - /** C type : SetDashboardOverlaySceneProcess_callback* */ - public VR_IVROverlay_FnTable.SetDashboardOverlaySceneProcess_callback SetDashboardOverlaySceneProcess; - /** C type : GetDashboardOverlaySceneProcess_callback* */ - public VR_IVROverlay_FnTable.GetDashboardOverlaySceneProcess_callback GetDashboardOverlaySceneProcess; - /** C type : ShowDashboard_callback* */ - public VR_IVROverlay_FnTable.ShowDashboard_callback ShowDashboard; - /** C type : GetPrimaryDashboardDevice_callback* */ - public VR_IVROverlay_FnTable.GetPrimaryDashboardDevice_callback GetPrimaryDashboardDevice; - /** C type : ShowKeyboard_callback* */ - public VR_IVROverlay_FnTable.ShowKeyboard_callback ShowKeyboard; - /** C type : ShowKeyboardForOverlay_callback* */ - public VR_IVROverlay_FnTable.ShowKeyboardForOverlay_callback ShowKeyboardForOverlay; - /** C type : GetKeyboardText_callback* */ - public VR_IVROverlay_FnTable.GetKeyboardText_callback GetKeyboardText; - /** C type : HideKeyboard_callback* */ - public VR_IVROverlay_FnTable.HideKeyboard_callback HideKeyboard; - /** C type : SetKeyboardTransformAbsolute_callback* */ - public VR_IVROverlay_FnTable.SetKeyboardTransformAbsolute_callback SetKeyboardTransformAbsolute; - /** C type : SetKeyboardPositionForOverlay_callback* */ - public VR_IVROverlay_FnTable.SetKeyboardPositionForOverlay_callback SetKeyboardPositionForOverlay; - /** C type : SetOverlayIntersectionMask_callback* */ - public VR_IVROverlay_FnTable.SetOverlayIntersectionMask_callback SetOverlayIntersectionMask; - /** C type : GetOverlayFlags_callback* */ - public VR_IVROverlay_FnTable.GetOverlayFlags_callback GetOverlayFlags; - /** C type : ShowMessageOverlay_callback* */ - public VR_IVROverlay_FnTable.ShowMessageOverlay_callback ShowMessageOverlay; - /** C type : CloseMessageOverlay_callback* */ - public VR_IVROverlay_FnTable.CloseMessageOverlay_callback CloseMessageOverlay; - /** native declaration : headers\openvr_capi.h:2129 */ - public interface FindOverlay_callback extends Callback { - int apply(Pointer pchOverlayKey, LongByReference pOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2130 */ - public interface CreateOverlay_callback extends Callback { - int apply(Pointer pchOverlayKey, Pointer pchOverlayName, LongByReference pOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2131 */ - public interface DestroyOverlay_callback extends Callback { - int apply(long ulOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2132 */ - public interface SetHighQualityOverlay_callback extends Callback { - int apply(long ulOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2133 */ - public interface GetHighQualityOverlay_callback extends Callback { - long apply(); - }; - /** native declaration : headers\openvr_capi.h:2134 */ - public interface GetOverlayKey_callback extends Callback { - int apply(long ulOverlayHandle, Pointer pchValue, int unBufferSize, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:2135 */ - public interface GetOverlayName_callback extends Callback { - int apply(long ulOverlayHandle, Pointer pchValue, int unBufferSize, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:2136 */ - public interface SetOverlayName_callback extends Callback { - int apply(long ulOverlayHandle, Pointer pchName); - }; - /** native declaration : headers\openvr_capi.h:2137 */ - public interface GetOverlayImageData_callback extends Callback { - int apply(long ulOverlayHandle, Pointer pvBuffer, int unBufferSize, IntByReference punWidth, IntByReference punHeight); - }; - /** native declaration : headers\openvr_capi.h:2138 */ - public interface GetOverlayErrorNameFromEnum_callback extends Callback { - Pointer apply(int error); - }; - /** native declaration : headers\openvr_capi.h:2139 */ - public interface SetOverlayRenderingPid_callback extends Callback { - int apply(long ulOverlayHandle, int unPID); - }; - /** native declaration : headers\openvr_capi.h:2140 */ - public interface GetOverlayRenderingPid_callback extends Callback { - int apply(long ulOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2141 */ - public interface SetOverlayFlag_callback extends Callback { - int apply(long ulOverlayHandle, int eOverlayFlag, byte bEnabled); - }; - /** native declaration : headers\openvr_capi.h:2142 */ - public interface GetOverlayFlag_callback extends Callback { - int apply(long ulOverlayHandle, int eOverlayFlag, Pointer pbEnabled); - }; - /** native declaration : headers\openvr_capi.h:2143 */ - public interface SetOverlayColor_callback extends Callback { - int apply(long ulOverlayHandle, float fRed, float fGreen, float fBlue); - }; - /** native declaration : headers\openvr_capi.h:2144 */ - public interface GetOverlayColor_callback extends Callback { - int apply(long ulOverlayHandle, FloatByReference pfRed, FloatByReference pfGreen, FloatByReference pfBlue); - }; - /** native declaration : headers\openvr_capi.h:2145 */ - public interface SetOverlayAlpha_callback extends Callback { - int apply(long ulOverlayHandle, float fAlpha); - }; - /** native declaration : headers\openvr_capi.h:2146 */ - public interface GetOverlayAlpha_callback extends Callback { - int apply(long ulOverlayHandle, FloatByReference pfAlpha); - }; - /** native declaration : headers\openvr_capi.h:2147 */ - public interface SetOverlayTexelAspect_callback extends Callback { - int apply(long ulOverlayHandle, float fTexelAspect); - }; - /** native declaration : headers\openvr_capi.h:2148 */ - public interface GetOverlayTexelAspect_callback extends Callback { - int apply(long ulOverlayHandle, FloatByReference pfTexelAspect); - }; - /** native declaration : headers\openvr_capi.h:2149 */ - public interface SetOverlaySortOrder_callback extends Callback { - int apply(long ulOverlayHandle, int unSortOrder); - }; - /** native declaration : headers\openvr_capi.h:2150 */ - public interface GetOverlaySortOrder_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference punSortOrder); - }; - /** native declaration : headers\openvr_capi.h:2151 */ - public interface SetOverlayWidthInMeters_callback extends Callback { - int apply(long ulOverlayHandle, float fWidthInMeters); - }; - /** native declaration : headers\openvr_capi.h:2152 */ - public interface GetOverlayWidthInMeters_callback extends Callback { - int apply(long ulOverlayHandle, FloatByReference pfWidthInMeters); - }; - /** native declaration : headers\openvr_capi.h:2153 */ - public interface SetOverlayAutoCurveDistanceRangeInMeters_callback extends Callback { - int apply(long ulOverlayHandle, float fMinDistanceInMeters, float fMaxDistanceInMeters); - }; - /** native declaration : headers\openvr_capi.h:2154 */ - public interface GetOverlayAutoCurveDistanceRangeInMeters_callback extends Callback { - int apply(long ulOverlayHandle, FloatByReference pfMinDistanceInMeters, FloatByReference pfMaxDistanceInMeters); - }; - /** native declaration : headers\openvr_capi.h:2155 */ - public interface SetOverlayTextureColorSpace_callback extends Callback { - int apply(long ulOverlayHandle, int eTextureColorSpace); - }; - /** native declaration : headers\openvr_capi.h:2156 */ - public interface GetOverlayTextureColorSpace_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference peTextureColorSpace); - }; - /** native declaration : headers\openvr_capi.h:2157 */ - public interface SetOverlayTextureBounds_callback extends Callback { - int apply(long ulOverlayHandle, VRTextureBounds_t pOverlayTextureBounds); - }; - /** native declaration : headers\openvr_capi.h:2158 */ - public interface GetOverlayTextureBounds_callback extends Callback { - int apply(long ulOverlayHandle, VRTextureBounds_t pOverlayTextureBounds); - }; - /** native declaration : headers\openvr_capi.h:2159 */ - public interface GetOverlayRenderModel_callback extends Callback { - int apply(long ulOverlayHandle, Pointer pchValue, int unBufferSize, HmdColor_t pColor, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:2160 */ - public interface SetOverlayRenderModel_callback extends Callback { - int apply(long ulOverlayHandle, Pointer pchRenderModel, HmdColor_t pColor); - }; - /** native declaration : headers\openvr_capi.h:2161 */ - public interface GetOverlayTransformType_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference peTransformType); - }; - /** native declaration : headers\openvr_capi.h:2162 */ - public interface SetOverlayTransformAbsolute_callback extends Callback { - int apply(long ulOverlayHandle, int eTrackingOrigin, HmdMatrix34_t pmatTrackingOriginToOverlayTransform); - }; - /** native declaration : headers\openvr_capi.h:2163 */ - public interface GetOverlayTransformAbsolute_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference peTrackingOrigin, HmdMatrix34_t pmatTrackingOriginToOverlayTransform); - }; - /** native declaration : headers\openvr_capi.h:2164 */ - public interface SetOverlayTransformTrackedDeviceRelative_callback extends Callback { - int apply(long ulOverlayHandle, int unTrackedDevice, HmdMatrix34_t pmatTrackedDeviceToOverlayTransform); - }; - /** native declaration : headers\openvr_capi.h:2165 */ - public interface GetOverlayTransformTrackedDeviceRelative_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference punTrackedDevice, HmdMatrix34_t pmatTrackedDeviceToOverlayTransform); - }; - /** native declaration : headers\openvr_capi.h:2166 */ - public interface SetOverlayTransformTrackedDeviceComponent_callback extends Callback { - int apply(long ulOverlayHandle, int unDeviceIndex, Pointer pchComponentName); - }; - /** native declaration : headers\openvr_capi.h:2167 */ - public interface GetOverlayTransformTrackedDeviceComponent_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference punDeviceIndex, Pointer pchComponentName, int unComponentNameSize); - }; - /** native declaration : headers\openvr_capi.h:2168 */ - public interface GetOverlayTransformOverlayRelative_callback extends Callback { - int apply(long ulOverlayHandle, LongByReference ulOverlayHandleParent, HmdMatrix34_t pmatParentOverlayToOverlayTransform); - }; - /** native declaration : headers\openvr_capi.h:2169 */ - public interface SetOverlayTransformOverlayRelative_callback extends Callback { - int apply(long ulOverlayHandle, long ulOverlayHandleParent, HmdMatrix34_t pmatParentOverlayToOverlayTransform); - }; - /** native declaration : headers\openvr_capi.h:2170 */ - public interface ShowOverlay_callback extends Callback { - int apply(long ulOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2171 */ - public interface HideOverlay_callback extends Callback { - int apply(long ulOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2172 */ - public interface IsOverlayVisible_callback extends Callback { - byte apply(long ulOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2173 */ - public interface GetTransformForOverlayCoordinates_callback extends Callback { - int apply(long ulOverlayHandle, int eTrackingOrigin, HmdVector2_t.ByValue coordinatesInOverlay, HmdMatrix34_t pmatTransform); - }; - /** native declaration : headers\openvr_capi.h:2174 */ - public interface PollNextOverlayEvent_callback extends Callback { - byte apply(long ulOverlayHandle, VREvent_t pEvent, int uncbVREvent); - }; - /** native declaration : headers\openvr_capi.h:2175 */ - public interface GetOverlayInputMethod_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference peInputMethod); - }; - /** native declaration : headers\openvr_capi.h:2176 */ - public interface SetOverlayInputMethod_callback extends Callback { - int apply(long ulOverlayHandle, int eInputMethod); - }; - /** native declaration : headers\openvr_capi.h:2177 */ - public interface GetOverlayMouseScale_callback extends Callback { - int apply(long ulOverlayHandle, HmdVector2_t pvecMouseScale); - }; - /** native declaration : headers\openvr_capi.h:2178 */ - public interface SetOverlayMouseScale_callback extends Callback { - int apply(long ulOverlayHandle, HmdVector2_t pvecMouseScale); - }; - /** native declaration : headers\openvr_capi.h:2179 */ - public interface ComputeOverlayIntersection_callback extends Callback { - byte apply(long ulOverlayHandle, VROverlayIntersectionParams_t pParams, VROverlayIntersectionResults_t pResults); - }; - /** native declaration : headers\openvr_capi.h:2180 */ - public interface IsHoverTargetOverlay_callback extends Callback { - byte apply(long ulOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2181 */ - public interface GetGamepadFocusOverlay_callback extends Callback { - long apply(); - }; - /** native declaration : headers\openvr_capi.h:2182 */ - public interface SetGamepadFocusOverlay_callback extends Callback { - int apply(long ulNewFocusOverlay); - }; - /** native declaration : headers\openvr_capi.h:2183 */ - public interface SetOverlayNeighbor_callback extends Callback { - int apply(int eDirection, long ulFrom, long ulTo); - }; - /** native declaration : headers\openvr_capi.h:2184 */ - public interface MoveGamepadFocusToNeighbor_callback extends Callback { - int apply(int eDirection, long ulFrom); - }; - /** native declaration : headers\openvr_capi.h:2185 */ - public interface SetOverlayDualAnalogTransform_callback extends Callback { - int apply(long ulOverlay, int eWhich, HmdVector2_t vCenter, float fRadius); - }; - /** native declaration : headers\openvr_capi.h:2186 */ - public interface GetOverlayDualAnalogTransform_callback extends Callback { - int apply(long ulOverlay, int eWhich, HmdVector2_t pvCenter, FloatByReference pfRadius); - }; - /** native declaration : headers\openvr_capi.h:2187 */ - public interface SetOverlayTexture_callback extends Callback { - int apply(long ulOverlayHandle, Texture_t pTexture); - }; - /** native declaration : headers\openvr_capi.h:2188 */ - public interface ClearOverlayTexture_callback extends Callback { - int apply(long ulOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2189 */ - public interface SetOverlayRaw_callback extends Callback { - int apply(long ulOverlayHandle, Pointer pvBuffer, int unWidth, int unHeight, int unDepth); - }; - /** native declaration : headers\openvr_capi.h:2190 */ - public interface SetOverlayFromFile_callback extends Callback { - int apply(long ulOverlayHandle, Pointer pchFilePath); - }; - /** native declaration : headers\openvr_capi.h:2191 */ - public interface GetOverlayTexture_callback extends Callback { - int apply(long ulOverlayHandle, PointerByReference pNativeTextureHandle, Pointer pNativeTextureRef, IntByReference pWidth, IntByReference pHeight, IntByReference pNativeFormat, IntByReference pAPIType, IntByReference pColorSpace, VRTextureBounds_t pTextureBounds); - }; - /** native declaration : headers\openvr_capi.h:2192 */ - public interface ReleaseNativeOverlayHandle_callback extends Callback { - int apply(long ulOverlayHandle, Pointer pNativeTextureHandle); - }; - /** native declaration : headers\openvr_capi.h:2193 */ - public interface GetOverlayTextureSize_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference pWidth, IntByReference pHeight); - }; - /** native declaration : headers\openvr_capi.h:2194 */ - public interface CreateDashboardOverlay_callback extends Callback { - int apply(Pointer pchOverlayKey, Pointer pchOverlayFriendlyName, LongByReference pMainHandle, LongByReference pThumbnailHandle); - }; - /** native declaration : headers\openvr_capi.h:2195 */ - public interface IsDashboardVisible_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:2196 */ - public interface IsActiveDashboardOverlay_callback extends Callback { - byte apply(long ulOverlayHandle); - }; - /** native declaration : headers\openvr_capi.h:2197 */ - public interface SetDashboardOverlaySceneProcess_callback extends Callback { - int apply(long ulOverlayHandle, int unProcessId); - }; - /** native declaration : headers\openvr_capi.h:2198 */ - public interface GetDashboardOverlaySceneProcess_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference punProcessId); - }; - /** native declaration : headers\openvr_capi.h:2199 */ - public interface ShowDashboard_callback extends Callback { - void apply(Pointer pchOverlayToShow); - }; - /** native declaration : headers\openvr_capi.h:2200 */ - public interface GetPrimaryDashboardDevice_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:2201 */ - public interface ShowKeyboard_callback extends Callback { - int apply(int eInputMode, int eLineInputMode, Pointer pchDescription, int unCharMax, Pointer pchExistingText, byte bUseMinimalMode, long uUserValue); - }; - /** native declaration : headers\openvr_capi.h:2202 */ - public interface ShowKeyboardForOverlay_callback extends Callback { - int apply(long ulOverlayHandle, int eInputMode, int eLineInputMode, Pointer pchDescription, int unCharMax, Pointer pchExistingText, byte bUseMinimalMode, long uUserValue); - }; - /** native declaration : headers\openvr_capi.h:2203 */ - public interface GetKeyboardText_callback extends Callback { - int apply(Pointer pchText, int cchText); - }; - /** native declaration : headers\openvr_capi.h:2204 */ - public interface HideKeyboard_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:2205 */ - public interface SetKeyboardTransformAbsolute_callback extends Callback { - void apply(int eTrackingOrigin, HmdMatrix34_t pmatTrackingOriginToKeyboardTransform); - }; - /** native declaration : headers\openvr_capi.h:2206 */ - public interface SetKeyboardPositionForOverlay_callback extends Callback { - void apply(long ulOverlayHandle, com.jme3.system.jopenvr.HmdRect2_t.ByValue avoidRect); - }; - /** native declaration : headers\openvr_capi.h:2207 */ - public interface SetOverlayIntersectionMask_callback extends Callback { - int apply(long ulOverlayHandle, VROverlayIntersectionMaskPrimitive_t pMaskPrimitives, int unNumMaskPrimitives, int unPrimitiveSize); - }; - /** native declaration : headers\openvr_capi.h:2208 */ - public interface GetOverlayFlags_callback extends Callback { - int apply(long ulOverlayHandle, IntByReference pFlags); - }; - /** native declaration : headers\openvr_capi.h:2209 */ - public interface ShowMessageOverlay_callback extends Callback { - int apply(Pointer pchText, Pointer pchCaption, Pointer pchButton0Text, Pointer pchButton1Text, Pointer pchButton2Text, Pointer pchButton3Text); - }; - /** native declaration : headers\openvr_capi.h:2210 */ - public interface CloseMessageOverlay_callback extends Callback { - void apply(); - }; - public VR_IVROverlay_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("FindOverlay", "CreateOverlay", "DestroyOverlay", "SetHighQualityOverlay", "GetHighQualityOverlay", "GetOverlayKey", "GetOverlayName", "SetOverlayName", "GetOverlayImageData", "GetOverlayErrorNameFromEnum", "SetOverlayRenderingPid", "GetOverlayRenderingPid", "SetOverlayFlag", "GetOverlayFlag", "SetOverlayColor", "GetOverlayColor", "SetOverlayAlpha", "GetOverlayAlpha", "SetOverlayTexelAspect", "GetOverlayTexelAspect", "SetOverlaySortOrder", "GetOverlaySortOrder", "SetOverlayWidthInMeters", "GetOverlayWidthInMeters", "SetOverlayAutoCurveDistanceRangeInMeters", "GetOverlayAutoCurveDistanceRangeInMeters", "SetOverlayTextureColorSpace", "GetOverlayTextureColorSpace", "SetOverlayTextureBounds", "GetOverlayTextureBounds", "GetOverlayRenderModel", "SetOverlayRenderModel", "GetOverlayTransformType", "SetOverlayTransformAbsolute", "GetOverlayTransformAbsolute", "SetOverlayTransformTrackedDeviceRelative", "GetOverlayTransformTrackedDeviceRelative", "SetOverlayTransformTrackedDeviceComponent", "GetOverlayTransformTrackedDeviceComponent", "GetOverlayTransformOverlayRelative", "SetOverlayTransformOverlayRelative", "ShowOverlay", "HideOverlay", "IsOverlayVisible", "GetTransformForOverlayCoordinates", "PollNextOverlayEvent", "GetOverlayInputMethod", "SetOverlayInputMethod", "GetOverlayMouseScale", "SetOverlayMouseScale", "ComputeOverlayIntersection", "IsHoverTargetOverlay", "GetGamepadFocusOverlay", "SetGamepadFocusOverlay", "SetOverlayNeighbor", "MoveGamepadFocusToNeighbor", "SetOverlayDualAnalogTransform", "GetOverlayDualAnalogTransform", "SetOverlayTexture", "ClearOverlayTexture", "SetOverlayRaw", "SetOverlayFromFile", "GetOverlayTexture", "ReleaseNativeOverlayHandle", "GetOverlayTextureSize", "CreateDashboardOverlay", "IsDashboardVisible", "IsActiveDashboardOverlay", "SetDashboardOverlaySceneProcess", "GetDashboardOverlaySceneProcess", "ShowDashboard", "GetPrimaryDashboardDevice", "ShowKeyboard", "ShowKeyboardForOverlay", "GetKeyboardText", "HideKeyboard", "SetKeyboardTransformAbsolute", "SetKeyboardPositionForOverlay", "SetOverlayIntersectionMask", "GetOverlayFlags", "ShowMessageOverlay", "CloseMessageOverlay"); - } - public VR_IVROverlay_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVROverlay_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVROverlay_FnTable implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:2211
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVROverlay_FnTable extends Structure { + /** C type : FindOverlay_callback* */ + public VR_IVROverlay_FnTable.FindOverlay_callback FindOverlay; + /** C type : CreateOverlay_callback* */ + public VR_IVROverlay_FnTable.CreateOverlay_callback CreateOverlay; + /** C type : DestroyOverlay_callback* */ + public VR_IVROverlay_FnTable.DestroyOverlay_callback DestroyOverlay; + /** C type : SetHighQualityOverlay_callback* */ + public VR_IVROverlay_FnTable.SetHighQualityOverlay_callback SetHighQualityOverlay; + /** C type : GetHighQualityOverlay_callback* */ + public VR_IVROverlay_FnTable.GetHighQualityOverlay_callback GetHighQualityOverlay; + /** C type : GetOverlayKey_callback* */ + public VR_IVROverlay_FnTable.GetOverlayKey_callback GetOverlayKey; + /** C type : GetOverlayName_callback* */ + public VR_IVROverlay_FnTable.GetOverlayName_callback GetOverlayName; + /** C type : SetOverlayName_callback* */ + public VR_IVROverlay_FnTable.SetOverlayName_callback SetOverlayName; + /** C type : GetOverlayImageData_callback* */ + public VR_IVROverlay_FnTable.GetOverlayImageData_callback GetOverlayImageData; + /** C type : GetOverlayErrorNameFromEnum_callback* */ + public VR_IVROverlay_FnTable.GetOverlayErrorNameFromEnum_callback GetOverlayErrorNameFromEnum; + /** C type : SetOverlayRenderingPid_callback* */ + public VR_IVROverlay_FnTable.SetOverlayRenderingPid_callback SetOverlayRenderingPid; + /** C type : GetOverlayRenderingPid_callback* */ + public VR_IVROverlay_FnTable.GetOverlayRenderingPid_callback GetOverlayRenderingPid; + /** C type : SetOverlayFlag_callback* */ + public VR_IVROverlay_FnTable.SetOverlayFlag_callback SetOverlayFlag; + /** C type : GetOverlayFlag_callback* */ + public VR_IVROverlay_FnTable.GetOverlayFlag_callback GetOverlayFlag; + /** C type : SetOverlayColor_callback* */ + public VR_IVROverlay_FnTable.SetOverlayColor_callback SetOverlayColor; + /** C type : GetOverlayColor_callback* */ + public VR_IVROverlay_FnTable.GetOverlayColor_callback GetOverlayColor; + /** C type : SetOverlayAlpha_callback* */ + public VR_IVROverlay_FnTable.SetOverlayAlpha_callback SetOverlayAlpha; + /** C type : GetOverlayAlpha_callback* */ + public VR_IVROverlay_FnTable.GetOverlayAlpha_callback GetOverlayAlpha; + /** C type : SetOverlayTexelAspect_callback* */ + public VR_IVROverlay_FnTable.SetOverlayTexelAspect_callback SetOverlayTexelAspect; + /** C type : GetOverlayTexelAspect_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTexelAspect_callback GetOverlayTexelAspect; + /** C type : SetOverlaySortOrder_callback* */ + public VR_IVROverlay_FnTable.SetOverlaySortOrder_callback SetOverlaySortOrder; + /** C type : GetOverlaySortOrder_callback* */ + public VR_IVROverlay_FnTable.GetOverlaySortOrder_callback GetOverlaySortOrder; + /** C type : SetOverlayWidthInMeters_callback* */ + public VR_IVROverlay_FnTable.SetOverlayWidthInMeters_callback SetOverlayWidthInMeters; + /** C type : GetOverlayWidthInMeters_callback* */ + public VR_IVROverlay_FnTable.GetOverlayWidthInMeters_callback GetOverlayWidthInMeters; + /** C type : SetOverlayAutoCurveDistanceRangeInMeters_callback* */ + public VR_IVROverlay_FnTable.SetOverlayAutoCurveDistanceRangeInMeters_callback SetOverlayAutoCurveDistanceRangeInMeters; + /** C type : GetOverlayAutoCurveDistanceRangeInMeters_callback* */ + public VR_IVROverlay_FnTable.GetOverlayAutoCurveDistanceRangeInMeters_callback GetOverlayAutoCurveDistanceRangeInMeters; + /** C type : SetOverlayTextureColorSpace_callback* */ + public VR_IVROverlay_FnTable.SetOverlayTextureColorSpace_callback SetOverlayTextureColorSpace; + /** C type : GetOverlayTextureColorSpace_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTextureColorSpace_callback GetOverlayTextureColorSpace; + /** C type : SetOverlayTextureBounds_callback* */ + public VR_IVROverlay_FnTable.SetOverlayTextureBounds_callback SetOverlayTextureBounds; + /** C type : GetOverlayTextureBounds_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTextureBounds_callback GetOverlayTextureBounds; + /** C type : GetOverlayRenderModel_callback* */ + public VR_IVROverlay_FnTable.GetOverlayRenderModel_callback GetOverlayRenderModel; + /** C type : SetOverlayRenderModel_callback* */ + public VR_IVROverlay_FnTable.SetOverlayRenderModel_callback SetOverlayRenderModel; + /** C type : GetOverlayTransformType_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTransformType_callback GetOverlayTransformType; + /** C type : SetOverlayTransformAbsolute_callback* */ + public VR_IVROverlay_FnTable.SetOverlayTransformAbsolute_callback SetOverlayTransformAbsolute; + /** C type : GetOverlayTransformAbsolute_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTransformAbsolute_callback GetOverlayTransformAbsolute; + /** C type : SetOverlayTransformTrackedDeviceRelative_callback* */ + public VR_IVROverlay_FnTable.SetOverlayTransformTrackedDeviceRelative_callback SetOverlayTransformTrackedDeviceRelative; + /** C type : GetOverlayTransformTrackedDeviceRelative_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTransformTrackedDeviceRelative_callback GetOverlayTransformTrackedDeviceRelative; + /** C type : SetOverlayTransformTrackedDeviceComponent_callback* */ + public VR_IVROverlay_FnTable.SetOverlayTransformTrackedDeviceComponent_callback SetOverlayTransformTrackedDeviceComponent; + /** C type : GetOverlayTransformTrackedDeviceComponent_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTransformTrackedDeviceComponent_callback GetOverlayTransformTrackedDeviceComponent; + /** C type : GetOverlayTransformOverlayRelative_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTransformOverlayRelative_callback GetOverlayTransformOverlayRelative; + /** C type : SetOverlayTransformOverlayRelative_callback* */ + public VR_IVROverlay_FnTable.SetOverlayTransformOverlayRelative_callback SetOverlayTransformOverlayRelative; + /** C type : ShowOverlay_callback* */ + public VR_IVROverlay_FnTable.ShowOverlay_callback ShowOverlay; + /** C type : HideOverlay_callback* */ + public VR_IVROverlay_FnTable.HideOverlay_callback HideOverlay; + /** C type : IsOverlayVisible_callback* */ + public VR_IVROverlay_FnTable.IsOverlayVisible_callback IsOverlayVisible; + /** C type : GetTransformForOverlayCoordinates_callback* */ + public VR_IVROverlay_FnTable.GetTransformForOverlayCoordinates_callback GetTransformForOverlayCoordinates; + /** C type : PollNextOverlayEvent_callback* */ + public VR_IVROverlay_FnTable.PollNextOverlayEvent_callback PollNextOverlayEvent; + /** C type : GetOverlayInputMethod_callback* */ + public VR_IVROverlay_FnTable.GetOverlayInputMethod_callback GetOverlayInputMethod; + /** C type : SetOverlayInputMethod_callback* */ + public VR_IVROverlay_FnTable.SetOverlayInputMethod_callback SetOverlayInputMethod; + /** C type : GetOverlayMouseScale_callback* */ + public VR_IVROverlay_FnTable.GetOverlayMouseScale_callback GetOverlayMouseScale; + /** C type : SetOverlayMouseScale_callback* */ + public VR_IVROverlay_FnTable.SetOverlayMouseScale_callback SetOverlayMouseScale; + /** C type : ComputeOverlayIntersection_callback* */ + public VR_IVROverlay_FnTable.ComputeOverlayIntersection_callback ComputeOverlayIntersection; + /** C type : IsHoverTargetOverlay_callback* */ + public VR_IVROverlay_FnTable.IsHoverTargetOverlay_callback IsHoverTargetOverlay; + /** C type : GetGamepadFocusOverlay_callback* */ + public VR_IVROverlay_FnTable.GetGamepadFocusOverlay_callback GetGamepadFocusOverlay; + /** C type : SetGamepadFocusOverlay_callback* */ + public VR_IVROverlay_FnTable.SetGamepadFocusOverlay_callback SetGamepadFocusOverlay; + /** C type : SetOverlayNeighbor_callback* */ + public VR_IVROverlay_FnTable.SetOverlayNeighbor_callback SetOverlayNeighbor; + /** C type : MoveGamepadFocusToNeighbor_callback* */ + public VR_IVROverlay_FnTable.MoveGamepadFocusToNeighbor_callback MoveGamepadFocusToNeighbor; + /** C type : SetOverlayDualAnalogTransform_callback* */ + public VR_IVROverlay_FnTable.SetOverlayDualAnalogTransform_callback SetOverlayDualAnalogTransform; + /** C type : GetOverlayDualAnalogTransform_callback* */ + public VR_IVROverlay_FnTable.GetOverlayDualAnalogTransform_callback GetOverlayDualAnalogTransform; + /** C type : SetOverlayTexture_callback* */ + public VR_IVROverlay_FnTable.SetOverlayTexture_callback SetOverlayTexture; + /** C type : ClearOverlayTexture_callback* */ + public VR_IVROverlay_FnTable.ClearOverlayTexture_callback ClearOverlayTexture; + /** C type : SetOverlayRaw_callback* */ + public VR_IVROverlay_FnTable.SetOverlayRaw_callback SetOverlayRaw; + /** C type : SetOverlayFromFile_callback* */ + public VR_IVROverlay_FnTable.SetOverlayFromFile_callback SetOverlayFromFile; + /** C type : GetOverlayTexture_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTexture_callback GetOverlayTexture; + /** C type : ReleaseNativeOverlayHandle_callback* */ + public VR_IVROverlay_FnTable.ReleaseNativeOverlayHandle_callback ReleaseNativeOverlayHandle; + /** C type : GetOverlayTextureSize_callback* */ + public VR_IVROverlay_FnTable.GetOverlayTextureSize_callback GetOverlayTextureSize; + /** C type : CreateDashboardOverlay_callback* */ + public VR_IVROverlay_FnTable.CreateDashboardOverlay_callback CreateDashboardOverlay; + /** C type : IsDashboardVisible_callback* */ + public VR_IVROverlay_FnTable.IsDashboardVisible_callback IsDashboardVisible; + /** C type : IsActiveDashboardOverlay_callback* */ + public VR_IVROverlay_FnTable.IsActiveDashboardOverlay_callback IsActiveDashboardOverlay; + /** C type : SetDashboardOverlaySceneProcess_callback* */ + public VR_IVROverlay_FnTable.SetDashboardOverlaySceneProcess_callback SetDashboardOverlaySceneProcess; + /** C type : GetDashboardOverlaySceneProcess_callback* */ + public VR_IVROverlay_FnTable.GetDashboardOverlaySceneProcess_callback GetDashboardOverlaySceneProcess; + /** C type : ShowDashboard_callback* */ + public VR_IVROverlay_FnTable.ShowDashboard_callback ShowDashboard; + /** C type : GetPrimaryDashboardDevice_callback* */ + public VR_IVROverlay_FnTable.GetPrimaryDashboardDevice_callback GetPrimaryDashboardDevice; + /** C type : ShowKeyboard_callback* */ + public VR_IVROverlay_FnTable.ShowKeyboard_callback ShowKeyboard; + /** C type : ShowKeyboardForOverlay_callback* */ + public VR_IVROverlay_FnTable.ShowKeyboardForOverlay_callback ShowKeyboardForOverlay; + /** C type : GetKeyboardText_callback* */ + public VR_IVROverlay_FnTable.GetKeyboardText_callback GetKeyboardText; + /** C type : HideKeyboard_callback* */ + public VR_IVROverlay_FnTable.HideKeyboard_callback HideKeyboard; + /** C type : SetKeyboardTransformAbsolute_callback* */ + public VR_IVROverlay_FnTable.SetKeyboardTransformAbsolute_callback SetKeyboardTransformAbsolute; + /** C type : SetKeyboardPositionForOverlay_callback* */ + public VR_IVROverlay_FnTable.SetKeyboardPositionForOverlay_callback SetKeyboardPositionForOverlay; + /** C type : SetOverlayIntersectionMask_callback* */ + public VR_IVROverlay_FnTable.SetOverlayIntersectionMask_callback SetOverlayIntersectionMask; + /** C type : GetOverlayFlags_callback* */ + public VR_IVROverlay_FnTable.GetOverlayFlags_callback GetOverlayFlags; + /** C type : ShowMessageOverlay_callback* */ + public VR_IVROverlay_FnTable.ShowMessageOverlay_callback ShowMessageOverlay; + /** C type : CloseMessageOverlay_callback* */ + public VR_IVROverlay_FnTable.CloseMessageOverlay_callback CloseMessageOverlay; + /** native declaration : headers\openvr_capi.h:2129 */ + public interface FindOverlay_callback extends Callback { + int apply(Pointer pchOverlayKey, LongByReference pOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2130 */ + public interface CreateOverlay_callback extends Callback { + int apply(Pointer pchOverlayKey, Pointer pchOverlayName, LongByReference pOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2131 */ + public interface DestroyOverlay_callback extends Callback { + int apply(long ulOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2132 */ + public interface SetHighQualityOverlay_callback extends Callback { + int apply(long ulOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2133 */ + public interface GetHighQualityOverlay_callback extends Callback { + long apply(); + }; + /** native declaration : headers\openvr_capi.h:2134 */ + public interface GetOverlayKey_callback extends Callback { + int apply(long ulOverlayHandle, Pointer pchValue, int unBufferSize, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:2135 */ + public interface GetOverlayName_callback extends Callback { + int apply(long ulOverlayHandle, Pointer pchValue, int unBufferSize, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:2136 */ + public interface SetOverlayName_callback extends Callback { + int apply(long ulOverlayHandle, Pointer pchName); + }; + /** native declaration : headers\openvr_capi.h:2137 */ + public interface GetOverlayImageData_callback extends Callback { + int apply(long ulOverlayHandle, Pointer pvBuffer, int unBufferSize, IntByReference punWidth, IntByReference punHeight); + }; + /** native declaration : headers\openvr_capi.h:2138 */ + public interface GetOverlayErrorNameFromEnum_callback extends Callback { + Pointer apply(int error); + }; + /** native declaration : headers\openvr_capi.h:2139 */ + public interface SetOverlayRenderingPid_callback extends Callback { + int apply(long ulOverlayHandle, int unPID); + }; + /** native declaration : headers\openvr_capi.h:2140 */ + public interface GetOverlayRenderingPid_callback extends Callback { + int apply(long ulOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2141 */ + public interface SetOverlayFlag_callback extends Callback { + int apply(long ulOverlayHandle, int eOverlayFlag, byte bEnabled); + }; + /** native declaration : headers\openvr_capi.h:2142 */ + public interface GetOverlayFlag_callback extends Callback { + int apply(long ulOverlayHandle, int eOverlayFlag, Pointer pbEnabled); + }; + /** native declaration : headers\openvr_capi.h:2143 */ + public interface SetOverlayColor_callback extends Callback { + int apply(long ulOverlayHandle, float fRed, float fGreen, float fBlue); + }; + /** native declaration : headers\openvr_capi.h:2144 */ + public interface GetOverlayColor_callback extends Callback { + int apply(long ulOverlayHandle, FloatByReference pfRed, FloatByReference pfGreen, FloatByReference pfBlue); + }; + /** native declaration : headers\openvr_capi.h:2145 */ + public interface SetOverlayAlpha_callback extends Callback { + int apply(long ulOverlayHandle, float fAlpha); + }; + /** native declaration : headers\openvr_capi.h:2146 */ + public interface GetOverlayAlpha_callback extends Callback { + int apply(long ulOverlayHandle, FloatByReference pfAlpha); + }; + /** native declaration : headers\openvr_capi.h:2147 */ + public interface SetOverlayTexelAspect_callback extends Callback { + int apply(long ulOverlayHandle, float fTexelAspect); + }; + /** native declaration : headers\openvr_capi.h:2148 */ + public interface GetOverlayTexelAspect_callback extends Callback { + int apply(long ulOverlayHandle, FloatByReference pfTexelAspect); + }; + /** native declaration : headers\openvr_capi.h:2149 */ + public interface SetOverlaySortOrder_callback extends Callback { + int apply(long ulOverlayHandle, int unSortOrder); + }; + /** native declaration : headers\openvr_capi.h:2150 */ + public interface GetOverlaySortOrder_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference punSortOrder); + }; + /** native declaration : headers\openvr_capi.h:2151 */ + public interface SetOverlayWidthInMeters_callback extends Callback { + int apply(long ulOverlayHandle, float fWidthInMeters); + }; + /** native declaration : headers\openvr_capi.h:2152 */ + public interface GetOverlayWidthInMeters_callback extends Callback { + int apply(long ulOverlayHandle, FloatByReference pfWidthInMeters); + }; + /** native declaration : headers\openvr_capi.h:2153 */ + public interface SetOverlayAutoCurveDistanceRangeInMeters_callback extends Callback { + int apply(long ulOverlayHandle, float fMinDistanceInMeters, float fMaxDistanceInMeters); + }; + /** native declaration : headers\openvr_capi.h:2154 */ + public interface GetOverlayAutoCurveDistanceRangeInMeters_callback extends Callback { + int apply(long ulOverlayHandle, FloatByReference pfMinDistanceInMeters, FloatByReference pfMaxDistanceInMeters); + }; + /** native declaration : headers\openvr_capi.h:2155 */ + public interface SetOverlayTextureColorSpace_callback extends Callback { + int apply(long ulOverlayHandle, int eTextureColorSpace); + }; + /** native declaration : headers\openvr_capi.h:2156 */ + public interface GetOverlayTextureColorSpace_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference peTextureColorSpace); + }; + /** native declaration : headers\openvr_capi.h:2157 */ + public interface SetOverlayTextureBounds_callback extends Callback { + int apply(long ulOverlayHandle, VRTextureBounds_t pOverlayTextureBounds); + }; + /** native declaration : headers\openvr_capi.h:2158 */ + public interface GetOverlayTextureBounds_callback extends Callback { + int apply(long ulOverlayHandle, VRTextureBounds_t pOverlayTextureBounds); + }; + /** native declaration : headers\openvr_capi.h:2159 */ + public interface GetOverlayRenderModel_callback extends Callback { + int apply(long ulOverlayHandle, Pointer pchValue, int unBufferSize, HmdColor_t pColor, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:2160 */ + public interface SetOverlayRenderModel_callback extends Callback { + int apply(long ulOverlayHandle, Pointer pchRenderModel, HmdColor_t pColor); + }; + /** native declaration : headers\openvr_capi.h:2161 */ + public interface GetOverlayTransformType_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference peTransformType); + }; + /** native declaration : headers\openvr_capi.h:2162 */ + public interface SetOverlayTransformAbsolute_callback extends Callback { + int apply(long ulOverlayHandle, int eTrackingOrigin, HmdMatrix34_t pmatTrackingOriginToOverlayTransform); + }; + /** native declaration : headers\openvr_capi.h:2163 */ + public interface GetOverlayTransformAbsolute_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference peTrackingOrigin, HmdMatrix34_t pmatTrackingOriginToOverlayTransform); + }; + /** native declaration : headers\openvr_capi.h:2164 */ + public interface SetOverlayTransformTrackedDeviceRelative_callback extends Callback { + int apply(long ulOverlayHandle, int unTrackedDevice, HmdMatrix34_t pmatTrackedDeviceToOverlayTransform); + }; + /** native declaration : headers\openvr_capi.h:2165 */ + public interface GetOverlayTransformTrackedDeviceRelative_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference punTrackedDevice, HmdMatrix34_t pmatTrackedDeviceToOverlayTransform); + }; + /** native declaration : headers\openvr_capi.h:2166 */ + public interface SetOverlayTransformTrackedDeviceComponent_callback extends Callback { + int apply(long ulOverlayHandle, int unDeviceIndex, Pointer pchComponentName); + }; + /** native declaration : headers\openvr_capi.h:2167 */ + public interface GetOverlayTransformTrackedDeviceComponent_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference punDeviceIndex, Pointer pchComponentName, int unComponentNameSize); + }; + /** native declaration : headers\openvr_capi.h:2168 */ + public interface GetOverlayTransformOverlayRelative_callback extends Callback { + int apply(long ulOverlayHandle, LongByReference ulOverlayHandleParent, HmdMatrix34_t pmatParentOverlayToOverlayTransform); + }; + /** native declaration : headers\openvr_capi.h:2169 */ + public interface SetOverlayTransformOverlayRelative_callback extends Callback { + int apply(long ulOverlayHandle, long ulOverlayHandleParent, HmdMatrix34_t pmatParentOverlayToOverlayTransform); + }; + /** native declaration : headers\openvr_capi.h:2170 */ + public interface ShowOverlay_callback extends Callback { + int apply(long ulOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2171 */ + public interface HideOverlay_callback extends Callback { + int apply(long ulOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2172 */ + public interface IsOverlayVisible_callback extends Callback { + byte apply(long ulOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2173 */ + public interface GetTransformForOverlayCoordinates_callback extends Callback { + int apply(long ulOverlayHandle, int eTrackingOrigin, HmdVector2_t.ByValue coordinatesInOverlay, HmdMatrix34_t pmatTransform); + }; + /** native declaration : headers\openvr_capi.h:2174 */ + public interface PollNextOverlayEvent_callback extends Callback { + byte apply(long ulOverlayHandle, VREvent_t pEvent, int uncbVREvent); + }; + /** native declaration : headers\openvr_capi.h:2175 */ + public interface GetOverlayInputMethod_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference peInputMethod); + }; + /** native declaration : headers\openvr_capi.h:2176 */ + public interface SetOverlayInputMethod_callback extends Callback { + int apply(long ulOverlayHandle, int eInputMethod); + }; + /** native declaration : headers\openvr_capi.h:2177 */ + public interface GetOverlayMouseScale_callback extends Callback { + int apply(long ulOverlayHandle, HmdVector2_t pvecMouseScale); + }; + /** native declaration : headers\openvr_capi.h:2178 */ + public interface SetOverlayMouseScale_callback extends Callback { + int apply(long ulOverlayHandle, HmdVector2_t pvecMouseScale); + }; + /** native declaration : headers\openvr_capi.h:2179 */ + public interface ComputeOverlayIntersection_callback extends Callback { + byte apply(long ulOverlayHandle, VROverlayIntersectionParams_t pParams, VROverlayIntersectionResults_t pResults); + }; + /** native declaration : headers\openvr_capi.h:2180 */ + public interface IsHoverTargetOverlay_callback extends Callback { + byte apply(long ulOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2181 */ + public interface GetGamepadFocusOverlay_callback extends Callback { + long apply(); + }; + /** native declaration : headers\openvr_capi.h:2182 */ + public interface SetGamepadFocusOverlay_callback extends Callback { + int apply(long ulNewFocusOverlay); + }; + /** native declaration : headers\openvr_capi.h:2183 */ + public interface SetOverlayNeighbor_callback extends Callback { + int apply(int eDirection, long ulFrom, long ulTo); + }; + /** native declaration : headers\openvr_capi.h:2184 */ + public interface MoveGamepadFocusToNeighbor_callback extends Callback { + int apply(int eDirection, long ulFrom); + }; + /** native declaration : headers\openvr_capi.h:2185 */ + public interface SetOverlayDualAnalogTransform_callback extends Callback { + int apply(long ulOverlay, int eWhich, HmdVector2_t vCenter, float fRadius); + }; + /** native declaration : headers\openvr_capi.h:2186 */ + public interface GetOverlayDualAnalogTransform_callback extends Callback { + int apply(long ulOverlay, int eWhich, HmdVector2_t pvCenter, FloatByReference pfRadius); + }; + /** native declaration : headers\openvr_capi.h:2187 */ + public interface SetOverlayTexture_callback extends Callback { + int apply(long ulOverlayHandle, Texture_t pTexture); + }; + /** native declaration : headers\openvr_capi.h:2188 */ + public interface ClearOverlayTexture_callback extends Callback { + int apply(long ulOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2189 */ + public interface SetOverlayRaw_callback extends Callback { + int apply(long ulOverlayHandle, Pointer pvBuffer, int unWidth, int unHeight, int unDepth); + }; + /** native declaration : headers\openvr_capi.h:2190 */ + public interface SetOverlayFromFile_callback extends Callback { + int apply(long ulOverlayHandle, Pointer pchFilePath); + }; + /** native declaration : headers\openvr_capi.h:2191 */ + public interface GetOverlayTexture_callback extends Callback { + int apply(long ulOverlayHandle, PointerByReference pNativeTextureHandle, Pointer pNativeTextureRef, IntByReference pWidth, IntByReference pHeight, IntByReference pNativeFormat, IntByReference pAPIType, IntByReference pColorSpace, VRTextureBounds_t pTextureBounds); + }; + /** native declaration : headers\openvr_capi.h:2192 */ + public interface ReleaseNativeOverlayHandle_callback extends Callback { + int apply(long ulOverlayHandle, Pointer pNativeTextureHandle); + }; + /** native declaration : headers\openvr_capi.h:2193 */ + public interface GetOverlayTextureSize_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference pWidth, IntByReference pHeight); + }; + /** native declaration : headers\openvr_capi.h:2194 */ + public interface CreateDashboardOverlay_callback extends Callback { + int apply(Pointer pchOverlayKey, Pointer pchOverlayFriendlyName, LongByReference pMainHandle, LongByReference pThumbnailHandle); + }; + /** native declaration : headers\openvr_capi.h:2195 */ + public interface IsDashboardVisible_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:2196 */ + public interface IsActiveDashboardOverlay_callback extends Callback { + byte apply(long ulOverlayHandle); + }; + /** native declaration : headers\openvr_capi.h:2197 */ + public interface SetDashboardOverlaySceneProcess_callback extends Callback { + int apply(long ulOverlayHandle, int unProcessId); + }; + /** native declaration : headers\openvr_capi.h:2198 */ + public interface GetDashboardOverlaySceneProcess_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference punProcessId); + }; + /** native declaration : headers\openvr_capi.h:2199 */ + public interface ShowDashboard_callback extends Callback { + void apply(Pointer pchOverlayToShow); + }; + /** native declaration : headers\openvr_capi.h:2200 */ + public interface GetPrimaryDashboardDevice_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:2201 */ + public interface ShowKeyboard_callback extends Callback { + int apply(int eInputMode, int eLineInputMode, Pointer pchDescription, int unCharMax, Pointer pchExistingText, byte bUseMinimalMode, long uUserValue); + }; + /** native declaration : headers\openvr_capi.h:2202 */ + public interface ShowKeyboardForOverlay_callback extends Callback { + int apply(long ulOverlayHandle, int eInputMode, int eLineInputMode, Pointer pchDescription, int unCharMax, Pointer pchExistingText, byte bUseMinimalMode, long uUserValue); + }; + /** native declaration : headers\openvr_capi.h:2203 */ + public interface GetKeyboardText_callback extends Callback { + int apply(Pointer pchText, int cchText); + }; + /** native declaration : headers\openvr_capi.h:2204 */ + public interface HideKeyboard_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:2205 */ + public interface SetKeyboardTransformAbsolute_callback extends Callback { + void apply(int eTrackingOrigin, HmdMatrix34_t pmatTrackingOriginToKeyboardTransform); + }; + /** native declaration : headers\openvr_capi.h:2206 */ + public interface SetKeyboardPositionForOverlay_callback extends Callback { + void apply(long ulOverlayHandle, com.jme3.system.jopenvr.HmdRect2_t.ByValue avoidRect); + }; + /** native declaration : headers\openvr_capi.h:2207 */ + public interface SetOverlayIntersectionMask_callback extends Callback { + int apply(long ulOverlayHandle, VROverlayIntersectionMaskPrimitive_t pMaskPrimitives, int unNumMaskPrimitives, int unPrimitiveSize); + }; + /** native declaration : headers\openvr_capi.h:2208 */ + public interface GetOverlayFlags_callback extends Callback { + int apply(long ulOverlayHandle, IntByReference pFlags); + }; + /** native declaration : headers\openvr_capi.h:2209 */ + public interface ShowMessageOverlay_callback extends Callback { + int apply(Pointer pchText, Pointer pchCaption, Pointer pchButton0Text, Pointer pchButton1Text, Pointer pchButton2Text, Pointer pchButton3Text); + }; + /** native declaration : headers\openvr_capi.h:2210 */ + public interface CloseMessageOverlay_callback extends Callback { + void apply(); + }; + public VR_IVROverlay_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("FindOverlay", "CreateOverlay", "DestroyOverlay", "SetHighQualityOverlay", "GetHighQualityOverlay", "GetOverlayKey", "GetOverlayName", "SetOverlayName", "GetOverlayImageData", "GetOverlayErrorNameFromEnum", "SetOverlayRenderingPid", "GetOverlayRenderingPid", "SetOverlayFlag", "GetOverlayFlag", "SetOverlayColor", "GetOverlayColor", "SetOverlayAlpha", "GetOverlayAlpha", "SetOverlayTexelAspect", "GetOverlayTexelAspect", "SetOverlaySortOrder", "GetOverlaySortOrder", "SetOverlayWidthInMeters", "GetOverlayWidthInMeters", "SetOverlayAutoCurveDistanceRangeInMeters", "GetOverlayAutoCurveDistanceRangeInMeters", "SetOverlayTextureColorSpace", "GetOverlayTextureColorSpace", "SetOverlayTextureBounds", "GetOverlayTextureBounds", "GetOverlayRenderModel", "SetOverlayRenderModel", "GetOverlayTransformType", "SetOverlayTransformAbsolute", "GetOverlayTransformAbsolute", "SetOverlayTransformTrackedDeviceRelative", "GetOverlayTransformTrackedDeviceRelative", "SetOverlayTransformTrackedDeviceComponent", "GetOverlayTransformTrackedDeviceComponent", "GetOverlayTransformOverlayRelative", "SetOverlayTransformOverlayRelative", "ShowOverlay", "HideOverlay", "IsOverlayVisible", "GetTransformForOverlayCoordinates", "PollNextOverlayEvent", "GetOverlayInputMethod", "SetOverlayInputMethod", "GetOverlayMouseScale", "SetOverlayMouseScale", "ComputeOverlayIntersection", "IsHoverTargetOverlay", "GetGamepadFocusOverlay", "SetGamepadFocusOverlay", "SetOverlayNeighbor", "MoveGamepadFocusToNeighbor", "SetOverlayDualAnalogTransform", "GetOverlayDualAnalogTransform", "SetOverlayTexture", "ClearOverlayTexture", "SetOverlayRaw", "SetOverlayFromFile", "GetOverlayTexture", "ReleaseNativeOverlayHandle", "GetOverlayTextureSize", "CreateDashboardOverlay", "IsDashboardVisible", "IsActiveDashboardOverlay", "SetDashboardOverlaySceneProcess", "GetDashboardOverlaySceneProcess", "ShowDashboard", "GetPrimaryDashboardDevice", "ShowKeyboard", "ShowKeyboardForOverlay", "GetKeyboardText", "HideKeyboard", "SetKeyboardTransformAbsolute", "SetKeyboardPositionForOverlay", "SetOverlayIntersectionMask", "GetOverlayFlags", "ShowMessageOverlay", "CloseMessageOverlay"); + } + public VR_IVROverlay_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVROverlay_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVROverlay_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRRenderModels_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRRenderModels_FnTable.java index a025a415e..3d448c307 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRRenderModels_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRRenderModels_FnTable.java @@ -7,139 +7,140 @@ import com.sun.jna.ptr.PointerByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:2251
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRRenderModels_FnTable extends Structure { - /** C type : LoadRenderModel_Async_callback* */ - public VR_IVRRenderModels_FnTable.LoadRenderModel_Async_callback LoadRenderModel_Async; - /** C type : FreeRenderModel_callback* */ - public VR_IVRRenderModels_FnTable.FreeRenderModel_callback FreeRenderModel; - /** C type : LoadTexture_Async_callback* */ - public VR_IVRRenderModels_FnTable.LoadTexture_Async_callback LoadTexture_Async; - /** C type : FreeTexture_callback* */ - public VR_IVRRenderModels_FnTable.FreeTexture_callback FreeTexture; - /** C type : LoadTextureD3D11_Async_callback* */ - public VR_IVRRenderModels_FnTable.LoadTextureD3D11_Async_callback LoadTextureD3D11_Async; - /** C type : LoadIntoTextureD3D11_Async_callback* */ - public VR_IVRRenderModels_FnTable.LoadIntoTextureD3D11_Async_callback LoadIntoTextureD3D11_Async; - /** C type : FreeTextureD3D11_callback* */ - public VR_IVRRenderModels_FnTable.FreeTextureD3D11_callback FreeTextureD3D11; - /** C type : GetRenderModelName_callback* */ - public VR_IVRRenderModels_FnTable.GetRenderModelName_callback GetRenderModelName; - /** C type : GetRenderModelCount_callback* */ - public VR_IVRRenderModels_FnTable.GetRenderModelCount_callback GetRenderModelCount; - /** C type : GetComponentCount_callback* */ - public VR_IVRRenderModels_FnTable.GetComponentCount_callback GetComponentCount; - /** C type : GetComponentName_callback* */ - public VR_IVRRenderModels_FnTable.GetComponentName_callback GetComponentName; - /** C type : GetComponentButtonMask_callback* */ - public VR_IVRRenderModels_FnTable.GetComponentButtonMask_callback GetComponentButtonMask; - /** C type : GetComponentRenderModelName_callback* */ - public VR_IVRRenderModels_FnTable.GetComponentRenderModelName_callback GetComponentRenderModelName; - /** C type : GetComponentStateForDevicePath_callback* */ - public VR_IVRRenderModels_FnTable.GetComponentStateForDevicePath_callback GetComponentStateForDevicePath; - /** C type : GetComponentState_callback* */ - public VR_IVRRenderModels_FnTable.GetComponentState_callback GetComponentState; - /** C type : RenderModelHasComponent_callback* */ - public VR_IVRRenderModels_FnTable.RenderModelHasComponent_callback RenderModelHasComponent; - /** C type : GetRenderModelThumbnailURL_callback* */ - public VR_IVRRenderModels_FnTable.GetRenderModelThumbnailURL_callback GetRenderModelThumbnailURL; - /** C type : GetRenderModelOriginalPath_callback* */ - public VR_IVRRenderModels_FnTable.GetRenderModelOriginalPath_callback GetRenderModelOriginalPath; - /** C type : GetRenderModelErrorNameFromEnum_callback* */ - public VR_IVRRenderModels_FnTable.GetRenderModelErrorNameFromEnum_callback GetRenderModelErrorNameFromEnum; - /** native declaration : headers\openvr_capi.h:2232 */ - public interface LoadRenderModel_Async_callback extends Callback { - int apply(Pointer pchRenderModelName, PointerByReference ppRenderModel); - }; - /** native declaration : headers\openvr_capi.h:2233 */ - public interface FreeRenderModel_callback extends Callback { - void apply(RenderModel_t pRenderModel); - }; - /** native declaration : headers\openvr_capi.h:2234 */ - public interface LoadTexture_Async_callback extends Callback { - int apply(int textureId, PointerByReference ppTexture); - }; - /** native declaration : headers\openvr_capi.h:2235 */ - public interface FreeTexture_callback extends Callback { - void apply(RenderModel_TextureMap_t pTexture); - }; - /** native declaration : headers\openvr_capi.h:2236 */ - public interface LoadTextureD3D11_Async_callback extends Callback { - int apply(int textureId, Pointer pD3D11Device, PointerByReference ppD3D11Texture2D); - }; - /** native declaration : headers\openvr_capi.h:2237 */ - public interface LoadIntoTextureD3D11_Async_callback extends Callback { - int apply(int textureId, Pointer pDstTexture); - }; - /** native declaration : headers\openvr_capi.h:2238 */ - public interface FreeTextureD3D11_callback extends Callback { - void apply(Pointer pD3D11Texture2D); - }; - /** native declaration : headers\openvr_capi.h:2239 */ - public interface GetRenderModelName_callback extends Callback { - int apply(int unRenderModelIndex, Pointer pchRenderModelName, int unRenderModelNameLen); - }; - /** native declaration : headers\openvr_capi.h:2240 */ - public interface GetRenderModelCount_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:2241 */ - public interface GetComponentCount_callback extends Callback { - int apply(Pointer pchRenderModelName); - }; - /** native declaration : headers\openvr_capi.h:2242 */ - public interface GetComponentName_callback extends Callback { - int apply(Pointer pchRenderModelName, int unComponentIndex, Pointer pchComponentName, int unComponentNameLen); - }; - /** native declaration : headers\openvr_capi.h:2243 */ - public interface GetComponentButtonMask_callback extends Callback { - long apply(Pointer pchRenderModelName, Pointer pchComponentName); - }; - /** native declaration : headers\openvr_capi.h:2244 */ - public interface GetComponentRenderModelName_callback extends Callback { - int apply(Pointer pchRenderModelName, Pointer pchComponentName, Pointer pchComponentRenderModelName, int unComponentRenderModelNameLen); - }; - /** native declaration : headers\openvr_capi.h:2245 */ - public interface GetComponentStateForDevicePath_callback extends Callback { - byte apply(Pointer pchRenderModelName, Pointer pchComponentName, long devicePath, RenderModel_ControllerMode_State_t pState, RenderModel_ComponentState_t pComponentState); - }; - /** native declaration : headers\openvr_capi.h:2246 */ - public interface GetComponentState_callback extends Callback { - byte apply(Pointer pchRenderModelName, Pointer pchComponentName, VRControllerState_t pControllerState, RenderModel_ControllerMode_State_t pState, RenderModel_ComponentState_t pComponentState); - }; - /** native declaration : headers\openvr_capi.h:2247 */ - public interface RenderModelHasComponent_callback extends Callback { - byte apply(Pointer pchRenderModelName, Pointer pchComponentName); - }; - /** native declaration : headers\openvr_capi.h:2248 */ - public interface GetRenderModelThumbnailURL_callback extends Callback { - int apply(Pointer pchRenderModelName, Pointer pchThumbnailURL, int unThumbnailURLLen, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2249 */ - public interface GetRenderModelOriginalPath_callback extends Callback { - int apply(Pointer pchRenderModelName, Pointer pchOriginalPath, int unOriginalPathLen, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2250 */ - public interface GetRenderModelErrorNameFromEnum_callback extends Callback { - Pointer apply(int error); - }; - public VR_IVRRenderModels_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("LoadRenderModel_Async", "FreeRenderModel", "LoadTexture_Async", "FreeTexture", "LoadTextureD3D11_Async", "LoadIntoTextureD3D11_Async", "FreeTextureD3D11", "GetRenderModelName", "GetRenderModelCount", "GetComponentCount", "GetComponentName", "GetComponentButtonMask", "GetComponentRenderModelName", "GetComponentStateForDevicePath", "GetComponentState", "RenderModelHasComponent", "GetRenderModelThumbnailURL", "GetRenderModelOriginalPath", "GetRenderModelErrorNameFromEnum"); - } - public VR_IVRRenderModels_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRRenderModels_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRRenderModels_FnTable implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:2251
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRRenderModels_FnTable extends Structure { + /** C type : LoadRenderModel_Async_callback* */ + public VR_IVRRenderModels_FnTable.LoadRenderModel_Async_callback LoadRenderModel_Async; + /** C type : FreeRenderModel_callback* */ + public VR_IVRRenderModels_FnTable.FreeRenderModel_callback FreeRenderModel; + /** C type : LoadTexture_Async_callback* */ + public VR_IVRRenderModels_FnTable.LoadTexture_Async_callback LoadTexture_Async; + /** C type : FreeTexture_callback* */ + public VR_IVRRenderModels_FnTable.FreeTexture_callback FreeTexture; + /** C type : LoadTextureD3D11_Async_callback* */ + public VR_IVRRenderModels_FnTable.LoadTextureD3D11_Async_callback LoadTextureD3D11_Async; + /** C type : LoadIntoTextureD3D11_Async_callback* */ + public VR_IVRRenderModels_FnTable.LoadIntoTextureD3D11_Async_callback LoadIntoTextureD3D11_Async; + /** C type : FreeTextureD3D11_callback* */ + public VR_IVRRenderModels_FnTable.FreeTextureD3D11_callback FreeTextureD3D11; + /** C type : GetRenderModelName_callback* */ + public VR_IVRRenderModels_FnTable.GetRenderModelName_callback GetRenderModelName; + /** C type : GetRenderModelCount_callback* */ + public VR_IVRRenderModels_FnTable.GetRenderModelCount_callback GetRenderModelCount; + /** C type : GetComponentCount_callback* */ + public VR_IVRRenderModels_FnTable.GetComponentCount_callback GetComponentCount; + /** C type : GetComponentName_callback* */ + public VR_IVRRenderModels_FnTable.GetComponentName_callback GetComponentName; + /** C type : GetComponentButtonMask_callback* */ + public VR_IVRRenderModels_FnTable.GetComponentButtonMask_callback GetComponentButtonMask; + /** C type : GetComponentRenderModelName_callback* */ + public VR_IVRRenderModels_FnTable.GetComponentRenderModelName_callback GetComponentRenderModelName; + /** C type : GetComponentStateForDevicePath_callback* */ + public VR_IVRRenderModels_FnTable.GetComponentStateForDevicePath_callback GetComponentStateForDevicePath; + /** C type : GetComponentState_callback* */ + public VR_IVRRenderModels_FnTable.GetComponentState_callback GetComponentState; + /** C type : RenderModelHasComponent_callback* */ + public VR_IVRRenderModels_FnTable.RenderModelHasComponent_callback RenderModelHasComponent; + /** C type : GetRenderModelThumbnailURL_callback* */ + public VR_IVRRenderModels_FnTable.GetRenderModelThumbnailURL_callback GetRenderModelThumbnailURL; + /** C type : GetRenderModelOriginalPath_callback* */ + public VR_IVRRenderModels_FnTable.GetRenderModelOriginalPath_callback GetRenderModelOriginalPath; + /** C type : GetRenderModelErrorNameFromEnum_callback* */ + public VR_IVRRenderModels_FnTable.GetRenderModelErrorNameFromEnum_callback GetRenderModelErrorNameFromEnum; + /** native declaration : headers\openvr_capi.h:2232 */ + public interface LoadRenderModel_Async_callback extends Callback { + int apply(Pointer pchRenderModelName, PointerByReference ppRenderModel); + }; + /** native declaration : headers\openvr_capi.h:2233 */ + public interface FreeRenderModel_callback extends Callback { + void apply(RenderModel_t pRenderModel); + }; + /** native declaration : headers\openvr_capi.h:2234 */ + public interface LoadTexture_Async_callback extends Callback { + int apply(int textureId, PointerByReference ppTexture); + }; + /** native declaration : headers\openvr_capi.h:2235 */ + public interface FreeTexture_callback extends Callback { + void apply(RenderModel_TextureMap_t pTexture); + }; + /** native declaration : headers\openvr_capi.h:2236 */ + public interface LoadTextureD3D11_Async_callback extends Callback { + int apply(int textureId, Pointer pD3D11Device, PointerByReference ppD3D11Texture2D); + }; + /** native declaration : headers\openvr_capi.h:2237 */ + public interface LoadIntoTextureD3D11_Async_callback extends Callback { + int apply(int textureId, Pointer pDstTexture); + }; + /** native declaration : headers\openvr_capi.h:2238 */ + public interface FreeTextureD3D11_callback extends Callback { + void apply(Pointer pD3D11Texture2D); + }; + /** native declaration : headers\openvr_capi.h:2239 */ + public interface GetRenderModelName_callback extends Callback { + int apply(int unRenderModelIndex, Pointer pchRenderModelName, int unRenderModelNameLen); + }; + /** native declaration : headers\openvr_capi.h:2240 */ + public interface GetRenderModelCount_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:2241 */ + public interface GetComponentCount_callback extends Callback { + int apply(Pointer pchRenderModelName); + }; + /** native declaration : headers\openvr_capi.h:2242 */ + public interface GetComponentName_callback extends Callback { + int apply(Pointer pchRenderModelName, int unComponentIndex, Pointer pchComponentName, int unComponentNameLen); + }; + /** native declaration : headers\openvr_capi.h:2243 */ + public interface GetComponentButtonMask_callback extends Callback { + long apply(Pointer pchRenderModelName, Pointer pchComponentName); + }; + /** native declaration : headers\openvr_capi.h:2244 */ + public interface GetComponentRenderModelName_callback extends Callback { + int apply(Pointer pchRenderModelName, Pointer pchComponentName, Pointer pchComponentRenderModelName, int unComponentRenderModelNameLen); + }; + /** native declaration : headers\openvr_capi.h:2245 */ + public interface GetComponentStateForDevicePath_callback extends Callback { + byte apply(Pointer pchRenderModelName, Pointer pchComponentName, long devicePath, RenderModel_ControllerMode_State_t pState, RenderModel_ComponentState_t pComponentState); + }; + /** native declaration : headers\openvr_capi.h:2246 */ + public interface GetComponentState_callback extends Callback { + byte apply(Pointer pchRenderModelName, Pointer pchComponentName, VRControllerState_t pControllerState, RenderModel_ControllerMode_State_t pState, RenderModel_ComponentState_t pComponentState); + }; + /** native declaration : headers\openvr_capi.h:2247 */ + public interface RenderModelHasComponent_callback extends Callback { + byte apply(Pointer pchRenderModelName, Pointer pchComponentName); + }; + /** native declaration : headers\openvr_capi.h:2248 */ + public interface GetRenderModelThumbnailURL_callback extends Callback { + int apply(Pointer pchRenderModelName, Pointer pchThumbnailURL, int unThumbnailURLLen, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2249 */ + public interface GetRenderModelOriginalPath_callback extends Callback { + int apply(Pointer pchRenderModelName, Pointer pchOriginalPath, int unOriginalPathLen, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2250 */ + public interface GetRenderModelErrorNameFromEnum_callback extends Callback { + Pointer apply(int error); + }; + public VR_IVRRenderModels_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("LoadRenderModel_Async", "FreeRenderModel", "LoadTexture_Async", "FreeTexture", "LoadTextureD3D11_Async", "LoadIntoTextureD3D11_Async", "FreeTextureD3D11", "GetRenderModelName", "GetRenderModelCount", "GetComponentCount", "GetComponentName", "GetComponentButtonMask", "GetComponentRenderModelName", "GetComponentStateForDevicePath", "GetComponentState", "RenderModelHasComponent", "GetRenderModelThumbnailURL", "GetRenderModelOriginalPath", "GetRenderModelErrorNameFromEnum"); + } + public VR_IVRRenderModels_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRRenderModels_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRRenderModels_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRResources_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRResources_FnTable.java index 889feb982..1533e094c 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRResources_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRResources_FnTable.java @@ -5,46 +5,47 @@ import com.sun.jna.Structure; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:2305
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRResources_FnTable extends Structure { - /** C type : LoadSharedResource_callback* */ - public VR_IVRResources_FnTable.LoadSharedResource_callback LoadSharedResource; - /** C type : GetResourceFullPath_callback* */ - public VR_IVRResources_FnTable.GetResourceFullPath_callback GetResourceFullPath; - /** native declaration : headers\openvr_capi.h:2303 */ - public interface LoadSharedResource_callback extends Callback { - int apply(Pointer pchResourceName, Pointer pchBuffer, int unBufferLen); - }; - /** native declaration : headers\openvr_capi.h:2304 */ - public interface GetResourceFullPath_callback extends Callback { - int apply(Pointer pchResourceName, Pointer pchResourceTypeDirectory, Pointer pchPathBuffer, int unBufferLen); - }; - public VR_IVRResources_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("LoadSharedResource", "GetResourceFullPath"); - } + * native declaration : headers\openvr_capi.h:2305
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRResources_FnTable extends Structure { + /** C type : LoadSharedResource_callback* */ + public VR_IVRResources_FnTable.LoadSharedResource_callback LoadSharedResource; + /** C type : GetResourceFullPath_callback* */ + public VR_IVRResources_FnTable.GetResourceFullPath_callback GetResourceFullPath; + /** native declaration : headers\openvr_capi.h:2303 */ + public interface LoadSharedResource_callback extends Callback { + int apply(Pointer pchResourceName, Pointer pchBuffer, int unBufferLen); + }; + /** native declaration : headers\openvr_capi.h:2304 */ + public interface GetResourceFullPath_callback extends Callback { + int apply(Pointer pchResourceName, Pointer pchResourceTypeDirectory, Pointer pchPathBuffer, int unBufferLen); + }; + public VR_IVRResources_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("LoadSharedResource", "GetResourceFullPath"); + } /** - * @param LoadSharedResource C type : LoadSharedResource_callback*
- * @param GetResourceFullPath C type : GetResourceFullPath_callback* - */ - public VR_IVRResources_FnTable(VR_IVRResources_FnTable.LoadSharedResource_callback LoadSharedResource, VR_IVRResources_FnTable.GetResourceFullPath_callback GetResourceFullPath) { - super(); - this.LoadSharedResource = LoadSharedResource; - this.GetResourceFullPath = GetResourceFullPath; - } - public VR_IVRResources_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRResources_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRResources_FnTable implements Structure.ByValue { - - }; + * @param LoadSharedResource C type : LoadSharedResource_callback*
+ * @param GetResourceFullPath C type : GetResourceFullPath_callback* + */ + public VR_IVRResources_FnTable(VR_IVRResources_FnTable.LoadSharedResource_callback LoadSharedResource, VR_IVRResources_FnTable.GetResourceFullPath_callback GetResourceFullPath) { + super(); + this.LoadSharedResource = LoadSharedResource; + this.GetResourceFullPath = GetResourceFullPath; + } + public VR_IVRResources_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRResources_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRResources_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRScreenshots_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRScreenshots_FnTable.java index 888c3ce2d..058637d0d 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRScreenshots_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRScreenshots_FnTable.java @@ -6,86 +6,87 @@ import com.sun.jna.ptr.IntByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:2299
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRScreenshots_FnTable extends Structure { - /** C type : RequestScreenshot_callback* */ - public VR_IVRScreenshots_FnTable.RequestScreenshot_callback RequestScreenshot; - /** C type : HookScreenshot_callback* */ - public VR_IVRScreenshots_FnTable.HookScreenshot_callback HookScreenshot; - /** C type : GetScreenshotPropertyType_callback* */ - public VR_IVRScreenshots_FnTable.GetScreenshotPropertyType_callback GetScreenshotPropertyType; - /** C type : GetScreenshotPropertyFilename_callback* */ - public VR_IVRScreenshots_FnTable.GetScreenshotPropertyFilename_callback GetScreenshotPropertyFilename; - /** C type : UpdateScreenshotProgress_callback* */ - public VR_IVRScreenshots_FnTable.UpdateScreenshotProgress_callback UpdateScreenshotProgress; - /** C type : TakeStereoScreenshot_callback* */ - public VR_IVRScreenshots_FnTable.TakeStereoScreenshot_callback TakeStereoScreenshot; - /** C type : SubmitScreenshot_callback* */ - public VR_IVRScreenshots_FnTable.SubmitScreenshot_callback SubmitScreenshot; - /** native declaration : headers\openvr_capi.h:2292 */ - public interface RequestScreenshot_callback extends Callback { - int apply(IntByReference pOutScreenshotHandle, int type, Pointer pchPreviewFilename, Pointer pchVRFilename); - }; - /** native declaration : headers\openvr_capi.h:2293 */ - public interface HookScreenshot_callback extends Callback { - int apply(IntByReference pSupportedTypes, int numTypes); - }; - /** native declaration : headers\openvr_capi.h:2294 */ - public interface GetScreenshotPropertyType_callback extends Callback { - int apply(int screenshotHandle, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:2295 */ - public interface GetScreenshotPropertyFilename_callback extends Callback { - int apply(int screenshotHandle, int filenameType, Pointer pchFilename, int cchFilename, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:2296 */ - public interface UpdateScreenshotProgress_callback extends Callback { - int apply(int screenshotHandle, float flProgress); - }; - /** native declaration : headers\openvr_capi.h:2297 */ - public interface TakeStereoScreenshot_callback extends Callback { - int apply(IntByReference pOutScreenshotHandle, Pointer pchPreviewFilename, Pointer pchVRFilename); - }; - /** native declaration : headers\openvr_capi.h:2298 */ - public interface SubmitScreenshot_callback extends Callback { - int apply(int screenshotHandle, int type, Pointer pchSourcePreviewFilename, Pointer pchSourceVRFilename); - }; - public VR_IVRScreenshots_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("RequestScreenshot", "HookScreenshot", "GetScreenshotPropertyType", "GetScreenshotPropertyFilename", "UpdateScreenshotProgress", "TakeStereoScreenshot", "SubmitScreenshot"); - } + * native declaration : headers\openvr_capi.h:2299
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRScreenshots_FnTable extends Structure { + /** C type : RequestScreenshot_callback* */ + public VR_IVRScreenshots_FnTable.RequestScreenshot_callback RequestScreenshot; + /** C type : HookScreenshot_callback* */ + public VR_IVRScreenshots_FnTable.HookScreenshot_callback HookScreenshot; + /** C type : GetScreenshotPropertyType_callback* */ + public VR_IVRScreenshots_FnTable.GetScreenshotPropertyType_callback GetScreenshotPropertyType; + /** C type : GetScreenshotPropertyFilename_callback* */ + public VR_IVRScreenshots_FnTable.GetScreenshotPropertyFilename_callback GetScreenshotPropertyFilename; + /** C type : UpdateScreenshotProgress_callback* */ + public VR_IVRScreenshots_FnTable.UpdateScreenshotProgress_callback UpdateScreenshotProgress; + /** C type : TakeStereoScreenshot_callback* */ + public VR_IVRScreenshots_FnTable.TakeStereoScreenshot_callback TakeStereoScreenshot; + /** C type : SubmitScreenshot_callback* */ + public VR_IVRScreenshots_FnTable.SubmitScreenshot_callback SubmitScreenshot; + /** native declaration : headers\openvr_capi.h:2292 */ + public interface RequestScreenshot_callback extends Callback { + int apply(IntByReference pOutScreenshotHandle, int type, Pointer pchPreviewFilename, Pointer pchVRFilename); + }; + /** native declaration : headers\openvr_capi.h:2293 */ + public interface HookScreenshot_callback extends Callback { + int apply(IntByReference pSupportedTypes, int numTypes); + }; + /** native declaration : headers\openvr_capi.h:2294 */ + public interface GetScreenshotPropertyType_callback extends Callback { + int apply(int screenshotHandle, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:2295 */ + public interface GetScreenshotPropertyFilename_callback extends Callback { + int apply(int screenshotHandle, int filenameType, Pointer pchFilename, int cchFilename, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:2296 */ + public interface UpdateScreenshotProgress_callback extends Callback { + int apply(int screenshotHandle, float flProgress); + }; + /** native declaration : headers\openvr_capi.h:2297 */ + public interface TakeStereoScreenshot_callback extends Callback { + int apply(IntByReference pOutScreenshotHandle, Pointer pchPreviewFilename, Pointer pchVRFilename); + }; + /** native declaration : headers\openvr_capi.h:2298 */ + public interface SubmitScreenshot_callback extends Callback { + int apply(int screenshotHandle, int type, Pointer pchSourcePreviewFilename, Pointer pchSourceVRFilename); + }; + public VR_IVRScreenshots_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("RequestScreenshot", "HookScreenshot", "GetScreenshotPropertyType", "GetScreenshotPropertyFilename", "UpdateScreenshotProgress", "TakeStereoScreenshot", "SubmitScreenshot"); + } /** - * @param RequestScreenshot C type : RequestScreenshot_callback*
- * @param HookScreenshot C type : HookScreenshot_callback*
- * @param GetScreenshotPropertyType C type : GetScreenshotPropertyType_callback*
- * @param GetScreenshotPropertyFilename C type : GetScreenshotPropertyFilename_callback*
- * @param UpdateScreenshotProgress C type : UpdateScreenshotProgress_callback*
- * @param TakeStereoScreenshot C type : TakeStereoScreenshot_callback*
- * @param SubmitScreenshot C type : SubmitScreenshot_callback* - */ - public VR_IVRScreenshots_FnTable(VR_IVRScreenshots_FnTable.RequestScreenshot_callback RequestScreenshot, VR_IVRScreenshots_FnTable.HookScreenshot_callback HookScreenshot, VR_IVRScreenshots_FnTable.GetScreenshotPropertyType_callback GetScreenshotPropertyType, VR_IVRScreenshots_FnTable.GetScreenshotPropertyFilename_callback GetScreenshotPropertyFilename, VR_IVRScreenshots_FnTable.UpdateScreenshotProgress_callback UpdateScreenshotProgress, VR_IVRScreenshots_FnTable.TakeStereoScreenshot_callback TakeStereoScreenshot, VR_IVRScreenshots_FnTable.SubmitScreenshot_callback SubmitScreenshot) { - super(); - this.RequestScreenshot = RequestScreenshot; - this.HookScreenshot = HookScreenshot; - this.GetScreenshotPropertyType = GetScreenshotPropertyType; - this.GetScreenshotPropertyFilename = GetScreenshotPropertyFilename; - this.UpdateScreenshotProgress = UpdateScreenshotProgress; - this.TakeStereoScreenshot = TakeStereoScreenshot; - this.SubmitScreenshot = SubmitScreenshot; - } - public VR_IVRScreenshots_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRScreenshots_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRScreenshots_FnTable implements Structure.ByValue { - - }; + * @param RequestScreenshot C type : RequestScreenshot_callback*
+ * @param HookScreenshot C type : HookScreenshot_callback*
+ * @param GetScreenshotPropertyType C type : GetScreenshotPropertyType_callback*
+ * @param GetScreenshotPropertyFilename C type : GetScreenshotPropertyFilename_callback*
+ * @param UpdateScreenshotProgress C type : UpdateScreenshotProgress_callback*
+ * @param TakeStereoScreenshot C type : TakeStereoScreenshot_callback*
+ * @param SubmitScreenshot C type : SubmitScreenshot_callback* + */ + public VR_IVRScreenshots_FnTable(VR_IVRScreenshots_FnTable.RequestScreenshot_callback RequestScreenshot, VR_IVRScreenshots_FnTable.HookScreenshot_callback HookScreenshot, VR_IVRScreenshots_FnTable.GetScreenshotPropertyType_callback GetScreenshotPropertyType, VR_IVRScreenshots_FnTable.GetScreenshotPropertyFilename_callback GetScreenshotPropertyFilename, VR_IVRScreenshots_FnTable.UpdateScreenshotProgress_callback UpdateScreenshotProgress, VR_IVRScreenshots_FnTable.TakeStereoScreenshot_callback TakeStereoScreenshot, VR_IVRScreenshots_FnTable.SubmitScreenshot_callback SubmitScreenshot) { + super(); + this.RequestScreenshot = RequestScreenshot; + this.HookScreenshot = HookScreenshot; + this.GetScreenshotPropertyType = GetScreenshotPropertyType; + this.GetScreenshotPropertyFilename = GetScreenshotPropertyFilename; + this.UpdateScreenshotProgress = UpdateScreenshotProgress; + this.TakeStereoScreenshot = TakeStereoScreenshot; + this.SubmitScreenshot = SubmitScreenshot; + } + public VR_IVRScreenshots_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRScreenshots_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRScreenshots_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSettings_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSettings_FnTable.java index a3704ec53..ebbe247fb 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSettings_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSettings_FnTable.java @@ -6,97 +6,98 @@ import com.sun.jna.ptr.IntByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:2283
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRSettings_FnTable extends Structure { - /** C type : GetSettingsErrorNameFromEnum_callback* */ - public VR_IVRSettings_FnTable.GetSettingsErrorNameFromEnum_callback GetSettingsErrorNameFromEnum; - /** C type : Sync_callback* */ - public VR_IVRSettings_FnTable.Sync_callback Sync; - /** C type : SetBool_callback* */ - public VR_IVRSettings_FnTable.SetBool_callback SetBool; - /** C type : SetInt32_callback* */ - public VR_IVRSettings_FnTable.SetInt32_callback SetInt32; - /** C type : SetFloat_callback* */ - public VR_IVRSettings_FnTable.SetFloat_callback SetFloat; - /** C type : SetString_callback* */ - public VR_IVRSettings_FnTable.SetString_callback SetString; - /** C type : GetBool_callback* */ - public VR_IVRSettings_FnTable.GetBool_callback GetBool; - /** C type : GetInt32_callback* */ - public VR_IVRSettings_FnTable.GetInt32_callback GetInt32; - /** C type : GetFloat_callback* */ - public VR_IVRSettings_FnTable.GetFloat_callback GetFloat; - /** C type : GetString_callback* */ - public VR_IVRSettings_FnTable.GetString_callback GetString; - /** C type : RemoveSection_callback* */ - public VR_IVRSettings_FnTable.RemoveSection_callback RemoveSection; - /** C type : RemoveKeyInSection_callback* */ - public VR_IVRSettings_FnTable.RemoveKeyInSection_callback RemoveKeyInSection; - /** native declaration : headers\openvr_capi.h:2271 */ - public interface GetSettingsErrorNameFromEnum_callback extends Callback { - Pointer apply(int eError); - }; - /** native declaration : headers\openvr_capi.h:2272 */ - public interface Sync_callback extends Callback { - byte apply(byte bForce, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2273 */ - public interface SetBool_callback extends Callback { - void apply(Pointer pchSection, Pointer pchSettingsKey, byte bValue, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2274 */ - public interface SetInt32_callback extends Callback { - void apply(Pointer pchSection, Pointer pchSettingsKey, int nValue, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2275 */ - public interface SetFloat_callback extends Callback { - void apply(Pointer pchSection, Pointer pchSettingsKey, float flValue, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2276 */ - public interface SetString_callback extends Callback { - void apply(Pointer pchSection, Pointer pchSettingsKey, Pointer pchValue, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2277 */ - public interface GetBool_callback extends Callback { - byte apply(Pointer pchSection, Pointer pchSettingsKey, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2278 */ - public interface GetInt32_callback extends Callback { - int apply(Pointer pchSection, Pointer pchSettingsKey, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2279 */ - public interface GetFloat_callback extends Callback { - float apply(Pointer pchSection, Pointer pchSettingsKey, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2280 */ - public interface GetString_callback extends Callback { - void apply(Pointer pchSection, Pointer pchSettingsKey, Pointer pchValue, int unValueLen, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2281 */ - public interface RemoveSection_callback extends Callback { - void apply(Pointer pchSection, IntByReference peError); - }; - /** native declaration : headers\openvr_capi.h:2282 */ - public interface RemoveKeyInSection_callback extends Callback { - void apply(Pointer pchSection, Pointer pchSettingsKey, IntByReference peError); - }; - public VR_IVRSettings_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("GetSettingsErrorNameFromEnum", "Sync", "SetBool", "SetInt32", "SetFloat", "SetString", "GetBool", "GetInt32", "GetFloat", "GetString", "RemoveSection", "RemoveKeyInSection"); - } - public VR_IVRSettings_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRSettings_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRSettings_FnTable implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:2283
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRSettings_FnTable extends Structure { + /** C type : GetSettingsErrorNameFromEnum_callback* */ + public VR_IVRSettings_FnTable.GetSettingsErrorNameFromEnum_callback GetSettingsErrorNameFromEnum; + /** C type : Sync_callback* */ + public VR_IVRSettings_FnTable.Sync_callback Sync; + /** C type : SetBool_callback* */ + public VR_IVRSettings_FnTable.SetBool_callback SetBool; + /** C type : SetInt32_callback* */ + public VR_IVRSettings_FnTable.SetInt32_callback SetInt32; + /** C type : SetFloat_callback* */ + public VR_IVRSettings_FnTable.SetFloat_callback SetFloat; + /** C type : SetString_callback* */ + public VR_IVRSettings_FnTable.SetString_callback SetString; + /** C type : GetBool_callback* */ + public VR_IVRSettings_FnTable.GetBool_callback GetBool; + /** C type : GetInt32_callback* */ + public VR_IVRSettings_FnTable.GetInt32_callback GetInt32; + /** C type : GetFloat_callback* */ + public VR_IVRSettings_FnTable.GetFloat_callback GetFloat; + /** C type : GetString_callback* */ + public VR_IVRSettings_FnTable.GetString_callback GetString; + /** C type : RemoveSection_callback* */ + public VR_IVRSettings_FnTable.RemoveSection_callback RemoveSection; + /** C type : RemoveKeyInSection_callback* */ + public VR_IVRSettings_FnTable.RemoveKeyInSection_callback RemoveKeyInSection; + /** native declaration : headers\openvr_capi.h:2271 */ + public interface GetSettingsErrorNameFromEnum_callback extends Callback { + Pointer apply(int eError); + }; + /** native declaration : headers\openvr_capi.h:2272 */ + public interface Sync_callback extends Callback { + byte apply(byte bForce, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2273 */ + public interface SetBool_callback extends Callback { + void apply(Pointer pchSection, Pointer pchSettingsKey, byte bValue, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2274 */ + public interface SetInt32_callback extends Callback { + void apply(Pointer pchSection, Pointer pchSettingsKey, int nValue, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2275 */ + public interface SetFloat_callback extends Callback { + void apply(Pointer pchSection, Pointer pchSettingsKey, float flValue, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2276 */ + public interface SetString_callback extends Callback { + void apply(Pointer pchSection, Pointer pchSettingsKey, Pointer pchValue, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2277 */ + public interface GetBool_callback extends Callback { + byte apply(Pointer pchSection, Pointer pchSettingsKey, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2278 */ + public interface GetInt32_callback extends Callback { + int apply(Pointer pchSection, Pointer pchSettingsKey, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2279 */ + public interface GetFloat_callback extends Callback { + float apply(Pointer pchSection, Pointer pchSettingsKey, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2280 */ + public interface GetString_callback extends Callback { + void apply(Pointer pchSection, Pointer pchSettingsKey, Pointer pchValue, int unValueLen, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2281 */ + public interface RemoveSection_callback extends Callback { + void apply(Pointer pchSection, IntByReference peError); + }; + /** native declaration : headers\openvr_capi.h:2282 */ + public interface RemoveKeyInSection_callback extends Callback { + void apply(Pointer pchSection, Pointer pchSettingsKey, IntByReference peError); + }; + public VR_IVRSettings_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("GetSettingsErrorNameFromEnum", "Sync", "SetBool", "SetInt32", "SetFloat", "SetString", "GetBool", "GetInt32", "GetFloat", "GetString", "RemoveSection", "RemoveKeyInSection"); + } + public VR_IVRSettings_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRSettings_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRSettings_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSpatialAnchors_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSpatialAnchors_FnTable.java index 17d789269..3b28c8da1 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSpatialAnchors_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSpatialAnchors_FnTable.java @@ -39,6 +39,7 @@ public class VR_IVRSpatialAnchors_FnTable extends Structure { public VR_IVRSpatialAnchors_FnTable() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("CreateSpatialAnchorFromDescriptor", "CreateSpatialAnchorFromPose", "GetSpatialAnchorPose", "GetSpatialAnchorDescriptor"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSystem_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSystem_FnTable.java index 315ca22cd..8257d23a4 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSystem_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRSystem_FnTable.java @@ -9,308 +9,309 @@ import com.sun.jna.ptr.LongByReference; import java.util.Arrays; import java.util.List; /** - * OpenVR Function Pointer Tables
- * native declaration : headers\openvr_capi.h:1799
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRSystem_FnTable extends Structure { - /** C type : GetRecommendedRenderTargetSize_callback* */ - public VR_IVRSystem_FnTable.GetRecommendedRenderTargetSize_callback GetRecommendedRenderTargetSize; - /** C type : GetProjectionMatrix_callback* */ - public VR_IVRSystem_FnTable.GetProjectionMatrix_callback GetProjectionMatrix; - /** C type : GetProjectionRaw_callback* */ - public VR_IVRSystem_FnTable.GetProjectionRaw_callback GetProjectionRaw; - /** C type : ComputeDistortion_callback* */ - public VR_IVRSystem_FnTable.ComputeDistortion_callback ComputeDistortion; - /** C type : GetEyeToHeadTransform_callback* */ - public VR_IVRSystem_FnTable.GetEyeToHeadTransform_callback GetEyeToHeadTransform; - /** C type : GetTimeSinceLastVsync_callback* */ - public VR_IVRSystem_FnTable.GetTimeSinceLastVsync_callback GetTimeSinceLastVsync; - /** C type : GetD3D9AdapterIndex_callback* */ - public VR_IVRSystem_FnTable.GetD3D9AdapterIndex_callback GetD3D9AdapterIndex; - /** C type : GetDXGIOutputInfo_callback* */ - public com.jme3.system.jopenvr.VR_IVRExtendedDisplay_FnTable.GetDXGIOutputInfo_callback GetDXGIOutputInfo; - /** C type : GetOutputDevice_callback* */ - public VR_IVRSystem_FnTable.GetOutputDevice_callback GetOutputDevice; - /** C type : IsDisplayOnDesktop_callback* */ - public VR_IVRSystem_FnTable.IsDisplayOnDesktop_callback IsDisplayOnDesktop; - /** C type : SetDisplayVisibility_callback* */ - public VR_IVRSystem_FnTable.SetDisplayVisibility_callback SetDisplayVisibility; - /** C type : GetDeviceToAbsoluteTrackingPose_callback* */ - public VR_IVRSystem_FnTable.GetDeviceToAbsoluteTrackingPose_callback GetDeviceToAbsoluteTrackingPose; - /** C type : ResetSeatedZeroPose_callback* */ - public VR_IVRSystem_FnTable.ResetSeatedZeroPose_callback ResetSeatedZeroPose; - /** C type : GetSeatedZeroPoseToStandingAbsoluteTrackingPose_callback* */ - public VR_IVRSystem_FnTable.GetSeatedZeroPoseToStandingAbsoluteTrackingPose_callback GetSeatedZeroPoseToStandingAbsoluteTrackingPose; - /** C type : GetRawZeroPoseToStandingAbsoluteTrackingPose_callback* */ - public VR_IVRSystem_FnTable.GetRawZeroPoseToStandingAbsoluteTrackingPose_callback GetRawZeroPoseToStandingAbsoluteTrackingPose; - /** C type : GetSortedTrackedDeviceIndicesOfClass_callback* */ - public VR_IVRSystem_FnTable.GetSortedTrackedDeviceIndicesOfClass_callback GetSortedTrackedDeviceIndicesOfClass; - /** C type : GetTrackedDeviceActivityLevel_callback* */ - public VR_IVRSystem_FnTable.GetTrackedDeviceActivityLevel_callback GetTrackedDeviceActivityLevel; - /** C type : ApplyTransform_callback* */ - public VR_IVRSystem_FnTable.ApplyTransform_callback ApplyTransform; - /** C type : GetTrackedDeviceIndexForControllerRole_callback* */ - public VR_IVRSystem_FnTable.GetTrackedDeviceIndexForControllerRole_callback GetTrackedDeviceIndexForControllerRole; - /** C type : GetControllerRoleForTrackedDeviceIndex_callback* */ - public VR_IVRSystem_FnTable.GetControllerRoleForTrackedDeviceIndex_callback GetControllerRoleForTrackedDeviceIndex; - /** C type : GetTrackedDeviceClass_callback* */ - public VR_IVRSystem_FnTable.GetTrackedDeviceClass_callback GetTrackedDeviceClass; - /** C type : IsTrackedDeviceConnected_callback* */ - public VR_IVRSystem_FnTable.IsTrackedDeviceConnected_callback IsTrackedDeviceConnected; - /** C type : GetBoolTrackedDeviceProperty_callback* */ - public VR_IVRSystem_FnTable.GetBoolTrackedDeviceProperty_callback GetBoolTrackedDeviceProperty; - /** C type : GetFloatTrackedDeviceProperty_callback* */ - public VR_IVRSystem_FnTable.GetFloatTrackedDeviceProperty_callback GetFloatTrackedDeviceProperty; - /** C type : GetInt32TrackedDeviceProperty_callback* */ - public VR_IVRSystem_FnTable.GetInt32TrackedDeviceProperty_callback GetInt32TrackedDeviceProperty; - /** C type : GetUint64TrackedDeviceProperty_callback* */ - public VR_IVRSystem_FnTable.GetUint64TrackedDeviceProperty_callback GetUint64TrackedDeviceProperty; - /** C type : GetMatrix34TrackedDeviceProperty_callback* */ - public VR_IVRSystem_FnTable.GetMatrix34TrackedDeviceProperty_callback GetMatrix34TrackedDeviceProperty; - /** C type : GetArrayTrackedDeviceProperty_callback* */ - public VR_IVRSystem_FnTable.GetArrayTrackedDeviceProperty_callback GetArrayTrackedDeviceProperty; - /** C type : GetStringTrackedDeviceProperty_callback* */ - public VR_IVRSystem_FnTable.GetStringTrackedDeviceProperty_callback GetStringTrackedDeviceProperty; - /** C type : GetPropErrorNameFromEnum_callback* */ - public VR_IVRSystem_FnTable.GetPropErrorNameFromEnum_callback GetPropErrorNameFromEnum; - /** C type : PollNextEvent_callback* */ - public VR_IVRSystem_FnTable.PollNextEvent_callback PollNextEvent; - /** C type : PollNextEventWithPose_callback* */ - public VR_IVRSystem_FnTable.PollNextEventWithPose_callback PollNextEventWithPose; - /** C type : GetEventTypeNameFromEnum_callback* */ - public VR_IVRSystem_FnTable.GetEventTypeNameFromEnum_callback GetEventTypeNameFromEnum; - /** C type : GetHiddenAreaMesh_callback* */ - public VR_IVRSystem_FnTable.GetHiddenAreaMesh_callback GetHiddenAreaMesh; - /** C type : GetControllerState_callback* */ - public VR_IVRSystem_FnTable.GetControllerState_callback GetControllerState; - /** C type : GetControllerStateWithPose_callback* */ - public VR_IVRSystem_FnTable.GetControllerStateWithPose_callback GetControllerStateWithPose; - /** C type : TriggerHapticPulse_callback* */ - public VR_IVRSystem_FnTable.TriggerHapticPulse_callback TriggerHapticPulse; - /** C type : GetButtonIdNameFromEnum_callback* */ - public VR_IVRSystem_FnTable.GetButtonIdNameFromEnum_callback GetButtonIdNameFromEnum; - /** C type : GetControllerAxisTypeNameFromEnum_callback* */ - public VR_IVRSystem_FnTable.GetControllerAxisTypeNameFromEnum_callback GetControllerAxisTypeNameFromEnum; - /** C type : IsInputAvailable_callback* */ - public VR_IVRSystem_FnTable.IsInputAvailable_callback IsInputAvailable; - /** C type : IsSteamVRDrawingControllers_callback* */ - public VR_IVRSystem_FnTable.IsSteamVRDrawingControllers_callback IsSteamVRDrawingControllers; - /** C type : ShouldApplicationPause_callback* */ - public VR_IVRSystem_FnTable.ShouldApplicationPause_callback ShouldApplicationPause; - /** C type : ShouldApplicationReduceRenderingWork_callback* */ - public VR_IVRSystem_FnTable.ShouldApplicationReduceRenderingWork_callback ShouldApplicationReduceRenderingWork; - /** C type : DriverDebugRequest_callback* */ - public VR_IVRSystem_FnTable.DriverDebugRequest_callback DriverDebugRequest; - /** C type : PerformFirmwareUpdate_callback* */ - public VR_IVRSystem_FnTable.PerformFirmwareUpdate_callback PerformFirmwareUpdate; - /** C type : AcknowledgeQuit_Exiting_callback* */ - public VR_IVRSystem_FnTable.AcknowledgeQuit_Exiting_callback AcknowledgeQuit_Exiting; - /** C type : AcknowledgeQuit_UserPrompt_callback* */ - public VR_IVRSystem_FnTable.AcknowledgeQuit_UserPrompt_callback AcknowledgeQuit_UserPrompt; - /** native declaration : headers\openvr_capi.h:1752 */ - public interface GetRecommendedRenderTargetSize_callback extends Callback { - void apply(IntByReference pnWidth, IntByReference pnHeight); - }; - /** native declaration : headers\openvr_capi.h:1753 */ - public interface GetProjectionMatrix_callback extends Callback { - com.jme3.system.jopenvr.HmdMatrix44_t.ByValue apply(int eEye, float fNearZ, float fFarZ); - }; - /** native declaration : headers\openvr_capi.h:1754 */ - public interface GetProjectionRaw_callback extends Callback { - void apply(int eEye, FloatByReference pfLeft, FloatByReference pfRight, FloatByReference pfTop, FloatByReference pfBottom); - }; - /** native declaration : headers\openvr_capi.h:1755 */ - public interface ComputeDistortion_callback extends Callback { - byte apply(int eEye, float fU, float fV, DistortionCoordinates_t pDistortionCoordinates); - }; - /** native declaration : headers\openvr_capi.h:1756 */ - public interface GetEyeToHeadTransform_callback extends Callback { - HmdMatrix34_t.ByValue apply(int eEye); - }; - /** native declaration : headers\openvr_capi.h:1757 */ - public interface GetTimeSinceLastVsync_callback extends Callback { - byte apply(FloatByReference pfSecondsSinceLastVsync, LongByReference pulFrameCounter); - }; - /** native declaration : headers\openvr_capi.h:1758 */ - public interface GetD3D9AdapterIndex_callback extends Callback { - int apply(); - }; - /** native declaration : headers\openvr_capi.h:1759 */ - public interface GetDXGIOutputInfo_callback extends Callback { - void apply(IntByReference pnAdapterIndex); - }; - /** native declaration : headers\openvr_capi.h:1760 */ - public interface GetOutputDevice_callback extends Callback { - void apply(LongByReference pnDevice, int textureType, VkInstance_T pInstance); - }; - /** native declaration : headers\openvr_capi.h:1761 */ - public interface IsDisplayOnDesktop_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:1762 */ - public interface SetDisplayVisibility_callback extends Callback { - byte apply(byte bIsVisibleOnDesktop); - }; - /** native declaration : headers\openvr_capi.h:1763 */ - public interface GetDeviceToAbsoluteTrackingPose_callback extends Callback { - void apply(int eOrigin, float fPredictedSecondsToPhotonsFromNow, TrackedDevicePose_t pTrackedDevicePoseArray, int unTrackedDevicePoseArrayCount); - }; - /** native declaration : headers\openvr_capi.h:1764 */ - public interface ResetSeatedZeroPose_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:1765 */ - public interface GetSeatedZeroPoseToStandingAbsoluteTrackingPose_callback extends Callback { - HmdMatrix34_t.ByValue apply(); - }; - /** native declaration : headers\openvr_capi.h:1766 */ - public interface GetRawZeroPoseToStandingAbsoluteTrackingPose_callback extends Callback { - HmdMatrix34_t.ByValue apply(); - }; - /** native declaration : headers\openvr_capi.h:1767 */ - public interface GetSortedTrackedDeviceIndicesOfClass_callback extends Callback { - int apply(int eTrackedDeviceClass, IntByReference punTrackedDeviceIndexArray, int unTrackedDeviceIndexArrayCount, int unRelativeToTrackedDeviceIndex); - }; - /** native declaration : headers\openvr_capi.h:1768 */ - public interface GetTrackedDeviceActivityLevel_callback extends Callback { - int apply(int unDeviceId); - }; - /** native declaration : headers\openvr_capi.h:1769 */ - public interface ApplyTransform_callback extends Callback { - void apply(TrackedDevicePose_t pOutputPose, TrackedDevicePose_t pTrackedDevicePose, HmdMatrix34_t pTransform); - }; - /** native declaration : headers\openvr_capi.h:1770 */ - public interface GetTrackedDeviceIndexForControllerRole_callback extends Callback { - int apply(int unDeviceType); - }; - /** native declaration : headers\openvr_capi.h:1771 */ - public interface GetControllerRoleForTrackedDeviceIndex_callback extends Callback { - int apply(int unDeviceIndex); - }; - /** native declaration : headers\openvr_capi.h:1772 */ - public interface GetTrackedDeviceClass_callback extends Callback { - int apply(int unDeviceIndex); - }; - /** native declaration : headers\openvr_capi.h:1773 */ - public interface IsTrackedDeviceConnected_callback extends Callback { - byte apply(int unDeviceIndex); - }; - /** native declaration : headers\openvr_capi.h:1774 */ - public interface GetBoolTrackedDeviceProperty_callback extends Callback { - byte apply(int unDeviceIndex, int prop, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:1775 */ - public interface GetFloatTrackedDeviceProperty_callback extends Callback { - float apply(int unDeviceIndex, int prop, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:1776 */ - public interface GetInt32TrackedDeviceProperty_callback extends Callback { - int apply(int unDeviceIndex, int prop, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:1777 */ - public interface GetUint64TrackedDeviceProperty_callback extends Callback { - long apply(int unDeviceIndex, int prop, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:1778 */ - public interface GetMatrix34TrackedDeviceProperty_callback extends Callback { - HmdMatrix34_t.ByValue apply(int unDeviceIndex, int prop, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:1779 */ - public interface GetArrayTrackedDeviceProperty_callback extends Callback { - int apply(int unDeviceIndex, int prop, int propType, Pointer pBuffer, int unBufferSize, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:1780 */ - public interface GetStringTrackedDeviceProperty_callback extends Callback { - int apply(int unDeviceIndex, int prop, Pointer pchValue, int unBufferSize, IntByReference pError); - }; - /** native declaration : headers\openvr_capi.h:1781 */ - public interface GetPropErrorNameFromEnum_callback extends Callback { - Pointer apply(int error); - }; - /** native declaration : headers\openvr_capi.h:1782 */ - public interface PollNextEvent_callback extends Callback { - byte apply(VREvent_t pEvent, int uncbVREvent); - }; - /** native declaration : headers\openvr_capi.h:1783 */ - public interface PollNextEventWithPose_callback extends Callback { - byte apply(int eOrigin, VREvent_t pEvent, int uncbVREvent, TrackedDevicePose_t pTrackedDevicePose); - }; - /** native declaration : headers\openvr_capi.h:1784 */ - public interface GetEventTypeNameFromEnum_callback extends Callback { - Pointer apply(int eType); - }; - /** native declaration : headers\openvr_capi.h:1785 */ - public interface GetHiddenAreaMesh_callback extends Callback { - com.jme3.system.jopenvr.HiddenAreaMesh_t.ByValue apply(int eEye, int type); - }; - /** native declaration : headers\openvr_capi.h:1786 */ - public interface GetControllerState_callback extends Callback { - byte apply(int unControllerDeviceIndex, VRControllerState_t pControllerState, int unControllerStateSize); - }; - /** native declaration : headers\openvr_capi.h:1787 */ - public interface GetControllerStateWithPose_callback extends Callback { - byte apply(int eOrigin, int unControllerDeviceIndex, VRControllerState_t pControllerState, int unControllerStateSize, TrackedDevicePose_t pTrackedDevicePose); - }; - /** native declaration : headers\openvr_capi.h:1788 */ - public interface TriggerHapticPulse_callback extends Callback { - void apply(int unControllerDeviceIndex, int unAxisId, short usDurationMicroSec); - }; - /** native declaration : headers\openvr_capi.h:1789 */ - public interface GetButtonIdNameFromEnum_callback extends Callback { - Pointer apply(int eButtonId); - }; - /** native declaration : headers\openvr_capi.h:1790 */ - public interface GetControllerAxisTypeNameFromEnum_callback extends Callback { - Pointer apply(int eAxisType); - }; - /** native declaration : headers\openvr_capi.h:1791 */ - public interface IsInputAvailable_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:1792 */ - public interface IsSteamVRDrawingControllers_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:1793 */ - public interface ShouldApplicationPause_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:1794 */ - public interface ShouldApplicationReduceRenderingWork_callback extends Callback { - byte apply(); - }; - /** native declaration : headers\openvr_capi.h:1795 */ - public interface DriverDebugRequest_callback extends Callback { - int apply(int unDeviceIndex, Pointer pchRequest, Pointer pchResponseBuffer, int unResponseBufferSize); - }; - /** native declaration : headers\openvr_capi.h:1796 */ - public interface PerformFirmwareUpdate_callback extends Callback { - int apply(int unDeviceIndex); - }; - /** native declaration : headers\openvr_capi.h:1797 */ - public interface AcknowledgeQuit_Exiting_callback extends Callback { - void apply(); - }; - /** native declaration : headers\openvr_capi.h:1798 */ - public interface AcknowledgeQuit_UserPrompt_callback extends Callback { - void apply(); - }; - public VR_IVRSystem_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("GetRecommendedRenderTargetSize", "GetProjectionMatrix", "GetProjectionRaw", "ComputeDistortion", "GetEyeToHeadTransform", "GetTimeSinceLastVsync", "GetD3D9AdapterIndex", "GetDXGIOutputInfo", "GetOutputDevice", "IsDisplayOnDesktop", "SetDisplayVisibility", "GetDeviceToAbsoluteTrackingPose", "ResetSeatedZeroPose", "GetSeatedZeroPoseToStandingAbsoluteTrackingPose", "GetRawZeroPoseToStandingAbsoluteTrackingPose", "GetSortedTrackedDeviceIndicesOfClass", "GetTrackedDeviceActivityLevel", "ApplyTransform", "GetTrackedDeviceIndexForControllerRole", "GetControllerRoleForTrackedDeviceIndex", "GetTrackedDeviceClass", "IsTrackedDeviceConnected", "GetBoolTrackedDeviceProperty", "GetFloatTrackedDeviceProperty", "GetInt32TrackedDeviceProperty", "GetUint64TrackedDeviceProperty", "GetMatrix34TrackedDeviceProperty", "GetArrayTrackedDeviceProperty", "GetStringTrackedDeviceProperty", "GetPropErrorNameFromEnum", "PollNextEvent", "PollNextEventWithPose", "GetEventTypeNameFromEnum", "GetHiddenAreaMesh", "GetControllerState", "GetControllerStateWithPose", "TriggerHapticPulse", "GetButtonIdNameFromEnum", "GetControllerAxisTypeNameFromEnum", "IsInputAvailable", "IsSteamVRDrawingControllers", "ShouldApplicationPause", "ShouldApplicationReduceRenderingWork", "DriverDebugRequest", "PerformFirmwareUpdate", "AcknowledgeQuit_Exiting", "AcknowledgeQuit_UserPrompt"); - } - public VR_IVRSystem_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRSystem_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRSystem_FnTable implements Structure.ByValue { - - }; + * OpenVR Function Pointer Tables
+ * native declaration : headers\openvr_capi.h:1799
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRSystem_FnTable extends Structure { + /** C type : GetRecommendedRenderTargetSize_callback* */ + public VR_IVRSystem_FnTable.GetRecommendedRenderTargetSize_callback GetRecommendedRenderTargetSize; + /** C type : GetProjectionMatrix_callback* */ + public VR_IVRSystem_FnTable.GetProjectionMatrix_callback GetProjectionMatrix; + /** C type : GetProjectionRaw_callback* */ + public VR_IVRSystem_FnTable.GetProjectionRaw_callback GetProjectionRaw; + /** C type : ComputeDistortion_callback* */ + public VR_IVRSystem_FnTable.ComputeDistortion_callback ComputeDistortion; + /** C type : GetEyeToHeadTransform_callback* */ + public VR_IVRSystem_FnTable.GetEyeToHeadTransform_callback GetEyeToHeadTransform; + /** C type : GetTimeSinceLastVsync_callback* */ + public VR_IVRSystem_FnTable.GetTimeSinceLastVsync_callback GetTimeSinceLastVsync; + /** C type : GetD3D9AdapterIndex_callback* */ + public VR_IVRSystem_FnTable.GetD3D9AdapterIndex_callback GetD3D9AdapterIndex; + /** C type : GetDXGIOutputInfo_callback* */ + public com.jme3.system.jopenvr.VR_IVRExtendedDisplay_FnTable.GetDXGIOutputInfo_callback GetDXGIOutputInfo; + /** C type : GetOutputDevice_callback* */ + public VR_IVRSystem_FnTable.GetOutputDevice_callback GetOutputDevice; + /** C type : IsDisplayOnDesktop_callback* */ + public VR_IVRSystem_FnTable.IsDisplayOnDesktop_callback IsDisplayOnDesktop; + /** C type : SetDisplayVisibility_callback* */ + public VR_IVRSystem_FnTable.SetDisplayVisibility_callback SetDisplayVisibility; + /** C type : GetDeviceToAbsoluteTrackingPose_callback* */ + public VR_IVRSystem_FnTable.GetDeviceToAbsoluteTrackingPose_callback GetDeviceToAbsoluteTrackingPose; + /** C type : ResetSeatedZeroPose_callback* */ + public VR_IVRSystem_FnTable.ResetSeatedZeroPose_callback ResetSeatedZeroPose; + /** C type : GetSeatedZeroPoseToStandingAbsoluteTrackingPose_callback* */ + public VR_IVRSystem_FnTable.GetSeatedZeroPoseToStandingAbsoluteTrackingPose_callback GetSeatedZeroPoseToStandingAbsoluteTrackingPose; + /** C type : GetRawZeroPoseToStandingAbsoluteTrackingPose_callback* */ + public VR_IVRSystem_FnTable.GetRawZeroPoseToStandingAbsoluteTrackingPose_callback GetRawZeroPoseToStandingAbsoluteTrackingPose; + /** C type : GetSortedTrackedDeviceIndicesOfClass_callback* */ + public VR_IVRSystem_FnTable.GetSortedTrackedDeviceIndicesOfClass_callback GetSortedTrackedDeviceIndicesOfClass; + /** C type : GetTrackedDeviceActivityLevel_callback* */ + public VR_IVRSystem_FnTable.GetTrackedDeviceActivityLevel_callback GetTrackedDeviceActivityLevel; + /** C type : ApplyTransform_callback* */ + public VR_IVRSystem_FnTable.ApplyTransform_callback ApplyTransform; + /** C type : GetTrackedDeviceIndexForControllerRole_callback* */ + public VR_IVRSystem_FnTable.GetTrackedDeviceIndexForControllerRole_callback GetTrackedDeviceIndexForControllerRole; + /** C type : GetControllerRoleForTrackedDeviceIndex_callback* */ + public VR_IVRSystem_FnTable.GetControllerRoleForTrackedDeviceIndex_callback GetControllerRoleForTrackedDeviceIndex; + /** C type : GetTrackedDeviceClass_callback* */ + public VR_IVRSystem_FnTable.GetTrackedDeviceClass_callback GetTrackedDeviceClass; + /** C type : IsTrackedDeviceConnected_callback* */ + public VR_IVRSystem_FnTable.IsTrackedDeviceConnected_callback IsTrackedDeviceConnected; + /** C type : GetBoolTrackedDeviceProperty_callback* */ + public VR_IVRSystem_FnTable.GetBoolTrackedDeviceProperty_callback GetBoolTrackedDeviceProperty; + /** C type : GetFloatTrackedDeviceProperty_callback* */ + public VR_IVRSystem_FnTable.GetFloatTrackedDeviceProperty_callback GetFloatTrackedDeviceProperty; + /** C type : GetInt32TrackedDeviceProperty_callback* */ + public VR_IVRSystem_FnTable.GetInt32TrackedDeviceProperty_callback GetInt32TrackedDeviceProperty; + /** C type : GetUint64TrackedDeviceProperty_callback* */ + public VR_IVRSystem_FnTable.GetUint64TrackedDeviceProperty_callback GetUint64TrackedDeviceProperty; + /** C type : GetMatrix34TrackedDeviceProperty_callback* */ + public VR_IVRSystem_FnTable.GetMatrix34TrackedDeviceProperty_callback GetMatrix34TrackedDeviceProperty; + /** C type : GetArrayTrackedDeviceProperty_callback* */ + public VR_IVRSystem_FnTable.GetArrayTrackedDeviceProperty_callback GetArrayTrackedDeviceProperty; + /** C type : GetStringTrackedDeviceProperty_callback* */ + public VR_IVRSystem_FnTable.GetStringTrackedDeviceProperty_callback GetStringTrackedDeviceProperty; + /** C type : GetPropErrorNameFromEnum_callback* */ + public VR_IVRSystem_FnTable.GetPropErrorNameFromEnum_callback GetPropErrorNameFromEnum; + /** C type : PollNextEvent_callback* */ + public VR_IVRSystem_FnTable.PollNextEvent_callback PollNextEvent; + /** C type : PollNextEventWithPose_callback* */ + public VR_IVRSystem_FnTable.PollNextEventWithPose_callback PollNextEventWithPose; + /** C type : GetEventTypeNameFromEnum_callback* */ + public VR_IVRSystem_FnTable.GetEventTypeNameFromEnum_callback GetEventTypeNameFromEnum; + /** C type : GetHiddenAreaMesh_callback* */ + public VR_IVRSystem_FnTable.GetHiddenAreaMesh_callback GetHiddenAreaMesh; + /** C type : GetControllerState_callback* */ + public VR_IVRSystem_FnTable.GetControllerState_callback GetControllerState; + /** C type : GetControllerStateWithPose_callback* */ + public VR_IVRSystem_FnTable.GetControllerStateWithPose_callback GetControllerStateWithPose; + /** C type : TriggerHapticPulse_callback* */ + public VR_IVRSystem_FnTable.TriggerHapticPulse_callback TriggerHapticPulse; + /** C type : GetButtonIdNameFromEnum_callback* */ + public VR_IVRSystem_FnTable.GetButtonIdNameFromEnum_callback GetButtonIdNameFromEnum; + /** C type : GetControllerAxisTypeNameFromEnum_callback* */ + public VR_IVRSystem_FnTable.GetControllerAxisTypeNameFromEnum_callback GetControllerAxisTypeNameFromEnum; + /** C type : IsInputAvailable_callback* */ + public VR_IVRSystem_FnTable.IsInputAvailable_callback IsInputAvailable; + /** C type : IsSteamVRDrawingControllers_callback* */ + public VR_IVRSystem_FnTable.IsSteamVRDrawingControllers_callback IsSteamVRDrawingControllers; + /** C type : ShouldApplicationPause_callback* */ + public VR_IVRSystem_FnTable.ShouldApplicationPause_callback ShouldApplicationPause; + /** C type : ShouldApplicationReduceRenderingWork_callback* */ + public VR_IVRSystem_FnTable.ShouldApplicationReduceRenderingWork_callback ShouldApplicationReduceRenderingWork; + /** C type : DriverDebugRequest_callback* */ + public VR_IVRSystem_FnTable.DriverDebugRequest_callback DriverDebugRequest; + /** C type : PerformFirmwareUpdate_callback* */ + public VR_IVRSystem_FnTable.PerformFirmwareUpdate_callback PerformFirmwareUpdate; + /** C type : AcknowledgeQuit_Exiting_callback* */ + public VR_IVRSystem_FnTable.AcknowledgeQuit_Exiting_callback AcknowledgeQuit_Exiting; + /** C type : AcknowledgeQuit_UserPrompt_callback* */ + public VR_IVRSystem_FnTable.AcknowledgeQuit_UserPrompt_callback AcknowledgeQuit_UserPrompt; + /** native declaration : headers\openvr_capi.h:1752 */ + public interface GetRecommendedRenderTargetSize_callback extends Callback { + void apply(IntByReference pnWidth, IntByReference pnHeight); + }; + /** native declaration : headers\openvr_capi.h:1753 */ + public interface GetProjectionMatrix_callback extends Callback { + com.jme3.system.jopenvr.HmdMatrix44_t.ByValue apply(int eEye, float fNearZ, float fFarZ); + }; + /** native declaration : headers\openvr_capi.h:1754 */ + public interface GetProjectionRaw_callback extends Callback { + void apply(int eEye, FloatByReference pfLeft, FloatByReference pfRight, FloatByReference pfTop, FloatByReference pfBottom); + }; + /** native declaration : headers\openvr_capi.h:1755 */ + public interface ComputeDistortion_callback extends Callback { + byte apply(int eEye, float fU, float fV, DistortionCoordinates_t pDistortionCoordinates); + }; + /** native declaration : headers\openvr_capi.h:1756 */ + public interface GetEyeToHeadTransform_callback extends Callback { + HmdMatrix34_t.ByValue apply(int eEye); + }; + /** native declaration : headers\openvr_capi.h:1757 */ + public interface GetTimeSinceLastVsync_callback extends Callback { + byte apply(FloatByReference pfSecondsSinceLastVsync, LongByReference pulFrameCounter); + }; + /** native declaration : headers\openvr_capi.h:1758 */ + public interface GetD3D9AdapterIndex_callback extends Callback { + int apply(); + }; + /** native declaration : headers\openvr_capi.h:1759 */ + public interface GetDXGIOutputInfo_callback extends Callback { + void apply(IntByReference pnAdapterIndex); + }; + /** native declaration : headers\openvr_capi.h:1760 */ + public interface GetOutputDevice_callback extends Callback { + void apply(LongByReference pnDevice, int textureType, VkInstance_T pInstance); + }; + /** native declaration : headers\openvr_capi.h:1761 */ + public interface IsDisplayOnDesktop_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:1762 */ + public interface SetDisplayVisibility_callback extends Callback { + byte apply(byte bIsVisibleOnDesktop); + }; + /** native declaration : headers\openvr_capi.h:1763 */ + public interface GetDeviceToAbsoluteTrackingPose_callback extends Callback { + void apply(int eOrigin, float fPredictedSecondsToPhotonsFromNow, TrackedDevicePose_t pTrackedDevicePoseArray, int unTrackedDevicePoseArrayCount); + }; + /** native declaration : headers\openvr_capi.h:1764 */ + public interface ResetSeatedZeroPose_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:1765 */ + public interface GetSeatedZeroPoseToStandingAbsoluteTrackingPose_callback extends Callback { + HmdMatrix34_t.ByValue apply(); + }; + /** native declaration : headers\openvr_capi.h:1766 */ + public interface GetRawZeroPoseToStandingAbsoluteTrackingPose_callback extends Callback { + HmdMatrix34_t.ByValue apply(); + }; + /** native declaration : headers\openvr_capi.h:1767 */ + public interface GetSortedTrackedDeviceIndicesOfClass_callback extends Callback { + int apply(int eTrackedDeviceClass, IntByReference punTrackedDeviceIndexArray, int unTrackedDeviceIndexArrayCount, int unRelativeToTrackedDeviceIndex); + }; + /** native declaration : headers\openvr_capi.h:1768 */ + public interface GetTrackedDeviceActivityLevel_callback extends Callback { + int apply(int unDeviceId); + }; + /** native declaration : headers\openvr_capi.h:1769 */ + public interface ApplyTransform_callback extends Callback { + void apply(TrackedDevicePose_t pOutputPose, TrackedDevicePose_t pTrackedDevicePose, HmdMatrix34_t pTransform); + }; + /** native declaration : headers\openvr_capi.h:1770 */ + public interface GetTrackedDeviceIndexForControllerRole_callback extends Callback { + int apply(int unDeviceType); + }; + /** native declaration : headers\openvr_capi.h:1771 */ + public interface GetControllerRoleForTrackedDeviceIndex_callback extends Callback { + int apply(int unDeviceIndex); + }; + /** native declaration : headers\openvr_capi.h:1772 */ + public interface GetTrackedDeviceClass_callback extends Callback { + int apply(int unDeviceIndex); + }; + /** native declaration : headers\openvr_capi.h:1773 */ + public interface IsTrackedDeviceConnected_callback extends Callback { + byte apply(int unDeviceIndex); + }; + /** native declaration : headers\openvr_capi.h:1774 */ + public interface GetBoolTrackedDeviceProperty_callback extends Callback { + byte apply(int unDeviceIndex, int prop, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:1775 */ + public interface GetFloatTrackedDeviceProperty_callback extends Callback { + float apply(int unDeviceIndex, int prop, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:1776 */ + public interface GetInt32TrackedDeviceProperty_callback extends Callback { + int apply(int unDeviceIndex, int prop, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:1777 */ + public interface GetUint64TrackedDeviceProperty_callback extends Callback { + long apply(int unDeviceIndex, int prop, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:1778 */ + public interface GetMatrix34TrackedDeviceProperty_callback extends Callback { + HmdMatrix34_t.ByValue apply(int unDeviceIndex, int prop, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:1779 */ + public interface GetArrayTrackedDeviceProperty_callback extends Callback { + int apply(int unDeviceIndex, int prop, int propType, Pointer pBuffer, int unBufferSize, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:1780 */ + public interface GetStringTrackedDeviceProperty_callback extends Callback { + int apply(int unDeviceIndex, int prop, Pointer pchValue, int unBufferSize, IntByReference pError); + }; + /** native declaration : headers\openvr_capi.h:1781 */ + public interface GetPropErrorNameFromEnum_callback extends Callback { + Pointer apply(int error); + }; + /** native declaration : headers\openvr_capi.h:1782 */ + public interface PollNextEvent_callback extends Callback { + byte apply(VREvent_t pEvent, int uncbVREvent); + }; + /** native declaration : headers\openvr_capi.h:1783 */ + public interface PollNextEventWithPose_callback extends Callback { + byte apply(int eOrigin, VREvent_t pEvent, int uncbVREvent, TrackedDevicePose_t pTrackedDevicePose); + }; + /** native declaration : headers\openvr_capi.h:1784 */ + public interface GetEventTypeNameFromEnum_callback extends Callback { + Pointer apply(int eType); + }; + /** native declaration : headers\openvr_capi.h:1785 */ + public interface GetHiddenAreaMesh_callback extends Callback { + com.jme3.system.jopenvr.HiddenAreaMesh_t.ByValue apply(int eEye, int type); + }; + /** native declaration : headers\openvr_capi.h:1786 */ + public interface GetControllerState_callback extends Callback { + byte apply(int unControllerDeviceIndex, VRControllerState_t pControllerState, int unControllerStateSize); + }; + /** native declaration : headers\openvr_capi.h:1787 */ + public interface GetControllerStateWithPose_callback extends Callback { + byte apply(int eOrigin, int unControllerDeviceIndex, VRControllerState_t pControllerState, int unControllerStateSize, TrackedDevicePose_t pTrackedDevicePose); + }; + /** native declaration : headers\openvr_capi.h:1788 */ + public interface TriggerHapticPulse_callback extends Callback { + void apply(int unControllerDeviceIndex, int unAxisId, short usDurationMicroSec); + }; + /** native declaration : headers\openvr_capi.h:1789 */ + public interface GetButtonIdNameFromEnum_callback extends Callback { + Pointer apply(int eButtonId); + }; + /** native declaration : headers\openvr_capi.h:1790 */ + public interface GetControllerAxisTypeNameFromEnum_callback extends Callback { + Pointer apply(int eAxisType); + }; + /** native declaration : headers\openvr_capi.h:1791 */ + public interface IsInputAvailable_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:1792 */ + public interface IsSteamVRDrawingControllers_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:1793 */ + public interface ShouldApplicationPause_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:1794 */ + public interface ShouldApplicationReduceRenderingWork_callback extends Callback { + byte apply(); + }; + /** native declaration : headers\openvr_capi.h:1795 */ + public interface DriverDebugRequest_callback extends Callback { + int apply(int unDeviceIndex, Pointer pchRequest, Pointer pchResponseBuffer, int unResponseBufferSize); + }; + /** native declaration : headers\openvr_capi.h:1796 */ + public interface PerformFirmwareUpdate_callback extends Callback { + int apply(int unDeviceIndex); + }; + /** native declaration : headers\openvr_capi.h:1797 */ + public interface AcknowledgeQuit_Exiting_callback extends Callback { + void apply(); + }; + /** native declaration : headers\openvr_capi.h:1798 */ + public interface AcknowledgeQuit_UserPrompt_callback extends Callback { + void apply(); + }; + public VR_IVRSystem_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("GetRecommendedRenderTargetSize", "GetProjectionMatrix", "GetProjectionRaw", "ComputeDistortion", "GetEyeToHeadTransform", "GetTimeSinceLastVsync", "GetD3D9AdapterIndex", "GetDXGIOutputInfo", "GetOutputDevice", "IsDisplayOnDesktop", "SetDisplayVisibility", "GetDeviceToAbsoluteTrackingPose", "ResetSeatedZeroPose", "GetSeatedZeroPoseToStandingAbsoluteTrackingPose", "GetRawZeroPoseToStandingAbsoluteTrackingPose", "GetSortedTrackedDeviceIndicesOfClass", "GetTrackedDeviceActivityLevel", "ApplyTransform", "GetTrackedDeviceIndexForControllerRole", "GetControllerRoleForTrackedDeviceIndex", "GetTrackedDeviceClass", "IsTrackedDeviceConnected", "GetBoolTrackedDeviceProperty", "GetFloatTrackedDeviceProperty", "GetInt32TrackedDeviceProperty", "GetUint64TrackedDeviceProperty", "GetMatrix34TrackedDeviceProperty", "GetArrayTrackedDeviceProperty", "GetStringTrackedDeviceProperty", "GetPropErrorNameFromEnum", "PollNextEvent", "PollNextEventWithPose", "GetEventTypeNameFromEnum", "GetHiddenAreaMesh", "GetControllerState", "GetControllerStateWithPose", "TriggerHapticPulse", "GetButtonIdNameFromEnum", "GetControllerAxisTypeNameFromEnum", "IsInputAvailable", "IsSteamVRDrawingControllers", "ShouldApplicationPause", "ShouldApplicationReduceRenderingWork", "DriverDebugRequest", "PerformFirmwareUpdate", "AcknowledgeQuit_Exiting", "AcknowledgeQuit_UserPrompt"); + } + public VR_IVRSystem_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRSystem_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRSystem_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRTrackedCamera_FnTable.java b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRTrackedCamera_FnTable.java index 1fc5d469a..42ba86816 100644 --- a/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRTrackedCamera_FnTable.java +++ b/jme3-vr/src/main/java/com/jme3/system/jopenvr/VR_IVRTrackedCamera_FnTable.java @@ -8,97 +8,98 @@ import com.sun.jna.ptr.PointerByReference; import java.util.Arrays; import java.util.List; /** - * native declaration : headers\openvr_capi.h:1833
- * This file was autogenerated by JNAerator,
- * a tool written by Olivier Chafik that uses a few opensource projects..
- * For help, please visit NativeLibs4Java , Rococoa, or JNA. - */ -public class VR_IVRTrackedCamera_FnTable extends Structure { - /** C type : GetCameraErrorNameFromEnum_callback* */ - public VR_IVRTrackedCamera_FnTable.GetCameraErrorNameFromEnum_callback GetCameraErrorNameFromEnum; - /** C type : HasCamera_callback* */ - public VR_IVRTrackedCamera_FnTable.HasCamera_callback HasCamera; - /** C type : GetCameraFrameSize_callback* */ - public VR_IVRTrackedCamera_FnTable.GetCameraFrameSize_callback GetCameraFrameSize; - /** C type : GetCameraIntrinsics_callback* */ - public VR_IVRTrackedCamera_FnTable.GetCameraIntrinsics_callback GetCameraIntrinsics; - /** C type : GetCameraProjection_callback* */ - public VR_IVRTrackedCamera_FnTable.GetCameraProjection_callback GetCameraProjection; - /** C type : AcquireVideoStreamingService_callback* */ - public VR_IVRTrackedCamera_FnTable.AcquireVideoStreamingService_callback AcquireVideoStreamingService; - /** C type : ReleaseVideoStreamingService_callback* */ - public VR_IVRTrackedCamera_FnTable.ReleaseVideoStreamingService_callback ReleaseVideoStreamingService; - /** C type : GetVideoStreamFrameBuffer_callback* */ - public VR_IVRTrackedCamera_FnTable.GetVideoStreamFrameBuffer_callback GetVideoStreamFrameBuffer; - /** C type : GetVideoStreamTextureSize_callback* */ - public VR_IVRTrackedCamera_FnTable.GetVideoStreamTextureSize_callback GetVideoStreamTextureSize; - /** C type : GetVideoStreamTextureD3D11_callback* */ - public VR_IVRTrackedCamera_FnTable.GetVideoStreamTextureD3D11_callback GetVideoStreamTextureD3D11; - /** C type : GetVideoStreamTextureGL_callback* */ - public VR_IVRTrackedCamera_FnTable.GetVideoStreamTextureGL_callback GetVideoStreamTextureGL; - /** C type : ReleaseVideoStreamTextureGL_callback* */ - public VR_IVRTrackedCamera_FnTable.ReleaseVideoStreamTextureGL_callback ReleaseVideoStreamTextureGL; - /** native declaration : headers\openvr_capi.h:1821 */ - public interface GetCameraErrorNameFromEnum_callback extends Callback { - Pointer apply(int eCameraError); - }; - /** native declaration : headers\openvr_capi.h:1822 */ - public interface HasCamera_callback extends Callback { - int apply(int nDeviceIndex, Pointer pHasCamera); - }; - /** native declaration : headers\openvr_capi.h:1823 */ - public interface GetCameraFrameSize_callback extends Callback { - int apply(int nDeviceIndex, int eFrameType, IntByReference pnWidth, IntByReference pnHeight, IntByReference pnFrameBufferSize); - }; - /** native declaration : headers\openvr_capi.h:1824 */ - public interface GetCameraIntrinsics_callback extends Callback { - int apply(int nDeviceIndex, int eFrameType, HmdVector2_t pFocalLength, HmdVector2_t pCenter); - }; - /** native declaration : headers\openvr_capi.h:1825 */ - public interface GetCameraProjection_callback extends Callback { - int apply(int nDeviceIndex, int eFrameType, float flZNear, float flZFar, HmdMatrix44_t pProjection); - }; - /** native declaration : headers\openvr_capi.h:1826 */ - public interface AcquireVideoStreamingService_callback extends Callback { - int apply(int nDeviceIndex, LongByReference pHandle); - }; - /** native declaration : headers\openvr_capi.h:1827 */ - public interface ReleaseVideoStreamingService_callback extends Callback { - int apply(long hTrackedCamera); - }; - /** native declaration : headers\openvr_capi.h:1828 */ - public interface GetVideoStreamFrameBuffer_callback extends Callback { - int apply(long hTrackedCamera, int eFrameType, Pointer pFrameBuffer, int nFrameBufferSize, CameraVideoStreamFrameHeader_t pFrameHeader, int nFrameHeaderSize); - }; - /** native declaration : headers\openvr_capi.h:1829 */ - public interface GetVideoStreamTextureSize_callback extends Callback { - int apply(int nDeviceIndex, int eFrameType, VRTextureBounds_t pTextureBounds, IntByReference pnWidth, IntByReference pnHeight); - }; - /** native declaration : headers\openvr_capi.h:1830 */ - public interface GetVideoStreamTextureD3D11_callback extends Callback { - int apply(long hTrackedCamera, int eFrameType, Pointer pD3D11DeviceOrResource, PointerByReference ppD3D11ShaderResourceView, CameraVideoStreamFrameHeader_t pFrameHeader, int nFrameHeaderSize); - }; - /** native declaration : headers\openvr_capi.h:1831 */ - public interface GetVideoStreamTextureGL_callback extends Callback { - int apply(long hTrackedCamera, int eFrameType, IntByReference pglTextureId, CameraVideoStreamFrameHeader_t pFrameHeader, int nFrameHeaderSize); - }; - /** native declaration : headers\openvr_capi.h:1832 */ - public interface ReleaseVideoStreamTextureGL_callback extends Callback { - int apply(long hTrackedCamera, int glTextureId); - }; - public VR_IVRTrackedCamera_FnTable() { - super(); - } - protected List getFieldOrder() { - return Arrays.asList("GetCameraErrorNameFromEnum", "HasCamera", "GetCameraFrameSize", "GetCameraIntrinsics", "GetCameraProjection", "AcquireVideoStreamingService", "ReleaseVideoStreamingService", "GetVideoStreamFrameBuffer", "GetVideoStreamTextureSize", "GetVideoStreamTextureD3D11", "GetVideoStreamTextureGL", "ReleaseVideoStreamTextureGL"); - } - public VR_IVRTrackedCamera_FnTable(Pointer peer) { - super(peer); - } - public static class ByReference extends VR_IVRTrackedCamera_FnTable implements Structure.ByReference { - - }; - public static class ByValue extends VR_IVRTrackedCamera_FnTable implements Structure.ByValue { - - }; + * native declaration : headers\openvr_capi.h:1833
+ * This file was autogenerated by JNAerator,
+ * a tool written by Olivier Chafik that uses a few opensource projects..
+ * For help, please visit NativeLibs4Java , Rococoa, or JNA. + */ +public class VR_IVRTrackedCamera_FnTable extends Structure { + /** C type : GetCameraErrorNameFromEnum_callback* */ + public VR_IVRTrackedCamera_FnTable.GetCameraErrorNameFromEnum_callback GetCameraErrorNameFromEnum; + /** C type : HasCamera_callback* */ + public VR_IVRTrackedCamera_FnTable.HasCamera_callback HasCamera; + /** C type : GetCameraFrameSize_callback* */ + public VR_IVRTrackedCamera_FnTable.GetCameraFrameSize_callback GetCameraFrameSize; + /** C type : GetCameraIntrinsics_callback* */ + public VR_IVRTrackedCamera_FnTable.GetCameraIntrinsics_callback GetCameraIntrinsics; + /** C type : GetCameraProjection_callback* */ + public VR_IVRTrackedCamera_FnTable.GetCameraProjection_callback GetCameraProjection; + /** C type : AcquireVideoStreamingService_callback* */ + public VR_IVRTrackedCamera_FnTable.AcquireVideoStreamingService_callback AcquireVideoStreamingService; + /** C type : ReleaseVideoStreamingService_callback* */ + public VR_IVRTrackedCamera_FnTable.ReleaseVideoStreamingService_callback ReleaseVideoStreamingService; + /** C type : GetVideoStreamFrameBuffer_callback* */ + public VR_IVRTrackedCamera_FnTable.GetVideoStreamFrameBuffer_callback GetVideoStreamFrameBuffer; + /** C type : GetVideoStreamTextureSize_callback* */ + public VR_IVRTrackedCamera_FnTable.GetVideoStreamTextureSize_callback GetVideoStreamTextureSize; + /** C type : GetVideoStreamTextureD3D11_callback* */ + public VR_IVRTrackedCamera_FnTable.GetVideoStreamTextureD3D11_callback GetVideoStreamTextureD3D11; + /** C type : GetVideoStreamTextureGL_callback* */ + public VR_IVRTrackedCamera_FnTable.GetVideoStreamTextureGL_callback GetVideoStreamTextureGL; + /** C type : ReleaseVideoStreamTextureGL_callback* */ + public VR_IVRTrackedCamera_FnTable.ReleaseVideoStreamTextureGL_callback ReleaseVideoStreamTextureGL; + /** native declaration : headers\openvr_capi.h:1821 */ + public interface GetCameraErrorNameFromEnum_callback extends Callback { + Pointer apply(int eCameraError); + }; + /** native declaration : headers\openvr_capi.h:1822 */ + public interface HasCamera_callback extends Callback { + int apply(int nDeviceIndex, Pointer pHasCamera); + }; + /** native declaration : headers\openvr_capi.h:1823 */ + public interface GetCameraFrameSize_callback extends Callback { + int apply(int nDeviceIndex, int eFrameType, IntByReference pnWidth, IntByReference pnHeight, IntByReference pnFrameBufferSize); + }; + /** native declaration : headers\openvr_capi.h:1824 */ + public interface GetCameraIntrinsics_callback extends Callback { + int apply(int nDeviceIndex, int eFrameType, HmdVector2_t pFocalLength, HmdVector2_t pCenter); + }; + /** native declaration : headers\openvr_capi.h:1825 */ + public interface GetCameraProjection_callback extends Callback { + int apply(int nDeviceIndex, int eFrameType, float flZNear, float flZFar, HmdMatrix44_t pProjection); + }; + /** native declaration : headers\openvr_capi.h:1826 */ + public interface AcquireVideoStreamingService_callback extends Callback { + int apply(int nDeviceIndex, LongByReference pHandle); + }; + /** native declaration : headers\openvr_capi.h:1827 */ + public interface ReleaseVideoStreamingService_callback extends Callback { + int apply(long hTrackedCamera); + }; + /** native declaration : headers\openvr_capi.h:1828 */ + public interface GetVideoStreamFrameBuffer_callback extends Callback { + int apply(long hTrackedCamera, int eFrameType, Pointer pFrameBuffer, int nFrameBufferSize, CameraVideoStreamFrameHeader_t pFrameHeader, int nFrameHeaderSize); + }; + /** native declaration : headers\openvr_capi.h:1829 */ + public interface GetVideoStreamTextureSize_callback extends Callback { + int apply(int nDeviceIndex, int eFrameType, VRTextureBounds_t pTextureBounds, IntByReference pnWidth, IntByReference pnHeight); + }; + /** native declaration : headers\openvr_capi.h:1830 */ + public interface GetVideoStreamTextureD3D11_callback extends Callback { + int apply(long hTrackedCamera, int eFrameType, Pointer pD3D11DeviceOrResource, PointerByReference ppD3D11ShaderResourceView, CameraVideoStreamFrameHeader_t pFrameHeader, int nFrameHeaderSize); + }; + /** native declaration : headers\openvr_capi.h:1831 */ + public interface GetVideoStreamTextureGL_callback extends Callback { + int apply(long hTrackedCamera, int eFrameType, IntByReference pglTextureId, CameraVideoStreamFrameHeader_t pFrameHeader, int nFrameHeaderSize); + }; + /** native declaration : headers\openvr_capi.h:1832 */ + public interface ReleaseVideoStreamTextureGL_callback extends Callback { + int apply(long hTrackedCamera, int glTextureId); + }; + public VR_IVRTrackedCamera_FnTable() { + super(); + } + @Override + protected List getFieldOrder() { + return Arrays.asList("GetCameraErrorNameFromEnum", "HasCamera", "GetCameraFrameSize", "GetCameraIntrinsics", "GetCameraProjection", "AcquireVideoStreamingService", "ReleaseVideoStreamingService", "GetVideoStreamFrameBuffer", "GetVideoStreamTextureSize", "GetVideoStreamTextureD3D11", "GetVideoStreamTextureGL", "ReleaseVideoStreamTextureGL"); + } + public VR_IVRTrackedCamera_FnTable(Pointer peer) { + super(peer); + } + public static class ByReference extends VR_IVRTrackedCamera_FnTable implements Structure.ByReference { + + }; + public static class ByValue extends VR_IVRTrackedCamera_FnTable implements Structure.ByValue { + + }; } diff --git a/jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglContextVR.java b/jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglContextVR.java index 1c461e6f3..d5a585d46 100644 --- a/jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglContextVR.java +++ b/jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglContextVR.java @@ -1,7 +1,7 @@ package com.jme3.system.lwjgl; /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -79,6 +79,7 @@ public abstract class LwjglContextVR implements JmeContext { protected Timer timer; protected SystemListener listener; + @Override public void setSystemListener(SystemListener listener) { this.listener = listener; } diff --git a/jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglWindowVR.java b/jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglWindowVR.java index 4bcad1876..41c416530 100644 --- a/jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglWindowVR.java +++ b/jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglWindowVR.java @@ -1,7 +1,7 @@ package com.jme3.system.lwjgl; /* - * Copyright (c) 2009-2018 jMonkeyEngine + * Copyright (c) 2009-2020 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -96,6 +96,7 @@ public abstract class LwjglWindowVR extends LwjglContextVR implements Runnable { /** * @return Type.Display or Type.Canvas */ + @Override public JmeContext.Type getType() { return type; } @@ -105,6 +106,7 @@ public abstract class LwjglWindowVR extends LwjglContextVR implements Runnable { * * @param title the title to set */ + @Override public void setTitle(final String title) { if (created.get() && window != NULL) { glfwSetWindowTitle(window, title); @@ -114,6 +116,7 @@ public abstract class LwjglWindowVR extends LwjglContextVR implements Runnable { /** * Restart if it's a windowed or full-screen display. */ + @Override public void restart() { if (created.get()) { needRestart.set(true); @@ -476,6 +479,7 @@ public abstract class LwjglWindowVR extends LwjglContextVR implements Runnable { deinitInThread(); } + @Override public JoyInput getJoyInput() { if (joyInput == null) { joyInput = new GlfwJoystickInput(); @@ -483,6 +487,7 @@ public abstract class LwjglWindowVR extends LwjglContextVR implements Runnable { return joyInput; } + @Override public MouseInput getMouseInput() { if (mouseInput == null) { mouseInput = new GlfwMouseInputVR(this); @@ -490,6 +495,7 @@ public abstract class LwjglWindowVR extends LwjglContextVR implements Runnable { return mouseInput; } + @Override public KeyInput getKeyInput() { if (keyInput == null) { keyInput = new GlfwKeyInputVR(this); @@ -498,14 +504,17 @@ public abstract class LwjglWindowVR extends LwjglContextVR implements Runnable { return keyInput; } + @Override public TouchInput getTouchInput() { return null; } + @Override public void setAutoFlushFrames(boolean enabled) { this.autoFlush = enabled; } + @Override public void destroy(boolean waitFor) { needClose.set(true); if (mainThread == Thread.currentThread()) { diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AccelerationReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AccelerationReport.java index 61592a5b3..c6ba614d1 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AccelerationReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AccelerationReport.java @@ -15,6 +15,7 @@ public class OSVR_AccelerationReport extends Structure { public OSVR_AccelerationReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AccelerationState.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AccelerationState.java index ccf4837ce..379a7972b 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AccelerationState.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AccelerationState.java @@ -20,6 +20,7 @@ public class OSVR_AccelerationState extends Structure { public OSVR_AccelerationState() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("linearAcceleration", "linearAccelerationValid", "angularAcceleration", "angularAccelerationValid"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AnalogReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AnalogReport.java index 0f84cdfea..8b5aca7d1 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AnalogReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AnalogReport.java @@ -15,6 +15,7 @@ public class OSVR_AnalogReport extends Structure { public OSVR_AnalogReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AngularAccelerationReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AngularAccelerationReport.java index 1afbe795b..c7a3821dd 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AngularAccelerationReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AngularAccelerationReport.java @@ -15,6 +15,7 @@ public class OSVR_AngularAccelerationReport extends Structure { public OSVR_AngularAccelerationReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AngularVelocityReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AngularVelocityReport.java index 5926ec745..bb526b7b1 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AngularVelocityReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_AngularVelocityReport.java @@ -15,6 +15,7 @@ public class OSVR_AngularVelocityReport extends Structure { public OSVR_AngularVelocityReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_ButtonReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_ButtonReport.java index ad3ab53be..498843367 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_ButtonReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_ButtonReport.java @@ -15,6 +15,7 @@ public class OSVR_ButtonReport extends Structure { public OSVR_ButtonReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_DirectionReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_DirectionReport.java index 78ca84a39..70af9a36b 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_DirectionReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_DirectionReport.java @@ -16,6 +16,7 @@ public class OSVR_DirectionReport extends Structure { public OSVR_DirectionReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "direction"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker2DReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker2DReport.java index fab1548e2..f72a176f7 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker2DReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker2DReport.java @@ -16,6 +16,7 @@ public class OSVR_EyeTracker2DReport extends Structure { public OSVR_EyeTracker2DReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker3DReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker3DReport.java index a42192be8..93af317c3 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker3DReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker3DReport.java @@ -16,6 +16,7 @@ public class OSVR_EyeTracker3DReport extends Structure { public OSVR_EyeTracker3DReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker3DState.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker3DState.java index 07eb1d880..29da57b20 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker3DState.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTracker3DState.java @@ -20,6 +20,7 @@ public class OSVR_EyeTracker3DState extends Structure { public OSVR_EyeTracker3DState() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("directionValid", "direction", "basePointValid", "basePoint"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTrackerBlinkReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTrackerBlinkReport.java index 4d051bbd2..0ad5f6436 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTrackerBlinkReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_EyeTrackerBlinkReport.java @@ -16,6 +16,7 @@ public class OSVR_EyeTrackerBlinkReport extends Structure { public OSVR_EyeTrackerBlinkReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_IncrementalQuaternion.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_IncrementalQuaternion.java index 66f04ba4e..07cb64c94 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_IncrementalQuaternion.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_IncrementalQuaternion.java @@ -15,6 +15,7 @@ public class OSVR_IncrementalQuaternion extends Structure { public OSVR_IncrementalQuaternion() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("incrementalRotation", "dt"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_LinearAccelerationReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_LinearAccelerationReport.java index e93333f59..4baffbd65 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_LinearAccelerationReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_LinearAccelerationReport.java @@ -15,6 +15,7 @@ public class OSVR_LinearAccelerationReport extends Structure { public OSVR_LinearAccelerationReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_LinearVelocityReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_LinearVelocityReport.java index daca276bc..c40b3e74a 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_LinearVelocityReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_LinearVelocityReport.java @@ -15,6 +15,7 @@ public class OSVR_LinearVelocityReport extends Structure { public OSVR_LinearVelocityReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Location2DReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Location2DReport.java index 75e9ea1e3..8c05d755a 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Location2DReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Location2DReport.java @@ -16,6 +16,7 @@ public class OSVR_Location2DReport extends Structure { public OSVR_Location2DReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "location"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_NaviPositionReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_NaviPositionReport.java index 641018a97..47cb3d563 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_NaviPositionReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_NaviPositionReport.java @@ -16,6 +16,7 @@ public class OSVR_NaviPositionReport extends Structure { public OSVR_NaviPositionReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_NaviVelocityReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_NaviVelocityReport.java index 89dcef250..ff07a8a0a 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_NaviVelocityReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_NaviVelocityReport.java @@ -16,6 +16,7 @@ public class OSVR_NaviVelocityReport extends Structure { public OSVR_NaviVelocityReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_OrientationReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_OrientationReport.java index 2699487f1..7b8dc7bde 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_OrientationReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_OrientationReport.java @@ -15,6 +15,7 @@ public class OSVR_OrientationReport extends Structure { public OSVR_OrientationReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "rotation"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Pose3.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Pose3.java index a9ce1c202..5dacd2738 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Pose3.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Pose3.java @@ -16,6 +16,7 @@ public class OSVR_Pose3 extends Structure { public OSVR_Pose3() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("translation", "rotation"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_PoseReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_PoseReport.java index f80bfd06b..e39eea50f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_PoseReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_PoseReport.java @@ -15,6 +15,7 @@ public class OSVR_PoseReport extends Structure { public OSVR_PoseReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "pose"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_PositionReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_PositionReport.java index 718682835..d93fc4a1f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_PositionReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_PositionReport.java @@ -15,6 +15,7 @@ public class OSVR_PositionReport extends Structure { public OSVR_PositionReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "xyz"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Quaternion.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Quaternion.java index 48f83f607..72952297a 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Quaternion.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Quaternion.java @@ -14,6 +14,7 @@ public class OSVR_Quaternion extends Structure { public OSVR_Quaternion() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("data"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Vec2.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Vec2.java index 28a5453a2..7427d1446 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Vec2.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Vec2.java @@ -14,6 +14,7 @@ public class OSVR_Vec2 extends Structure { public OSVR_Vec2() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("data"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Vec3.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Vec3.java index 96c81a65c..b3b2ed889 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Vec3.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_Vec3.java @@ -14,6 +14,7 @@ public class OSVR_Vec3 extends Structure { public OSVR_Vec3() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("data"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_VelocityReport.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_VelocityReport.java index 103f351d8..da65aaf62 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_VelocityReport.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_VelocityReport.java @@ -15,6 +15,7 @@ public class OSVR_VelocityReport extends Structure { public OSVR_VelocityReport() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("sensor", "state"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_VelocityState.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_VelocityState.java index de34de0cd..4a4589a07 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_VelocityState.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrclientreporttypes/OSVR_VelocityState.java @@ -20,6 +20,7 @@ public class OSVR_VelocityState extends Structure { public OSVR_VelocityState() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("linearVelocity", "linearVelocityValid", "angularVelocity", "angularVelocityValid"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Pose3.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Pose3.java index 8925e2c6e..8ec8f7cfa 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Pose3.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Pose3.java @@ -16,6 +16,7 @@ public class OSVR_Pose3 extends Structure { public OSVR_Pose3() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("translation", "rotation"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Quaternion.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Quaternion.java index 04c914594..462704020 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Quaternion.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Quaternion.java @@ -14,6 +14,7 @@ public class OSVR_Quaternion extends Structure { public OSVR_Quaternion() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("data"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Vec3.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Vec3.java index 31db1607a..7aa44a979 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Vec3.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrmatrixconventions/OSVR_Vec3.java @@ -14,6 +14,7 @@ public class OSVR_Vec3 extends Structure { public OSVR_Vec3() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("data"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_ProjectionMatrix.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_ProjectionMatrix.java index 7b9d66e3f..2ebeb8f2f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_ProjectionMatrix.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_ProjectionMatrix.java @@ -19,6 +19,7 @@ public class OSVR_ProjectionMatrix extends Structure { public OSVR_ProjectionMatrix() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("left", "right", "top", "bottom", "nearClip", "farClip"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_RGB.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_RGB.java index 09695a57b..4fca69fc4 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_RGB.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_RGB.java @@ -15,6 +15,7 @@ public class OSVR_RGB extends Structure { public OSVR_RGB() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("r", "g", "b"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_RenderParams.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_RenderParams.java index 262b7ddb2..ea094d4f3 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_RenderParams.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_RenderParams.java @@ -24,6 +24,7 @@ public class OSVR_RenderParams extends Structure { public OSVR_RenderParams() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("worldFromRoomAppend", "roomFromHeadReplace", "nearClipDistanceMeters", "farClipDistanceMeters"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_ViewportDescription.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_ViewportDescription.java index 11f05bda7..2e3865829 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_ViewportDescription.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanager/OSVR_ViewportDescription.java @@ -20,6 +20,7 @@ public class OSVR_ViewportDescription extends Structure { public OSVR_ViewportDescription() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("left", "lower", "width", "height"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_GraphicsLibraryOpenGL.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_GraphicsLibraryOpenGL.java index 626609e08..f52a83387 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_GraphicsLibraryOpenGL.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_GraphicsLibraryOpenGL.java @@ -14,6 +14,7 @@ public class OSVR_GraphicsLibraryOpenGL extends Structure { public OSVR_GraphicsLibraryOpenGL() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("toolkit"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenGLContextParams.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenGLContextParams.java index 71a67ee1a..185a2d5bb 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenGLContextParams.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenGLContextParams.java @@ -24,6 +24,7 @@ public class OSVR_OpenGLContextParams extends Structure { public OSVR_OpenGLContextParams() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("windowTitle", "fullScreen", "width", "height", "xPos", "yPos", "bitsPerPixel", "numBuffers", "visible"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenGLToolkitFunctions.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenGLToolkitFunctions.java index 0b996bcec..e32b3901f 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenGLToolkitFunctions.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenGLToolkitFunctions.java @@ -58,6 +58,7 @@ public class OSVR_OpenGLToolkitFunctions extends Structure { public OSVR_OpenGLToolkitFunctions() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("size", "data", "create", "destroy", "handleEvents", "getDisplayFrameBuffer", "getDisplaySizeOverride"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenResultsOpenGL.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenResultsOpenGL.java index e4da1e6da..85e020f6e 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenResultsOpenGL.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_OpenResultsOpenGL.java @@ -20,6 +20,7 @@ public class OSVR_OpenResultsOpenGL extends Structure { public OSVR_OpenResultsOpenGL() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("status", "library", "buffers"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_ProjectionMatrix.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_ProjectionMatrix.java index 21df22bdb..94d224854 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_ProjectionMatrix.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_ProjectionMatrix.java @@ -19,6 +19,7 @@ public class OSVR_ProjectionMatrix extends Structure { public OSVR_ProjectionMatrix() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("left", "right", "top", "bottom", "nearClip", "farClip"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RGB.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RGB.java index fb5a925b3..c74e15643 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RGB.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RGB.java @@ -15,6 +15,7 @@ public class OSVR_RGB extends Structure { public OSVR_RGB() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("r", "g", "b"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderBufferOpenGL.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderBufferOpenGL.java index d2488eff9..7f502dd05 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderBufferOpenGL.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderBufferOpenGL.java @@ -14,6 +14,7 @@ public class OSVR_RenderBufferOpenGL extends Structure { public OSVR_RenderBufferOpenGL() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("colorBufferName", "depthStencilBufferName"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderInfoOpenGL.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderInfoOpenGL.java index 3b0e1a79f..997215f3c 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderInfoOpenGL.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderInfoOpenGL.java @@ -20,6 +20,7 @@ public /*abstract*/ class OSVR_RenderInfoOpenGL extends Structure { public OSVR_RenderInfoOpenGL() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("library", "viewport", "pose", "projection"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderParams.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderParams.java index 2b63b7b3c..6df55bdc8 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderParams.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_RenderParams.java @@ -24,6 +24,7 @@ public class OSVR_RenderParams extends Structure { public OSVR_RenderParams() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("worldFromRoomAppend", "roomFromHeadReplace", "nearClipDistanceMeters", "farClipDistanceMeters"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_ViewportDescription.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_ViewportDescription.java index 0df38e45f..f504476e4 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_ViewportDescription.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrrendermanageropengl/OSVR_ViewportDescription.java @@ -20,6 +20,7 @@ public class OSVR_ViewportDescription extends Structure { public OSVR_ViewportDescription() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("left", "lower", "width", "height"); } diff --git a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrtimevalue/OSVR_TimeValue.java b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrtimevalue/OSVR_TimeValue.java index db60f043d..e500f89b1 100644 --- a/jme3-vr/src/main/java/com/jme3/system/osvr/osvrtimevalue/OSVR_TimeValue.java +++ b/jme3-vr/src/main/java/com/jme3/system/osvr/osvrtimevalue/OSVR_TimeValue.java @@ -16,6 +16,7 @@ public class OSVR_TimeValue extends Structure { public OSVR_TimeValue() { super(); } + @Override protected List getFieldOrder() { return Arrays.asList("seconds", "microseconds"); }