From bd2f8bf117e8003b899e1f282ff443a00d68335e Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sun, 15 Jan 2023 08:13:33 +0000 Subject: [PATCH] Fix ALCdevice/GLSync returning function generation --- log.txt | 45 +------------------ .../java/org/lwjglx/openal/ALC11.java | 4 +- .../java/org/lwjglx/opengl/GL32.java | 3 +- .../lwjgl3ify/MethodRedirector.java | 27 +++++++---- 4 files changed, 23 insertions(+), 56 deletions(-) diff --git a/log.txt b/log.txt index 112d36b..254677c 100644 --- a/log.txt +++ b/log.txt @@ -60,49 +60,6 @@ Missing in mod: org/lwjgl/input/Mouse : updateCursor:()V Missing in mod: org/lwjgl/openal/AL : create:(Ljava/lang/String;IIZ)V Missing in mod: org/lwjgl/openal/AL : create:(Ljava/lang/String;IIZZ)V Missing in mod: org/lwjgl/openal/AL : getContext:()Lorg/lwjgl/openal/ALCcontext; -Missing in mod: org/lwjgl/openal/AL10 : alBufferData:(IILjava/nio/IntBuffer;I)V -Missing in mod: org/lwjgl/openal/AL10 : alBufferData:(IILjava/nio/ShortBuffer;I)V -Missing in mod: org/lwjgl/openal/AL10 : alDeleteBuffers:(I)V -Missing in mod: org/lwjgl/openal/AL10 : alDeleteSources:(I)V -Missing in mod: org/lwjgl/openal/AL10 : alDisable:(I)V -Missing in mod: org/lwjgl/openal/AL10 : alDistanceModel:(I)V -Missing in mod: org/lwjgl/openal/AL10 : alDopplerFactor:(F)V -Missing in mod: org/lwjgl/openal/AL10 : alDopplerVelocity:(F)V -Missing in mod: org/lwjgl/openal/AL10 : alEnable:(I)V -Missing in mod: org/lwjgl/openal/AL10 : alGenBuffers:()I -Missing in mod: org/lwjgl/openal/AL10 : alGenSources:()I -Missing in mod: org/lwjgl/openal/AL10 : alGetBoolean:(I)Z -Missing in mod: org/lwjgl/openal/AL10 : alGetBufferf:(II)F -Missing in mod: org/lwjgl/openal/AL10 : alGetBufferi:(II)I -Missing in mod: org/lwjgl/openal/AL10 : alGetDouble:(I)D -Missing in mod: org/lwjgl/openal/AL10 : alGetDouble:(ILjava/nio/DoubleBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alGetEnumValue:(Ljava/lang/String;)I -Missing in mod: org/lwjgl/openal/AL10 : alGetFloat:(I)F -Missing in mod: org/lwjgl/openal/AL10 : alGetFloat:(ILjava/nio/FloatBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alGetInteger:(I)I -Missing in mod: org/lwjgl/openal/AL10 : alGetInteger:(ILjava/nio/IntBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alGetListener:(ILjava/nio/FloatBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alGetListenerf:(I)F -Missing in mod: org/lwjgl/openal/AL10 : alGetListeneri:(I)I -Missing in mod: org/lwjgl/openal/AL10 : alGetSource:(IILjava/nio/FloatBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alGetSourcef:(II)F -Missing in mod: org/lwjgl/openal/AL10 : alIsBuffer:(I)Z -Missing in mod: org/lwjgl/openal/AL10 : alIsEnabled:(I)Z -Missing in mod: org/lwjgl/openal/AL10 : alIsExtensionPresent:(Ljava/lang/String;)Z -Missing in mod: org/lwjgl/openal/AL10 : alIsSource:(I)Z -Missing in mod: org/lwjgl/openal/AL10 : alListener:(ILjava/nio/FloatBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alListenerf:(IF)V -Missing in mod: org/lwjgl/openal/AL10 : alListeneri:(II)V -Missing in mod: org/lwjgl/openal/AL10 : alSource:(IILjava/nio/FloatBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alSourcePause:(I)V -Missing in mod: org/lwjgl/openal/AL10 : alSourcePause:(Ljava/nio/IntBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alSourcePlay:(Ljava/nio/IntBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alSourceQueueBuffers:(II)V -Missing in mod: org/lwjgl/openal/AL10 : alSourceQueueBuffers:(ILjava/nio/IntBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alSourceRewind:(I)V -Missing in mod: org/lwjgl/openal/AL10 : alSourceRewind:(Ljava/nio/IntBuffer;)V -Missing in mod: org/lwjgl/openal/AL10 : alSourceUnqueueBuffers:(I)I -Missing in mod: org/lwjgl/openal/AL10 : alSourceUnqueueBuffers:(ILjava/nio/IntBuffer;)V org/lwjgl/openal/AL11 + alBuffer3f:(IIFFF)V + alBuffer3i:(IIIII)V @@ -3602,5 +3559,5 @@ Missing in mod: org/lwjgl/util/vector/Vector2f : equals:(Ljava/lang/Object;)Z Missing in mod: org/lwjgl/util/vector/Vector3f : equals:(Ljava/lang/Object;)Z Missing in mod: org/lwjgl/util/vector/Vector4f : equals:(Ljava/lang/Object;)Z -BUILD SUCCESSFUL in 2s +BUILD SUCCESSFUL in 1s 21 actionable tasks: 2 executed, 19 up-to-date diff --git a/src/generated/java/org/lwjglx/openal/ALC11.java b/src/generated/java/org/lwjglx/openal/ALC11.java index b05c612..30f0718 100644 --- a/src/generated/java/org/lwjglx/openal/ALC11.java +++ b/src/generated/java/org/lwjglx/openal/ALC11.java @@ -11,8 +11,8 @@ public class ALC11 { public static org.lwjglx.openal.ALCdevice alcCaptureOpenDevice( java.lang.String arg0, int arg1, int frequency, int format) { - org.lwjglx.openal.ALCdevice returnValue = - new ALCdevice(org.lwjgl.openal.ALC11.alcCaptureOpenDevice(arg0, arg1, frequency, format)); + org.lwjglx.openal.ALCdevice returnValue = new org.lwjglx.openal.ALCdevice( + org.lwjgl.openal.ALC11.alcCaptureOpenDevice(arg0, arg1, frequency, format)); return returnValue; } diff --git a/src/generated/java/org/lwjglx/opengl/GL32.java b/src/generated/java/org/lwjglx/opengl/GL32.java index e5ba670..81ed43a 100644 --- a/src/generated/java/org/lwjglx/opengl/GL32.java +++ b/src/generated/java/org/lwjglx/opengl/GL32.java @@ -62,7 +62,8 @@ public class GL32 { public static org.lwjglx.opengl.GLSync glFenceSync(int condition, int flags) { - org.lwjglx.opengl.GLSync returnValue = new GLSync(org.lwjgl.opengl.GL32.glFenceSync(condition, flags)); + org.lwjglx.opengl.GLSync returnValue = + new org.lwjglx.opengl.GLSync(org.lwjgl.opengl.GL32.glFenceSync(condition, flags)); return returnValue; } diff --git a/src/util/java/me/eigenraven/lwjgl3ify/MethodRedirector.java b/src/util/java/me/eigenraven/lwjgl3ify/MethodRedirector.java index 8f3e733..5de3cb7 100644 --- a/src/util/java/me/eigenraven/lwjgl3ify/MethodRedirector.java +++ b/src/util/java/me/eigenraven/lwjgl3ify/MethodRedirector.java @@ -99,15 +99,24 @@ public abstract class MethodRedirector { if (preCode != null) { writer.println(preCode); } - writer.printf( - " %s%s.%s(%s);%n", - matcher.methodType.getReturnType().equals(Type.VOID_TYPE) - ? "" - : matcher.methodType.getReturnType().getClassName().replace(".lwjgl.", ".lwjglx.") - + " returnValue = ", - this.javaClassName, - newMethod.name, - argCall); + if (matcher.methodType.getReturnType().equals(Type.VOID_TYPE)) { + writer.printf(" %s.%s(%s);%n", this.javaClassName, newMethod.name, argCall); + } else { + final String retType = + matcher.methodType.getReturnType().getClassName().replace(".lwjgl.", ".lwjglx."); + String preRet = "", postRet = ""; + if (retType.endsWith("ALCdevice")) { + preRet = "new org.lwjglx.openal.ALCdevice("; + postRet = ")"; + } + if (retType.endsWith("GLSync")) { + preRet = "new org.lwjglx.opengl.GLSync("; + postRet = ")"; + } + writer.printf( + " %s returnValue = %s%s.%s(%s)%s;%n", + retType, preRet, this.javaClassName, newMethod.name, argCall, postRet); + } if (postCode != null) { writer.println(postCode); }