From 16fae702444ddb107200c9395fee4a95d4db1dff Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 23 Sep 2023 11:47:09 +0100 Subject: [PATCH] [ci skip] Update the spotless config --- settings.gradle | 2 +- .../mods/fml/common/TracingPrintStream.java | 6 +- .../EventSubscriptionTransformer.java | 33 +- .../fml/common/patcher/ClassPatchManager.java | 57 +- .../mods/fml/relauncher/CoreModManager.java | 228 ++- .../fml/relauncher/FMLSecurityManager.java | 28 +- .../fml/relauncher/ServerLaunchWrapper.java | 4 +- .../common/util/EnumHelper.java | 30 +- src/generated/java/org/lwjgl/LWJGLUtil.java | 8 +- .../lwjgl/opengl/AMDMultiDrawIndirect.java | 2 +- .../org/lwjgl/opengl/APPLEElementArray.java | 2 +- .../opengl/APPLEVertexProgramEvaluators.java | 8 +- .../java/org/lwjgl/opengl/ARBProgram.java | 6 +- .../lwjgl/opengl/ARBVertexAttrib64bit.java | 2 +- .../org/lwjgl/opengl/ATIFragmentShader.java | 8 +- .../opengl/ATIVertexAttribArrayObject.java | 2 +- .../java/org/lwjgl/opengl/Display.java | 2 +- .../org/lwjgl/opengl/EXTPalettedTexture.java | 2 +- .../org/lwjgl/opengl/InputImplementation.java | 2 +- .../java/org/lwjgl/opengl/NVEvaluators.java | 4 +- .../org/lwjgl/opengl/NVFragmentProgram.java | 4 +- .../java/org/lwjgl/opengl/NVPresentVideo.java | 4 +- .../org/lwjgl/opengl/NVRegisterCombiners.java | 4 +- .../java/org/lwjgl/util/Display.java | 4 +- .../java/org/lwjgl/util/Rectangle.java | 2 +- .../java/org/lwjgl/util/glu/GLU.java | 10 +- .../util/glu/GLUtessellatorCallback.java | 2 +- .../glu/GLUtessellatorCallbackAdapter.java | 2 +- .../java/org/lwjgl/util/glu/MipMap.java | 4 +- .../java/org/lwjgl/util/glu/Project.java | 6 +- .../org/lwjgl/util/mapped/MappedHelper.java | 6 +- .../java/org/lwjgl/util/mapped/MappedSet.java | 8 +- .../java/org/lwjgl/util/vector/Matrix2f.java | 12 +- .../java/org/lwjgl/util/vector/Matrix3f.java | 24 +- .../java/org/lwjgl/util/vector/Matrix4f.java | 198 +- .../org/lwjgl/util/vector/Quaternion.java | 18 +- .../java/org/lwjgl/util/vector/Vector3f.java | 6 +- .../java/org/lwjglx/openal/ALC10.java | 6 +- .../java/org/lwjglx/openal/ALC11.java | 4 +- .../org/lwjglx/opengl/AMDDebugOutput.java | 4 +- .../lwjglx/opengl/AMDPerformanceMonitor.java | 14 +- .../org/lwjglx/opengl/AMDSparseTexture.java | 8 +- .../org/lwjglx/opengl/ARBBaseInstance.java | 50 +- .../lwjglx/opengl/ARBBlendFuncExtended.java | 4 +- .../lwjglx/opengl/ARBClearBufferObject.java | 12 +- .../org/lwjglx/opengl/ARBClearTexture.java | 80 +- .../opengl/ARBComputeVariableGroupSize.java | 14 +- .../java/org/lwjglx/opengl/ARBCopyBuffer.java | 2 +- .../java/org/lwjglx/opengl/ARBCopyImage.java | 34 +- .../org/lwjglx/opengl/ARBDebugOutput.java | 8 +- .../lwjglx/opengl/ARBDirectStateAccess.java | 318 ++- .../opengl/ARBDrawElementsBaseVertex.java | 45 +- .../org/lwjglx/opengl/ARBDrawInstanced.java | 4 +- .../lwjglx/opengl/ARBES2Compatibility.java | 2 +- .../lwjglx/opengl/ARBFramebufferObject.java | 14 +- .../lwjglx/opengl/ARBGetProgramBinary.java | 2 +- .../lwjglx/opengl/ARBGetTextureSubImage.java | 238 +-- .../java/org/lwjglx/opengl/ARBImaging.java | 1700 ++++++++--------- .../lwjglx/opengl/ARBIndirectParameters.java | 31 +- .../lwjglx/opengl/ARBInvalidateSubdata.java | 6 +- .../org/lwjglx/opengl/ARBMapBufferRange.java | 2 +- .../lwjglx/opengl/ARBMultiDrawIndirect.java | 10 +- .../opengl/ARBProgramInterfaceQuery.java | 12 +- .../java/org/lwjglx/opengl/ARBRobustness.java | 28 +- .../opengl/ARBSeparateShaderObjects.java | 2 +- .../opengl/ARBShaderImageLoadStore.java | 4 +- .../org/lwjglx/opengl/ARBShaderObjects.java | 4 +- .../opengl/ARBShaderStorageBufferObject.java | 2 +- .../lwjglx/opengl/ARBShaderSubroutine.java | 8 +- .../opengl/ARBShadingLanguageInclude.java | 4 +- .../org/lwjglx/opengl/ARBSparseTexture.java | 4 +- .../lwjglx/opengl/ARBTextureBufferRange.java | 4 +- .../lwjglx/opengl/ARBTextureCompression.java | 146 +- .../lwjglx/opengl/ARBTextureMultisample.java | 8 +- .../org/lwjglx/opengl/ARBTextureStorage.java | 8 +- .../opengl/ARBTextureStorageMultisample.java | 42 +- .../org/lwjglx/opengl/ARBTextureView.java | 4 +- .../opengl/ARBTransformFeedbackInstanced.java | 2 +- .../lwjglx/opengl/ARBUniformBufferObject.java | 8 +- .../lwjglx/opengl/ARBVertexAttribBinding.java | 4 +- .../org/lwjglx/opengl/ARBVertexBlend.java | 32 +- .../org/lwjglx/opengl/ARBVertexProgram.java | 4 +- .../org/lwjglx/opengl/ARBVertexShader.java | 68 +- .../lwjglx/opengl/EXTBlendFuncSeparate.java | 2 +- .../lwjglx/opengl/EXTDirectStateAccess.java | 1610 ++++++++-------- .../org/lwjglx/opengl/EXTDrawInstanced.java | 4 +- .../org/lwjglx/opengl/EXTFramebufferBlit.java | 4 +- .../opengl/EXTFramebufferMultisample.java | 4 +- .../lwjglx/opengl/EXTFramebufferObject.java | 12 +- .../org/lwjglx/opengl/EXTSecondaryColor.java | 20 +- .../opengl/EXTShaderImageLoadStore.java | 4 +- .../lwjglx/opengl/EXTTransformFeedback.java | 8 +- .../lwjglx/opengl/EXTVertexAttrib64bit.java | 4 +- .../java/org/lwjglx/opengl/GL11.java | 118 +- .../java/org/lwjglx/opengl/GL12.java | 90 +- .../java/org/lwjglx/opengl/GL13.java | 123 +- .../java/org/lwjglx/opengl/GL14.java | 22 +- .../java/org/lwjglx/opengl/GL20.java | 68 +- .../java/org/lwjglx/opengl/GL30.java | 14 +- .../java/org/lwjglx/opengl/GL31.java | 14 +- .../java/org/lwjglx/opengl/GL32.java | 47 +- .../java/org/lwjglx/opengl/GL33.java | 4 +- .../java/org/lwjglx/opengl/GL40.java | 8 +- .../java/org/lwjglx/opengl/GL41.java | 44 +- .../java/org/lwjglx/opengl/GL42.java | 54 +- .../java/org/lwjglx/opengl/GL43.java | 76 +- .../java/org/lwjglx/opengl/GL44.java | 104 +- .../java/org/lwjglx/opengl/GL45.java | 566 +++--- .../java/org/lwjglx/opengl/KHRDebug.java | 10 +- .../java/org/lwjglx/opengl/KHRRobustness.java | 12 +- .../opengl/NVBindlessMultiDrawIndirect.java | 32 +- .../java/org/lwjglx/opengl/NVCopyImage.java | 32 +- .../java/org/lwjglx/opengl/NVDrawTexture.java | 2 +- .../NVFramebufferMultisampleCoverage.java | 14 +- .../org/lwjglx/opengl/NVPathRendering.java | 122 +- .../lwjglx/opengl/NVTextureMultisample.java | 106 +- .../lwjglx/opengl/NVTransformFeedback.java | 2 +- .../Lwjgl3ifyHotswapPlugin.java | 23 +- .../TransformHelper.java | 6 +- .../me/eigenraven/lwjgl3ify/ClientProxy.java | 4 +- .../me/eigenraven/lwjgl3ify/Lwjgl3ify.java | 18 +- .../me/eigenraven/lwjgl3ify/UnsafeHacks.java | 3 +- .../eigenraven/lwjgl3ify/api/ConfigUtils.java | 12 +- .../lwjgl3ify/client/GLInfoCrashCallable.java | 13 +- .../lwjgl3ify/client/GuiConfigLwjgl3ify.java | 24 +- .../me/eigenraven/lwjgl3ify/core/Config.java | 213 +-- .../core/ExtensibleEnumTransformerHelper.java | 109 +- ...xConstantPoolInterfaceMethodRefHelper.java | 13 +- .../lwjgl3ify/core/Lwjgl3ifyCoremod.java | 15 +- .../UnfinalizeObjectHoldersTransformer.java | 13 +- .../mixins/fml/ItemStackHolderRef.java | 12 +- .../lwjgl3ify/mixins/fml/JarDiscoverer.java | 14 +- .../lwjgl3ify/mixins/fml/ObjectHolderRef.java | 12 +- .../mixins/fml/ObjectHolderRegistry.java | 8 +- .../lwjgl3ify/mixins/game/MixinStitcher.java | 2 +- .../mixins/game/MixinTextureAtlasSprite.java | 2 +- .../mixins/game/MixinTextureMap.java | 10 +- .../lwjgl3ify/textures/NativeBackedImage.java | 2 +- .../lwjgl3ify/textures/StbStitcher.java | 18 +- src/main/java/org/lwjglx/BufferChecks.java | 22 +- src/main/java/org/lwjglx/BufferUtils.java | 3 +- src/main/java/org/lwjglx/LWJGLUtil.java | 395 ++-- src/main/java/org/lwjglx/PointerBuffer.java | 2 +- .../org/lwjglx/PointerWrapperAbstract.java | 5 +- src/main/java/org/lwjglx/Sys.java | 4 +- src/main/java/org/lwjglx/input/Cursor.java | 4 +- src/main/java/org/lwjglx/input/Keyboard.java | 26 +- src/main/java/org/lwjglx/input/Mouse.java | 6 +- src/main/java/org/lwjglx/openal/AL.java | 4 +- src/main/java/org/lwjglx/openal/EFXUtil.java | 3 +- .../java/org/lwjglx/opengl/AWTGLCanvas.java | 2 +- .../lwjglx/opengl/ContextCapabilities.java | 3 +- src/main/java/org/lwjglx/opengl/Display.java | 46 +- .../lwjglx/opengl/DisplayImplementation.java | 2 +- src/main/java/org/lwjglx/opengl/GL20x.java | 6 +- .../lwjglx/opengl/InputImplementation.java | 2 +- src/main/java/org/lwjglx/opengl/Pbuffer.java | 26 +- .../java/org/lwjglx/opengl/PixelFormat.java | 14 +- .../java/org/lwjglx/opengl/RenderTexture.java | 4 +- src/main/java/org/lwjglx/util/Color.java | 8 +- src/main/java/org/lwjglx/util/Display.java | 10 +- src/main/java/org/lwjglx/util/WaveData.java | 19 +- src/main/java/org/lwjglx/util/XPMFile.java | 10 +- src/main/java/org/lwjglx/util/glu/GLU.java | 10 +- src/main/java/org/lwjglx/util/glu/MipMap.java | 44 +- .../java/org/lwjglx/util/glu/Project.java | 28 +- .../glu/tessellation/GLUtessellatorImpl.java | 18 +- .../lwjglx/util/glu/tessellation/Mesh.java | 10 +- .../lwjglx/util/glu/tessellation/Render.java | 16 +- .../lwjglx/util/glu/tessellation/Sweep.java | 324 ++-- .../util/glu/tessellation/TessMono.java | 6 +- .../java/org/lwjglx/util/vector/Matrix2f.java | 12 +- .../java/org/lwjglx/util/vector/Matrix3f.java | 24 +- .../java/org/lwjglx/util/vector/Matrix4f.java | 198 +- .../org/lwjglx/util/vector/Quaternion.java | 18 +- .../java/org/lwjglx/util/vector/Vector3f.java | 6 +- .../eigenraven/lwjgl3ify/ComparisonTool.java | 73 +- .../me/eigenraven/lwjgl3ify/JarApiSet.java | 33 +- .../eigenraven/lwjgl3ify/MethodMatcher.java | 167 +- .../lwjgl3ify/MethodRedirector.java | 58 +- 180 files changed, 4552 insertions(+), 4781 deletions(-) diff --git a/settings.gradle b/settings.gradle index b28e995..0ca1ba6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,7 +23,7 @@ plugins { blowdryerSetup { repoSubfolder 'gtnhShared' - github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0') + github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.2') //devLocal '.' // Use this when testing config updates locally } diff --git a/src/forgePatches/java/cpw/mods/fml/common/TracingPrintStream.java b/src/forgePatches/java/cpw/mods/fml/common/TracingPrintStream.java index bb93819..d45f0bd 100644 --- a/src/forgePatches/java/cpw/mods/fml/common/TracingPrintStream.java +++ b/src/forgePatches/java/cpw/mods/fml/common/TracingPrintStream.java @@ -36,9 +36,11 @@ public class TracingPrintStream extends PrintStream { } private String getPrefix() { - StackTraceElement[] elems = Thread.currentThread().getStackTrace(); + StackTraceElement[] elems = Thread.currentThread() + .getStackTrace(); StackTraceElement elem = elems[BASE_DEPTH]; // The caller is always at BASE_DEPTH, including this call. - if (elem.getClassName().startsWith("kotlin.io.")) { + if (elem.getClassName() + .startsWith("kotlin.io.")) { elem = elems[BASE_DEPTH + 2]; // Kotlins IoPackage masks origins 2 deeper in the stack. } return "[" + elem.getClassName() + ":" + elem.getMethodName() + ":" + elem.getLineNumber() + "]: "; diff --git a/src/forgePatches/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java b/src/forgePatches/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java index 1220caf..71136a0 100644 --- a/src/forgePatches/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java +++ b/src/forgePatches/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java @@ -50,8 +50,8 @@ public class EventSubscriptionTransformer implements IClassTransformer { @Override public byte[] transform(String name, String transformedName, byte[] bytes) { if (bytes == null || name.equals("cpw.mods.fml.common.eventhandler.Event") - || name.startsWith("net.minecraft.") - || name.indexOf('.') == -1) { + || name.startsWith("net.minecraft.") + || name.indexOf('.') == -1) { return bytes; } ClassReader cr = new ClassReader(bytes); @@ -78,7 +78,9 @@ public class EventSubscriptionTransformer implements IClassTransformer { // Yes, this recursively loads classes until we get this base class. THIS IS NOT A ISSUE. Coremods should handle // re-entry just fine. // If they do not this a COREMOD issue NOT a Forge/LaunchWrapper issue. - Class parent = this.getClass().getClassLoader().loadClass(classNode.superName.replace('/', '.')); + Class parent = this.getClass() + .getClassLoader() + .loadClass(classNode.superName.replace('/', '.')); if (!Event.class.isAssignableFrom(parent)) { return false; } @@ -100,8 +102,7 @@ public class EventSubscriptionTransformer implements IClassTransformer { for (MethodNode method : (List) classNode.methods) { if (method.name.equals("setup") && method.desc.equals(voidDesc) - && (method.access & ACC_PROTECTED) == ACC_PROTECTED) - hasSetup = true; + && (method.access & ACC_PROTECTED) == ACC_PROTECTED) hasSetup = true; if ((method.access & ACC_PUBLIC) == ACC_PUBLIC) { if (method.name.equals("getListenerList") && method.desc.equals(listDescM)) hasGetListenerList = true; if (method.name.equals("isCancelable") && method.desc.equals(boolDesc)) hasCancelable = true; @@ -112,8 +113,8 @@ public class EventSubscriptionTransformer implements IClassTransformer { if (classNode.visibleAnnotations != null) { for (AnnotationNode node : classNode.visibleAnnotations) { - if (!hasResult - && node.desc.replace('$', '/').equals("Lcpw/mods/fml/common/eventhandler/Event/HasResult;")) { + if (!hasResult && node.desc.replace('$', '/') + .equals("Lcpw/mods/fml/common/eventhandler/Event/HasResult;")) { /* * Add: public boolean hasResult() { return true; } */ @@ -137,7 +138,7 @@ public class EventSubscriptionTransformer implements IClassTransformer { if (hasSetup) { if (!hasGetListenerList) throw new RuntimeException( - "Event class defines setup() but does not define getListenerList! " + classNode.name); + "Event class defines setup() but does not define getListenerList! " + classNode.name); else return edited; } @@ -153,7 +154,7 @@ public class EventSubscriptionTransformer implements IClassTransformer { MethodNode method = new MethodNode(ACC_PUBLIC, "", voidDesc, null, null); method.instructions.add(new VarInsnNode(ALOAD, 0)); method.instructions - .add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "", voidDesc, false)); + .add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "", voidDesc, false)); method.instructions.add(new InsnNode(RETURN)); classNode.methods.add(method); } @@ -175,14 +176,14 @@ public class EventSubscriptionTransformer implements IClassTransformer { method.instructions.add(new InsnNode(DUP)); method.instructions.add(new VarInsnNode(ALOAD, 0)); method.instructions - .add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "getListenerList", listDescM, false)); + .add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "getListenerList", listDescM, false)); method.instructions.add( - new MethodInsnNode( - INVOKESPECIAL, - tList.getInternalName(), - "", - getMethodDescriptor(VOID_TYPE, tList), - false)); + new MethodInsnNode( + INVOKESPECIAL, + tList.getInternalName(), + "", + getMethodDescriptor(VOID_TYPE, tList), + false)); method.instructions.add(new FieldInsnNode(PUTSTATIC, classNode.name, "LISTENER_LIST", listDesc)); method.instructions.add(new InsnNode(RETURN)); classNode.methods.add(method); diff --git a/src/forgePatches/java/cpw/mods/fml/common/patcher/ClassPatchManager.java b/src/forgePatches/java/cpw/mods/fml/common/patcher/ClassPatchManager.java index f2d1b2d..da42e63 100644 --- a/src/forgePatches/java/cpw/mods/fml/common/patcher/ClassPatchManager.java +++ b/src/forgePatches/java/cpw/mods/fml/common/patcher/ClassPatchManager.java @@ -38,7 +38,7 @@ public class ClassPatchManager { public static final ClassPatchManager INSTANCE = new ClassPatchManager(); public static final boolean dumpPatched = Boolean - .parseBoolean(System.getProperty("fml.dumpPatchedClasses", "false")); + .parseBoolean(System.getProperty("fml.dumpPatchedClasses", "false")); public static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("fml.debugClassPatchManager", "false")); private GDiffPatcher patcher = new GDiffPatcher(); @@ -72,11 +72,11 @@ public class ClassPatchManager { } boolean ignoredError = false; if (DEBUG) FMLRelaunchLog.fine( - "Runtime patching class %s (input size %d), found %d patch%s", - mappedName, - (inputData == null ? 0 : inputData.length), - list.size(), - list.size() != 1 ? "es" : ""); + "Runtime patching class %s (input size %d), found %d patch%s", + mappedName, + (inputData == null ? 0 : inputData.length), + list.size(), + list.size() != 1 ? "es" : ""); for (ClassPatch patch : list) { if (!patch.targetClassName.equals(mappedName) && !patch.sourceClassName.equals(name)) { FMLRelaunchLog.warning("Binary patch found %s for wrong class %s", patch.targetClassName, mappedName); @@ -85,24 +85,26 @@ public class ClassPatchManager { inputData = new byte[0]; } else if (!patch.existsAtTarget) { FMLRelaunchLog.warning( - "Patcher expecting empty class data file for %s, but received non-empty", - patch.targetClassName); + "Patcher expecting empty class data file for %s, but received non-empty", + patch.targetClassName); } else { - int inputChecksum = Hashing.adler32().hashBytes(inputData).asInt(); + int inputChecksum = Hashing.adler32() + .hashBytes(inputData) + .asInt(); if (patch.inputChecksum != inputChecksum) { FMLRelaunchLog.severe( - "There is a binary discrepency between the expected input class %s (%s) and the actual class. Checksum on disk is %x, in patch %x. Things are probably about to go very wrong. Did you put something into the jar file?", - mappedName, - name, - inputChecksum, - patch.inputChecksum); + "There is a binary discrepency between the expected input class %s (%s) and the actual class. Checksum on disk is %x, in patch %x. Things are probably about to go very wrong. Did you put something into the jar file?", + mappedName, + name, + inputChecksum, + patch.inputChecksum); if (!Boolean.parseBoolean(System.getProperty("fml.ignorePatchDiscrepancies", "false"))) { FMLRelaunchLog.severe( - "The game is going to exit, because this is a critical error, and it is very improbable that the modded game will work, please obtain clean jar files."); + "The game is going to exit, because this is a critical error, and it is very improbable that the modded game will work, please obtain clean jar files."); System.exit(1); } else { FMLRelaunchLog.severe( - "FML is going to ignore this error, note that the patch will not be applied, and there is likely to be a malfunctioning behaviour, including not running at all"); + "FML is going to ignore this error, note that the patch will not be applied, and there is likely to be a malfunctioning behaviour, including not running at all"); ignoredError = true; continue; } @@ -120,7 +122,7 @@ public class ClassPatchManager { } if (!ignoredError && DEBUG) { FMLRelaunchLog - .fine("Successfully applied runtime patches for %s (new size %d)", mappedName, inputData.length); + .fine("Successfully applied runtime patches for %s (new size %d)", mappedName, inputData.length); } if (dumpPatched) { try { @@ -135,15 +137,18 @@ public class ClassPatchManager { } public void setup(Side side) { - Pattern binpatchMatcher = Pattern - .compile(String.format("binpatch/%s/.*.binpatch", side.toString().toLowerCase(Locale.ENGLISH))); + Pattern binpatchMatcher = Pattern.compile( + String.format( + "binpatch/%s/.*.binpatch", + side.toString() + .toLowerCase(Locale.ENGLISH))); JarInputStream jis; try { InputStream binpatchesCompressed = getClass().getResourceAsStream("/binpatches.pack.lzma"); if (binpatchesCompressed == null) { FMLRelaunchLog.log( - Level.ERROR, - "The binary patch set is missing. Either you are in a development environment, or things are not going to work!"); + Level.ERROR, + "The binary patch set is missing. Either you are in a development environment, or things are not going to work!"); return; } LzmaInputStream binpatchesDecompressedLzma = new LzmaInputStream(binpatchesCompressed); @@ -169,7 +174,8 @@ public class ClassPatchManager { if (entry == null) { break; } - if (binpatchMatcher.matcher(entry.getName()).matches()) { + if (binpatchMatcher.matcher(entry.getName()) + .matches()) { ClassPatch cp = readPatch(entry, jis); if (cp != null) { patches.put(cp.sourceClassName, cp); @@ -180,7 +186,12 @@ public class ClassPatchManager { } catch (IOException e) {} } while (true); FMLRelaunchLog.fine("Read %d binary patches", patches.size()); - if (DEBUG) FMLRelaunchLog.fine("Patch list :\n\t%s", Joiner.on("\t\n").join(patches.asMap().entrySet())); + if (DEBUG) FMLRelaunchLog.fine( + "Patch list :\n\t%s", + Joiner.on("\t\n") + .join( + patches.asMap() + .entrySet())); patchedClasses.clear(); } diff --git a/src/forgePatches/java/cpw/mods/fml/relauncher/CoreModManager.java b/src/forgePatches/java/cpw/mods/fml/relauncher/CoreModManager.java index d0d529b..f5a2874 100644 --- a/src/forgePatches/java/cpw/mods/fml/relauncher/CoreModManager.java +++ b/src/forgePatches/java/cpw/mods/fml/relauncher/CoreModManager.java @@ -57,7 +57,7 @@ public class CoreModManager { private static final Attributes.Name MODTYPE = new Attributes.Name("ModType"); private static final Attributes.Name MODSIDE = new Attributes.Name("ModSide"); private static String[] rootPlugins = { "cpw.mods.fml.relauncher.FMLCorePlugin", - "net.minecraftforge.classloading.FMLForgePlugin" }; + "net.minecraftforge.classloading.FMLForgePlugin" }; private static List loadedCoremods = Lists.newArrayList(); private static List loadPlugins; private static boolean deobfuscatedEnvironment; @@ -75,7 +75,7 @@ public class CoreModManager { public final int sortIndex; public FMLPluginWrapper(String name, IFMLLoadingPlugin coreModInstance, File location, int sortIndex, - String... predepends) { + String... predepends) { super(); this.name = name; this.coreModInstance = coreModInstance; @@ -96,8 +96,11 @@ public class CoreModManager { @Override public void injectIntoClassLoader(LaunchClassLoader classLoader) { - FMLRelaunchLog - .info("Injecting coremod %s {%s} class transformers", name, coreModInstance.getClass().getName()); + FMLRelaunchLog.info( + "Injecting coremod %s {%s} class transformers", + name, + coreModInstance.getClass() + .getName()); if (coreModInstance.getASMTransformerClass() != null) for (String transformer : coreModInstance.getASMTransformerClass()) { FMLRelaunchLog.finer("Registering transformer %s", transformer); @@ -105,7 +108,11 @@ public class CoreModManager { } FMLRelaunchLog.fine("Injection complete"); - FMLRelaunchLog.fine("Running coremod plugin for %s {%s}", name, coreModInstance.getClass().getName()); + FMLRelaunchLog.fine( + "Running coremod plugin for %s {%s}", + name, + coreModInstance.getClass() + .getName()); Map data = new HashMap(); data.put("mcLocation", mcDir); data.put("coremodList", loadPlugins); @@ -116,7 +123,8 @@ public class CoreModManager { String setupClass = coreModInstance.getSetupClass(); if (setupClass != null) { try { - IFMLCallHook call = (IFMLCallHook) Class.forName(setupClass, true, classLoader).newInstance(); + IFMLCallHook call = (IFMLCallHook) Class.forName(setupClass, true, classLoader) + .newInstance(); Map callData = new HashMap(); callData.put("runtimeDeobfuscationEnabled", !deobfuscatedEnvironment); callData.put("mcLocation", mcDir); @@ -129,7 +137,10 @@ public class CoreModManager { throw new RuntimeException(e); } } - FMLRelaunchLog.fine("Coremod plugin class %s run successfully", coreModInstance.getClass().getSimpleName()); + FMLRelaunchLog.fine( + "Coremod plugin class %s run successfully", + coreModInstance.getClass() + .getSimpleName()); String modContainer = coreModInstance.getModContainerClass(); if (modContainer != null) { @@ -156,7 +167,7 @@ public class CoreModManager { byte[] bs = classLoader.getClassBytes("net.minecraft.world.World"); if (bs != null) { FMLRelaunchLog.info( - "Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation"); + "Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation"); deobfuscatedEnvironment = true; } } catch (IOException e1) {} @@ -170,9 +181,9 @@ public class CoreModManager { classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.PatchingTransformer"); } catch (Exception e) { FMLRelaunchLog.log( - Level.ERROR, - e, - "The patch transformer failed to load! This is critical, loading cannot continue!"); + Level.ERROR, + e, + "The patch transformer failed to load! This is critical, loading cannot continue!"); e.printStackTrace(); throw Throwables.propagate(e); } @@ -184,7 +195,7 @@ public class CoreModManager { if (loadPlugins.isEmpty()) { throw new RuntimeException( - "A fatal error has occured - no valid fml load plugin was found - this is a completely corrupt FML installation."); + "A fatal error has occured - no valid fml load plugin was found - this is a completely corrupt FML installation."); } FMLRelaunchLog.fine("All fundamental core mods are successfully located"); @@ -222,7 +233,7 @@ public class CoreModManager { File[] derplist = coreMods.listFiles(derpfilter); if (derplist != null && derplist.length > 0) { FMLRelaunchLog.severe( - "FML has detected several badly downloaded jar files, which have been named as zip files. You probably need to download them again, or they may not work properly"); + "FML has detected several badly downloaded jar files, which have been named as zip files. You probably need to download them again, or they may not work properly"); for (File f : derplist) { FMLRelaunchLog.severe("Problem file : %s", f.getName()); } @@ -236,18 +247,22 @@ public class CoreModManager { }; File[] derpdirlist = coreMods.listFiles(derpdirfilter); if (derpdirlist != null && derpdirlist.length > 0) { - FMLRelaunchLog.log.getLogger().log( + FMLRelaunchLog.log.getLogger() + .log( Level.FATAL, "There appear to be jars extracted into the mods directory. This is VERY BAD and will almost NEVER WORK WELL"); - FMLRelaunchLog.log.getLogger().log( + FMLRelaunchLog.log.getLogger() + .log( Level.FATAL, "You should place original jars only in the mods directory. NEVER extract them to the mods directory."); - FMLRelaunchLog.log.getLogger().log( + FMLRelaunchLog.log.getLogger() + .log( Level.FATAL, "The directories below appear to be extracted jar files. Fix this before you continue."); for (File f : derpdirlist) { - FMLRelaunchLog.log.getLogger().log( + FMLRelaunchLog.log.getLogger() + .log( Level.FATAL, "Directory {} contains {}", f.getName(), @@ -258,17 +273,19 @@ public class CoreModManager { // We're generating a crash report for the launcher to show to the user here try { Class crashreportclass = classLoader.loadClass("b"); - Object crashreport = crashreportclass.getMethod("a", Throwable.class, String.class).invoke( + Object crashreport = crashreportclass.getMethod("a", Throwable.class, String.class) + .invoke( null, re, "FML has discovered extracted jar files in the mods directory.\nThis breaks mod loading functionality completely.\nRemove the directories and replace with the jar files originally provided."); File crashreportfile = new File( - new File(coreMods.getParentFile(), "crash-reports"), - String.format("fml-crash-%1$tY-%1$tm-%1$td_%1$tT.txt", Calendar.getInstance())); - crashreportclass.getMethod("a", File.class).invoke(crashreport, crashreportfile); + new File(coreMods.getParentFile(), "crash-reports"), + String.format("fml-crash-%1$tY-%1$tm-%1$td_%1$tT.txt", Calendar.getInstance())); + crashreportclass.getMethod("a", File.class) + .invoke(crashreport, crashreportfile); System.out.println( - "#@!@# FML has crashed the game deliberately. Crash report saved to: #@!@# " - + crashreportfile.getAbsolutePath()); + "#@!@# FML has crashed the game deliberately. Crash report saved to: #@!@# " + + crashreportfile.getAbsolutePath()); } catch (Exception e) { e.printStackTrace(); // NOOP - hopefully @@ -282,8 +299,11 @@ public class CoreModManager { coreModList = ObjectArrays.concat(coreModList, versionedCoreMods, File.class); } - coreModList = ObjectArrays - .concat(coreModList, ModListHelper.additionalMods.values().toArray(new File[0]), File.class); + coreModList = ObjectArrays.concat( + coreModList, + ModListHelper.additionalMods.values() + .toArray(new File[0]), + File.class); coreModList = FileListHelper.sortFileList(coreModList); @@ -298,7 +318,8 @@ public class CoreModManager { continue; } ModAccessTransformer.addJar(jar); - mfAttributes = jar.getManifest().getMainAttributes(); + mfAttributes = jar.getManifest() + .getMainAttributes(); } catch (IOException ioe) { FMLRelaunchLog.log(Level.ERROR, ioe, "Unable to read the jar file %s - ignoring", coreMod.getName()); ioe.printStackTrace(); @@ -321,25 +342,27 @@ public class CoreModManager { loadedCoremods.add(coreMod.getName()); continue; } - List modTypes = mfAttributes.containsKey(MODTYPE) - ? Arrays.asList(mfAttributes.getValue(MODTYPE).split(",")) - : ImmutableList.of("FML"); + List modTypes = mfAttributes.containsKey(MODTYPE) ? Arrays.asList( + mfAttributes.getValue(MODTYPE) + .split(",")) + : ImmutableList.of("FML"); if (!modTypes.contains("FML")) { FMLRelaunchLog.fine( - "Adding %s to the list of things to skip. It is not an FML mod, it has types %s", - coreMod.getName(), - modTypes); + "Adding %s to the list of things to skip. It is not an FML mod, it has types %s", + coreMod.getName(), + modTypes); loadedCoremods.add(coreMod.getName()); continue; } String modSide = mfAttributes.containsKey(MODSIDE) ? mfAttributes.getValue(MODSIDE) : "BOTH"; - if (!("BOTH".equals(modSide) || FMLLaunchHandler.side.name().equals(modSide))) { + if (!("BOTH".equals(modSide) || FMLLaunchHandler.side.name() + .equals(modSide))) { FMLRelaunchLog.fine( - "Mod %s has ModSide meta-inf value %s, and we're %s. It will be ignored", - coreMod.getName(), - modSide, - FMLLaunchHandler.side.name()); + "Mod %s has ModSide meta-inf value %s, and we're %s. It will be ignored", + coreMod.getName(), + modSide, + FMLLaunchHandler.side.name()); loadedCoremods.add(coreMod.getName()); continue; } @@ -351,16 +374,18 @@ public class CoreModManager { } // Support things that are mod jars, but not FML mod jars try { - classLoader.addURL(coreMod.toURI().toURL()); + classLoader.addURL( + coreMod.toURI() + .toURL()); if (!mfAttributes.containsKey(COREMODCONTAINSFMLMOD)) { FMLRelaunchLog.finer( - "Adding %s to the list of known coremods, it will not be examined again", - coreMod.getName()); + "Adding %s to the list of known coremods, it will not be examined again", + coreMod.getName()); loadedCoremods.add(coreMod.getName()); } else { FMLRelaunchLog.finer( - "Found FMLCorePluginContainsFMLMod marker in %s, it will be examined later for regular @Mod instances", - coreMod.getName()); + "Found FMLCorePluginContainsFMLMod marker in %s, it will be examined later for regular @Mod instances", + coreMod.getName()); reparsedCoremods.add(coreMod.getName()); } } catch (MalformedURLException e) { @@ -386,14 +411,18 @@ public class CoreModManager { Field ucpField; try { // Java 8-11 - ucpField = loader.getClass().getDeclaredField("ucp"); + ucpField = loader.getClass() + .getDeclaredField("ucp"); } catch (NoSuchFieldException e) { // Java 17 - ucpField = loader.getClass().getSuperclass().getDeclaredField("ucp"); + ucpField = loader.getClass() + .getSuperclass() + .getDeclaredField("ucp"); } ucpField.setAccessible(true); final Object ucp = ucpField.get(loader); - final Method urlAdder = ucp.getClass().getDeclaredMethod("addURL", URL.class); + final Method urlAdder = ucp.getClass() + .getDeclaredMethod("addURL", URL.class); urlAdder.invoke(ucp, coreModUrl); } } catch (ReflectiveOperationException e) { @@ -402,12 +431,14 @@ public class CoreModManager { } private static void handleCascadingTweak(File coreMod, JarFile jar, String cascadedTweaker, - LaunchClassLoader classLoader, Integer sortingOrder) { + LaunchClassLoader classLoader, Integer sortingOrder) { try { // Have to manually stuff the tweaker into the parent classloader // PATCHED BEGIN - URL coreModUrl = coreMod.toURI().toURL(); - ClassLoader myLoader = classLoader.getClass().getClassLoader(); + URL coreModUrl = coreMod.toURI() + .toURL(); + ClassLoader myLoader = classLoader.getClass() + .getClassLoader(); addUrlToClassloader(myLoader, coreModUrl); classLoader.addURL(coreModUrl); // PATCHED END @@ -415,10 +446,10 @@ public class CoreModManager { tweakSorting.put(cascadedTweaker, sortingOrder); } catch (Exception e) { FMLRelaunchLog.log( - Level.INFO, - e, - "There was a problem trying to load the mod dir tweaker %s", - coreMod.getAbsolutePath()); + Level.INFO, + e, + "There was a problem trying to load the mod dir tweaker %s", + coreMod.getAbsolutePath()); e.printStackTrace(); } } @@ -433,14 +464,14 @@ public class CoreModManager { coreModDir = coreModDir.getCanonicalFile(); } catch (IOException e) { throw new RuntimeException( - String.format("Unable to canonicalize the coremod dir at %s", mcDir.getName()), - e); + String.format("Unable to canonicalize the coremod dir at %s", mcDir.getName()), + e); } if (!coreModDir.exists()) { coreModDir.mkdir(); } else if (coreModDir.exists() && !coreModDir.isDirectory()) { throw new RuntimeException( - String.format("Found a coremod file in %s that's not a directory", mcDir.getName())); + String.format("Found a coremod file in %s that's not a directory", mcDir.getName())); } return coreModDir; } @@ -465,30 +496,31 @@ public class CoreModManager { FMLRelaunchLog.finer("coremod named %s is loading", coreModName); } MCVersion requiredMCVersion = coreModClazz.getAnnotation(IFMLLoadingPlugin.MCVersion.class); - if (!Arrays.asList(rootPlugins).contains(coreModClass) - && (requiredMCVersion == null || Strings.isNullOrEmpty(requiredMCVersion.value()))) { + if (!Arrays.asList(rootPlugins) + .contains(coreModClass) + && (requiredMCVersion == null || Strings.isNullOrEmpty(requiredMCVersion.value()))) { FMLRelaunchLog.log( - Level.WARN, - "The coremod %s does not have a MCVersion annotation, it may cause issues with this version of Minecraft", - coreModClass); + Level.WARN, + "The coremod %s does not have a MCVersion annotation, it may cause issues with this version of Minecraft", + coreModClass); } else if (requiredMCVersion != null && !FMLInjectionData.mccversion.equals(requiredMCVersion.value())) { FMLRelaunchLog.log( - Level.ERROR, - "The coremod %s is requesting minecraft version %s and minecraft is %s. It will be ignored.", - coreModClass, - requiredMCVersion.value(), - FMLInjectionData.mccversion); + Level.ERROR, + "The coremod %s is requesting minecraft version %s and minecraft is %s. It will be ignored.", + coreModClass, + requiredMCVersion.value(), + FMLInjectionData.mccversion); return null; } else if (requiredMCVersion != null) { FMLRelaunchLog.log( - Level.DEBUG, - "The coremod %s requested minecraft version %s and minecraft is %s. It will be loaded.", - coreModClass, - requiredMCVersion.value(), - FMLInjectionData.mccversion); + Level.DEBUG, + "The coremod %s requested minecraft version %s and minecraft is %s. It will be loaded.", + coreModClass, + requiredMCVersion.value(), + FMLInjectionData.mccversion); } TransformerExclusions trExclusions = coreModClazz - .getAnnotation(IFMLLoadingPlugin.TransformerExclusions.class); + .getAnnotation(IFMLLoadingPlugin.TransformerExclusions.class); if (trExclusions != null) { for (String st : trExclusions.value()) { classLoader.addTransformerExclusion(st); @@ -506,9 +538,9 @@ public class CoreModManager { String accessTransformerClass = plugin.getAccessTransformerClass(); if (accessTransformerClass != null) { FMLRelaunchLog.log( - Level.DEBUG, - "Added access transformer class %s to enqueued access transformers", - accessTransformerClass); + Level.DEBUG, + "Added access transformer class %s to enqueued access transformers", + accessTransformerClass); accessTransformers.add(accessTransformerClass); } FMLPluginWrapper wrap = new FMLPluginWrapper(coreModName, plugin, location, sortIndex, dependencies); @@ -516,7 +548,9 @@ public class CoreModManager { FMLRelaunchLog.fine("Enqueued coremod %s", coreModName); return wrap; } catch (ClassNotFoundException cnfe) { - if (!Lists.newArrayList(rootPlugins).contains(coreModClass)) FMLRelaunchLog.log( + if (!Lists.newArrayList(rootPlugins) + .contains(coreModClass)) + FMLRelaunchLog.log( Level.ERROR, cnfe, "Coremod %s: Unable to class load the plugin %s", @@ -525,27 +559,23 @@ public class CoreModManager { else FMLRelaunchLog.fine("Skipping root plugin %s", coreModClass); } catch (ClassCastException cce) { FMLRelaunchLog.log( - Level.ERROR, - cce, - "Coremod %s: The plugin %s is not an implementor of IFMLLoadingPlugin", - coreModName, - coreModClass); + Level.ERROR, + cce, + "Coremod %s: The plugin %s is not an implementor of IFMLLoadingPlugin", + coreModName, + coreModClass); cce.printStackTrace(); } catch (InstantiationException ie) { FMLRelaunchLog.log( - Level.ERROR, - ie, - "Coremod %s: The plugin class %s was not instantiable", - coreModName, - coreModClass); + Level.ERROR, + ie, + "Coremod %s: The plugin class %s was not instantiable", + coreModName, + coreModClass); ie.printStackTrace(); } catch (IllegalAccessException iae) { - FMLRelaunchLog.log( - Level.ERROR, - iae, - "Coremod %s: The plugin class %s was not accessible", - coreModName, - coreModClass); + FMLRelaunchLog + .log(Level.ERROR, iae, "Coremod %s: The plugin class %s was not accessible", coreModName, coreModClass); iae.printStackTrace(); } return null; @@ -564,10 +594,10 @@ public class CoreModManager { for (String dep : plug.predepends) { if (!pluginMap.containsKey(dep)) { FMLRelaunchLog.log( - Level.ERROR, - "Missing coremod dependency - the coremod %s depends on coremod %s which isn't present.", - plug.name, - dep); + Level.ERROR, + "Missing coremod dependency - the coremod %s depends on coremod %s which isn't present.", + plug.name, + dep); throw new RuntimeException(); } sortGraph.addEdge(plug, pluginMap.get(dep)); @@ -624,12 +654,16 @@ public class CoreModManager { if (o1 instanceof FMLPluginWrapper) { first = ((FMLPluginWrapper) o1).sortIndex; } else if (first == null) { - first = tweakSorting.get(o1.getClass().getName()); + first = tweakSorting.get( + o1.getClass() + .getName()); } if (o2 instanceof FMLPluginWrapper) { second = ((FMLPluginWrapper) o2).sortIndex; } else if (second == null) { - second = tweakSorting.get(o2.getClass().getName()); + second = tweakSorting.get( + o2.getClass() + .getName()); } if (first == null) { first = 0; diff --git a/src/forgePatches/java/cpw/mods/fml/relauncher/FMLSecurityManager.java b/src/forgePatches/java/cpw/mods/fml/relauncher/FMLSecurityManager.java index 7bee51b..b980d35 100644 --- a/src/forgePatches/java/cpw/mods/fml/relauncher/FMLSecurityManager.java +++ b/src/forgePatches/java/cpw/mods/fml/relauncher/FMLSecurityManager.java @@ -28,13 +28,13 @@ public class FMLSecurityManager extends SecurityManager { final Class cRuntimeVersion = Class.forName("java.lang.Runtime$Version"); final MethodHandles.Lookup lookup = MethodHandles.publicLookup(); final MethodHandle mRuntimeVersion = lookup - .findStatic(cRuntime, "version", MethodType.methodType(cRuntimeVersion)); + .findStatic(cRuntime, "version", MethodType.methodType(cRuntimeVersion)); final MethodHandle mVersionParse = lookup - .findStatic(cRuntimeVersion, "parse", MethodType.methodType(cRuntimeVersion, String.class)); + .findStatic(cRuntimeVersion, "parse", MethodType.methodType(cRuntimeVersion, String.class)); final MethodHandle mVersionCompareTo = lookup.findVirtual( - cRuntimeVersion, - "compareToIgnoreOptional", - MethodType.methodType(int.class, cRuntimeVersion)); + cRuntimeVersion, + "compareToIgnoreOptional", + MethodType.methodType(int.class, cRuntimeVersion)); final Object runtimeVersion = mRuntimeVersion.invoke(); final Object ver17_0_6 = mVersionParse.invoke("17.0.6"); final int cmpResult = (int) mVersionCompareTo.invoke(runtimeVersion, ver17_0_6); @@ -46,11 +46,11 @@ public class FMLSecurityManager extends SecurityManager { System.err.println("================================================================="); } else { JOptionPane.showMessageDialog( - null, - "Upgrade your Java 17 install to Java 17.0.6 for lwjgl3ify to work\nYour java version is: " - + runtimeVersion, - "Java version requirement not met", - JOptionPane.ERROR_MESSAGE); + null, + "Upgrade your Java 17 install to Java 17.0.6 for lwjgl3ify to work\nYour java version is: " + + runtimeVersion, + "Java version requirement not met", + JOptionPane.ERROR_MESSAGE); } System.exit(1); } @@ -70,10 +70,10 @@ public class FMLSecurityManager extends SecurityManager { String callingParent = classContexts.length > 5 ? classContexts[5].getName() : "none"; // PATCHED // FML is allowed to call system exit and the Minecraft applet (from the quit button) if (!(callingClass.startsWith("cpw.mods.fml.") - || ("net.minecraft.client.Minecraft".equals(callingClass) - && "net.minecraft.client.Minecraft".equals(callingParent)) - || ("net.minecraft.server.dedicated.DedicatedServer".equals(callingClass) - && "net.minecraft.server.MinecraftServer".equals(callingParent)))) { + || ("net.minecraft.client.Minecraft".equals(callingClass) + && "net.minecraft.client.Minecraft".equals(callingParent)) + || ("net.minecraft.server.dedicated.DedicatedServer".equals(callingClass) + && "net.minecraft.server.MinecraftServer".equals(callingParent)))) { throw new ExitTrappedException(); } } else if ("setSecurityManager".equals(permName)) { diff --git a/src/forgePatches/java/cpw/mods/fml/relauncher/ServerLaunchWrapper.java b/src/forgePatches/java/cpw/mods/fml/relauncher/ServerLaunchWrapper.java index 13a3774..f03bc00 100644 --- a/src/forgePatches/java/cpw/mods/fml/relauncher/ServerLaunchWrapper.java +++ b/src/forgePatches/java/cpw/mods/fml/relauncher/ServerLaunchWrapper.java @@ -22,8 +22,8 @@ public class ServerLaunchWrapper { Class.forName("org.objectweb.asm.Type", true, getClass().getClassLoader()); } catch (Exception e) { System.err.printf( - "We appear to be missing one or more essential library files.\n" - + "You will need to add them to your server before FML and Forge will run successfully."); + "We appear to be missing one or more essential library files.\n" + + "You will need to add them to your server before FML and Forge will run successfully."); e.printStackTrace(System.err); System.exit(1); } diff --git a/src/forgePatches/java/net/minecraftforge/common/util/EnumHelper.java b/src/forgePatches/java/net/minecraftforge/common/util/EnumHelper.java index 1f9c2f5..79a504e 100644 --- a/src/forgePatches/java/net/minecraftforge/common/util/EnumHelper.java +++ b/src/forgePatches/java/net/minecraftforge/common/util/EnumHelper.java @@ -31,21 +31,20 @@ public class EnumHelper { // Some enums are decompiled with extra arguments, so lets check for that @SuppressWarnings("rawtypes") private static Class[][] commonTypes = { { EnumAction.class }, - { ArmorMaterial.class, int.class, int[].class, int.class }, - { EnumArt.class, String.class, int.class, int.class, int.class, int.class }, - { EnumCreatureAttribute.class }, - { EnumCreatureType.class, Class.class, int.class, Material.class, boolean.class, boolean.class }, - { Door.class }, { EnumEnchantmentType.class }, { EnumEntitySize.class }, { Sensitivity.class }, - { MovingObjectType.class }, { EnumSkyBlock.class, int.class }, { EnumStatus.class }, - { ToolMaterial.class, int.class, int.class, float.class, float.class, int.class }, - { EnumRarity.class, EnumChatFormatting.class, String.class } }; + { ArmorMaterial.class, int.class, int[].class, int.class }, + { EnumArt.class, String.class, int.class, int.class, int.class, int.class }, { EnumCreatureAttribute.class }, + { EnumCreatureType.class, Class.class, int.class, Material.class, boolean.class, boolean.class }, + { Door.class }, { EnumEnchantmentType.class }, { EnumEntitySize.class }, { Sensitivity.class }, + { MovingObjectType.class }, { EnumSkyBlock.class, int.class }, { EnumStatus.class }, + { ToolMaterial.class, int.class, int.class, float.class, float.class, int.class }, + { EnumRarity.class, EnumChatFormatting.class, String.class } }; public static EnumAction addAction(String name) { return addEnum(EnumAction.class, name); } public static ArmorMaterial addArmorMaterial(String name, int durability, int[] reductionAmounts, - int enchantability) { + int enchantability) { return addEnum(ArmorMaterial.class, name, durability, reductionAmounts, enchantability); } @@ -59,7 +58,7 @@ public class EnumHelper { @SuppressWarnings("rawtypes") public static EnumCreatureType addCreatureType(String name, Class typeClass, int maxNumber, Material material, - boolean peaceful, boolean animal) { + boolean peaceful, boolean animal) { return addEnum(EnumCreatureType.class, name, typeClass, maxNumber, material, peaceful, animal); } @@ -92,7 +91,7 @@ public class EnumHelper { } public static ToolMaterial addToolMaterial(String name, int harvestLevel, int maxUses, float efficiency, - float damage, int enchantability) { + float damage, int enchantability) { return addEnum(ToolMaterial.class, name, harvestLevel, maxUses, efficiency, damage, enchantability); } @@ -114,7 +113,7 @@ public class EnumHelper { @SuppressWarnings("rawtypes") public static > T addEnum(Class[][] map, Class enumType, String enumName, - Object... paramValues) { + Object... paramValues) { for (Class[] lookup : map) { if (lookup[0] == enumType) { Class[] paramTypes = new Class[lookup.length - 1]; @@ -129,10 +128,10 @@ public class EnumHelper { @SuppressWarnings("unchecked") public static > T addEnum(Class enumType, String enumName, Class[] paramTypes, - Object[] paramValues) { + Object[] paramValues) { if (!extensibleEnumIface.isAssignableFrom(enumType)) { throw new RuntimeException( - "Enum " + enumType.getName() + " was not made extensible, add it to lwjgl3ify configs."); + "Enum " + enumType.getName() + " was not made extensible, add it to lwjgl3ify configs."); } try { @@ -157,7 +156,8 @@ public class EnumHelper { extensibleEnumIface = Class.forName("me.eigenraven.lwjgl3ify.IExtensibleEnum"); Class unsafeHacks = Class.forName("me.eigenraven.lwjgl3ify.UnsafeHacks"); Method setFieldM = unsafeHacks.getMethod("setField", Field.class, Object.class, Object.class); - setFieldHandle = MethodHandles.publicLookup().unreflect(setFieldM); + setFieldHandle = MethodHandles.publicLookup() + .unreflect(setFieldM); } catch (ReflectiveOperationException e) { throw new RuntimeException(e); } diff --git a/src/generated/java/org/lwjgl/LWJGLUtil.java b/src/generated/java/org/lwjgl/LWJGLUtil.java index 3b7d792..2c3647b 100644 --- a/src/generated/java/org/lwjgl/LWJGLUtil.java +++ b/src/generated/java/org/lwjgl/LWJGLUtil.java @@ -14,22 +14,22 @@ public class LWJGLUtil { public static final java.lang.String PLATFORM_WINDOWS_NAME = "windows"; public static java.util.Map getClassTokens(org.lwjgl.LWJGLUtil$TokenFilter arg0, java.util.Map arg1, - java.lang.Iterable arg2) { + java.lang.Iterable arg2) { throw new UnsupportedOperationException(); } public static java.util.Map getClassTokens(org.lwjgl.LWJGLUtil$TokenFilter arg0, java.util.Map arg1, - java.lang.Class[] arg2) { + java.lang.Class[] arg2) { throw new UnsupportedOperationException(); } public static java.lang.String[] getLibraryPaths(java.lang.String arg0, java.lang.String arg1, - java.lang.ClassLoader arg2) { + java.lang.ClassLoader arg2) { throw new UnsupportedOperationException(); } public static java.lang.String[] getLibraryPaths(java.lang.String arg0, java.lang.String[] arg1, - java.lang.ClassLoader arg2) { + java.lang.ClassLoader arg2) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/AMDMultiDrawIndirect.java b/src/generated/java/org/lwjgl/opengl/AMDMultiDrawIndirect.java index bdd3286..ab9cba3 100644 --- a/src/generated/java/org/lwjgl/opengl/AMDMultiDrawIndirect.java +++ b/src/generated/java/org/lwjgl/opengl/AMDMultiDrawIndirect.java @@ -19,7 +19,7 @@ public class AMDMultiDrawIndirect { } public static void glMultiDrawElementsIndirectAMD(int arg0, int arg1, java.nio.ByteBuffer arg2, int arg3, - int arg4) { + int arg4) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/APPLEElementArray.java b/src/generated/java/org/lwjgl/opengl/APPLEElementArray.java index fa39e72..aab6178 100644 --- a/src/generated/java/org/lwjgl/opengl/APPLEElementArray.java +++ b/src/generated/java/org/lwjgl/opengl/APPLEElementArray.java @@ -31,7 +31,7 @@ public class APPLEElementArray { } public static void glMultiDrawRangeElementArrayAPPLE(int arg0, int arg1, int arg2, java.nio.IntBuffer arg3, - java.nio.IntBuffer arg4) { + java.nio.IntBuffer arg4) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/APPLEVertexProgramEvaluators.java b/src/generated/java/org/lwjgl/opengl/APPLEVertexProgramEvaluators.java index 75693ff..477da54 100644 --- a/src/generated/java/org/lwjgl/opengl/APPLEVertexProgramEvaluators.java +++ b/src/generated/java/org/lwjgl/opengl/APPLEVertexProgramEvaluators.java @@ -26,22 +26,22 @@ public class APPLEVertexProgramEvaluators { } public static void glMapVertexAttrib1dAPPLE(int arg0, int arg1, double arg2, double arg3, int arg4, int arg5, - java.nio.DoubleBuffer arg6) { + java.nio.DoubleBuffer arg6) { throw new UnsupportedOperationException(); } public static void glMapVertexAttrib1fAPPLE(int arg0, int arg1, float arg2, float arg3, int arg4, int arg5, - java.nio.FloatBuffer arg6) { + java.nio.FloatBuffer arg6) { throw new UnsupportedOperationException(); } public static void glMapVertexAttrib2dAPPLE(int arg0, int arg1, double arg2, double arg3, int arg4, int arg5, - double arg6, double arg7, int arg8, int arg9, java.nio.DoubleBuffer arg10) { + double arg6, double arg7, int arg8, int arg9, java.nio.DoubleBuffer arg10) { throw new UnsupportedOperationException(); } public static void glMapVertexAttrib2fAPPLE(int arg0, int arg1, float arg2, float arg3, int arg4, int arg5, - float arg6, float arg7, int arg8, int arg9, java.nio.FloatBuffer arg10) { + float arg6, float arg7, int arg8, int arg9, java.nio.FloatBuffer arg10) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/ARBProgram.java b/src/generated/java/org/lwjgl/opengl/ARBProgram.java index 319e517..48111ef 100644 --- a/src/generated/java/org/lwjgl/opengl/ARBProgram.java +++ b/src/generated/java/org/lwjgl/opengl/ARBProgram.java @@ -135,7 +135,7 @@ public class ARBProgram { } public static void glProgramEnvParameter4dARB(int arg0, int arg1, double arg2, double arg3, double arg4, - double arg5) { + double arg5) { throw new UnsupportedOperationException(); } @@ -152,12 +152,12 @@ public class ARBProgram { } public static void glProgramLocalParameter4dARB(int arg0, int arg1, double arg2, double arg3, double arg4, - double arg5) { + double arg5) { throw new UnsupportedOperationException(); } public static void glProgramLocalParameter4fARB(int arg0, int arg1, float arg2, float arg3, float arg4, - float arg5) { + float arg5) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/ARBVertexAttrib64bit.java b/src/generated/java/org/lwjgl/opengl/ARBVertexAttrib64bit.java index 969af3e..42fc592 100644 --- a/src/generated/java/org/lwjgl/opengl/ARBVertexAttrib64bit.java +++ b/src/generated/java/org/lwjgl/opengl/ARBVertexAttrib64bit.java @@ -20,7 +20,7 @@ public class ARBVertexAttrib64bit { } public static void glVertexArrayVertexAttribLOffsetEXT(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, - long arg6) { + long arg6) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/ATIFragmentShader.java b/src/generated/java/org/lwjgl/opengl/ATIFragmentShader.java index 501eba6..22d10a9 100644 --- a/src/generated/java/org/lwjgl/opengl/ATIFragmentShader.java +++ b/src/generated/java/org/lwjgl/opengl/ATIFragmentShader.java @@ -112,12 +112,12 @@ public class ATIFragmentShader { } public static void glAlphaFragmentOp2ATI(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, - int arg7, int arg8) { + int arg7, int arg8) { throw new UnsupportedOperationException(); } public static void glAlphaFragmentOp3ATI(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, - int arg7, int arg8, int arg9, int arg10, int arg11) { + int arg7, int arg8, int arg9, int arg10, int arg11) { throw new UnsupportedOperationException(); } @@ -134,12 +134,12 @@ public class ATIFragmentShader { } public static void glColorFragmentOp2ATI(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, - int arg7, int arg8, int arg9) { + int arg7, int arg8, int arg9) { throw new UnsupportedOperationException(); } public static void glColorFragmentOp3ATI(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, - int arg7, int arg8, int arg9, int arg10, int arg11, int arg12) { + int arg7, int arg8, int arg9, int arg10, int arg11, int arg12) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java b/src/generated/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java index ba57202..8613092 100644 --- a/src/generated/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java +++ b/src/generated/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java @@ -11,7 +11,7 @@ public class ATIVertexAttribArrayObject { } public static void glVertexAttribArrayObjectATI(int arg0, int arg1, int arg2, boolean arg3, int arg4, int arg5, - int arg6) { + int arg6) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/Display.java b/src/generated/java/org/lwjgl/opengl/Display.java index 1aae90a..56fcc15 100644 --- a/src/generated/java/org/lwjgl/opengl/Display.java +++ b/src/generated/java/org/lwjgl/opengl/Display.java @@ -19,7 +19,7 @@ public class Display { } public static void create(org.lwjgl.opengl.PixelFormat arg0, org.lwjgl.opengl.Drawable arg1, - org.lwjgl.opengl.ContextAttribs arg2) { + org.lwjgl.opengl.ContextAttribs arg2) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/EXTPalettedTexture.java b/src/generated/java/org/lwjgl/opengl/EXTPalettedTexture.java index da6813e..e244658 100644 --- a/src/generated/java/org/lwjgl/opengl/EXTPalettedTexture.java +++ b/src/generated/java/org/lwjgl/opengl/EXTPalettedTexture.java @@ -23,7 +23,7 @@ public class EXTPalettedTexture { } public static void glColorSubTableEXT(int arg0, int arg1, int arg2, int arg3, int arg4, - java.nio.DoubleBuffer arg5) { + java.nio.DoubleBuffer arg5) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/InputImplementation.java b/src/generated/java/org/lwjgl/opengl/InputImplementation.java index 8f0266d..b3338f4 100644 --- a/src/generated/java/org/lwjgl/opengl/InputImplementation.java +++ b/src/generated/java/org/lwjgl/opengl/InputImplementation.java @@ -3,7 +3,7 @@ package org.lwjgl.opengl; public interface InputImplementation { public abstract java.lang.Object createCursor(int arg0, int arg1, int arg2, int arg3, int arg4, - java.nio.IntBuffer arg5, java.nio.IntBuffer arg6); + java.nio.IntBuffer arg5, java.nio.IntBuffer arg6); public abstract void createKeyboard(); diff --git a/src/generated/java/org/lwjgl/opengl/NVEvaluators.java b/src/generated/java/org/lwjgl/opengl/NVEvaluators.java index d95c5e7..dc3e8ef 100644 --- a/src/generated/java/org/lwjgl/opengl/NVEvaluators.java +++ b/src/generated/java/org/lwjgl/opengl/NVEvaluators.java @@ -40,7 +40,7 @@ public class NVEvaluators { } public static void glGetMapControlPointsNV(int arg0, int arg1, int arg2, int arg3, int arg4, boolean arg5, - java.nio.FloatBuffer arg6) { + java.nio.FloatBuffer arg6) { throw new UnsupportedOperationException(); } @@ -53,7 +53,7 @@ public class NVEvaluators { } public static void glMapControlPointsNV(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, - boolean arg7, java.nio.FloatBuffer arg8) { + boolean arg7, java.nio.FloatBuffer arg8) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/NVFragmentProgram.java b/src/generated/java/org/lwjgl/opengl/NVFragmentProgram.java index 809a6b2..c71131b 100644 --- a/src/generated/java/org/lwjgl/opengl/NVFragmentProgram.java +++ b/src/generated/java/org/lwjgl/opengl/NVFragmentProgram.java @@ -17,12 +17,12 @@ public class NVFragmentProgram extends org.lwjgl.opengl.NVProgram { } public static void glProgramNamedParameter4dNV(int arg0, java.nio.ByteBuffer arg1, double arg2, double arg3, - double arg4, double arg5) { + double arg4, double arg5) { throw new UnsupportedOperationException(); } public static void glProgramNamedParameter4fNV(int arg0, java.nio.ByteBuffer arg1, float arg2, float arg3, - float arg4, float arg5) { + float arg4, float arg5) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/NVPresentVideo.java b/src/generated/java/org/lwjgl/opengl/NVPresentVideo.java index 93a0f2d..277e4bc 100644 --- a/src/generated/java/org/lwjgl/opengl/NVPresentVideo.java +++ b/src/generated/java/org/lwjgl/opengl/NVPresentVideo.java @@ -43,12 +43,12 @@ public class NVPresentVideo { } public static void glPresentFrameDualFillNV(int arg0, long arg1, int arg2, int arg3, int arg4, int arg5, int arg6, - int arg7, int arg8, int arg9, int arg10, int arg11, int arg12) { + int arg7, int arg8, int arg9, int arg10, int arg11, int arg12) { throw new UnsupportedOperationException(); } public static void glPresentFrameKeyedNV(int arg0, long arg1, int arg2, int arg3, int arg4, int arg5, int arg6, - int arg7, int arg8, int arg9, int arg10) { + int arg7, int arg8, int arg9, int arg10) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/NVRegisterCombiners.java b/src/generated/java/org/lwjgl/opengl/NVRegisterCombiners.java index 3e28298..f8064ee 100644 --- a/src/generated/java/org/lwjgl/opengl/NVRegisterCombiners.java +++ b/src/generated/java/org/lwjgl/opengl/NVRegisterCombiners.java @@ -59,7 +59,7 @@ public class NVRegisterCombiners { } public static void glCombinerOutputNV(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, - boolean arg7, boolean arg8, boolean arg9) { + boolean arg7, boolean arg8, boolean arg9) { throw new UnsupportedOperationException(); } @@ -84,7 +84,7 @@ public class NVRegisterCombiners { } public static void glGetCombinerInputParameterNV(int arg0, int arg1, int arg2, int arg3, - java.nio.FloatBuffer arg4) { + java.nio.FloatBuffer arg4) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/Display.java b/src/generated/java/org/lwjgl/util/Display.java index 3a7ed5b..1f7ed41 100644 --- a/src/generated/java/org/lwjgl/util/Display.java +++ b/src/generated/java/org/lwjgl/util/Display.java @@ -3,12 +3,12 @@ package org.lwjgl.util; public class Display { public static org.lwjgl.opengl.DisplayMode[] getAvailableDisplayModes(int arg0, int arg1, int arg2, int arg3, - int arg4, int arg5, int arg6, int arg7) { + int arg4, int arg5, int arg6, int arg7) { throw new UnsupportedOperationException(); } public static org.lwjgl.opengl.DisplayMode setDisplayMode(org.lwjgl.opengl.DisplayMode[] arg0, - java.lang.String[] arg1) { + java.lang.String[] arg1) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/Rectangle.java b/src/generated/java/org/lwjgl/util/Rectangle.java index 0626fec..ac2efb6 100644 --- a/src/generated/java/org/lwjgl/util/Rectangle.java +++ b/src/generated/java/org/lwjgl/util/Rectangle.java @@ -135,7 +135,7 @@ public class Rectangle { } public org.lwjgl.util.WritableRectangle union(org.lwjgl.util.ReadableRectangle arg0, - org.lwjgl.util.WritableRectangle arg1) { + org.lwjgl.util.WritableRectangle arg1) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/glu/GLU.java b/src/generated/java/org/lwjgl/util/glu/GLU.java index dd4afeb..806d94f 100644 --- a/src/generated/java/org/lwjgl/util/glu/GLU.java +++ b/src/generated/java/org/lwjgl/util/glu/GLU.java @@ -119,7 +119,7 @@ public class GLU { public static final double TESS_MAX_COORD = (double) 1.0E150; public static int gluBuild2DMipmaps(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, - java.nio.ByteBuffer arg6) { + java.nio.ByteBuffer arg6) { throw new UnsupportedOperationException(); } @@ -136,7 +136,7 @@ public class GLU { } public static void gluLookAt(float arg0, float arg1, float arg2, float arg3, float arg4, float arg5, float arg6, - float arg7, float arg8) { + float arg7, float arg8) { throw new UnsupportedOperationException(); } @@ -157,17 +157,17 @@ public class GLU { } public static boolean gluProject(float arg0, float arg1, float arg2, java.nio.FloatBuffer arg3, - java.nio.FloatBuffer arg4, java.nio.IntBuffer arg5, java.nio.FloatBuffer arg6) { + java.nio.FloatBuffer arg4, java.nio.IntBuffer arg5, java.nio.FloatBuffer arg6) { throw new UnsupportedOperationException(); } public static int gluScaleImage(int arg0, int arg1, int arg2, int arg3, java.nio.ByteBuffer arg4, int arg5, - int arg6, int arg7, java.nio.ByteBuffer arg8) { + int arg6, int arg7, java.nio.ByteBuffer arg8) { throw new UnsupportedOperationException(); } public static boolean gluUnProject(float arg0, float arg1, float arg2, java.nio.FloatBuffer arg3, - java.nio.FloatBuffer arg4, java.nio.IntBuffer arg5, java.nio.FloatBuffer arg6) { + java.nio.FloatBuffer arg4, java.nio.IntBuffer arg5, java.nio.FloatBuffer arg6) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/glu/GLUtessellatorCallback.java b/src/generated/java/org/lwjgl/util/glu/GLUtessellatorCallback.java index da20875..39c32c4 100644 --- a/src/generated/java/org/lwjgl/util/glu/GLUtessellatorCallback.java +++ b/src/generated/java/org/lwjgl/util/glu/GLUtessellatorCallback.java @@ -9,7 +9,7 @@ public interface GLUtessellatorCallback { public abstract void combine(double[] arg0, java.lang.Object[] arg1, float[] arg2, java.lang.Object[] arg3); public abstract void combineData(double[] arg0, java.lang.Object[] arg1, float[] arg2, java.lang.Object[] arg3, - java.lang.Object arg4); + java.lang.Object arg4); public abstract void edgeFlag(boolean arg0); diff --git a/src/generated/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java b/src/generated/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java index 7f299ef..d64440b 100644 --- a/src/generated/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java +++ b/src/generated/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java @@ -15,7 +15,7 @@ public class GLUtessellatorCallbackAdapter { } public void combineData(double[] arg0, java.lang.Object[] arg1, float[] arg2, java.lang.Object[] arg3, - java.lang.Object arg4) { + java.lang.Object arg4) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/glu/MipMap.java b/src/generated/java/org/lwjgl/util/glu/MipMap.java index d460134..a20e830 100644 --- a/src/generated/java/org/lwjgl/util/glu/MipMap.java +++ b/src/generated/java/org/lwjgl/util/glu/MipMap.java @@ -3,12 +3,12 @@ package org.lwjgl.util.glu; public class MipMap extends org.lwjgl.util.glu.Util { public static int gluBuild2DMipmaps(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, - java.nio.ByteBuffer arg6) { + java.nio.ByteBuffer arg6) { throw new UnsupportedOperationException(); } public static int gluScaleImage(int arg0, int arg1, int arg2, int arg3, java.nio.ByteBuffer arg4, int arg5, - int arg6, int arg7, java.nio.ByteBuffer arg8) { + int arg6, int arg7, java.nio.ByteBuffer arg8) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/glu/Project.java b/src/generated/java/org/lwjgl/util/glu/Project.java index d09d7a6..020d7ee 100644 --- a/src/generated/java/org/lwjgl/util/glu/Project.java +++ b/src/generated/java/org/lwjgl/util/glu/Project.java @@ -3,7 +3,7 @@ package org.lwjgl.util.glu; public class Project extends org.lwjgl.util.glu.Util { public static void gluLookAt(float arg0, float arg1, float arg2, float arg3, float arg4, float arg5, float arg6, - float arg7, float arg8) { + float arg7, float arg8) { throw new UnsupportedOperationException(); } @@ -16,12 +16,12 @@ public class Project extends org.lwjgl.util.glu.Util { } public static boolean gluProject(float arg0, float arg1, float arg2, java.nio.FloatBuffer arg3, - java.nio.FloatBuffer arg4, java.nio.IntBuffer arg5, java.nio.FloatBuffer arg6) { + java.nio.FloatBuffer arg4, java.nio.IntBuffer arg5, java.nio.FloatBuffer arg6) { throw new UnsupportedOperationException(); } public static boolean gluUnProject(float arg0, float arg1, float arg2, java.nio.FloatBuffer arg3, - java.nio.FloatBuffer arg4, java.nio.IntBuffer arg5, java.nio.FloatBuffer arg6) { + java.nio.FloatBuffer arg4, java.nio.IntBuffer arg5, java.nio.FloatBuffer arg6) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/mapped/MappedHelper.java b/src/generated/java/org/lwjgl/util/mapped/MappedHelper.java index e6ab974..bdfe282 100644 --- a/src/generated/java/org/lwjgl/util/mapped/MappedHelper.java +++ b/src/generated/java/org/lwjgl/util/mapped/MappedHelper.java @@ -63,7 +63,7 @@ public class MappedHelper { } public static void copy(org.lwjgl.util.mapped.MappedObject arg0, org.lwjgl.util.mapped.MappedObject arg1, - int arg2) { + int arg2) { throw new UnsupportedOperationException(); } @@ -108,7 +108,7 @@ public class MappedHelper { } public static org.lwjgl.util.mapped.MappedObject dup(org.lwjgl.util.mapped.MappedObject arg0, - org.lwjgl.util.mapped.MappedObject arg1) { + org.lwjgl.util.mapped.MappedObject arg1) { throw new UnsupportedOperationException(); } @@ -273,7 +273,7 @@ public class MappedHelper { } public static org.lwjgl.util.mapped.MappedObject slice(org.lwjgl.util.mapped.MappedObject arg0, - org.lwjgl.util.mapped.MappedObject arg1) { + org.lwjgl.util.mapped.MappedObject arg1) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/mapped/MappedSet.java b/src/generated/java/org/lwjgl/util/mapped/MappedSet.java index b21311f..d74e33b 100644 --- a/src/generated/java/org/lwjgl/util/mapped/MappedSet.java +++ b/src/generated/java/org/lwjgl/util/mapped/MappedSet.java @@ -3,18 +3,18 @@ package org.lwjgl.util.mapped; public class MappedSet { public static org.lwjgl.util.mapped.MappedSet2 create(org.lwjgl.util.mapped.MappedObject arg0, - org.lwjgl.util.mapped.MappedObject arg1) { + org.lwjgl.util.mapped.MappedObject arg1) { throw new UnsupportedOperationException(); } public static org.lwjgl.util.mapped.MappedSet3 create(org.lwjgl.util.mapped.MappedObject arg0, - org.lwjgl.util.mapped.MappedObject arg1, org.lwjgl.util.mapped.MappedObject arg2) { + org.lwjgl.util.mapped.MappedObject arg1, org.lwjgl.util.mapped.MappedObject arg2) { throw new UnsupportedOperationException(); } public static org.lwjgl.util.mapped.MappedSet4 create(org.lwjgl.util.mapped.MappedObject arg0, - org.lwjgl.util.mapped.MappedObject arg1, org.lwjgl.util.mapped.MappedObject arg2, - org.lwjgl.util.mapped.MappedObject arg3) { + org.lwjgl.util.mapped.MappedObject arg1, org.lwjgl.util.mapped.MappedObject arg2, + org.lwjgl.util.mapped.MappedObject arg3) { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/vector/Matrix2f.java b/src/generated/java/org/lwjgl/util/vector/Matrix2f.java index d5f7f59..ecb00c4 100644 --- a/src/generated/java/org/lwjgl/util/vector/Matrix2f.java +++ b/src/generated/java/org/lwjgl/util/vector/Matrix2f.java @@ -294,8 +294,16 @@ public class Matrix2f extends Matrix implements Serializable { */ public String toString() { StringBuilder buf = new StringBuilder(); - buf.append(m00).append(' ').append(m10).append(' ').append('\n'); - buf.append(m01).append(' ').append(m11).append(' ').append('\n'); + buf.append(m00) + .append(' ') + .append(m10) + .append(' ') + .append('\n'); + buf.append(m01) + .append(' ') + .append(m11) + .append(' ') + .append('\n'); return buf.toString(); } diff --git a/src/generated/java/org/lwjgl/util/vector/Matrix3f.java b/src/generated/java/org/lwjgl/util/vector/Matrix3f.java index 0e3ab4c..37d290d 100644 --- a/src/generated/java/org/lwjgl/util/vector/Matrix3f.java +++ b/src/generated/java/org/lwjgl/util/vector/Matrix3f.java @@ -317,9 +317,27 @@ public class Matrix3f extends Matrix implements Serializable { */ public String toString() { StringBuilder buf = new StringBuilder(); - buf.append(m00).append(' ').append(m10).append(' ').append(m20).append(' ').append('\n'); - buf.append(m01).append(' ').append(m11).append(' ').append(m21).append(' ').append('\n'); - buf.append(m02).append(' ').append(m12).append(' ').append(m22).append(' ').append('\n'); + buf.append(m00) + .append(' ') + .append(m10) + .append(' ') + .append(m20) + .append(' ') + .append('\n'); + buf.append(m01) + .append(' ') + .append(m11) + .append(' ') + .append(m21) + .append(' ') + .append('\n'); + buf.append(m02) + .append(' ') + .append(m12) + .append(' ') + .append(m22) + .append(' ') + .append('\n'); return buf.toString(); } diff --git a/src/generated/java/org/lwjgl/util/vector/Matrix4f.java b/src/generated/java/org/lwjgl/util/vector/Matrix4f.java index 0bfddb1..598be60 100644 --- a/src/generated/java/org/lwjgl/util/vector/Matrix4f.java +++ b/src/generated/java/org/lwjgl/util/vector/Matrix4f.java @@ -47,10 +47,38 @@ public class Matrix4f extends Matrix implements Serializable { */ public String toString() { StringBuilder buf = new StringBuilder(); - buf.append(m00).append(' ').append(m10).append(' ').append(m20).append(' ').append(m30).append('\n'); - buf.append(m01).append(' ').append(m11).append(' ').append(m21).append(' ').append(m31).append('\n'); - buf.append(m02).append(' ').append(m12).append(' ').append(m22).append(' ').append(m32).append('\n'); - buf.append(m03).append(' ').append(m13).append(' ').append(m23).append(' ').append(m33).append('\n'); + buf.append(m00) + .append(' ') + .append(m10) + .append(' ') + .append(m20) + .append(' ') + .append(m30) + .append('\n'); + buf.append(m01) + .append(' ') + .append(m11) + .append(' ') + .append(m21) + .append(' ') + .append(m31) + .append('\n'); + buf.append(m02) + .append(' ') + .append(m12) + .append(' ') + .append(m22) + .append(' ') + .append(m32) + .append('\n'); + buf.append(m03) + .append(' ') + .append(m13) + .append(' ') + .append(m23) + .append(' ') + .append(m33) + .append('\n'); return buf.toString(); } @@ -687,17 +715,17 @@ public class Matrix4f extends Matrix implements Serializable { */ public float determinant() { float f = m00 * ((m11 * m22 * m33 + m12 * m23 * m31 + m13 * m21 * m32) - m13 * m22 * m31 - - m11 * m23 * m32 - - m12 * m21 * m33); + - m11 * m23 * m32 + - m12 * m21 * m33); f -= m01 * ((m10 * m22 * m33 + m12 * m23 * m30 + m13 * m20 * m32) - m13 * m22 * m30 - - m10 * m23 * m32 - - m12 * m20 * m33); + - m10 * m23 * m32 + - m12 * m20 * m33); f += m02 * ((m10 * m21 * m33 + m11 * m23 * m30 + m13 * m20 * m31) - m13 * m21 * m30 - - m10 * m23 * m31 - - m11 * m20 * m33); + - m10 * m23 * m31 + - m11 * m20 * m33); f -= m03 * ((m10 * m21 * m32 + m11 * m22 * m30 + m12 * m20 * m31) - m12 * m21 * m30 - - m10 * m22 * m31 - - m11 * m20 * m32); + - m10 * m22 * m31 + - m11 * m20 * m32); return f; } @@ -707,7 +735,7 @@ public class Matrix4f extends Matrix implements Serializable { * @return result */ private static float determinant3x3(float t00, float t01, float t02, float t10, float t11, float t12, float t20, - float t21, float t22) { + float t21, float t22) { return t00 * (t11 * t22 - t12 * t21) + t01 * (t12 * t20 - t10 * t22) + t02 * (t10 * t21 - t11 * t20); } @@ -740,94 +768,94 @@ public class Matrix4f extends Matrix implements Serializable { // first row float t00 = determinant3x3(src.m11, src.m12, src.m13, src.m21, src.m22, src.m23, src.m31, src.m32, src.m33); float t01 = -determinant3x3( - src.m10, - src.m12, - src.m13, - src.m20, - src.m22, - src.m23, - src.m30, - src.m32, - src.m33); + src.m10, + src.m12, + src.m13, + src.m20, + src.m22, + src.m23, + src.m30, + src.m32, + src.m33); float t02 = determinant3x3(src.m10, src.m11, src.m13, src.m20, src.m21, src.m23, src.m30, src.m31, src.m33); float t03 = -determinant3x3( - src.m10, - src.m11, - src.m12, - src.m20, - src.m21, - src.m22, - src.m30, - src.m31, - src.m32); + src.m10, + src.m11, + src.m12, + src.m20, + src.m21, + src.m22, + src.m30, + src.m31, + src.m32); // second row float t10 = -determinant3x3( - src.m01, - src.m02, - src.m03, - src.m21, - src.m22, - src.m23, - src.m31, - src.m32, - src.m33); + src.m01, + src.m02, + src.m03, + src.m21, + src.m22, + src.m23, + src.m31, + src.m32, + src.m33); float t11 = determinant3x3(src.m00, src.m02, src.m03, src.m20, src.m22, src.m23, src.m30, src.m32, src.m33); float t12 = -determinant3x3( - src.m00, - src.m01, - src.m03, - src.m20, - src.m21, - src.m23, - src.m30, - src.m31, - src.m33); + src.m00, + src.m01, + src.m03, + src.m20, + src.m21, + src.m23, + src.m30, + src.m31, + src.m33); float t13 = determinant3x3(src.m00, src.m01, src.m02, src.m20, src.m21, src.m22, src.m30, src.m31, src.m32); // third row float t20 = determinant3x3(src.m01, src.m02, src.m03, src.m11, src.m12, src.m13, src.m31, src.m32, src.m33); float t21 = -determinant3x3( - src.m00, - src.m02, - src.m03, - src.m10, - src.m12, - src.m13, - src.m30, - src.m32, - src.m33); + src.m00, + src.m02, + src.m03, + src.m10, + src.m12, + src.m13, + src.m30, + src.m32, + src.m33); float t22 = determinant3x3(src.m00, src.m01, src.m03, src.m10, src.m11, src.m13, src.m30, src.m31, src.m33); float t23 = -determinant3x3( - src.m00, - src.m01, - src.m02, - src.m10, - src.m11, - src.m12, - src.m30, - src.m31, - src.m32); + src.m00, + src.m01, + src.m02, + src.m10, + src.m11, + src.m12, + src.m30, + src.m31, + src.m32); // fourth row float t30 = -determinant3x3( - src.m01, - src.m02, - src.m03, - src.m11, - src.m12, - src.m13, - src.m21, - src.m22, - src.m23); + src.m01, + src.m02, + src.m03, + src.m11, + src.m12, + src.m13, + src.m21, + src.m22, + src.m23); float t31 = determinant3x3(src.m00, src.m02, src.m03, src.m10, src.m12, src.m13, src.m20, src.m22, src.m23); float t32 = -determinant3x3( - src.m00, - src.m01, - src.m03, - src.m10, - src.m11, - src.m13, - src.m20, - src.m21, - src.m23); + src.m00, + src.m01, + src.m03, + src.m10, + src.m11, + src.m13, + src.m20, + src.m21, + src.m23); float t33 = determinant3x3(src.m00, src.m01, src.m02, src.m10, src.m11, src.m12, src.m20, src.m21, src.m22); // transpose and divide by the determinant diff --git a/src/generated/java/org/lwjgl/util/vector/Quaternion.java b/src/generated/java/org/lwjgl/util/vector/Quaternion.java index 91525b5..0572a22 100644 --- a/src/generated/java/org/lwjgl/util/vector/Quaternion.java +++ b/src/generated/java/org/lwjgl/util/vector/Quaternion.java @@ -330,10 +330,10 @@ public class Quaternion extends Vector implements ReadableVector4f { public static Quaternion mul(Quaternion left, Quaternion right, Quaternion dest) { if (dest == null) dest = new Quaternion(); dest.set( - left.x * right.w + left.w * right.x + left.y * right.z - left.z * right.y, - left.y * right.w + left.w * right.y + left.z * right.x - left.x * right.z, - left.z * right.w + left.w * right.z + left.x * right.y - left.y * right.x, - left.w * right.w - left.x * right.x - left.y * right.y - left.z * right.z); + left.x * right.w + left.w * right.x + left.y * right.z - left.z * right.y, + left.y * right.w + left.w * right.y + left.z * right.x - left.x * right.z, + left.z * right.w + left.w * right.z + left.x * right.y - left.y * right.x, + left.w * right.w - left.x * right.x - left.y * right.y - left.z * right.z); return dest; } @@ -352,10 +352,10 @@ public class Quaternion extends Vector implements ReadableVector4f { // store on stack once for aliasing-safty if (dest == null) dest = new Quaternion(); dest.set( - (left.x * right.w - left.w * right.x - left.y * right.z + left.z * right.y) * n, - (left.y * right.w - left.w * right.y - left.z * right.x + left.x * right.z) * n, - (left.z * right.w - left.w * right.z - left.x * right.y + left.y * right.x) * n, - (left.w * right.w + left.x * right.x + left.y * right.y + left.z * right.z) * n); + (left.x * right.w - left.w * right.x - left.y * right.z + left.z * right.y) * n, + (left.y * right.w - left.w * right.y - left.z * right.x + left.x * right.z) * n, + (left.z * right.w - left.w * right.z - left.x * right.y + left.y * right.x) * n, + (left.w * right.w + left.x * right.x + left.y * right.y + left.z * right.z) * n); return dest; } @@ -423,7 +423,7 @@ public class Quaternion extends Vector implements ReadableVector4f { * Private method to perform the matrix-to-quaternion conversion */ private Quaternion setFromMat(float m00, float m01, float m02, float m10, float m11, float m12, float m20, - float m21, float m22) { + float m21, float m22) { float s; float tr = m00 + m11 + m22; diff --git a/src/generated/java/org/lwjgl/util/vector/Vector3f.java b/src/generated/java/org/lwjgl/util/vector/Vector3f.java index 63e96cb..778a632 100644 --- a/src/generated/java/org/lwjgl/util/vector/Vector3f.java +++ b/src/generated/java/org/lwjgl/util/vector/Vector3f.java @@ -150,9 +150,9 @@ public class Vector3f extends Vector implements Serializable, ReadableVector3f, if (dest == null) dest = new Vector3f(); dest.set( - left.y * right.z - left.z * right.y, - right.x * left.z - right.z * left.x, - left.x * right.y - left.y * right.x); + left.y * right.z - left.z * right.y, + right.x * left.z - right.z * left.x, + left.x * right.y - left.y * right.x); return dest; } diff --git a/src/generated/java/org/lwjglx/openal/ALC10.java b/src/generated/java/org/lwjglx/openal/ALC10.java index 32583f9..7c6ee7f 100644 --- a/src/generated/java/org/lwjglx/openal/ALC10.java +++ b/src/generated/java/org/lwjglx/openal/ALC10.java @@ -30,10 +30,10 @@ public class ALC10 { } public static org.lwjglx.openal.ALCcontext alcCreateContext(org.lwjglx.openal.ALCdevice arg0, - java.nio.IntBuffer arg1) { + java.nio.IntBuffer arg1) { org.lwjglx.openal.ALCcontext returnValue = new ALCcontext( - org.lwjgl.openal.ALC10.alcCreateContext(arg0.device, arg1)); + org.lwjgl.openal.ALC10.alcCreateContext(arg0.device, arg1)); return returnValue; } @@ -103,7 +103,7 @@ public class ALC10 { public static org.lwjglx.openal.ALCdevice alcOpenDevice(java.lang.String arg0) { org.lwjglx.openal.ALCdevice returnValue = new org.lwjglx.openal.ALCdevice( - org.lwjgl.openal.ALC10.alcOpenDevice(arg0)); + org.lwjgl.openal.ALC10.alcOpenDevice(arg0)); return returnValue; } diff --git a/src/generated/java/org/lwjglx/openal/ALC11.java b/src/generated/java/org/lwjglx/openal/ALC11.java index 9b8d9f6..e16c760 100644 --- a/src/generated/java/org/lwjglx/openal/ALC11.java +++ b/src/generated/java/org/lwjglx/openal/ALC11.java @@ -18,10 +18,10 @@ public class ALC11 { } public static org.lwjglx.openal.ALCdevice alcCaptureOpenDevice(java.lang.String arg0, int arg1, int frequency, - int format) { + int format) { org.lwjglx.openal.ALCdevice returnValue = new org.lwjglx.openal.ALCdevice( - org.lwjgl.openal.ALC11.alcCaptureOpenDevice(arg0, arg1, frequency, format)); + org.lwjgl.openal.ALC11.alcCaptureOpenDevice(arg0, arg1, frequency, format)); return returnValue; } diff --git a/src/generated/java/org/lwjglx/opengl/AMDDebugOutput.java b/src/generated/java/org/lwjglx/opengl/AMDDebugOutput.java index c074ad0..c26852a 100644 --- a/src/generated/java/org/lwjglx/opengl/AMDDebugOutput.java +++ b/src/generated/java/org/lwjglx/opengl/AMDDebugOutput.java @@ -30,9 +30,9 @@ public class AMDDebugOutput { } public static int glGetDebugMessageLogAMD(int count, java.nio.IntBuffer categories, java.nio.IntBuffer severities, - java.nio.IntBuffer ids, java.nio.IntBuffer lengths, java.nio.ByteBuffer messageLog) { + java.nio.IntBuffer ids, java.nio.IntBuffer lengths, java.nio.ByteBuffer messageLog) { return org.lwjgl.opengl.AMDDebugOutput - .glGetDebugMessageLogAMD(count, categories, severities, ids, lengths, messageLog); + .glGetDebugMessageLogAMD(count, categories, severities, ids, lengths, messageLog); } } diff --git a/src/generated/java/org/lwjglx/opengl/AMDPerformanceMonitor.java b/src/generated/java/org/lwjglx/opengl/AMDPerformanceMonitor.java index 8ac83f3..04b37f7 100644 --- a/src/generated/java/org/lwjglx/opengl/AMDPerformanceMonitor.java +++ b/src/generated/java/org/lwjglx/opengl/AMDPerformanceMonitor.java @@ -35,7 +35,7 @@ public class AMDPerformanceMonitor { } public static void glGetPerfMonitorCounterDataAMD(int monitor, int pname, java.nio.IntBuffer data, - java.nio.IntBuffer bytesWritten) { + java.nio.IntBuffer bytesWritten) { org.lwjgl.opengl.AMDPerformanceMonitor.glGetPerfMonitorCounterDataAMD(monitor, pname, data, bytesWritten); } @@ -44,18 +44,18 @@ public class AMDPerformanceMonitor { } public static void glGetPerfMonitorCounterStringAMD(int group, int counter, java.nio.IntBuffer length, - java.nio.ByteBuffer counterString) { + java.nio.ByteBuffer counterString) { org.lwjgl.opengl.AMDPerformanceMonitor.glGetPerfMonitorCounterStringAMD(group, counter, length, counterString); } public static void glGetPerfMonitorCountersAMD(int group, java.nio.IntBuffer numCounters, - java.nio.IntBuffer maxActiveCounters, java.nio.IntBuffer counters) { + java.nio.IntBuffer maxActiveCounters, java.nio.IntBuffer counters) { org.lwjgl.opengl.AMDPerformanceMonitor - .glGetPerfMonitorCountersAMD(group, numCounters, maxActiveCounters, counters); + .glGetPerfMonitorCountersAMD(group, numCounters, maxActiveCounters, counters); } public static void glGetPerfMonitorGroupStringAMD(int group, java.nio.IntBuffer length, - java.nio.ByteBuffer groupString) { + java.nio.ByteBuffer groupString) { org.lwjgl.opengl.AMDPerformanceMonitor.glGetPerfMonitorGroupStringAMD(group, length, groupString); } @@ -66,12 +66,12 @@ public class AMDPerformanceMonitor { public static void glSelectPerfMonitorCountersAMD(int monitor, boolean enable, int group, int counter) { org.lwjgl.opengl.AMDPerformanceMonitor - .glSelectPerfMonitorCountersAMD(monitor, enable, group, new int[] { counter }); + .glSelectPerfMonitorCountersAMD(monitor, enable, group, new int[] { counter }); } public static void glSelectPerfMonitorCountersAMD(int monitor, boolean enable, int group, - java.nio.IntBuffer counterList) { + java.nio.IntBuffer counterList) { org.lwjgl.opengl.AMDPerformanceMonitor.glSelectPerfMonitorCountersAMD(monitor, enable, group, counterList); } diff --git a/src/generated/java/org/lwjglx/opengl/AMDSparseTexture.java b/src/generated/java/org/lwjglx/opengl/AMDSparseTexture.java index b030318..d6c28cc 100644 --- a/src/generated/java/org/lwjglx/opengl/AMDSparseTexture.java +++ b/src/generated/java/org/lwjglx/opengl/AMDSparseTexture.java @@ -13,15 +13,15 @@ public class AMDSparseTexture { public static final int GL_VIRTUAL_PAGE_SIZE_Z_AMD = (int) 37271; public static void glTexStorageSparseAMD(int target, int internalFormat, int width, int height, int depth, - int layers, int flags) { + int layers, int flags) { org.lwjgl.opengl.AMDSparseTexture - .glTexStorageSparseAMD(target, internalFormat, width, height, depth, layers, flags); + .glTexStorageSparseAMD(target, internalFormat, width, height, depth, layers, flags); } public static void glTextureStorageSparseAMD(int texture, int target, int internalFormat, int width, int height, - int depth, int layers, int flags) { + int depth, int layers, int flags) { org.lwjgl.opengl.AMDSparseTexture - .glTextureStorageSparseAMD(texture, target, internalFormat, width, height, depth, layers, flags); + .glTextureStorageSparseAMD(texture, target, internalFormat, width, height, depth, layers, flags); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBBaseInstance.java b/src/generated/java/org/lwjglx/opengl/ARBBaseInstance.java index efea415..bacea42 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBBaseInstance.java +++ b/src/generated/java/org/lwjglx/opengl/ARBBaseInstance.java @@ -3,64 +3,64 @@ package org.lwjglx.opengl; public class ARBBaseInstance { public static void glDrawArraysInstancedBaseInstance(int mode, int first, int count, int primcount, - int baseinstance) { + int baseinstance) { org.lwjgl.opengl.ARBBaseInstance.glDrawArraysInstancedBaseInstance(mode, first, count, primcount, baseinstance); } public static void glDrawElementsInstancedBaseInstance(int mode, int indices_count, int type, - long indices_buffer_offset, int primcount, int baseinstance) { + long indices_buffer_offset, int primcount, int baseinstance) { org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance( - mode, - indices_count, - type, - indices_buffer_offset, - primcount, - baseinstance); + mode, + indices_count, + type, + indices_buffer_offset, + primcount, + baseinstance); } public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.ByteBuffer indices, int primcount, - int baseinstance) { + int baseinstance) { org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance); } public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.IntBuffer indices, int primcount, - int baseinstance) { + int baseinstance) { org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance); } public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.ShortBuffer indices, int primcount, - int baseinstance) { + int baseinstance) { org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance); } public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, int indices_count, int type, - long indices_buffer_offset, int primcount, int basevertex, int baseinstance) { + long indices_buffer_offset, int primcount, int basevertex, int baseinstance) { org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseVertexBaseInstance( - mode, - indices_count, - type, - indices_buffer_offset, - primcount, - basevertex, - baseinstance); + mode, + indices_count, + type, + indices_buffer_offset, + primcount, + basevertex, + baseinstance); } public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.ByteBuffer indices, - int primcount, int basevertex, int baseinstance) { + int primcount, int basevertex, int baseinstance) { org.lwjgl.opengl.ARBBaseInstance - .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); + .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); } public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.IntBuffer indices, - int primcount, int basevertex, int baseinstance) { + int primcount, int basevertex, int baseinstance) { org.lwjgl.opengl.ARBBaseInstance - .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); + .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); } public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.ShortBuffer indices, - int primcount, int basevertex, int baseinstance) { + int primcount, int basevertex, int baseinstance) { org.lwjgl.opengl.ARBBaseInstance - .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); + .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBBlendFuncExtended.java b/src/generated/java/org/lwjglx/opengl/ARBBlendFuncExtended.java index 74f1187..7358e40 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBBlendFuncExtended.java +++ b/src/generated/java/org/lwjglx/opengl/ARBBlendFuncExtended.java @@ -9,12 +9,12 @@ public class ARBBlendFuncExtended { public static final int GL_SRC1_COLOR = (int) 35065; public static void glBindFragDataLocationIndexed(int program, int colorNumber, int index, - java.lang.CharSequence name) { + java.lang.CharSequence name) { org.lwjgl.opengl.ARBBlendFuncExtended.glBindFragDataLocationIndexed(program, colorNumber, index, name); } public static void glBindFragDataLocationIndexed(int program, int colorNumber, int index, - java.nio.ByteBuffer name) { + java.nio.ByteBuffer name) { org.lwjgl.opengl.ARBBlendFuncExtended.glBindFragDataLocationIndexed(program, colorNumber, index, name); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBClearBufferObject.java b/src/generated/java/org/lwjglx/opengl/ARBClearBufferObject.java index a8e2cda..b268531 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBClearBufferObject.java +++ b/src/generated/java/org/lwjglx/opengl/ARBClearBufferObject.java @@ -3,25 +3,25 @@ package org.lwjglx.opengl; public class ARBClearBufferObject { public static void glClearBufferData(int target, int internalformat, int format, int type, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBClearBufferObject.glClearBufferData(target, internalformat, format, type, data); } public static void glClearBufferSubData(int target, int internalformat, long offset, long size, int format, - int type, java.nio.ByteBuffer data) { + int type, java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBClearBufferObject - .glClearBufferSubData(target, internalformat, offset, size, format, type, data); + .glClearBufferSubData(target, internalformat, offset, size, format, type, data); } public static void glClearNamedBufferDataEXT(int buffer, int internalformat, int format, int type, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBClearBufferObject.glClearNamedBufferDataEXT(buffer, internalformat, format, type, data); } public static void glClearNamedBufferSubDataEXT(int buffer, int internalformat, long offset, long size, int format, - int type, java.nio.ByteBuffer data) { + int type, java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBClearBufferObject - .glClearNamedBufferSubDataEXT(buffer, internalformat, offset, size, format, type, data); + .glClearNamedBufferSubDataEXT(buffer, internalformat, offset, size, format, type, data); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBClearTexture.java b/src/generated/java/org/lwjglx/opengl/ARBClearTexture.java index 0d69b10..2edadb2 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBClearTexture.java +++ b/src/generated/java/org/lwjglx/opengl/ARBClearTexture.java @@ -25,83 +25,33 @@ public class ARBClearTexture { } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ByteBuffer data) { - org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.ByteBuffer data) { + org.lwjgl.opengl.ARBClearTexture + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.DoubleBuffer data) { - org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.DoubleBuffer data) { + org.lwjgl.opengl.ARBClearTexture + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.FloatBuffer data) { - org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.FloatBuffer data) { + org.lwjgl.opengl.ARBClearTexture + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.IntBuffer data) { - org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.IntBuffer data) { + org.lwjgl.opengl.ARBClearTexture + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ShortBuffer data) { - org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.ShortBuffer data) { + org.lwjgl.opengl.ARBClearTexture + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBComputeVariableGroupSize.java b/src/generated/java/org/lwjglx/opengl/ARBComputeVariableGroupSize.java index b6643d1..57d2f67 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBComputeVariableGroupSize.java +++ b/src/generated/java/org/lwjglx/opengl/ARBComputeVariableGroupSize.java @@ -8,14 +8,14 @@ public class ARBComputeVariableGroupSize { public static final int GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB = (int) 37701; public static void glDispatchComputeGroupSizeARB(int num_groups_x, int num_groups_y, int num_groups_z, - int group_size_x, int group_size_y, int group_size_z) { + int group_size_x, int group_size_y, int group_size_z) { org.lwjgl.opengl.ARBComputeVariableGroupSize.glDispatchComputeGroupSizeARB( - num_groups_x, - num_groups_y, - num_groups_z, - group_size_x, - group_size_y, - group_size_z); + num_groups_x, + num_groups_y, + num_groups_z, + group_size_x, + group_size_y, + group_size_z); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBCopyBuffer.java b/src/generated/java/org/lwjglx/opengl/ARBCopyBuffer.java index bc48a59..1c8a621 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBCopyBuffer.java +++ b/src/generated/java/org/lwjglx/opengl/ARBCopyBuffer.java @@ -6,7 +6,7 @@ public class ARBCopyBuffer { public static final int GL_COPY_WRITE_BUFFER = (int) 36663; public static void glCopyBufferSubData(int readTarget, int writeTarget, long readOffset, long writeOffset, - long size) { + long size) { org.lwjgl.opengl.ARBCopyBuffer.glCopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBCopyImage.java b/src/generated/java/org/lwjglx/opengl/ARBCopyImage.java index 76de75e..8aa9423 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBCopyImage.java +++ b/src/generated/java/org/lwjglx/opengl/ARBCopyImage.java @@ -3,24 +3,24 @@ package org.lwjglx.opengl; public class ARBCopyImage { public static void glCopyImageSubData(int srcName, int srcTarget, int srcLevel, int srcX, int srcY, int srcZ, - int dstName, int dstTarget, int dstLevel, int dstX, int dstY, int dstZ, int srcWidth, int srcHeight, - int srcDepth) { + int dstName, int dstTarget, int dstLevel, int dstX, int dstY, int dstZ, int srcWidth, int srcHeight, + int srcDepth) { org.lwjgl.opengl.ARBCopyImage.glCopyImageSubData( - srcName, - srcTarget, - srcLevel, - srcX, - srcY, - srcZ, - dstName, - dstTarget, - dstLevel, - dstX, - dstY, - dstZ, - srcWidth, - srcHeight, - srcDepth); + srcName, + srcTarget, + srcLevel, + srcX, + srcY, + srcZ, + dstName, + dstTarget, + dstLevel, + dstX, + dstY, + dstZ, + srcWidth, + srcHeight, + srcDepth); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBDebugOutput.java b/src/generated/java/org/lwjglx/opengl/ARBDebugOutput.java index e7f8146..dfced5e 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBDebugOutput.java +++ b/src/generated/java/org/lwjglx/opengl/ARBDebugOutput.java @@ -26,7 +26,7 @@ public class ARBDebugOutput { public static final int GL_MAX_DEBUG_MESSAGE_LENGTH_ARB = (int) 37187; public static void glDebugMessageControlARB(int source, int type, int severity, java.nio.IntBuffer ids, - boolean enabled) { + boolean enabled) { org.lwjgl.opengl.ARBDebugOutput.glDebugMessageControlARB(source, type, severity, ids, enabled); } @@ -39,10 +39,10 @@ public class ARBDebugOutput { } public static int glGetDebugMessageLogARB(int count, java.nio.IntBuffer sources, java.nio.IntBuffer types, - java.nio.IntBuffer ids, java.nio.IntBuffer severities, java.nio.IntBuffer lengths, - java.nio.ByteBuffer messageLog) { + java.nio.IntBuffer ids, java.nio.IntBuffer severities, java.nio.IntBuffer lengths, + java.nio.ByteBuffer messageLog) { return org.lwjgl.opengl.ARBDebugOutput - .glGetDebugMessageLogARB(count, sources, types, ids, severities, lengths, messageLog); + .glGetDebugMessageLogARB(count, sources, types, ids, severities, lengths, messageLog); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBDirectStateAccess.java b/src/generated/java/org/lwjglx/opengl/ARBDirectStateAccess.java index a4e6d5b..bf0e382 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBDirectStateAccess.java +++ b/src/generated/java/org/lwjglx/opengl/ARBDirectStateAccess.java @@ -11,20 +11,20 @@ public class ARBDirectStateAccess { } public static void glBlitNamedFramebuffer(int readFramebuffer, int drawFramebuffer, int srcX0, int srcY0, int srcX1, - int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) { + int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) { org.lwjgl.opengl.ARBDirectStateAccess.glBlitNamedFramebuffer( - readFramebuffer, - drawFramebuffer, - srcX0, - srcY0, - srcX1, - srcY1, - dstX0, - dstY0, - dstX1, - dstY1, - mask, - filter); + readFramebuffer, + drawFramebuffer, + srcX0, + srcY0, + srcX1, + srcY1, + dstX0, + dstY0, + dstX1, + dstY1, + mask, + filter); } public static int glCheckNamedFramebufferStatus(int framebuffer, int target) { @@ -32,74 +32,68 @@ public class ARBDirectStateAccess { } public static void glClearNamedBufferData(int buffer, int internalformat, int format, int type, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBDirectStateAccess.glClearNamedBufferData(buffer, internalformat, format, type, data); } public static void glClearNamedBufferSubData(int buffer, int internalformat, long offset, long size, int format, - int type, java.nio.ByteBuffer data) { + int type, java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBDirectStateAccess - .glClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data); + .glClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data); } public static void glCompressedTextureSubImage1D(int texture, int level, int xoffset, int width, int format, - int data_imageSize, long data_buffer_offset) { - org.lwjgl.opengl.ARBDirectStateAccess.glCompressedTextureSubImage1D( - texture, - level, - xoffset, - width, - format, - data_imageSize, - data_buffer_offset); + int data_imageSize, long data_buffer_offset) { + org.lwjgl.opengl.ARBDirectStateAccess + .glCompressedTextureSubImage1D(texture, level, xoffset, width, format, data_imageSize, data_buffer_offset); } public static void glCompressedTextureSubImage1D(int texture, int level, int xoffset, int width, int format, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBDirectStateAccess - .glCompressedTextureSubImage1D(texture, level, xoffset, width, format, data); + .glCompressedTextureSubImage1D(texture, level, xoffset, width, format, data); } public static void glCompressedTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, - int height, int format, int data_imageSize, long data_buffer_offset) { + int height, int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.ARBDirectStateAccess.glCompressedTextureSubImage2D( - texture, - level, - xoffset, - yoffset, - width, - height, - format, - data_imageSize, - data_buffer_offset); + texture, + level, + xoffset, + yoffset, + width, + height, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, - int height, int format, java.nio.ByteBuffer data) { + int height, int format, java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBDirectStateAccess - .glCompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, data); + .glCompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, data); } public static void glCompressedTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int imageSize, long data_buffer_offset) { + int width, int height, int depth, int format, int imageSize, long data_buffer_offset) { org.lwjgl.opengl.ARBDirectStateAccess.glCompressedTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - imageSize, - data_buffer_offset); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + imageSize, + data_buffer_offset); } public static void glCopyNamedBufferSubData(int readBuffer, int writeBuffer, long readOffset, long writeOffset, - long size) { + long size) { org.lwjgl.opengl.ARBDirectStateAccess - .glCopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size); + .glCopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size); } public static void glCopyTextureSubImage1D(int texture, int level, int xoffset, int x, int y, int width) { @@ -107,15 +101,15 @@ public class ARBDirectStateAccess { } public static void glCopyTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int x, int y, - int width, int height) { + int width, int height) { org.lwjgl.opengl.ARBDirectStateAccess - .glCopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height); + .glCopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height); } public static void glCopyTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int x, - int y, int width, int height) { + int y, int width, int height) { org.lwjgl.opengl.ARBDirectStateAccess - .glCopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height); + .glCopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height); } public static int glCreateBuffers() { @@ -207,9 +201,9 @@ public class ARBDirectStateAccess { } public static void glGetCompressedTextureImage(int texture, int level, int pixels_bufSize, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.ARBDirectStateAccess - .glGetCompressedTextureImage(texture, level, pixels_bufSize, pixels_buffer_offset); + .glGetCompressedTextureImage(texture, level, pixels_bufSize, pixels_buffer_offset); } public static void glGetCompressedTextureImage(int texture, int level, java.nio.ByteBuffer pixels) { @@ -245,9 +239,9 @@ public class ARBDirectStateAccess { } public static void glGetTextureImage(int texture, int level, int format, int type, int pixels_bufSize, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.ARBDirectStateAccess - .glGetTextureImage(texture, level, format, type, pixels_bufSize, pixels_buffer_offset); + .glGetTextureImage(texture, level, format, type, pixels_bufSize, pixels_buffer_offset); } public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.ByteBuffer pixels) { @@ -315,13 +309,13 @@ public class ARBDirectStateAccess { } public static void glInvalidateNamedFramebufferSubData(int framebuffer, java.nio.IntBuffer attachments, int x, - int y, int width, int height) { + int y, int width, int height) { org.lwjgl.opengl.ARBDirectStateAccess - .glInvalidateNamedFramebufferSubData(framebuffer, attachments, x, y, width, height); + .glInvalidateNamedFramebufferSubData(framebuffer, attachments, x, y, width, height); } public static java.nio.ByteBuffer glMapNamedBuffer(int buffer, int access, long length, - java.nio.ByteBuffer old_buffer) { + java.nio.ByteBuffer old_buffer) { return org.lwjgl.opengl.ARBDirectStateAccess.glMapNamedBuffer(buffer, access, length, old_buffer); } @@ -330,7 +324,7 @@ public class ARBDirectStateAccess { } public static java.nio.ByteBuffer glMapNamedBufferRange(int buffer, long offset, long length, int access, - java.nio.ByteBuffer old_buffer) { + java.nio.ByteBuffer old_buffer) { return org.lwjgl.opengl.ARBDirectStateAccess.glMapNamedBufferRange(buffer, offset, length, access, old_buffer); } @@ -419,9 +413,9 @@ public class ARBDirectStateAccess { } public static void glNamedFramebufferRenderbuffer(int framebuffer, int attachment, int renderbuffertarget, - int renderbuffer) { + int renderbuffer) { org.lwjgl.opengl.ARBDirectStateAccess - .glNamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer); + .glNamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer); } public static void glNamedFramebufferTexture(int framebuffer, int attachment, int texture, int level) { @@ -429,9 +423,9 @@ public class ARBDirectStateAccess { } public static void glNamedFramebufferTextureLayer(int framebuffer, int attachment, int texture, int level, - int layer) { + int layer) { org.lwjgl.opengl.ARBDirectStateAccess - .glNamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer); + .glNamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer); } public static void glNamedRenderbufferStorage(int renderbuffer, int internalformat, int width, int height) { @@ -439,9 +433,9 @@ public class ARBDirectStateAccess { } public static void glNamedRenderbufferStorageMultisample(int renderbuffer, int samples, int internalformat, - int width, int height) { + int width, int height) { org.lwjgl.opengl.ARBDirectStateAccess - .glNamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height); + .glNamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height); } public static void glTextureBuffer(int texture, int internalformat, int buffer) { @@ -469,197 +463,139 @@ public class ARBDirectStateAccess { } public static void glTextureStorage2DMultisample(int texture, int samples, int internalformat, int width, - int height, boolean fixedsamplelocations) { + int height, boolean fixedsamplelocations) { org.lwjgl.opengl.ARBDirectStateAccess - .glTextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations); + .glTextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations); } public static void glTextureStorage3D(int texture, int levels, int internalformat, int width, int height, - int depth) { + int depth) { org.lwjgl.opengl.ARBDirectStateAccess.glTextureStorage3D(texture, levels, internalformat, width, height, depth); } public static void glTextureStorage3DMultisample(int texture, int samples, int internalformat, int width, - int height, int depth, boolean fixedsamplelocations) { + int height, int depth, boolean fixedsamplelocations) { org.lwjgl.opengl.ARBDirectStateAccess.glTextureStorage3DMultisample( - texture, - samples, - internalformat, - width, - height, - depth, - fixedsamplelocations); + texture, + samples, + internalformat, + width, + height, + depth, + fixedsamplelocations); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.ARBDirectStateAccess - .glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels_buffer_offset); + .glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels_buffer_offset); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.ByteBuffer pixels) { + java.nio.ByteBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.DoubleBuffer pixels) { + java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.FloatBuffer pixels) { + java.nio.FloatBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.IntBuffer pixels) { + java.nio.IntBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.ShortBuffer pixels) { + java.nio.ShortBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, long pixels_buffer_offset) { - org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage2D( - texture, - level, - xoffset, - yoffset, - width, - height, - format, - type, - pixels_buffer_offset); + int format, int type, long pixels_buffer_offset) { + org.lwjgl.opengl.ARBDirectStateAccess + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels_buffer_offset); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.ByteBuffer pixels) { + int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.DoubleBuffer pixels) { + int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.FloatBuffer pixels) { + int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.IntBuffer pixels) { + int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.ShortBuffer pixels) { + int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.ARBDirectStateAccess - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, long pixels_buffer_offset) { + int height, int depth, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels_buffer_offset); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels_buffer_offset); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { - org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { + org.lwjgl.opengl.ARBDirectStateAccess + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { - org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { + org.lwjgl.opengl.ARBDirectStateAccess + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { - org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { + org.lwjgl.opengl.ARBDirectStateAccess + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.IntBuffer pixels) { - org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.IntBuffer pixels) { + org.lwjgl.opengl.ARBDirectStateAccess + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { - org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { + org.lwjgl.opengl.ARBDirectStateAccess + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTransformFeedbackBufferBase(int xfb, int index, int buffer) { @@ -679,19 +615,19 @@ public class ARBDirectStateAccess { } public static void glVertexArrayAttribFormat(int vaobj, int attribindex, int size, int type, boolean normalized, - int relativeoffset) { + int relativeoffset) { org.lwjgl.opengl.ARBDirectStateAccess - .glVertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset); + .glVertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset); } public static void glVertexArrayAttribIFormat(int vaobj, int attribindex, int size, int type, int relativeoffset) { org.lwjgl.opengl.ARBDirectStateAccess - .glVertexArrayAttribIFormat(vaobj, attribindex, size, type, relativeoffset); + .glVertexArrayAttribIFormat(vaobj, attribindex, size, type, relativeoffset); } public static void glVertexArrayAttribLFormat(int vaobj, int attribindex, int size, int type, int relativeoffset) { org.lwjgl.opengl.ARBDirectStateAccess - .glVertexArrayAttribLFormat(vaobj, attribindex, size, type, relativeoffset); + .glVertexArrayAttribLFormat(vaobj, attribindex, size, type, relativeoffset); } public static void glVertexArrayBindingDivisor(int vaobj, int bindingindex, int divisor) { diff --git a/src/generated/java/org/lwjglx/opengl/ARBDrawElementsBaseVertex.java b/src/generated/java/org/lwjglx/opengl/ARBDrawElementsBaseVertex.java index 5aa76a6..1d3cafa 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBDrawElementsBaseVertex.java +++ b/src/generated/java/org/lwjglx/opengl/ARBDrawElementsBaseVertex.java @@ -3,9 +3,9 @@ package org.lwjglx.opengl; public class ARBDrawElementsBaseVertex { public static void glDrawElementsBaseVertex(int mode, int indices_count, int type, long indices_buffer_offset, - int basevertex) { + int basevertex) { org.lwjgl.opengl.ARBDrawElementsBaseVertex - .glDrawElementsBaseVertex(mode, indices_count, type, indices_buffer_offset, basevertex); + .glDrawElementsBaseVertex(mode, indices_count, type, indices_buffer_offset, basevertex); } public static void glDrawElementsBaseVertex(int mode, java.nio.ByteBuffer indices, int basevertex) { @@ -21,58 +21,47 @@ public class ARBDrawElementsBaseVertex { } public static void glDrawElementsInstancedBaseVertex(int mode, int indices_count, int type, - long indices_buffer_offset, int primcount, int basevertex) { - org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawElementsInstancedBaseVertex( - mode, - indices_count, - type, - indices_buffer_offset, - primcount, - basevertex); + long indices_buffer_offset, int primcount, int basevertex) { + org.lwjgl.opengl.ARBDrawElementsBaseVertex + .glDrawElementsInstancedBaseVertex(mode, indices_count, type, indices_buffer_offset, primcount, basevertex); } public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.ByteBuffer indices, int primcount, - int basevertex) { + int basevertex) { org.lwjgl.opengl.ARBDrawElementsBaseVertex - .glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex); + .glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex); } public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.IntBuffer indices, int primcount, - int basevertex) { + int basevertex) { org.lwjgl.opengl.ARBDrawElementsBaseVertex - .glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex); + .glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex); } public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.ShortBuffer indices, int primcount, - int basevertex) { + int basevertex) { org.lwjgl.opengl.ARBDrawElementsBaseVertex - .glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex); + .glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex); } public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, int indices_count, int type, - long indices_buffer_offset, int basevertex) { - org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex( - mode, - start, - end, - indices_count, - type, - indices_buffer_offset, - basevertex); + long indices_buffer_offset, int basevertex) { + org.lwjgl.opengl.ARBDrawElementsBaseVertex + .glDrawRangeElementsBaseVertex(mode, start, end, indices_count, type, indices_buffer_offset, basevertex); } public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.ByteBuffer indices, - int basevertex) { + int basevertex) { org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex); } public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.IntBuffer indices, - int basevertex) { + int basevertex) { org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex); } public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.ShortBuffer indices, - int basevertex) { + int basevertex) { org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBDrawInstanced.java b/src/generated/java/org/lwjglx/opengl/ARBDrawInstanced.java index f33deb3..a5f5134 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBDrawInstanced.java +++ b/src/generated/java/org/lwjglx/opengl/ARBDrawInstanced.java @@ -7,9 +7,9 @@ public class ARBDrawInstanced { } public static void glDrawElementsInstancedARB(int mode, int indices_count, int type, long indices_buffer_offset, - int primcount) { + int primcount) { org.lwjgl.opengl.ARBDrawInstanced - .glDrawElementsInstancedARB(mode, indices_count, type, indices_buffer_offset, primcount); + .glDrawElementsInstancedARB(mode, indices_count, type, indices_buffer_offset, primcount); } public static void glDrawElementsInstancedARB(int mode, java.nio.ByteBuffer indices, int primcount) { diff --git a/src/generated/java/org/lwjglx/opengl/ARBES2Compatibility.java b/src/generated/java/org/lwjglx/opengl/ARBES2Compatibility.java index 0e2176c..e07e4cc 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBES2Compatibility.java +++ b/src/generated/java/org/lwjglx/opengl/ARBES2Compatibility.java @@ -27,7 +27,7 @@ public class ARBES2Compatibility { } public static void glGetShaderPrecisionFormat(int shadertype, int precisiontype, java.nio.IntBuffer range, - java.nio.IntBuffer precision) { + java.nio.IntBuffer precision) { org.lwjgl.opengl.ARBES2Compatibility.glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBFramebufferObject.java b/src/generated/java/org/lwjglx/opengl/ARBFramebufferObject.java index 2c9eda3..c4848ca 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBFramebufferObject.java +++ b/src/generated/java/org/lwjglx/opengl/ARBFramebufferObject.java @@ -86,9 +86,9 @@ public class ARBFramebufferObject { } public static void glBlitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, - int dstY1, int mask, int filter) { + int dstY1, int mask, int filter) { org.lwjgl.opengl.ARBFramebufferObject - .glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); + .glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } public static int glCheckFramebufferStatus(int target) { @@ -113,7 +113,7 @@ public class ARBFramebufferObject { public static void glFramebufferRenderbuffer(int target, int attachment, int renderbuffertarget, int renderbuffer) { org.lwjgl.opengl.ARBFramebufferObject - .glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer); + .glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer); } public static void glFramebufferTexture1D(int target, int attachment, int textarget, int texture, int level) { @@ -125,9 +125,9 @@ public class ARBFramebufferObject { } public static void glFramebufferTexture3D(int target, int attachment, int textarget, int texture, int level, - int layer) { + int layer) { org.lwjgl.opengl.ARBFramebufferObject - .glFramebufferTexture3D(target, attachment, textarget, texture, level, layer); + .glFramebufferTexture3D(target, attachment, textarget, texture, level, layer); } public static void glFramebufferTextureLayer(int target, int attachment, int texture, int level, int layer) { @@ -175,9 +175,9 @@ public class ARBFramebufferObject { } public static void glRenderbufferStorageMultisample(int target, int samples, int internalformat, int width, - int height) { + int height) { org.lwjgl.opengl.ARBFramebufferObject - .glRenderbufferStorageMultisample(target, samples, internalformat, width, height); + .glRenderbufferStorageMultisample(target, samples, internalformat, width, height); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBGetProgramBinary.java b/src/generated/java/org/lwjglx/opengl/ARBGetProgramBinary.java index 9f5c525..6c4a086 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBGetProgramBinary.java +++ b/src/generated/java/org/lwjglx/opengl/ARBGetProgramBinary.java @@ -8,7 +8,7 @@ public class ARBGetProgramBinary { public static final int GL_PROGRAM_BINARY_RETRIEVABLE_HINT = (int) 33367; public static void glGetProgramBinary(int program, java.nio.IntBuffer length, java.nio.IntBuffer binaryFormat, - java.nio.ByteBuffer binary) { + java.nio.ByteBuffer binary) { org.lwjgl.opengl.ARBGetProgramBinary.glGetProgramBinary(program, length, binaryFormat, binary); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBGetTextureSubImage.java b/src/generated/java/org/lwjglx/opengl/ARBGetTextureSubImage.java index a12c76f..721463b 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBGetTextureSubImage.java +++ b/src/generated/java/org/lwjglx/opengl/ARBGetTextureSubImage.java @@ -3,185 +3,145 @@ package org.lwjglx.opengl; public class ARBGetTextureSubImage { public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int pixels_bufSize, long pixels_buffer_offset) { + int width, int height, int depth, int pixels_bufSize, long pixels_buffer_offset) { org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels_bufSize, - pixels_buffer_offset); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + pixels_bufSize, + pixels_buffer_offset); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.ByteBuffer pixels) { - org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.ByteBuffer pixels) { + org.lwjgl.opengl.ARBGetTextureSubImage + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.DoubleBuffer pixels) { - org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.DoubleBuffer pixels) { + org.lwjgl.opengl.ARBGetTextureSubImage + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.FloatBuffer pixels) { - org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.FloatBuffer pixels) { + org.lwjgl.opengl.ARBGetTextureSubImage + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.IntBuffer pixels) { - org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.IntBuffer pixels) { + org.lwjgl.opengl.ARBGetTextureSubImage + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.ShortBuffer pixels) { - org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.ShortBuffer pixels) { + org.lwjgl.opengl.ARBGetTextureSubImage + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, int pixels_bufSize, long pixels_buffer_offset) { + int height, int depth, int format, int type, int pixels_bufSize, long pixels_buffer_offset) { org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels_bufSize, - pixels_buffer_offset); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels_bufSize, + pixels_buffer_offset); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { + int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { + int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { + int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.IntBuffer pixels) { + int height, int depth, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { + int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBImaging.java b/src/generated/java/org/lwjglx/opengl/ARBImaging.java index 33c5104..84690cd 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBImaging.java +++ b/src/generated/java/org/lwjglx/opengl/ARBImaging.java @@ -84,51 +84,51 @@ public class ARBImaging { } public static void glColorSubTable(int target, int start, int count, int format, int type, - long data_buffer_offset) { + long data_buffer_offset) { org.lwjgl.opengl.ARBImaging.glColorSubTable(target, start, count, format, type, data_buffer_offset); } public static void glColorSubTable(int target, int start, int count, int format, int type, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBImaging.glColorSubTable(target, start, count, format, type, data); } public static void glColorSubTable(int target, int start, int count, int format, int type, - java.nio.DoubleBuffer data) { + java.nio.DoubleBuffer data) { org.lwjgl.opengl.ARBImaging - .glColorSubTable(target, start, count, format, type, org.lwjglx.MemoryUtil.getAddress(data)); + .glColorSubTable(target, start, count, format, type, org.lwjglx.MemoryUtil.getAddress(data)); } public static void glColorSubTable(int target, int start, int count, int format, int type, - java.nio.FloatBuffer data) { + java.nio.FloatBuffer data) { org.lwjgl.opengl.ARBImaging - .glColorSubTable(target, start, count, format, type, org.lwjglx.MemoryUtil.getAddress(data)); + .glColorSubTable(target, start, count, format, type, org.lwjglx.MemoryUtil.getAddress(data)); } public static void glColorTable(int target, int internalFormat, int width, int format, int type, - long data_buffer_offset) { + long data_buffer_offset) { org.lwjgl.opengl.ARBImaging.glColorTable(target, internalFormat, width, format, type, data_buffer_offset); } public static void glColorTable(int target, int internalFormat, int width, int format, int type, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBImaging.glColorTable(target, internalFormat, width, format, type, data); } public static void glColorTable(int target, int internalFormat, int width, int format, int type, - java.nio.DoubleBuffer data) { + java.nio.DoubleBuffer data) { org.lwjgl.opengl.ARBImaging - .glColorTable(target, internalFormat, width, format, type, org.lwjglx.MemoryUtil.getAddress(data)); + .glColorTable(target, internalFormat, width, format, type, org.lwjglx.MemoryUtil.getAddress(data)); } public static void glColorTable(int target, int internalFormat, int width, int format, int type, - java.nio.FloatBuffer data) { + java.nio.FloatBuffer data) { org.lwjgl.opengl.ARBImaging.glColorTable(target, internalFormat, width, format, type, data); } @@ -141,104 +141,104 @@ public class ARBImaging { } public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, - long image_buffer_offset) { + long image_buffer_offset) { org.lwjgl.opengl.ARBImaging - .glConvolutionFilter1D(target, internalformat, width, format, type, image_buffer_offset); + .glConvolutionFilter1D(target, internalformat, width, format, type, image_buffer_offset); } public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, - java.nio.ByteBuffer image) { + java.nio.ByteBuffer image) { org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D(target, internalformat, width, format, type, image); } public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, - java.nio.DoubleBuffer image) { + java.nio.DoubleBuffer image) { org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D( - target, - internalformat, - width, - format, - type, - org.lwjglx.MemoryUtil.getAddress(image)); + target, + internalformat, + width, + format, + type, + org.lwjglx.MemoryUtil.getAddress(image)); } public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, - java.nio.FloatBuffer image) { + java.nio.FloatBuffer image) { org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D( - target, - internalformat, - width, - format, - type, - org.lwjglx.MemoryUtil.getAddress(image)); + target, + internalformat, + width, + format, + type, + org.lwjglx.MemoryUtil.getAddress(image)); } public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, - java.nio.IntBuffer image) { + java.nio.IntBuffer image) { org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D( - target, - internalformat, - width, - format, - type, - org.lwjglx.MemoryUtil.getAddress(image)); + target, + internalformat, + width, + format, + type, + org.lwjglx.MemoryUtil.getAddress(image)); } public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, - java.nio.ShortBuffer image) { + java.nio.ShortBuffer image) { org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D( - target, - internalformat, - width, - format, - type, - org.lwjglx.MemoryUtil.getAddress(image)); + target, + internalformat, + width, + format, + type, + org.lwjglx.MemoryUtil.getAddress(image)); } public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, - int type, long image_buffer_offset) { + int type, long image_buffer_offset) { org.lwjgl.opengl.ARBImaging - .glConvolutionFilter2D(target, internalformat, width, height, format, type, image_buffer_offset); + .glConvolutionFilter2D(target, internalformat, width, height, format, type, image_buffer_offset); } public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, - int type, java.nio.ByteBuffer image) { + int type, java.nio.ByteBuffer image) { org.lwjgl.opengl.ARBImaging.glConvolutionFilter2D(target, internalformat, width, height, format, type, image); } public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, - int type, java.nio.IntBuffer image) { + int type, java.nio.IntBuffer image) { org.lwjgl.opengl.ARBImaging.glConvolutionFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(image)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(image)); } public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, - int type, java.nio.ShortBuffer image) { + int type, java.nio.ShortBuffer image) { org.lwjgl.opengl.ARBImaging.glConvolutionFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(image)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(image)); } @@ -307,28 +307,28 @@ public class ARBImaging { public static void glGetConvolutionFilter(int target, int format, int type, java.nio.DoubleBuffer image) { org.lwjgl.opengl.ARBImaging - .glGetConvolutionFilter(target, format, type, org.lwjglx.MemoryUtil.getAddress(image)); + .glGetConvolutionFilter(target, format, type, org.lwjglx.MemoryUtil.getAddress(image)); } public static void glGetConvolutionFilter(int target, int format, int type, java.nio.FloatBuffer image) { org.lwjgl.opengl.ARBImaging - .glGetConvolutionFilter(target, format, type, org.lwjglx.MemoryUtil.getAddress(image)); + .glGetConvolutionFilter(target, format, type, org.lwjglx.MemoryUtil.getAddress(image)); } public static void glGetConvolutionFilter(int target, int format, int type, java.nio.IntBuffer image) { org.lwjgl.opengl.ARBImaging - .glGetConvolutionFilter(target, format, type, org.lwjglx.MemoryUtil.getAddress(image)); + .glGetConvolutionFilter(target, format, type, org.lwjglx.MemoryUtil.getAddress(image)); } public static void glGetConvolutionFilter(int target, int format, int type, java.nio.ShortBuffer image) { org.lwjgl.opengl.ARBImaging - .glGetConvolutionFilter(target, format, type, org.lwjglx.MemoryUtil.getAddress(image)); + .glGetConvolutionFilter(target, format, type, org.lwjglx.MemoryUtil.getAddress(image)); } @@ -351,28 +351,28 @@ public class ARBImaging { public static void glGetHistogram(int target, boolean reset, int format, int type, java.nio.DoubleBuffer values) { org.lwjgl.opengl.ARBImaging - .glGetHistogram(target, reset, format, type, org.lwjglx.MemoryUtil.getAddress(values)); + .glGetHistogram(target, reset, format, type, org.lwjglx.MemoryUtil.getAddress(values)); } public static void glGetHistogram(int target, boolean reset, int format, int type, java.nio.FloatBuffer values) { org.lwjgl.opengl.ARBImaging - .glGetHistogram(target, reset, format, type, org.lwjglx.MemoryUtil.getAddress(values)); + .glGetHistogram(target, reset, format, type, org.lwjglx.MemoryUtil.getAddress(values)); } public static void glGetHistogram(int target, boolean reset, int format, int type, java.nio.IntBuffer values) { org.lwjgl.opengl.ARBImaging - .glGetHistogram(target, reset, format, type, org.lwjglx.MemoryUtil.getAddress(values)); + .glGetHistogram(target, reset, format, type, org.lwjglx.MemoryUtil.getAddress(values)); } public static void glGetHistogram(int target, boolean reset, int format, int type, java.nio.ShortBuffer values) { org.lwjgl.opengl.ARBImaging - .glGetHistogram(target, reset, format, type, org.lwjglx.MemoryUtil.getAddress(values)); + .glGetHistogram(target, reset, format, type, org.lwjglx.MemoryUtil.getAddress(values)); } @@ -425,1153 +425,1153 @@ public class ARBImaging { } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.ByteBuffer column, java.nio.ByteBuffer span) { + java.nio.ByteBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(target, format, type, row, column, span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { + java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.ByteBuffer column, java.nio.IntBuffer span) { + java.nio.ByteBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.ByteBuffer column, java.nio.ShortBuffer span) { + java.nio.ByteBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { + java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { + java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.DoubleBuffer column, java.nio.IntBuffer span) { + java.nio.DoubleBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { + java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.IntBuffer column, java.nio.ByteBuffer span) { + java.nio.IntBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.IntBuffer column, java.nio.DoubleBuffer span) { + java.nio.IntBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.IntBuffer column, java.nio.IntBuffer span) { + java.nio.IntBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.IntBuffer column, java.nio.ShortBuffer span) { + java.nio.IntBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.ShortBuffer column, java.nio.ByteBuffer span) { + java.nio.ShortBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { + java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.ShortBuffer column, java.nio.IntBuffer span) { + java.nio.ShortBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.ShortBuffer column, java.nio.ShortBuffer span) { + java.nio.ShortBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.ByteBuffer column, java.nio.ByteBuffer span) { + java.nio.ByteBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { + java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.ByteBuffer column, java.nio.IntBuffer span) { + java.nio.ByteBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.ByteBuffer column, java.nio.ShortBuffer span) { + java.nio.ByteBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { + java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { + java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.DoubleBuffer column, java.nio.IntBuffer span) { + java.nio.DoubleBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { + java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.IntBuffer column, java.nio.ByteBuffer span) { + java.nio.IntBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.IntBuffer column, java.nio.DoubleBuffer span) { + java.nio.IntBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.IntBuffer column, java.nio.IntBuffer span) { + java.nio.IntBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.IntBuffer column, java.nio.ShortBuffer span) { + java.nio.IntBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.ShortBuffer column, java.nio.ByteBuffer span) { + java.nio.ShortBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { + java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.ShortBuffer column, java.nio.IntBuffer span) { + java.nio.ShortBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row, - java.nio.ShortBuffer column, java.nio.ShortBuffer span) { + java.nio.ShortBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.ByteBuffer column, java.nio.ByteBuffer span) { + java.nio.ByteBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { + java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.ByteBuffer column, java.nio.IntBuffer span) { + java.nio.ByteBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.ByteBuffer column, java.nio.ShortBuffer span) { + java.nio.ByteBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { + java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { + java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.DoubleBuffer column, java.nio.IntBuffer span) { + java.nio.DoubleBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { + java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.IntBuffer column, java.nio.ByteBuffer span) { + java.nio.IntBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.IntBuffer column, java.nio.DoubleBuffer span) { + java.nio.IntBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.IntBuffer column, java.nio.IntBuffer span) { + java.nio.IntBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.IntBuffer column, java.nio.ShortBuffer span) { + java.nio.IntBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.ShortBuffer column, java.nio.ByteBuffer span) { + java.nio.ShortBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { + java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.ShortBuffer column, java.nio.IntBuffer span) { + java.nio.ShortBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row, - java.nio.ShortBuffer column, java.nio.ShortBuffer span) { + java.nio.ShortBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.ByteBuffer column, java.nio.ByteBuffer span) { + java.nio.ByteBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { + java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.ByteBuffer column, java.nio.IntBuffer span) { + java.nio.ByteBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.ByteBuffer column, java.nio.ShortBuffer span) { + java.nio.ByteBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { + java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { + java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.DoubleBuffer column, java.nio.IntBuffer span) { + java.nio.DoubleBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { + java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.IntBuffer column, java.nio.ByteBuffer span) { + java.nio.IntBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.IntBuffer column, java.nio.DoubleBuffer span) { + java.nio.IntBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.IntBuffer column, java.nio.IntBuffer span) { + java.nio.IntBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.IntBuffer column, java.nio.ShortBuffer span) { + java.nio.IntBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.ShortBuffer column, java.nio.ByteBuffer span) { + java.nio.ShortBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { + java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.ShortBuffer column, java.nio.IntBuffer span) { + java.nio.ShortBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row, - java.nio.ShortBuffer column, java.nio.ShortBuffer span) { + java.nio.ShortBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.ByteBuffer column, java.nio.ByteBuffer span) { + java.nio.ByteBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { + java.nio.ByteBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.ByteBuffer column, java.nio.IntBuffer span) { + java.nio.ByteBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.ByteBuffer column, java.nio.ShortBuffer span) { + java.nio.ByteBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { + java.nio.DoubleBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { + java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.DoubleBuffer column, java.nio.IntBuffer span) { + java.nio.DoubleBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { + java.nio.DoubleBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.IntBuffer column, java.nio.ByteBuffer span) { + java.nio.IntBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.IntBuffer column, java.nio.DoubleBuffer span) { + java.nio.IntBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.IntBuffer column, java.nio.IntBuffer span) { + java.nio.IntBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.IntBuffer column, java.nio.ShortBuffer span) { + java.nio.IntBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.ShortBuffer column, java.nio.ByteBuffer span) { + java.nio.ShortBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - span); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + span); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { + java.nio.ShortBuffer column, java.nio.DoubleBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.ShortBuffer column, java.nio.IntBuffer span) { + java.nio.ShortBuffer column, java.nio.IntBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row, - java.nio.ShortBuffer column, java.nio.ShortBuffer span) { + java.nio.ShortBuffer column, java.nio.ShortBuffer span) { final java.nio.ByteBuffer wrappedArg5 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(span); org.lwjgl.opengl.ARBImaging.glGetSeparableFilter( - target, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column), - wrappedArg5); + target, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column), + wrappedArg5); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(span, wrappedArg5); } @@ -1593,381 +1593,381 @@ public class ARBImaging { } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - long row_buffer_offset, long column_buffer_offset) { + long row_buffer_offset, long column_buffer_offset) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - row_buffer_offset, - column_buffer_offset); + target, + internalformat, + width, + height, + format, + type, + row_buffer_offset, + column_buffer_offset); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ByteBuffer row, java.nio.ByteBuffer column) { + java.nio.ByteBuffer row, java.nio.ByteBuffer column) { org.lwjgl.opengl.ARBImaging - .glSeparableFilter2D(target, internalformat, width, height, format, type, row, column); + .glSeparableFilter2D(target, internalformat, width, height, format, type, row, column); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ByteBuffer row, java.nio.DoubleBuffer column) { + java.nio.ByteBuffer row, java.nio.DoubleBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ByteBuffer row, java.nio.FloatBuffer column) { + java.nio.ByteBuffer row, java.nio.FloatBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ByteBuffer row, java.nio.IntBuffer column) { + java.nio.ByteBuffer row, java.nio.IntBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ByteBuffer row, java.nio.ShortBuffer column) { + java.nio.ByteBuffer row, java.nio.ShortBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.DoubleBuffer row, java.nio.ByteBuffer column) { + java.nio.DoubleBuffer row, java.nio.ByteBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.DoubleBuffer row, java.nio.DoubleBuffer column) { + java.nio.DoubleBuffer row, java.nio.DoubleBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.DoubleBuffer row, java.nio.FloatBuffer column) { + java.nio.DoubleBuffer row, java.nio.FloatBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.DoubleBuffer row, java.nio.IntBuffer column) { + java.nio.DoubleBuffer row, java.nio.IntBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.DoubleBuffer row, java.nio.ShortBuffer column) { + java.nio.DoubleBuffer row, java.nio.ShortBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.FloatBuffer row, java.nio.ByteBuffer column) { + java.nio.FloatBuffer row, java.nio.ByteBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.FloatBuffer row, java.nio.DoubleBuffer column) { + java.nio.FloatBuffer row, java.nio.DoubleBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.FloatBuffer row, java.nio.FloatBuffer column) { + java.nio.FloatBuffer row, java.nio.FloatBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.FloatBuffer row, java.nio.IntBuffer column) { + java.nio.FloatBuffer row, java.nio.IntBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.FloatBuffer row, java.nio.ShortBuffer column) { + java.nio.FloatBuffer row, java.nio.ShortBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.IntBuffer row, java.nio.ByteBuffer column) { + java.nio.IntBuffer row, java.nio.ByteBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.IntBuffer row, java.nio.DoubleBuffer column) { + java.nio.IntBuffer row, java.nio.DoubleBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.IntBuffer row, java.nio.FloatBuffer column) { + java.nio.IntBuffer row, java.nio.FloatBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.IntBuffer row, java.nio.IntBuffer column) { + java.nio.IntBuffer row, java.nio.IntBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.IntBuffer row, java.nio.ShortBuffer column) { + java.nio.IntBuffer row, java.nio.ShortBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ShortBuffer row, java.nio.ByteBuffer column) { + java.nio.ShortBuffer row, java.nio.ByteBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ShortBuffer row, java.nio.DoubleBuffer column) { + java.nio.ShortBuffer row, java.nio.DoubleBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ShortBuffer row, java.nio.FloatBuffer column) { + java.nio.ShortBuffer row, java.nio.FloatBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ShortBuffer row, java.nio.IntBuffer column) { + java.nio.ShortBuffer row, java.nio.IntBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, - java.nio.ShortBuffer row, java.nio.ShortBuffer column) { + java.nio.ShortBuffer row, java.nio.ShortBuffer column) { org.lwjgl.opengl.ARBImaging.glSeparableFilter2D( - target, - internalformat, - width, - height, - format, - type, - org.lwjglx.MemoryUtil.getAddress(row), - org.lwjglx.MemoryUtil.getAddress(column)); + target, + internalformat, + width, + height, + format, + type, + org.lwjglx.MemoryUtil.getAddress(row), + org.lwjglx.MemoryUtil.getAddress(column)); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBIndirectParameters.java b/src/generated/java/org/lwjglx/opengl/ARBIndirectParameters.java index 851ffa2..5a65b43 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBIndirectParameters.java +++ b/src/generated/java/org/lwjglx/opengl/ARBIndirectParameters.java @@ -6,44 +6,39 @@ public class ARBIndirectParameters { public static final int GL_PARAMETER_BUFFER_BINDING_ARB = (int) 33007; public static void glMultiDrawArraysIndirectCountARB(int mode, long indirect_buffer_offset, long drawcount, - int maxdrawcount, int stride) { + int maxdrawcount, int stride) { org.lwjgl.opengl.ARBIndirectParameters - .glMultiDrawArraysIndirectCountARB(mode, indirect_buffer_offset, drawcount, maxdrawcount, stride); + .glMultiDrawArraysIndirectCountARB(mode, indirect_buffer_offset, drawcount, maxdrawcount, stride); } public static void glMultiDrawArraysIndirectCountARB(int mode, java.nio.ByteBuffer indirect, long drawcount, - int maxdrawcount, int stride) { + int maxdrawcount, int stride) { org.lwjgl.opengl.ARBIndirectParameters - .glMultiDrawArraysIndirectCountARB(mode, indirect, drawcount, maxdrawcount, stride); + .glMultiDrawArraysIndirectCountARB(mode, indirect, drawcount, maxdrawcount, stride); } public static void glMultiDrawArraysIndirectCountARB(int mode, java.nio.IntBuffer indirect, long drawcount, - int maxdrawcount, int stride) { + int maxdrawcount, int stride) { org.lwjgl.opengl.ARBIndirectParameters - .glMultiDrawArraysIndirectCountARB(mode, indirect, drawcount, maxdrawcount, stride); + .glMultiDrawArraysIndirectCountARB(mode, indirect, drawcount, maxdrawcount, stride); } public static void glMultiDrawElementsIndirectCountARB(int mode, int type, long indirect_buffer_offset, - long drawcount, int maxdrawcount, int stride) { - org.lwjgl.opengl.ARBIndirectParameters.glMultiDrawElementsIndirectCountARB( - mode, - type, - indirect_buffer_offset, - drawcount, - maxdrawcount, - stride); + long drawcount, int maxdrawcount, int stride) { + org.lwjgl.opengl.ARBIndirectParameters + .glMultiDrawElementsIndirectCountARB(mode, type, indirect_buffer_offset, drawcount, maxdrawcount, stride); } public static void glMultiDrawElementsIndirectCountARB(int mode, int type, java.nio.ByteBuffer indirect, - long drawcount, int maxdrawcount, int stride) { + long drawcount, int maxdrawcount, int stride) { org.lwjgl.opengl.ARBIndirectParameters - .glMultiDrawElementsIndirectCountARB(mode, type, indirect, drawcount, maxdrawcount, stride); + .glMultiDrawElementsIndirectCountARB(mode, type, indirect, drawcount, maxdrawcount, stride); } public static void glMultiDrawElementsIndirectCountARB(int mode, int type, java.nio.IntBuffer indirect, - long drawcount, int maxdrawcount, int stride) { + long drawcount, int maxdrawcount, int stride) { org.lwjgl.opengl.ARBIndirectParameters - .glMultiDrawElementsIndirectCountARB(mode, type, indirect, drawcount, maxdrawcount, stride); + .glMultiDrawElementsIndirectCountARB(mode, type, indirect, drawcount, maxdrawcount, stride); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBInvalidateSubdata.java b/src/generated/java/org/lwjglx/opengl/ARBInvalidateSubdata.java index c78a8c8..e115a9e 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBInvalidateSubdata.java +++ b/src/generated/java/org/lwjglx/opengl/ARBInvalidateSubdata.java @@ -15,7 +15,7 @@ public class ARBInvalidateSubdata { } public static void glInvalidateSubFramebuffer(int target, java.nio.IntBuffer attachments, int x, int y, int width, - int height) { + int height) { org.lwjgl.opengl.ARBInvalidateSubdata.glInvalidateSubFramebuffer(target, attachments, x, y, width, height); } @@ -24,9 +24,9 @@ public class ARBInvalidateSubdata { } public static void glInvalidateTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth) { + int height, int depth) { org.lwjgl.opengl.ARBInvalidateSubdata - .glInvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth); + .glInvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBMapBufferRange.java b/src/generated/java/org/lwjglx/opengl/ARBMapBufferRange.java index afbad81..388d779 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBMapBufferRange.java +++ b/src/generated/java/org/lwjglx/opengl/ARBMapBufferRange.java @@ -14,7 +14,7 @@ public class ARBMapBufferRange { } public static java.nio.ByteBuffer glMapBufferRange(int target, long offset, long length, int access, - java.nio.ByteBuffer old_buffer) { + java.nio.ByteBuffer old_buffer) { return org.lwjgl.opengl.ARBMapBufferRange.glMapBufferRange(target, offset, length, access, old_buffer); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBMultiDrawIndirect.java b/src/generated/java/org/lwjglx/opengl/ARBMultiDrawIndirect.java index 00537c8..61438c2 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBMultiDrawIndirect.java +++ b/src/generated/java/org/lwjglx/opengl/ARBMultiDrawIndirect.java @@ -4,7 +4,7 @@ public class ARBMultiDrawIndirect { public static void glMultiDrawArraysIndirect(int mode, long indirect_buffer_offset, int primcount, int stride) { org.lwjgl.opengl.ARBMultiDrawIndirect - .glMultiDrawArraysIndirect(mode, indirect_buffer_offset, primcount, stride); + .glMultiDrawArraysIndirect(mode, indirect_buffer_offset, primcount, stride); } public static void glMultiDrawArraysIndirect(int mode, java.nio.ByteBuffer indirect, int primcount, int stride) { @@ -16,18 +16,18 @@ public class ARBMultiDrawIndirect { } public static void glMultiDrawElementsIndirect(int mode, int type, long indirect_buffer_offset, int primcount, - int stride) { + int stride) { org.lwjgl.opengl.ARBMultiDrawIndirect - .glMultiDrawElementsIndirect(mode, type, indirect_buffer_offset, primcount, stride); + .glMultiDrawElementsIndirect(mode, type, indirect_buffer_offset, primcount, stride); } public static void glMultiDrawElementsIndirect(int mode, int type, java.nio.ByteBuffer indirect, int primcount, - int stride) { + int stride) { org.lwjgl.opengl.ARBMultiDrawIndirect.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride); } public static void glMultiDrawElementsIndirect(int mode, int type, java.nio.IntBuffer indirect, int primcount, - int stride) { + int stride) { org.lwjgl.opengl.ARBMultiDrawIndirect.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBProgramInterfaceQuery.java b/src/generated/java/org/lwjglx/opengl/ARBProgramInterfaceQuery.java index 9d5f1c4..dd7879d 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBProgramInterfaceQuery.java +++ b/src/generated/java/org/lwjglx/opengl/ARBProgramInterfaceQuery.java @@ -71,25 +71,25 @@ public class ARBProgramInterfaceQuery { } public static int glGetProgramResourceLocationIndex(int program, int programInterface, - java.lang.CharSequence name) { + java.lang.CharSequence name) { return org.lwjgl.opengl.ARBProgramInterfaceQuery - .glGetProgramResourceLocationIndex(program, programInterface, name); + .glGetProgramResourceLocationIndex(program, programInterface, name); } public static int glGetProgramResourceLocationIndex(int program, int programInterface, java.nio.ByteBuffer name) { return org.lwjgl.opengl.ARBProgramInterfaceQuery - .glGetProgramResourceLocationIndex(program, programInterface, name); + .glGetProgramResourceLocationIndex(program, programInterface, name); } public static java.lang.String glGetProgramResourceName(int program, int programInterface, int index, int bufSize) { return org.lwjgl.opengl.ARBProgramInterfaceQuery - .glGetProgramResourceName(program, programInterface, index, bufSize); + .glGetProgramResourceName(program, programInterface, index, bufSize); } public static void glGetProgramResourceName(int program, int programInterface, int index, java.nio.IntBuffer length, - java.nio.ByteBuffer name) { + java.nio.ByteBuffer name) { org.lwjgl.opengl.ARBProgramInterfaceQuery - .glGetProgramResourceName(program, programInterface, index, length, name); + .glGetProgramResourceName(program, programInterface, index, length, name); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBRobustness.java b/src/generated/java/org/lwjglx/opengl/ARBRobustness.java index 1fd211a..926b422 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBRobustness.java +++ b/src/generated/java/org/lwjglx/opengl/ARBRobustness.java @@ -31,9 +31,9 @@ public class ARBRobustness { } public static void glGetnConvolutionFilterARB(int target, int format, int type, int image_bufSize, - long image_buffer_offset) { + long image_buffer_offset) { org.lwjgl.opengl.ARBRobustness - .glGetnConvolutionFilterARB(target, format, type, image_bufSize, image_buffer_offset); + .glGetnConvolutionFilterARB(target, format, type, image_bufSize, image_buffer_offset); } public static void glGetnConvolutionFilterARB(int target, int format, int type, java.nio.ByteBuffer image) { @@ -41,9 +41,9 @@ public class ARBRobustness { } public static void glGetnHistogramARB(int target, boolean reset, int format, int type, int values_bufSize, - long values_buffer_offset) { + long values_buffer_offset) { org.lwjgl.opengl.ARBRobustness - .glGetnHistogramARB(target, reset, format, type, values_bufSize, values_buffer_offset); + .glGetnHistogramARB(target, reset, format, type, values_bufSize, values_buffer_offset); } public static void glGetnHistogramARB(int target, boolean reset, int format, int type, java.nio.ByteBuffer values) { @@ -63,9 +63,9 @@ public class ARBRobustness { } public static void glGetnMinmaxARB(int target, boolean reset, int format, int type, int values_bufSize, - long values_buffer_offset) { + long values_buffer_offset) { org.lwjgl.opengl.ARBRobustness - .glGetnMinmaxARB(target, reset, format, type, values_bufSize, values_buffer_offset); + .glGetnMinmaxARB(target, reset, format, type, values_bufSize, values_buffer_offset); } public static void glGetnMinmaxARB(int target, boolean reset, int format, int type, java.nio.ByteBuffer values) { @@ -89,12 +89,12 @@ public class ARBRobustness { } public static void glGetnSeparableFilterARB(int target, int format, int type, java.nio.ByteBuffer row, - java.nio.ByteBuffer column, java.nio.ByteBuffer span) { + java.nio.ByteBuffer column, java.nio.ByteBuffer span) { org.lwjgl.opengl.ARBRobustness.glGetnSeparableFilterARB(target, format, type, row, column, span); } public static void glGetnTexImageARB(int target, int level, int format, int type, int img_bufSize, - long img_buffer_offset) { + long img_buffer_offset) { org.lwjgl.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img_bufSize, img_buffer_offset); } @@ -135,28 +135,28 @@ public class ARBRobustness { } public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type, int data_bufSize, - long data_buffer_offset) { + long data_buffer_offset) { org.lwjgl.opengl.ARBRobustness - .glReadnPixelsARB(x, y, width, height, format, type, data_bufSize, data_buffer_offset); + .glReadnPixelsARB(x, y, width, height, format, type, data_bufSize, data_buffer_offset); } public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data); } public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type, - java.nio.FloatBuffer data) { + java.nio.FloatBuffer data) { org.lwjgl.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data); } public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type, - java.nio.IntBuffer data) { + java.nio.IntBuffer data) { org.lwjgl.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data); } public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type, - java.nio.ShortBuffer data) { + java.nio.ShortBuffer data) { org.lwjgl.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBSeparateShaderObjects.java b/src/generated/java/org/lwjglx/opengl/ARBSeparateShaderObjects.java index a86aeae..c300122 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBSeparateShaderObjects.java +++ b/src/generated/java/org/lwjglx/opengl/ARBSeparateShaderObjects.java @@ -41,7 +41,7 @@ public class ARBSeparateShaderObjects { } public static void glGetProgramPipelineInfoLog(int pipeline, java.nio.IntBuffer length, - java.nio.ByteBuffer infoLog) { + java.nio.ByteBuffer infoLog) { org.lwjgl.opengl.ARBSeparateShaderObjects.glGetProgramPipelineInfoLog(pipeline, length, infoLog); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBShaderImageLoadStore.java b/src/generated/java/org/lwjglx/opengl/ARBShaderImageLoadStore.java index 5732356..cdad8a9 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBShaderImageLoadStore.java +++ b/src/generated/java/org/lwjglx/opengl/ARBShaderImageLoadStore.java @@ -68,9 +68,9 @@ public class ARBShaderImageLoadStore { public static final int IMAGE_FORMAT_COMPATIBILITY_BY_CLASS = (int) 37065; public static void glBindImageTexture(int unit, int texture, int level, boolean layered, int layer, int access, - int format) { + int format) { org.lwjgl.opengl.ARBShaderImageLoadStore - .glBindImageTexture(unit, texture, level, layered, layer, access, format); + .glBindImageTexture(unit, texture, level, layered, layer, access, format); } public static void glMemoryBarrier(int barriers) { diff --git a/src/generated/java/org/lwjglx/opengl/ARBShaderObjects.java b/src/generated/java/org/lwjglx/opengl/ARBShaderObjects.java index 8d702db..6c8a03b 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBShaderObjects.java +++ b/src/generated/java/org/lwjglx/opengl/ARBShaderObjects.java @@ -62,7 +62,7 @@ public class ARBShaderObjects { } public static void glGetActiveUniformARB(int programObj, int index, java.nio.IntBuffer length, - java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) { + java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) { org.lwjgl.opengl.ARBShaderObjects.glGetActiveUniformARB(programObj, index, length, size, type, name); } @@ -129,7 +129,7 @@ public class ARBShaderObjects { public static void glShaderSourceARB(int shader, java.nio.ByteBuffer string) { org.lwjgl.opengl.ARBShaderObjects - .glShaderSourceARB(shader, me.eigenraven.lwjgl3ify.BufferCasts.bufferToCharSeq(string)); + .glShaderSourceARB(shader, me.eigenraven.lwjgl3ify.BufferCasts.bufferToCharSeq(string)); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBShaderStorageBufferObject.java b/src/generated/java/org/lwjglx/opengl/ARBShaderStorageBufferObject.java index e63b6ce..7d52f38 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBShaderStorageBufferObject.java +++ b/src/generated/java/org/lwjglx/opengl/ARBShaderStorageBufferObject.java @@ -21,7 +21,7 @@ public class ARBShaderStorageBufferObject { public static void glShaderStorageBlockBinding(int program, int storageBlockIndex, int storageBlockBinding) { org.lwjgl.opengl.ARBShaderStorageBufferObject - .glShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding); + .glShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBShaderSubroutine.java b/src/generated/java/org/lwjglx/opengl/ARBShaderSubroutine.java index eac1df2..bd61074 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBShaderSubroutine.java +++ b/src/generated/java/org/lwjglx/opengl/ARBShaderSubroutine.java @@ -17,18 +17,18 @@ public class ARBShaderSubroutine { } public static void glGetActiveSubroutineName(int program, int shadertype, int index, java.nio.IntBuffer length, - java.nio.ByteBuffer name) { + java.nio.ByteBuffer name) { org.lwjgl.opengl.ARBShaderSubroutine.glGetActiveSubroutineName(program, shadertype, index, length, name); } public static java.lang.String glGetActiveSubroutineUniformName(int program, int shadertype, int index, - int bufsize) { + int bufsize) { return org.lwjgl.opengl.ARBShaderSubroutine - .glGetActiveSubroutineUniformName(program, shadertype, index, bufsize); + .glGetActiveSubroutineUniformName(program, shadertype, index, bufsize); } public static void glGetActiveSubroutineUniformName(int program, int shadertype, int index, - java.nio.IntBuffer length, java.nio.ByteBuffer name) { + java.nio.IntBuffer length, java.nio.ByteBuffer name) { org.lwjgl.opengl.ARBShaderSubroutine.glGetActiveSubroutineUniformName(program, shadertype, index, length, name); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBShadingLanguageInclude.java b/src/generated/java/org/lwjglx/opengl/ARBShadingLanguageInclude.java index 3aeb065..dc2c570 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBShadingLanguageInclude.java +++ b/src/generated/java/org/lwjglx/opengl/ARBShadingLanguageInclude.java @@ -19,7 +19,7 @@ public class ARBShadingLanguageInclude { } public static void glGetNamedStringARB(java.lang.CharSequence name, java.nio.IntBuffer stringlen, - java.nio.ByteBuffer string) { + java.nio.ByteBuffer string) { org.lwjgl.opengl.ARBShadingLanguageInclude.glGetNamedStringARB(name, stringlen, string); } @@ -28,7 +28,7 @@ public class ARBShadingLanguageInclude { } public static void glGetNamedStringARB(java.nio.ByteBuffer name, java.nio.IntBuffer stringlen, - java.nio.ByteBuffer string) { + java.nio.ByteBuffer string) { org.lwjgl.opengl.ARBShadingLanguageInclude.glGetNamedStringARB(name, stringlen, string); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBSparseTexture.java b/src/generated/java/org/lwjglx/opengl/ARBSparseTexture.java index a8dbcc7..5d155dd 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBSparseTexture.java +++ b/src/generated/java/org/lwjglx/opengl/ARBSparseTexture.java @@ -15,9 +15,9 @@ public class ARBSparseTexture { public static final int GL_VIRTUAL_PAGE_SIZE_Z_ARB = (int) 37271; public static void glTexPageCommitmentARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, boolean commit) { + int height, int depth, boolean commit) { org.lwjgl.opengl.ARBSparseTexture - .glTexPageCommitmentARB(target, level, xoffset, yoffset, zoffset, width, height, depth, commit); + .glTexPageCommitmentARB(target, level, xoffset, yoffset, zoffset, width, height, depth, commit); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBTextureBufferRange.java b/src/generated/java/org/lwjglx/opengl/ARBTextureBufferRange.java index d464aca..ce86886 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBTextureBufferRange.java +++ b/src/generated/java/org/lwjglx/opengl/ARBTextureBufferRange.java @@ -11,9 +11,9 @@ public class ARBTextureBufferRange { } public static void glTextureBufferRangeEXT(int texture, int target, int internalformat, int buffer, long offset, - long size) { + long size) { org.lwjgl.opengl.ARBTextureBufferRange - .glTextureBufferRangeEXT(texture, target, internalformat, buffer, offset, size); + .glTextureBufferRangeEXT(texture, target, internalformat, buffer, offset, size); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBTextureCompression.java b/src/generated/java/org/lwjglx/opengl/ARBTextureCompression.java index 28418a4..144b264 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBTextureCompression.java +++ b/src/generated/java/org/lwjglx/opengl/ARBTextureCompression.java @@ -15,111 +15,105 @@ public class ARBTextureCompression { public static final int GL_TEXTURE_COMPRESSION_HINT_ARB = (int) 34031; public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, - int pData_imageSize, long pData_buffer_offset) { + int pData_imageSize, long pData_buffer_offset) { org.lwjgl.opengl.ARBTextureCompression.glCompressedTexImage1DARB( - target, - level, - internalformat, - width, - border, - pData_imageSize, - pData_buffer_offset); + target, + level, + internalformat, + width, + border, + pData_imageSize, + pData_buffer_offset); } public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, - int border, int pData_imageSize, long pData_buffer_offset) { + int border, int pData_imageSize, long pData_buffer_offset) { org.lwjgl.opengl.ARBTextureCompression.glCompressedTexImage2DARB( - target, - level, - internalformat, - width, - height, - border, - pData_imageSize, - pData_buffer_offset); + target, + level, + internalformat, + width, + height, + border, + pData_imageSize, + pData_buffer_offset); } public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, - int depth, int border, int pData_imageSize, long pData_buffer_offset) { + int depth, int border, int pData_imageSize, long pData_buffer_offset) { org.lwjgl.opengl.ARBTextureCompression.glCompressedTexImage3DARB( - target, - level, - internalformat, - width, - height, - depth, - border, - pData_imageSize, - pData_buffer_offset); + target, + level, + internalformat, + width, + height, + depth, + border, + pData_imageSize, + pData_buffer_offset); } public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, - int pData_imageSize, long pData_buffer_offset) { - org.lwjgl.opengl.ARBTextureCompression.glCompressedTexSubImage1DARB( - target, - level, - xoffset, - width, - format, - pData_imageSize, - pData_buffer_offset); - } - - public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, - java.nio.ByteBuffer pData) { + int pData_imageSize, long pData_buffer_offset) { org.lwjgl.opengl.ARBTextureCompression - .glCompressedTexSubImage1DARB(target, level, xoffset, width, format, pData); + .glCompressedTexSubImage1DARB(target, level, xoffset, width, format, pData_imageSize, pData_buffer_offset); + } + + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, + java.nio.ByteBuffer pData) { + org.lwjgl.opengl.ARBTextureCompression + .glCompressedTexSubImage1DARB(target, level, xoffset, width, format, pData); } public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, - int height, int format, int pData_imageSize, long pData_buffer_offset) { + int height, int format, int pData_imageSize, long pData_buffer_offset) { org.lwjgl.opengl.ARBTextureCompression.glCompressedTexSubImage2DARB( - target, - level, - xoffset, - yoffset, - width, - height, - format, - pData_imageSize, - pData_buffer_offset); + target, + level, + xoffset, + yoffset, + width, + height, + format, + pData_imageSize, + pData_buffer_offset); } public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, - int height, int format, java.nio.ByteBuffer pData) { + int height, int format, java.nio.ByteBuffer pData) { org.lwjgl.opengl.ARBTextureCompression - .glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, pData); + .glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, pData); } public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int pData_imageSize, long pData_buffer_offset) { + int width, int height, int depth, int format, int pData_imageSize, long pData_buffer_offset) { org.lwjgl.opengl.ARBTextureCompression.glCompressedTexSubImage3DARB( - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - pData_imageSize, - pData_buffer_offset); + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + pData_imageSize, + pData_buffer_offset); } public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, java.nio.ByteBuffer pData) { + int width, int height, int depth, int format, java.nio.ByteBuffer pData) { org.lwjgl.opengl.ARBTextureCompression.glCompressedTexSubImage3DARB( - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - pData); + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + pData); } public static void glGetCompressedTexImageARB(int target, int lod, long pImg_buffer_offset) { diff --git a/src/generated/java/org/lwjglx/opengl/ARBTextureMultisample.java b/src/generated/java/org/lwjglx/opengl/ARBTextureMultisample.java index 09732ba..377b6cd 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBTextureMultisample.java +++ b/src/generated/java/org/lwjglx/opengl/ARBTextureMultisample.java @@ -29,15 +29,15 @@ public class ARBTextureMultisample { } public static void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height, - boolean fixedsamplelocations) { + boolean fixedsamplelocations) { org.lwjgl.opengl.ARBTextureMultisample - .glTexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); + .glTexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); } public static void glTexImage3DMultisample(int target, int samples, int internalformat, int width, int height, - int depth, boolean fixedsamplelocations) { + int depth, boolean fixedsamplelocations) { org.lwjgl.opengl.ARBTextureMultisample - .glTexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations); + .glTexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBTextureStorage.java b/src/generated/java/org/lwjglx/opengl/ARBTextureStorage.java index 37f75db..ec057ba 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBTextureStorage.java +++ b/src/generated/java/org/lwjglx/opengl/ARBTextureStorage.java @@ -21,15 +21,15 @@ public class ARBTextureStorage { } public static void glTextureStorage2DEXT(int texture, int target, int levels, int internalformat, int width, - int height) { + int height) { org.lwjgl.opengl.ARBTextureStorage - .glTextureStorage2DEXT(texture, target, levels, internalformat, width, height); + .glTextureStorage2DEXT(texture, target, levels, internalformat, width, height); } public static void glTextureStorage3DEXT(int texture, int target, int levels, int internalformat, int width, - int height, int depth) { + int height, int depth) { org.lwjgl.opengl.ARBTextureStorage - .glTextureStorage3DEXT(texture, target, levels, internalformat, width, height, depth); + .glTextureStorage3DEXT(texture, target, levels, internalformat, width, height, depth); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBTextureStorageMultisample.java b/src/generated/java/org/lwjglx/opengl/ARBTextureStorageMultisample.java index 7a4b10b..5510827 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBTextureStorageMultisample.java +++ b/src/generated/java/org/lwjglx/opengl/ARBTextureStorageMultisample.java @@ -3,40 +3,40 @@ package org.lwjglx.opengl; public class ARBTextureStorageMultisample { public static void glTexStorage2DMultisample(int target, int samples, int internalformat, int width, int height, - boolean fixedsamplelocations) { + boolean fixedsamplelocations) { org.lwjgl.opengl.ARBTextureStorageMultisample - .glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); + .glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); } public static void glTexStorage3DMultisample(int target, int samples, int internalformat, int width, int height, - int depth, boolean fixedsamplelocations) { + int depth, boolean fixedsamplelocations) { org.lwjgl.opengl.ARBTextureStorageMultisample - .glTexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations); + .glTexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations); } public static void glTextureStorage2DMultisampleEXT(int texture, int target, int samples, int internalformat, - int width, int height, boolean fixedsamplelocations) { + int width, int height, boolean fixedsamplelocations) { org.lwjgl.opengl.ARBTextureStorageMultisample.glTextureStorage2DMultisampleEXT( - texture, - target, - samples, - internalformat, - width, - height, - fixedsamplelocations); + texture, + target, + samples, + internalformat, + width, + height, + fixedsamplelocations); } public static void glTextureStorage3DMultisampleEXT(int texture, int target, int samples, int internalformat, - int width, int height, int depth, boolean fixedsamplelocations) { + int width, int height, int depth, boolean fixedsamplelocations) { org.lwjgl.opengl.ARBTextureStorageMultisample.glTextureStorage3DMultisampleEXT( - texture, - target, - samples, - internalformat, - width, - height, - depth, - fixedsamplelocations); + texture, + target, + samples, + internalformat, + width, + height, + depth, + fixedsamplelocations); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBTextureView.java b/src/generated/java/org/lwjglx/opengl/ARBTextureView.java index 80cbd2b..c73b6ff 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBTextureView.java +++ b/src/generated/java/org/lwjglx/opengl/ARBTextureView.java @@ -9,9 +9,9 @@ public class ARBTextureView { public static final int GL_TEXTURE_VIEW_NUM_LEVELS = (int) 33500; public static void glTextureView(int texture, int target, int origtexture, int internalformat, int minlevel, - int numlevels, int minlayer, int numlayers) { + int numlevels, int minlayer, int numlayers) { org.lwjgl.opengl.ARBTextureView - .glTextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers); + .glTextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBTransformFeedbackInstanced.java b/src/generated/java/org/lwjglx/opengl/ARBTransformFeedbackInstanced.java index 15b9097..3e34ea6 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBTransformFeedbackInstanced.java +++ b/src/generated/java/org/lwjglx/opengl/ARBTransformFeedbackInstanced.java @@ -8,7 +8,7 @@ public class ARBTransformFeedbackInstanced { public static void glDrawTransformFeedbackStreamInstanced(int mode, int id, int stream, int primcount) { org.lwjgl.opengl.ARBTransformFeedbackInstanced - .glDrawTransformFeedbackStreamInstanced(mode, id, stream, primcount); + .glDrawTransformFeedbackStreamInstanced(mode, id, stream, primcount); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBUniformBufferObject.java b/src/generated/java/org/lwjglx/opengl/ARBUniformBufferObject.java index 5025ea8..6f3bc72 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBUniformBufferObject.java +++ b/src/generated/java/org/lwjglx/opengl/ARBUniformBufferObject.java @@ -49,9 +49,9 @@ public class ARBUniformBufferObject { } public static void glGetActiveUniformBlockName(int program, int uniformBlockIndex, java.nio.IntBuffer length, - java.nio.ByteBuffer uniformBlockName) { + java.nio.ByteBuffer uniformBlockName) { org.lwjgl.opengl.ARBUniformBufferObject - .glGetActiveUniformBlockName(program, uniformBlockIndex, length, uniformBlockName); + .glGetActiveUniformBlockName(program, uniformBlockIndex, length, uniformBlockName); } public static int glGetActiveUniformBlocki(int program, int uniformBlockIndex, int pname) { @@ -63,7 +63,7 @@ public class ARBUniformBufferObject { } public static void glGetActiveUniformName(int program, int uniformIndex, java.nio.IntBuffer length, - java.nio.ByteBuffer uniformName) { + java.nio.ByteBuffer uniformName) { org.lwjgl.opengl.ARBUniformBufferObject.glGetActiveUniformName(program, uniformIndex, length, uniformName); } @@ -80,7 +80,7 @@ public class ARBUniformBufferObject { } public static void glGetUniformIndices(int program, java.lang.CharSequence[] uniformNames, - java.nio.IntBuffer uniformIndices) { + java.nio.IntBuffer uniformIndices) { org.lwjgl.opengl.ARBUniformBufferObject.glGetUniformIndices(program, uniformNames, uniformIndices); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBVertexAttribBinding.java b/src/generated/java/org/lwjglx/opengl/ARBVertexAttribBinding.java index a23524c..d11f127 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBVertexAttribBinding.java +++ b/src/generated/java/org/lwjglx/opengl/ARBVertexAttribBinding.java @@ -19,9 +19,9 @@ public class ARBVertexAttribBinding { } public static void glVertexAttribFormat(int attribindex, int size, int type, boolean normalized, - int relativeoffset) { + int relativeoffset) { org.lwjgl.opengl.ARBVertexAttribBinding - .glVertexAttribFormat(attribindex, size, type, normalized, relativeoffset); + .glVertexAttribFormat(attribindex, size, type, normalized, relativeoffset); } public static void glVertexAttribIFormat(int attribindex, int size, int type, int relativeoffset) { diff --git a/src/generated/java/org/lwjglx/opengl/ARBVertexBlend.java b/src/generated/java/org/lwjglx/opengl/ARBVertexBlend.java index 259b183..58686de 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBVertexBlend.java +++ b/src/generated/java/org/lwjglx/opengl/ARBVertexBlend.java @@ -76,10 +76,10 @@ public class ARBVertexBlend { public static void glWeightPointerARB(int size, int stride, java.nio.DoubleBuffer pPointer) { org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB( - size, - org.lwjgl.opengl.GL11.GL_DOUBLE, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pPointer)); + size, + org.lwjgl.opengl.GL11.GL_DOUBLE, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pPointer)); } @@ -92,30 +92,30 @@ public class ARBVertexBlend { public static void glWeightPointerARB(int size, boolean unsigned, int stride, java.nio.ByteBuffer pPointer) { org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB( - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), - stride, - org.lwjglx.MemoryUtil.getAddress(pPointer)); + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), + stride, + org.lwjglx.MemoryUtil.getAddress(pPointer)); } public static void glWeightPointerARB(int size, boolean unsigned, int stride, java.nio.IntBuffer pPointer) { org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB( - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT), - stride, - org.lwjglx.MemoryUtil.getAddress(pPointer)); + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT), + stride, + org.lwjglx.MemoryUtil.getAddress(pPointer)); } public static void glWeightPointerARB(int size, boolean unsigned, int stride, java.nio.ShortBuffer pPointer) { org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB( - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT), - stride, - org.lwjglx.MemoryUtil.getAddress(pPointer)); + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT), + stride, + org.lwjglx.MemoryUtil.getAddress(pPointer)); } diff --git a/src/generated/java/org/lwjglx/opengl/ARBVertexProgram.java b/src/generated/java/org/lwjglx/opengl/ARBVertexProgram.java index 170db5c..d936f0a 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBVertexProgram.java +++ b/src/generated/java/org/lwjglx/opengl/ARBVertexProgram.java @@ -80,9 +80,9 @@ public class ARBVertexProgram extends org.lwjgl.opengl.ARBProgram { } public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, - long buffer_buffer_offset) { + long buffer_buffer_offset) { org.lwjgl.opengl.ARBVertexProgram - .glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_buffer_offset); + .glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_buffer_offset); } } diff --git a/src/generated/java/org/lwjglx/opengl/ARBVertexShader.java b/src/generated/java/org/lwjglx/opengl/ARBVertexShader.java index 4b0fc6e..c8a6ad6 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBVertexShader.java +++ b/src/generated/java/org/lwjglx/opengl/ARBVertexShader.java @@ -45,7 +45,7 @@ public class ARBVertexShader { } public static void glGetActiveAttribARB(int programObj, int index, java.nio.IntBuffer length, - java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) { + java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) { org.lwjgl.opengl.ARBVertexShader.glGetActiveAttribARB(programObj, index, length, size, type, name); } @@ -122,73 +122,73 @@ public class ARBVertexShader { } public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, - long buffer_buffer_offset) { + long buffer_buffer_offset) { org.lwjgl.opengl.ARBVertexShader - .glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_buffer_offset); + .glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_buffer_offset); } public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, - java.nio.ByteBuffer buffer) { + java.nio.ByteBuffer buffer) { org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB(index, size, type, normalized, stride, buffer); } public static void glVertexAttribPointerARB(int index, int size, boolean normalized, int stride, - java.nio.DoubleBuffer buffer) { + java.nio.DoubleBuffer buffer) { org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB( - index, - size, - org.lwjgl.opengl.GL11.GL_DOUBLE, - normalized, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(buffer)); + index, + size, + org.lwjgl.opengl.GL11.GL_DOUBLE, + normalized, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(buffer)); } public static void glVertexAttribPointerARB(int index, int size, boolean normalized, int stride, - java.nio.FloatBuffer buffer) { + java.nio.FloatBuffer buffer) { org.lwjgl.opengl.ARBVertexShader - .glVertexAttribPointerARB(index, size, org.lwjgl.opengl.GL11.GL_FLOAT, normalized, stride, buffer); + .glVertexAttribPointerARB(index, size, org.lwjgl.opengl.GL11.GL_FLOAT, normalized, stride, buffer); } public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, - java.nio.ByteBuffer buffer) { + java.nio.ByteBuffer buffer) { org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB( - index, - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), - normalized, - stride, - org.lwjglx.MemoryUtil.getAddress(buffer)); + index, + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), + normalized, + stride, + org.lwjglx.MemoryUtil.getAddress(buffer)); } public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, - java.nio.IntBuffer buffer) { + java.nio.IntBuffer buffer) { org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB( - index, - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT), - normalized, - stride, - org.lwjglx.MemoryUtil.getAddress(buffer)); + index, + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT), + normalized, + stride, + org.lwjglx.MemoryUtil.getAddress(buffer)); } public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, - java.nio.ShortBuffer buffer) { + java.nio.ShortBuffer buffer) { org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB( - index, - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT), - normalized, - stride, - org.lwjglx.MemoryUtil.getAddress(buffer)); + index, + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT), + normalized, + stride, + org.lwjglx.MemoryUtil.getAddress(buffer)); } diff --git a/src/generated/java/org/lwjglx/opengl/EXTBlendFuncSeparate.java b/src/generated/java/org/lwjglx/opengl/EXTBlendFuncSeparate.java index 4c904ec..22a6653 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTBlendFuncSeparate.java +++ b/src/generated/java/org/lwjglx/opengl/EXTBlendFuncSeparate.java @@ -9,7 +9,7 @@ public class EXTBlendFuncSeparate { public static void glBlendFuncSeparateEXT(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha) { org.lwjgl.opengl.EXTBlendFuncSeparate - .glBlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); + .glBlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); } } diff --git a/src/generated/java/org/lwjglx/opengl/EXTDirectStateAccess.java b/src/generated/java/org/lwjglx/opengl/EXTDirectStateAccess.java index 345207a..66d257d 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTDirectStateAccess.java +++ b/src/generated/java/org/lwjglx/opengl/EXTDirectStateAccess.java @@ -19,359 +19,327 @@ public class EXTDirectStateAccess { } public static void glCompressedMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width, - int border, int data_imageSize, long data_buffer_offset) { + int border, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexImage1DEXT( - texunit, - target, - level, - internalformat, - width, - border, - data_imageSize, - data_buffer_offset); + texunit, + target, + level, + internalformat, + width, + border, + data_imageSize, + data_buffer_offset); } public static void glCompressedMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width, - int border, java.nio.ByteBuffer data) { + int border, java.nio.ByteBuffer data) { org.lwjgl.opengl.EXTDirectStateAccess - .glCompressedMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, data); + .glCompressedMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, data); } public static void glCompressedMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int border, int data_imageSize, long data_buffer_offset) { + int height, int border, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexImage2DEXT( - texunit, - target, - level, - internalformat, - width, - height, - border, - data_imageSize, - data_buffer_offset); + texunit, + target, + level, + internalformat, + width, + height, + border, + data_imageSize, + data_buffer_offset); } public static void glCompressedMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int border, java.nio.ByteBuffer data) { + int height, int border, java.nio.ByteBuffer data) { org.lwjgl.opengl.EXTDirectStateAccess - .glCompressedMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, data); + .glCompressedMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, data); } public static void glCompressedMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int depth, int border, int data_imageSize, long data_buffer_offset) { + int height, int depth, int border, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexImage3DEXT( - texunit, - target, - level, - internalformat, - width, - height, - depth, - border, - data_imageSize, - data_buffer_offset); + texunit, + target, + level, + internalformat, + width, + height, + depth, + border, + data_imageSize, + data_buffer_offset); } public static void glCompressedMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int depth, int border, java.nio.ByteBuffer data) { - org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexImage3DEXT( - texunit, - target, - level, - internalformat, - width, - height, - depth, - border, - data); + int height, int depth, int border, java.nio.ByteBuffer data) { + org.lwjgl.opengl.EXTDirectStateAccess + .glCompressedMultiTexImage3DEXT(texunit, target, level, internalformat, width, height, depth, border, data); } public static void glCompressedMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, - int format, int data_imageSize, long data_buffer_offset) { + int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage1DEXT( - texunit, - target, - level, - xoffset, - width, - format, - data_imageSize, - data_buffer_offset); + texunit, + target, + level, + xoffset, + width, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, - int format, java.nio.ByteBuffer data) { + int format, java.nio.ByteBuffer data) { org.lwjgl.opengl.EXTDirectStateAccess - .glCompressedMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, data); + .glCompressedMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, data); } public static void glCompressedMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int width, int height, int format, int data_imageSize, long data_buffer_offset) { + int width, int height, int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage2DEXT( - texunit, - target, - level, - xoffset, - yoffset, - width, - height, - format, - data_imageSize, - data_buffer_offset); + texunit, + target, + level, + xoffset, + yoffset, + width, + height, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int width, int height, int format, java.nio.ByteBuffer data) { - org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage2DEXT( - texunit, - target, - level, - xoffset, - yoffset, - width, - height, - format, - data); + int width, int height, int format, java.nio.ByteBuffer data) { + org.lwjgl.opengl.EXTDirectStateAccess + .glCompressedMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, data); } public static void glCompressedMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, int data_imageSize, long data_buffer_offset) { + int zoffset, int width, int height, int depth, int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage3DEXT( - texunit, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - data_imageSize, - data_buffer_offset); + texunit, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, java.nio.ByteBuffer data) { + int zoffset, int width, int height, int depth, int format, java.nio.ByteBuffer data) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage3DEXT( - texunit, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - data); + texunit, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + data); } public static void glCompressedTextureImage1DEXT(int texture, int target, int level, int internalformat, int width, - int border, int data_imageSize, long data_buffer_offset) { + int border, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureImage1DEXT( - texture, - target, - level, - internalformat, - width, - border, - data_imageSize, - data_buffer_offset); + texture, + target, + level, + internalformat, + width, + border, + data_imageSize, + data_buffer_offset); } public static void glCompressedTextureImage1DEXT(int texture, int target, int level, int internalformat, int width, - int border, java.nio.ByteBuffer data) { + int border, java.nio.ByteBuffer data) { org.lwjgl.opengl.EXTDirectStateAccess - .glCompressedTextureImage1DEXT(texture, target, level, internalformat, width, border, data); + .glCompressedTextureImage1DEXT(texture, target, level, internalformat, width, border, data); } public static void glCompressedTextureImage2DEXT(int texture, int target, int level, int internalformat, int width, - int height, int border, int data_imageSize, long data_buffer_offset) { + int height, int border, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureImage2DEXT( - texture, - target, - level, - internalformat, - width, - height, - border, - data_imageSize, - data_buffer_offset); + texture, + target, + level, + internalformat, + width, + height, + border, + data_imageSize, + data_buffer_offset); } public static void glCompressedTextureImage2DEXT(int texture, int target, int level, int internalformat, int width, - int height, int border, java.nio.ByteBuffer data) { + int height, int border, java.nio.ByteBuffer data) { org.lwjgl.opengl.EXTDirectStateAccess - .glCompressedTextureImage2DEXT(texture, target, level, internalformat, width, height, border, data); + .glCompressedTextureImage2DEXT(texture, target, level, internalformat, width, height, border, data); } public static void glCompressedTextureImage3DEXT(int texture, int target, int level, int internalformat, int width, - int height, int depth, int border, int data_imageSize, long data_buffer_offset) { + int height, int depth, int border, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureImage3DEXT( - texture, - target, - level, - internalformat, - width, - height, - depth, - border, - data_imageSize, - data_buffer_offset); + texture, + target, + level, + internalformat, + width, + height, + depth, + border, + data_imageSize, + data_buffer_offset); } public static void glCompressedTextureImage3DEXT(int texture, int target, int level, int internalformat, int width, - int height, int depth, int border, java.nio.ByteBuffer data) { - org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureImage3DEXT( - texture, - target, - level, - internalformat, - width, - height, - depth, - border, - data); + int height, int depth, int border, java.nio.ByteBuffer data) { + org.lwjgl.opengl.EXTDirectStateAccess + .glCompressedTextureImage3DEXT(texture, target, level, internalformat, width, height, depth, border, data); } public static void glCompressedTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, - int format, int data_imageSize, long data_buffer_offset) { + int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage1DEXT( - texture, - target, - level, - xoffset, - width, - format, - data_imageSize, - data_buffer_offset); + texture, + target, + level, + xoffset, + width, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, - int format, java.nio.ByteBuffer data) { + int format, java.nio.ByteBuffer data) { org.lwjgl.opengl.EXTDirectStateAccess - .glCompressedTextureSubImage1DEXT(texture, target, level, xoffset, width, format, data); + .glCompressedTextureSubImage1DEXT(texture, target, level, xoffset, width, format, data); } public static void glCompressedTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, - int width, int height, int format, int data_imageSize, long data_buffer_offset) { + int width, int height, int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage2DEXT( - texture, - target, - level, - xoffset, - yoffset, - width, - height, - format, - data_imageSize, - data_buffer_offset); + texture, + target, + level, + xoffset, + yoffset, + width, + height, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, - int width, int height, int format, java.nio.ByteBuffer data) { - org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage2DEXT( - texture, - target, - level, - xoffset, - yoffset, - width, - height, - format, - data); + int width, int height, int format, java.nio.ByteBuffer data) { + org.lwjgl.opengl.EXTDirectStateAccess + .glCompressedTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, data); } public static void glCompressedTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, int data_imageSize, long data_buffer_offset) { + int zoffset, int width, int height, int depth, int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage3DEXT( - texture, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - data_imageSize, - data_buffer_offset); + texture, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, java.nio.ByteBuffer data) { + int zoffset, int width, int height, int depth, int format, java.nio.ByteBuffer data) { org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage3DEXT( - texture, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - data); + texture, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + data); } public static void glCopyMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int x, int y, - int width, int border) { + int width, int border) { org.lwjgl.opengl.EXTDirectStateAccess - .glCopyMultiTexImage1DEXT(texunit, target, level, internalformat, x, y, width, border); + .glCopyMultiTexImage1DEXT(texunit, target, level, internalformat, x, y, width, border); } public static void glCopyMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int x, int y, - int width, int height, int border) { + int width, int height, int border) { org.lwjgl.opengl.EXTDirectStateAccess - .glCopyMultiTexImage2DEXT(texunit, target, level, internalformat, x, y, width, height, border); + .glCopyMultiTexImage2DEXT(texunit, target, level, internalformat, x, y, width, height, border); } public static void glCopyMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int x, int y, - int width) { + int width) { org.lwjgl.opengl.EXTDirectStateAccess.glCopyMultiTexSubImage1DEXT(texunit, target, level, xoffset, x, y, width); } public static void glCopyMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int x, - int y, int width, int height) { + int y, int width, int height) { org.lwjgl.opengl.EXTDirectStateAccess - .glCopyMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, x, y, width, height); + .glCopyMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, x, y, width, height); } public static void glCopyMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int zoffset, int x, int y, int width, int height) { + int zoffset, int x, int y, int width, int height) { org.lwjgl.opengl.EXTDirectStateAccess - .glCopyMultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, x, y, width, height); + .glCopyMultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, x, y, width, height); } public static void glCopyTextureImage1DEXT(int texture, int target, int level, int internalformat, int x, int y, - int width, int border) { + int width, int border) { org.lwjgl.opengl.EXTDirectStateAccess - .glCopyTextureImage1DEXT(texture, target, level, internalformat, x, y, width, border); + .glCopyTextureImage1DEXT(texture, target, level, internalformat, x, y, width, border); } public static void glCopyTextureImage2DEXT(int texture, int target, int level, int internalformat, int x, int y, - int width, int height, int border) { + int width, int height, int border) { org.lwjgl.opengl.EXTDirectStateAccess - .glCopyTextureImage2DEXT(texture, target, level, internalformat, x, y, width, height, border); + .glCopyTextureImage2DEXT(texture, target, level, internalformat, x, y, width, height, border); } public static void glCopyTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int x, int y, - int width) { + int width) { org.lwjgl.opengl.EXTDirectStateAccess.glCopyTextureSubImage1DEXT(texture, target, level, xoffset, x, y, width); } public static void glCopyTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int x, - int y, int width, int height) { + int y, int width, int height) { org.lwjgl.opengl.EXTDirectStateAccess - .glCopyTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, x, y, width, height); + .glCopyTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, x, y, width, height); } public static void glCopyTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, - int zoffset, int x, int y, int width, int height) { + int zoffset, int x, int y, int width, int height) { org.lwjgl.opengl.EXTDirectStateAccess - .glCopyTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, x, y, width, height); + .glCopyTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, x, y, width, height); } public static void glDisableClientStateIndexedEXT(int array, int index) { @@ -444,7 +412,7 @@ public class EXTDirectStateAccess { public static void glGetCompressedMultiTexImageEXT(int texunit, int target, int level, long img_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glGetCompressedMultiTexImageEXT(texunit, target, level, img_buffer_offset); + .glGetCompressedMultiTexImageEXT(texunit, target, level, img_buffer_offset); } public static void glGetCompressedMultiTexImageEXT(int texunit, int target, int level, java.nio.ByteBuffer img) { @@ -454,14 +422,14 @@ public class EXTDirectStateAccess { public static void glGetCompressedMultiTexImageEXT(int texunit, int target, int level, java.nio.IntBuffer img) { org.lwjgl.opengl.EXTDirectStateAccess - .glGetCompressedMultiTexImageEXT(texunit, target, level, org.lwjglx.MemoryUtil.getAddress(img)); + .glGetCompressedMultiTexImageEXT(texunit, target, level, org.lwjglx.MemoryUtil.getAddress(img)); } public static void glGetCompressedMultiTexImageEXT(int texunit, int target, int level, java.nio.ShortBuffer img) { org.lwjgl.opengl.EXTDirectStateAccess - .glGetCompressedMultiTexImageEXT(texunit, target, level, org.lwjglx.MemoryUtil.getAddress(img)); + .glGetCompressedMultiTexImageEXT(texunit, target, level, org.lwjglx.MemoryUtil.getAddress(img)); } @@ -476,14 +444,14 @@ public class EXTDirectStateAccess { public static void glGetCompressedTextureImageEXT(int texture, int target, int level, java.nio.IntBuffer img) { org.lwjgl.opengl.EXTDirectStateAccess - .glGetCompressedTextureImageEXT(texture, target, level, org.lwjglx.MemoryUtil.getAddress(img)); + .glGetCompressedTextureImageEXT(texture, target, level, org.lwjglx.MemoryUtil.getAddress(img)); } public static void glGetCompressedTextureImageEXT(int texture, int target, int level, java.nio.ShortBuffer img) { org.lwjgl.opengl.EXTDirectStateAccess - .glGetCompressedTextureImageEXT(texture, target, level, org.lwjglx.MemoryUtil.getAddress(img)); + .glGetCompressedTextureImageEXT(texture, target, level, org.lwjglx.MemoryUtil.getAddress(img)); } @@ -540,43 +508,43 @@ public class EXTDirectStateAccess { } public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glGetMultiTexImageEXT(texunit, target, level, format, type, pixels_buffer_offset); + .glGetMultiTexImageEXT(texunit, target, level, format, type, pixels_buffer_offset); } public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type, - java.nio.ByteBuffer pixels) { + java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels); } public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type, - java.nio.DoubleBuffer pixels) { + java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels); } public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type, - java.nio.FloatBuffer pixels) { + java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels); } public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type, - java.nio.IntBuffer pixels) { + java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels); } public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type, - java.nio.ShortBuffer pixels) { + java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels); } public static void glGetMultiTexLevelParameterEXT(int texunit, int target, int level, int pname, - java.nio.FloatBuffer params) { + java.nio.FloatBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameterfvEXT(texunit, target, level, pname, params); } public static void glGetMultiTexLevelParameterEXT(int texunit, int target, int level, int pname, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameterivEXT(texunit, target, level, pname, params); } @@ -645,9 +613,9 @@ public class EXTDirectStateAccess { } public static void glGetNamedFramebufferAttachmentParameterEXT(int framebuffer, int attachment, int pname, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess - .glGetNamedFramebufferAttachmentParameterivEXT(framebuffer, attachment, pname, params); + .glGetNamedFramebufferAttachmentParameterivEXT(framebuffer, attachment, pname, params); } public static void glGetNamedProgramEXT(int program, int target, int pname, java.nio.IntBuffer params) { @@ -655,22 +623,22 @@ public class EXTDirectStateAccess { } public static void glGetNamedProgramLocalParameterEXT(int program, int target, int index, - java.nio.DoubleBuffer params) { + java.nio.DoubleBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterdvEXT(program, target, index, params); } public static void glGetNamedProgramLocalParameterEXT(int program, int target, int index, - java.nio.FloatBuffer params) { + java.nio.FloatBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterfvEXT(program, target, index, params); } public static void glGetNamedProgramLocalParameterIEXT(int program, int target, int index, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterIivEXT(program, target, index, params); } public static void glGetNamedProgramLocalParameterIuEXT(int program, int target, int index, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterIuivEXT(program, target, index, params); } @@ -683,43 +651,43 @@ public class EXTDirectStateAccess { } public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glGetTextureImageEXT(texture, target, level, format, type, pixels_buffer_offset); + .glGetTextureImageEXT(texture, target, level, format, type, pixels_buffer_offset); } public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type, - java.nio.ByteBuffer pixels) { + java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels); } public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type, - java.nio.DoubleBuffer pixels) { + java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels); } public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type, - java.nio.FloatBuffer pixels) { + java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels); } public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type, - java.nio.IntBuffer pixels) { + java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels); } public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type, - java.nio.ShortBuffer pixels) { + java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels); } public static void glGetTextureLevelParameterEXT(int texture, int target, int level, int pname, - java.nio.FloatBuffer params) { + java.nio.FloatBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureLevelParameterfvEXT(texture, target, level, pname, params); } public static void glGetTextureLevelParameterEXT(int texture, int target, int level, int pname, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureLevelParameterivEXT(texture, target, level, pname, params); } @@ -784,7 +752,7 @@ public class EXTDirectStateAccess { } public static java.nio.ByteBuffer glMapNamedBufferEXT(int buffer, int access, long length, - java.nio.ByteBuffer old_buffer) { + java.nio.ByteBuffer old_buffer) { return org.lwjgl.opengl.EXTDirectStateAccess.glMapNamedBufferEXT(buffer, access, length, old_buffer); } @@ -793,9 +761,9 @@ public class EXTDirectStateAccess { } public static java.nio.ByteBuffer glMapNamedBufferRangeEXT(int buffer, long offset, long length, int access, - java.nio.ByteBuffer old_buffer) { + java.nio.ByteBuffer old_buffer) { return org.lwjgl.opengl.EXTDirectStateAccess - .glMapNamedBufferRangeEXT(buffer, offset, length, access, old_buffer); + .glMapNamedBufferRangeEXT(buffer, offset, length, access, old_buffer); } public static void glMatrixFrustumEXT(int matrixMode, double l, double r, double b, double t, double n, double f) { @@ -879,26 +847,26 @@ public class EXTDirectStateAccess { } public static void glMultiTexCoordPointerEXT(int texunit, int size, int type, int stride, - long pointer_buffer_offset) { + long pointer_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexCoordPointerEXT(texunit, size, type, stride, pointer_buffer_offset); + .glMultiTexCoordPointerEXT(texunit, size, type, stride, pointer_buffer_offset); } public static void glMultiTexCoordPointerEXT(int texunit, int size, int stride, java.nio.DoubleBuffer pointer) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexCoordPointerEXT( - texunit, - size, - org.lwjgl.opengl.GL11.GL_DOUBLE, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); + texunit, + size, + org.lwjgl.opengl.GL11.GL_DOUBLE, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); } public static void glMultiTexCoordPointerEXT(int texunit, int size, int stride, java.nio.FloatBuffer pointer) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexCoordPointerEXT(texunit, size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pointer); + .glMultiTexCoordPointerEXT(texunit, size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pointer); } @@ -943,233 +911,188 @@ public class EXTDirectStateAccess { } public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width, - int border, int format, int type, long pixels_buffer_offset) { + int border, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage1DEXT( - texunit, - target, - level, - internalformat, - width, - border, - format, - type, - pixels_buffer_offset); + texunit, + target, + level, + internalformat, + width, + border, + format, + type, + pixels_buffer_offset); } public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.ByteBuffer pixels) { + int border, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); + .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); } public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.DoubleBuffer pixels) { + int border, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); + .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); } public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.FloatBuffer pixels) { + int border, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); + .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); } public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.IntBuffer pixels) { + int border, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); + .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); } public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.ShortBuffer pixels) { + int border, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); + .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels); } public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int border, int format, int type, long pixels_buffer_offset) { + int height, int border, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT( - texunit, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels_buffer_offset); + texunit, + target, + level, + internalformat, + width, + height, + border, + format, + type, + pixels_buffer_offset); } public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.ByteBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT( - texunit, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.ByteBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, format, type, pixels); } public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.DoubleBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT( - texunit, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.DoubleBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, format, type, pixels); } public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.FloatBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT( - texunit, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.FloatBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, format, type, pixels); } public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.IntBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT( - texunit, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.IntBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, format, type, pixels); } public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.ShortBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT( - texunit, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.ShortBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, format, type, pixels); } public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, long pixels_buffer_offset) { + int height, int depth, int border, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT( - texunit, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels_buffer_offset); + texunit, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels_buffer_offset); } public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.ByteBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT( - texunit, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texunit, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.DoubleBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT( - texunit, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texunit, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.FloatBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT( - texunit, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texunit, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.IntBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT( - texunit, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texunit, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.ShortBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT( - texunit, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texunit, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glMultiTexParameterEXT(int texunit, int target, int pname, java.nio.FloatBuffer param) { @@ -1213,186 +1136,186 @@ public class EXTDirectStateAccess { } public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format, - int type, long pixels_buffer_offset) { + int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels_buffer_offset); + .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels_buffer_offset); } public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format, - int type, java.nio.ByteBuffer pixels) { + int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); + .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); } public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format, - int type, java.nio.DoubleBuffer pixels) { + int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); + .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); } public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format, - int type, java.nio.FloatBuffer pixels) { + int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); + .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); } public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format, - int type, java.nio.IntBuffer pixels) { + int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); + .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); } public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format, - int type, java.nio.ShortBuffer pixels) { + int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); + .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels); } public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, long pixels_buffer_offset) { + int height, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage2DEXT( - texunit, - target, - level, - xoffset, - yoffset, - width, - height, - format, - type, - pixels_buffer_offset); + texunit, + target, + level, + xoffset, + yoffset, + width, + height, + format, + type, + pixels_buffer_offset); } public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.ByteBuffer pixels) { + int height, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.DoubleBuffer pixels) { + int height, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.FloatBuffer pixels) { + int height, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.IntBuffer pixels) { + int height, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.ShortBuffer pixels) { + int height, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, int type, long pixels_buffer_offset) { + int zoffset, int width, int height, int depth, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT( - texunit, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels_buffer_offset); + texunit, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels_buffer_offset); } public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { + int zoffset, int width, int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT( - texunit, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texunit, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { + int zoffset, int width, int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT( - texunit, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texunit, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { + int zoffset, int width, int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT( - texunit, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texunit, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, int type, java.nio.IntBuffer pixels) { + int zoffset, int width, int height, int depth, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT( - texunit, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texunit, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset, - int zoffset, int width, int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { + int zoffset, int width, int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT( - texunit, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texunit, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glNamedBufferDataEXT(int buffer, long data_size, int usage) { @@ -1440,33 +1363,33 @@ public class EXTDirectStateAccess { } public static void glNamedCopyBufferSubDataEXT(int readBuffer, int writeBuffer, long readoffset, long writeoffset, - long size) { + long size) { org.lwjgl.opengl.EXTDirectStateAccess - .glNamedCopyBufferSubDataEXT(readBuffer, writeBuffer, readoffset, writeoffset, size); + .glNamedCopyBufferSubDataEXT(readBuffer, writeBuffer, readoffset, writeoffset, size); } public static void glNamedFramebufferRenderbufferEXT(int framebuffer, int attachment, int renderbuffertarget, - int renderbuffer) { + int renderbuffer) { org.lwjgl.opengl.EXTDirectStateAccess - .glNamedFramebufferRenderbufferEXT(framebuffer, attachment, renderbuffertarget, renderbuffer); + .glNamedFramebufferRenderbufferEXT(framebuffer, attachment, renderbuffertarget, renderbuffer); } public static void glNamedFramebufferTexture1DEXT(int framebuffer, int attachment, int textarget, int texture, - int level) { + int level) { org.lwjgl.opengl.EXTDirectStateAccess - .glNamedFramebufferTexture1DEXT(framebuffer, attachment, textarget, texture, level); + .glNamedFramebufferTexture1DEXT(framebuffer, attachment, textarget, texture, level); } public static void glNamedFramebufferTexture2DEXT(int framebuffer, int attachment, int textarget, int texture, - int level) { + int level) { org.lwjgl.opengl.EXTDirectStateAccess - .glNamedFramebufferTexture2DEXT(framebuffer, attachment, textarget, texture, level); + .glNamedFramebufferTexture2DEXT(framebuffer, attachment, textarget, texture, level); } public static void glNamedFramebufferTexture3DEXT(int framebuffer, int attachment, int textarget, int texture, - int level, int zoffset) { + int level, int zoffset) { org.lwjgl.opengl.EXTDirectStateAccess - .glNamedFramebufferTexture3DEXT(framebuffer, attachment, textarget, texture, level, zoffset); + .glNamedFramebufferTexture3DEXT(framebuffer, attachment, textarget, texture, level, zoffset); } public static void glNamedFramebufferTextureEXT(int framebuffer, int attachment, int texture, int level) { @@ -1474,69 +1397,69 @@ public class EXTDirectStateAccess { } public static void glNamedFramebufferTextureFaceEXT(int framebuffer, int attachment, int texture, int level, - int face) { + int face) { org.lwjgl.opengl.EXTDirectStateAccess - .glNamedFramebufferTextureFaceEXT(framebuffer, attachment, texture, level, face); + .glNamedFramebufferTextureFaceEXT(framebuffer, attachment, texture, level, face); } public static void glNamedFramebufferTextureLayerEXT(int framebuffer, int attachment, int texture, int level, - int layer) { + int layer) { org.lwjgl.opengl.EXTDirectStateAccess - .glNamedFramebufferTextureLayerEXT(framebuffer, attachment, texture, level, layer); + .glNamedFramebufferTextureLayerEXT(framebuffer, attachment, texture, level, layer); } public static void glNamedProgramLocalParameter4EXT(int program, int target, int index, - java.nio.DoubleBuffer params) { + java.nio.DoubleBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4dvEXT(program, target, index, params); } public static void glNamedProgramLocalParameter4EXT(int program, int target, int index, - java.nio.FloatBuffer params) { + java.nio.FloatBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4fvEXT(program, target, index, params); } public static void glNamedProgramLocalParameter4dEXT(int program, int target, int index, double x, double y, - double z, double w) { + double z, double w) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4dEXT(program, target, index, x, y, z, w); } public static void glNamedProgramLocalParameter4fEXT(int program, int target, int index, float x, float y, float z, - float w) { + float w) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4fEXT(program, target, index, x, y, z, w); } public static void glNamedProgramLocalParameterI4EXT(int program, int target, int index, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4ivEXT(program, target, index, params); } public static void glNamedProgramLocalParameterI4iEXT(int program, int target, int index, int x, int y, int z, - int w) { + int w) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4iEXT(program, target, index, x, y, z, w); } public static void glNamedProgramLocalParameterI4uEXT(int program, int target, int index, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4uivEXT(program, target, index, params); } public static void glNamedProgramLocalParameterI4uiEXT(int program, int target, int index, int x, int y, int z, - int w) { + int w) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4uiEXT(program, target, index, x, y, z, w); } public static void glNamedProgramLocalParameters4EXT(int program, int target, int index, - java.nio.FloatBuffer params) { + java.nio.FloatBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameters4fvEXT(program, target, index, params); } public static void glNamedProgramLocalParametersI4EXT(int program, int target, int index, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParametersI4ivEXT(program, target, index, params); } public static void glNamedProgramLocalParametersI4uEXT(int program, int target, int index, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParametersI4uivEXT(program, target, index, params); } @@ -1546,24 +1469,24 @@ public class EXTDirectStateAccess { public static void glNamedRenderbufferStorageEXT(int renderbuffer, int internalformat, int width, int height) { org.lwjgl.opengl.EXTDirectStateAccess - .glNamedRenderbufferStorageEXT(renderbuffer, internalformat, width, height); + .glNamedRenderbufferStorageEXT(renderbuffer, internalformat, width, height); } public static void glNamedRenderbufferStorageMultisampleCoverageEXT(int renderbuffer, int coverageSamples, - int colorSamples, int internalformat, int width, int height) { + int colorSamples, int internalformat, int width, int height) { org.lwjgl.opengl.EXTDirectStateAccess.glNamedRenderbufferStorageMultisampleCoverageEXT( - renderbuffer, - coverageSamples, - colorSamples, - internalformat, - width, - height); + renderbuffer, + coverageSamples, + colorSamples, + internalformat, + width, + height); } public static void glNamedRenderbufferStorageMultisampleEXT(int renderbuffer, int samples, int internalformat, - int width, int height) { + int width, int height) { org.lwjgl.opengl.EXTDirectStateAccess - .glNamedRenderbufferStorageMultisampleEXT(renderbuffer, samples, internalformat, width, height); + .glNamedRenderbufferStorageMultisampleEXT(renderbuffer, samples, internalformat, width, height); } public static void glProgramUniform1EXT(int program, int location, java.nio.FloatBuffer value) { @@ -1663,47 +1586,47 @@ public class EXTDirectStateAccess { } public static void glProgramUniformMatrix2EXT(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix2fvEXT(program, location, transpose, value); } public static void glProgramUniformMatrix2x3EXT(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix2x3fvEXT(program, location, transpose, value); } public static void glProgramUniformMatrix2x4EXT(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix2x4fvEXT(program, location, transpose, value); } public static void glProgramUniformMatrix3EXT(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix3fvEXT(program, location, transpose, value); } public static void glProgramUniformMatrix3x2EXT(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix3x2fvEXT(program, location, transpose, value); } public static void glProgramUniformMatrix3x4EXT(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix3x4fvEXT(program, location, transpose, value); } public static void glProgramUniformMatrix4EXT(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix4fvEXT(program, location, transpose, value); } public static void glProgramUniformMatrix4x2EXT(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix4x2fvEXT(program, location, transpose, value); } public static void glProgramUniformMatrix4x3EXT(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix4x3fvEXT(program, location, transpose, value); } @@ -1716,233 +1639,188 @@ public class EXTDirectStateAccess { } public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width, - int border, int format, int type, long pixels_buffer_offset) { + int border, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage1DEXT( - texture, - target, - level, - internalformat, - width, - border, - format, - type, - pixels_buffer_offset); + texture, + target, + level, + internalformat, + width, + border, + format, + type, + pixels_buffer_offset); } public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.ByteBuffer pixels) { + int border, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); + .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); } public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.DoubleBuffer pixels) { + int border, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); + .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); } public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.FloatBuffer pixels) { + int border, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); + .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); } public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.IntBuffer pixels) { + int border, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); + .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); } public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width, - int border, int format, int type, java.nio.ShortBuffer pixels) { + int border, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); + .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels); } public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width, - int height, int border, int format, int type, long pixels_buffer_offset) { + int height, int border, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT( - texture, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels_buffer_offset); + texture, + target, + level, + internalformat, + width, + height, + border, + format, + type, + pixels_buffer_offset); } public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.ByteBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT( - texture, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.ByteBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glTextureImage2DEXT(texture, target, level, internalformat, width, height, border, format, type, pixels); } public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.DoubleBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT( - texture, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.DoubleBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glTextureImage2DEXT(texture, target, level, internalformat, width, height, border, format, type, pixels); } public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.FloatBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT( - texture, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.FloatBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glTextureImage2DEXT(texture, target, level, internalformat, width, height, border, format, type, pixels); } public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.IntBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT( - texture, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.IntBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glTextureImage2DEXT(texture, target, level, internalformat, width, height, border, format, type, pixels); } public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width, - int height, int border, int format, int type, java.nio.ShortBuffer pixels) { - org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT( - texture, - target, - level, - internalformat, - width, - height, - border, - format, - type, - pixels); + int height, int border, int format, int type, java.nio.ShortBuffer pixels) { + org.lwjgl.opengl.EXTDirectStateAccess + .glTextureImage2DEXT(texture, target, level, internalformat, width, height, border, format, type, pixels); } public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, long pixels_buffer_offset) { + int height, int depth, int border, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT( - texture, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels_buffer_offset); + texture, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels_buffer_offset); } public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.ByteBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT( - texture, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texture, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.DoubleBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT( - texture, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texture, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.FloatBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT( - texture, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texture, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.IntBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT( - texture, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texture, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width, - int height, int depth, int border, int format, int type, java.nio.ShortBuffer pixels) { + int height, int depth, int border, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT( - texture, - target, - level, - internalformat, - width, - height, - depth, - border, - format, - type, - pixels); + texture, + target, + level, + internalformat, + width, + height, + depth, + border, + format, + type, + pixels); } public static void glTextureParameterEXT(int texture, int target, int pname, java.nio.FloatBuffer param) { @@ -1986,186 +1864,186 @@ public class EXTDirectStateAccess { } public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format, - int type, long pixels_buffer_offset) { + int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels_buffer_offset); + .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels_buffer_offset); } public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format, - int type, java.nio.ByteBuffer pixels) { + int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); + .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format, - int type, java.nio.DoubleBuffer pixels) { + int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); + .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format, - int type, java.nio.FloatBuffer pixels) { + int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); + .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format, - int type, java.nio.IntBuffer pixels) { + int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); + .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format, - int type, java.nio.ShortBuffer pixels) { + int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); + .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, long pixels_buffer_offset) { + int height, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage2DEXT( - texture, - target, - level, - xoffset, - yoffset, - width, - height, - format, - type, - pixels_buffer_offset); + texture, + target, + level, + xoffset, + yoffset, + width, + height, + format, + type, + pixels_buffer_offset); } public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.ByteBuffer pixels) { + int height, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.DoubleBuffer pixels) { + int height, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.FloatBuffer pixels) { + int height, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.IntBuffer pixels) { + int height, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width, - int height, int format, int type, java.nio.ShortBuffer pixels) { + int height, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess - .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int type, long pixels_buffer_offset) { + int width, int height, int depth, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT( - texture, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels_buffer_offset); + texture, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels_buffer_offset); } public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { + int width, int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT( - texture, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { + int width, int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT( - texture, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { + int width, int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT( - texture, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int type, java.nio.IntBuffer pixels) { + int width, int height, int depth, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT( - texture, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { + int width, int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT( - texture, - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static boolean glUnmapNamedBufferEXT(int buffer) { @@ -2189,9 +2067,9 @@ public class EXTDirectStateAccess { } public static void glVertexArrayMultiTexCoordOffsetEXT(int vaobj, int buffer, int texunit, int size, int type, - int stride, long offset) { + int stride, long offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glVertexArrayMultiTexCoordOffsetEXT(vaobj, buffer, texunit, size, type, stride, offset); + .glVertexArrayMultiTexCoordOffsetEXT(vaobj, buffer, texunit, size, type, stride, offset); } public static void glVertexArrayNormalOffsetEXT(int vaobj, int buffer, int type, int stride, long offset) { @@ -2199,30 +2077,30 @@ public class EXTDirectStateAccess { } public static void glVertexArraySecondaryColorOffsetEXT(int vaobj, int buffer, int size, int type, int stride, - long offset) { + long offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glVertexArraySecondaryColorOffsetEXT(vaobj, buffer, size, type, stride, offset); + .glVertexArraySecondaryColorOffsetEXT(vaobj, buffer, size, type, stride, offset); } public static void glVertexArrayTexCoordOffsetEXT(int vaobj, int buffer, int size, int type, int stride, - long offset) { + long offset) { org.lwjgl.opengl.EXTDirectStateAccess.glVertexArrayTexCoordOffsetEXT(vaobj, buffer, size, type, stride, offset); } public static void glVertexArrayVertexAttribIOffsetEXT(int vaobj, int buffer, int index, int size, int type, - int stride, long offset) { + int stride, long offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glVertexArrayVertexAttribIOffsetEXT(vaobj, buffer, index, size, type, stride, offset); + .glVertexArrayVertexAttribIOffsetEXT(vaobj, buffer, index, size, type, stride, offset); } public static void glVertexArrayVertexAttribOffsetEXT(int vaobj, int buffer, int index, int size, int type, - boolean normalized, int stride, long offset) { + boolean normalized, int stride, long offset) { org.lwjgl.opengl.EXTDirectStateAccess - .glVertexArrayVertexAttribOffsetEXT(vaobj, buffer, index, size, type, normalized, stride, offset); + .glVertexArrayVertexAttribOffsetEXT(vaobj, buffer, index, size, type, normalized, stride, offset); } public static void glVertexArrayVertexOffsetEXT(int vaobj, int buffer, int size, int type, int stride, - long offset) { + long offset) { org.lwjgl.opengl.EXTDirectStateAccess.glVertexArrayVertexOffsetEXT(vaobj, buffer, size, type, stride, offset); } diff --git a/src/generated/java/org/lwjglx/opengl/EXTDrawInstanced.java b/src/generated/java/org/lwjglx/opengl/EXTDrawInstanced.java index 953ea2b..508a82f 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTDrawInstanced.java +++ b/src/generated/java/org/lwjglx/opengl/EXTDrawInstanced.java @@ -7,9 +7,9 @@ public class EXTDrawInstanced { } public static void glDrawElementsInstancedEXT(int mode, int indices_count, int type, long indices_buffer_offset, - int primcount) { + int primcount) { org.lwjgl.opengl.EXTDrawInstanced - .glDrawElementsInstancedEXT(mode, indices_count, type, indices_buffer_offset, primcount); + .glDrawElementsInstancedEXT(mode, indices_count, type, indices_buffer_offset, primcount); } public static void glDrawElementsInstancedEXT(int mode, java.nio.ByteBuffer indices, int primcount) { diff --git a/src/generated/java/org/lwjglx/opengl/EXTFramebufferBlit.java b/src/generated/java/org/lwjglx/opengl/EXTFramebufferBlit.java index 2bbabfb..b134ef0 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTFramebufferBlit.java +++ b/src/generated/java/org/lwjglx/opengl/EXTFramebufferBlit.java @@ -8,9 +8,9 @@ public class EXTFramebufferBlit { public static final int GL_READ_FRAMEBUFFER_EXT = (int) 36008; public static void glBlitFramebufferEXT(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, - int dstY1, int mask, int filter) { + int dstY1, int mask, int filter) { org.lwjgl.opengl.EXTFramebufferBlit - .glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); + .glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } } diff --git a/src/generated/java/org/lwjglx/opengl/EXTFramebufferMultisample.java b/src/generated/java/org/lwjglx/opengl/EXTFramebufferMultisample.java index 631a09f..af29253 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTFramebufferMultisample.java +++ b/src/generated/java/org/lwjglx/opengl/EXTFramebufferMultisample.java @@ -7,9 +7,9 @@ public class EXTFramebufferMultisample { public static final int GL_RENDERBUFFER_SAMPLES_EXT = (int) 36011; public static void glRenderbufferStorageMultisampleEXT(int target, int samples, int internalformat, int width, - int height) { + int height) { org.lwjgl.opengl.EXTFramebufferMultisample - .glRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height); + .glRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height); } } diff --git a/src/generated/java/org/lwjglx/opengl/EXTFramebufferObject.java b/src/generated/java/org/lwjglx/opengl/EXTFramebufferObject.java index b981c2b..f8d98d0 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTFramebufferObject.java +++ b/src/generated/java/org/lwjglx/opengl/EXTFramebufferObject.java @@ -83,9 +83,9 @@ public class EXTFramebufferObject { } public static void glFramebufferRenderbufferEXT(int target, int attachment, int renderbuffertarget, - int renderbuffer) { + int renderbuffer) { org.lwjgl.opengl.EXTFramebufferObject - .glFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer); + .glFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer); } public static void glFramebufferTexture1DEXT(int target, int attachment, int textarget, int texture, int level) { @@ -97,9 +97,9 @@ public class EXTFramebufferObject { } public static void glFramebufferTexture3DEXT(int target, int attachment, int textarget, int texture, int level, - int zoffset) { + int zoffset) { org.lwjgl.opengl.EXTFramebufferObject - .glFramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset); + .glFramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset); } public static int glGenFramebuffersEXT() { @@ -123,9 +123,9 @@ public class EXTFramebufferObject { } public static void glGetFramebufferAttachmentParameterEXT(int target, int attachment, int pname, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.EXTFramebufferObject - .glGetFramebufferAttachmentParameterivEXT(target, attachment, pname, params); + .glGetFramebufferAttachmentParameterivEXT(target, attachment, pname, params); } public static int glGetFramebufferAttachmentParameteriEXT(int target, int attachment, int pname) { diff --git a/src/generated/java/org/lwjglx/opengl/EXTSecondaryColor.java b/src/generated/java/org/lwjglx/opengl/EXTSecondaryColor.java index 5ef650d..7fa43e4 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTSecondaryColor.java +++ b/src/generated/java/org/lwjglx/opengl/EXTSecondaryColor.java @@ -33,28 +33,28 @@ public class EXTSecondaryColor { public static void glSecondaryColorPointerEXT(int size, int stride, java.nio.DoubleBuffer pPointer) { org.lwjgl.opengl.EXTSecondaryColor.glSecondaryColorPointerEXT( - size, - org.lwjgl.opengl.GL11.GL_DOUBLE, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pPointer)); + size, + org.lwjgl.opengl.GL11.GL_DOUBLE, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pPointer)); } public static void glSecondaryColorPointerEXT(int size, int stride, java.nio.FloatBuffer pPointer) { org.lwjgl.opengl.EXTSecondaryColor - .glSecondaryColorPointerEXT(size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pPointer); + .glSecondaryColorPointerEXT(size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pPointer); } public static void glSecondaryColorPointerEXT(int size, boolean unsigned, int stride, - java.nio.ByteBuffer pPointer) { + java.nio.ByteBuffer pPointer) { org.lwjgl.opengl.EXTSecondaryColor.glSecondaryColorPointerEXT( - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), - stride, - org.lwjglx.MemoryUtil.getAddress(pPointer)); + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), + stride, + org.lwjglx.MemoryUtil.getAddress(pPointer)); } diff --git a/src/generated/java/org/lwjglx/opengl/EXTShaderImageLoadStore.java b/src/generated/java/org/lwjglx/opengl/EXTShaderImageLoadStore.java index 0b51bb3..1d4d8da 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTShaderImageLoadStore.java +++ b/src/generated/java/org/lwjglx/opengl/EXTShaderImageLoadStore.java @@ -59,9 +59,9 @@ public class EXTShaderImageLoadStore { public static final int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT = (int) 1; public static void glBindImageTextureEXT(int index, int texture, int level, boolean layered, int layer, int access, - int format) { + int format) { org.lwjgl.opengl.EXTShaderImageLoadStore - .glBindImageTextureEXT(index, texture, level, layered, layer, access, format); + .glBindImageTextureEXT(index, texture, level, layered, layer, access, format); } public static void glMemoryBarrierEXT(int barriers) { diff --git a/src/generated/java/org/lwjglx/opengl/EXTTransformFeedback.java b/src/generated/java/org/lwjglx/opengl/EXTTransformFeedback.java index b170ffb..a75c9e8 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTTransformFeedback.java +++ b/src/generated/java/org/lwjglx/opengl/EXTTransformFeedback.java @@ -39,15 +39,15 @@ public class EXTTransformFeedback { } public static java.lang.String glGetTransformFeedbackVaryingEXT(int program, int index, int bufSize, - java.nio.IntBuffer size, java.nio.IntBuffer type) { + java.nio.IntBuffer size, java.nio.IntBuffer type) { return org.lwjgl.opengl.EXTTransformFeedback - .glGetTransformFeedbackVaryingEXT(program, index, bufSize, size, type); + .glGetTransformFeedbackVaryingEXT(program, index, bufSize, size, type); } public static void glGetTransformFeedbackVaryingEXT(int program, int index, java.nio.IntBuffer length, - java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) { + java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) { org.lwjgl.opengl.EXTTransformFeedback - .glGetTransformFeedbackVaryingEXT(program, index, length, size, type, name); + .glGetTransformFeedbackVaryingEXT(program, index, length, size, type, name); } public static void glTransformFeedbackVaryingsEXT(int program, java.lang.CharSequence[] varyings, int bufferMode) { diff --git a/src/generated/java/org/lwjglx/opengl/EXTVertexAttrib64bit.java b/src/generated/java/org/lwjglx/opengl/EXTVertexAttrib64bit.java index 0e8f7c6..5b02af4 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTVertexAttrib64bit.java +++ b/src/generated/java/org/lwjglx/opengl/EXTVertexAttrib64bit.java @@ -20,9 +20,9 @@ public class EXTVertexAttrib64bit { } public static void glVertexArrayVertexAttribLOffsetEXT(int vaobj, int buffer, int index, int size, int type, - int stride, long offset) { + int stride, long offset) { org.lwjgl.opengl.EXTVertexAttrib64bit - .glVertexArrayVertexAttribLOffsetEXT(vaobj, buffer, index, size, type, stride, offset); + .glVertexArrayVertexAttribLOffsetEXT(vaobj, buffer, index, size, type, stride, offset); } public static void glVertexAttribL1EXT(int index, java.nio.DoubleBuffer v) { diff --git a/src/generated/java/org/lwjglx/opengl/GL11.java b/src/generated/java/org/lwjglx/opengl/GL11.java index b7ea7f1..017806e 100644 --- a/src/generated/java/org/lwjglx/opengl/GL11.java +++ b/src/generated/java/org/lwjglx/opengl/GL11.java @@ -560,12 +560,12 @@ public class GL11 { } public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, - long bitmap_buffer_offset) { + long bitmap_buffer_offset) { org.lwjgl.opengl.GL11.glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap_buffer_offset); } public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, - java.nio.ByteBuffer bitmap) { + java.nio.ByteBuffer bitmap) { org.lwjgl.opengl.GL11.glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap); } @@ -664,10 +664,10 @@ public class GL11 { public static void glColorPointer(int size, int stride, java.nio.DoubleBuffer pointer) { org.lwjgl.opengl.GL11.glColorPointer( - size, - org.lwjgl.opengl.GL11.GL_DOUBLE, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); + size, + org.lwjgl.opengl.GL11.GL_DOUBLE, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); } @@ -680,10 +680,10 @@ public class GL11 { public static void glColorPointer(int size, boolean unsigned, int stride, java.nio.ByteBuffer pointer) { org.lwjgl.opengl.GL11.glColorPointer( - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), - stride, - org.lwjglx.MemoryUtil.getAddress(pointer)); + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), + stride, + org.lwjglx.MemoryUtil.getAddress(pointer)); } @@ -692,12 +692,12 @@ public class GL11 { } public static void glCopyTexImage1D(int target, int level, int internalFormat, int x, int y, int width, - int border) { + int border) { org.lwjgl.opengl.GL11.glCopyTexImage1D(target, level, internalFormat, x, y, width, border); } public static void glCopyTexImage2D(int target, int level, int internalFormat, int x, int y, int width, int height, - int border) { + int border) { org.lwjgl.opengl.GL11.glCopyTexImage2D(target, level, internalFormat, x, y, width, height, border); } @@ -706,7 +706,7 @@ public class GL11 { } public static void glCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y, int width, - int height) { + int height) { org.lwjgl.opengl.GL11.glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); } @@ -1217,12 +1217,12 @@ public class GL11 { } public static void glMap2d(int target, double u1, double u2, int ustride, int uorder, double v1, double v2, - int vstride, int vorder, java.nio.DoubleBuffer points) { + int vstride, int vorder, java.nio.DoubleBuffer points) { org.lwjgl.opengl.GL11.glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); } public static void glMap2f(int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, - int vorder, java.nio.FloatBuffer points) { + int vorder, java.nio.FloatBuffer points) { org.lwjgl.opengl.GL11.glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); } @@ -1307,9 +1307,9 @@ public class GL11 { public static void glNormalPointer(int stride, java.nio.DoubleBuffer pointer) { org.lwjgl.opengl.GL11.glNormalPointer( - org.lwjgl.opengl.GL11.GL_DOUBLE, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); + org.lwjgl.opengl.GL11.GL_DOUBLE, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); } @@ -1474,34 +1474,34 @@ public class GL11 { } public static void glReadPixels(int x, int y, int width, int height, int format, int type, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels_buffer_offset); } public static void glReadPixels(int x, int y, int width, int height, int format, int type, - java.nio.ByteBuffer pixels) { + java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels); } public static void glReadPixels(int x, int y, int width, int height, int format, int type, - java.nio.DoubleBuffer pixels) { + java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, org.lwjglx.MemoryUtil.getAddress(pixels)); } public static void glReadPixels(int x, int y, int width, int height, int format, int type, - java.nio.FloatBuffer pixels) { + java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels); } public static void glReadPixels(int x, int y, int width, int height, int format, int type, - java.nio.IntBuffer pixels) { + java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels); } public static void glReadPixels(int x, int y, int width, int height, int format, int type, - java.nio.ShortBuffer pixels) { + java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels); } @@ -1604,10 +1604,10 @@ public class GL11 { public static void glTexCoordPointer(int size, int stride, java.nio.DoubleBuffer pointer) { org.lwjgl.opengl.GL11.glTexCoordPointer( - size, - org.lwjgl.opengl.GL11.GL_DOUBLE, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); + size, + org.lwjgl.opengl.GL11.GL_DOUBLE, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); } @@ -1670,64 +1670,64 @@ public class GL11 { } public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, - int type, long pixels_buffer_offset) { + int type, long pixels_buffer_offset) { org.lwjgl.opengl.GL11 - .glTexImage1D(target, level, internalformat, width, border, format, type, pixels_buffer_offset); + .glTexImage1D(target, level, internalformat, width, border, format, type, pixels_buffer_offset); } public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, - int type, java.nio.ByteBuffer pixels) { + int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels); } public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, - int type, java.nio.DoubleBuffer pixels) { + int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels); } public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, - int type, java.nio.FloatBuffer pixels) { + int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels); } public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, - int type, java.nio.IntBuffer pixels) { + int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels); } public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, - int type, java.nio.ShortBuffer pixels) { + int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels); } public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, - int format, int type, long pixels_buffer_offset) { + int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.GL11 - .glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels_buffer_offset); + .glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels_buffer_offset); } public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, - int format, int type, java.nio.ByteBuffer pixels) { + int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, - int format, int type, java.nio.DoubleBuffer pixels) { + int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, - int format, int type, java.nio.FloatBuffer pixels) { + int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, - int format, int type, java.nio.IntBuffer pixels) { + int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, - int format, int type, java.nio.ShortBuffer pixels) { + int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @@ -1748,63 +1748,63 @@ public class GL11 { } public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels_buffer_offset); } public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, - java.nio.ByteBuffer pixels) { + java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels); } public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, - java.nio.DoubleBuffer pixels) { + java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels); } public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, - java.nio.FloatBuffer pixels) { + java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels); } public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, - java.nio.IntBuffer pixels) { + java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels); } public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, - java.nio.ShortBuffer pixels) { + java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels); } public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, int type, long pixels_buffer_offset) { + int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.GL11 - .glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels_buffer_offset); + .glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels_buffer_offset); } public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.ByteBuffer pixels) { + int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.DoubleBuffer pixels) { + int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.FloatBuffer pixels) { + int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.IntBuffer pixels) { + int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.ShortBuffer pixels) { + int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); } @@ -1863,10 +1863,10 @@ public class GL11 { public static void glVertexPointer(int size, int stride, java.nio.DoubleBuffer pointer) { org.lwjgl.opengl.GL11.glVertexPointer( - size, - org.lwjgl.opengl.GL11.GL_DOUBLE, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); + size, + org.lwjgl.opengl.GL11.GL_DOUBLE, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(pointer)); } diff --git a/src/generated/java/org/lwjglx/opengl/GL12.java b/src/generated/java/org/lwjglx/opengl/GL12.java index a433e48..caf56f5 100644 --- a/src/generated/java/org/lwjglx/opengl/GL12.java +++ b/src/generated/java/org/lwjglx/opengl/GL12.java @@ -45,12 +45,12 @@ public class GL12 { public static final int GL_UNSIGNED_SHORT_5_6_5_REV = (int) 33636; public static void glCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, - int width, int height) { + int width, int height) { org.lwjgl.opengl.GL12.glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height); } public static void glDrawRangeElements(int mode, int start, int end, int indices_count, int type, - long indices_buffer_offset) { + long indices_buffer_offset) { org.lwjgl.opengl.GL12.glDrawRangeElements(mode, start, end, indices_count, type, indices_buffer_offset); } @@ -67,94 +67,94 @@ public class GL12 { } public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, - int border, int format, int type, long pixels_buffer_offset) { + int border, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.GL12.glTexImage3D( - target, - level, - internalFormat, - width, - height, - depth, - border, - format, - type, - pixels_buffer_offset); + target, + level, + internalFormat, + width, + height, + depth, + border, + format, + type, + pixels_buffer_offset); } public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, - int border, int format, int type, java.nio.ByteBuffer pixels) { + int border, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); + .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, - int border, int format, int type, java.nio.DoubleBuffer pixels) { + int border, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); + .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, - int border, int format, int type, java.nio.FloatBuffer pixels) { + int border, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); + .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, - int border, int format, int type, java.nio.IntBuffer pixels) { + int border, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); + .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, - int border, int format, int type, java.nio.ShortBuffer pixels) { + int border, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); + .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, long pixels_buffer_offset) { + int height, int depth, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.GL12.glTexSubImage3D( - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels_buffer_offset); + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels_buffer_offset); } public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { + int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); + .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { + int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); + .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { + int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); + .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.IntBuffer pixels) { + int height, int depth, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); + .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { + int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL12 - .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); + .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } } diff --git a/src/generated/java/org/lwjglx/opengl/GL13.java b/src/generated/java/org/lwjglx/opengl/GL13.java index d062c2a..8b7d29e 100644 --- a/src/generated/java/org/lwjglx/opengl/GL13.java +++ b/src/generated/java/org/lwjglx/opengl/GL13.java @@ -108,118 +108,103 @@ public class GL13 { } public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, - int data_imageSize, long data_buffer_offset) { - org.lwjgl.opengl.GL13.glCompressedTexImage1D( - target, - level, - internalformat, - width, - border, - data_imageSize, - data_buffer_offset); + int data_imageSize, long data_buffer_offset) { + org.lwjgl.opengl.GL13 + .glCompressedTexImage1D(target, level, internalformat, width, border, data_imageSize, data_buffer_offset); } public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.GL13.glCompressedTexImage1D(target, level, internalformat, width, border, data); } public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, - int border, int data_imageSize, long data_buffer_offset) { + int border, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.GL13.glCompressedTexImage2D( - target, - level, - internalformat, - width, - height, - border, - data_imageSize, - data_buffer_offset); + target, + level, + internalformat, + width, + height, + border, + data_imageSize, + data_buffer_offset); } public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, - int border, java.nio.ByteBuffer data) { + int border, java.nio.ByteBuffer data) { org.lwjgl.opengl.GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, data); } public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, - int depth, int border, int data_imageSize, long data_buffer_offset) { + int depth, int border, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.GL13.glCompressedTexImage3D( - target, - level, - internalformat, - width, - height, - depth, - border, - data_imageSize, - data_buffer_offset); + target, + level, + internalformat, + width, + height, + depth, + border, + data_imageSize, + data_buffer_offset); } public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, - int depth, int border, java.nio.ByteBuffer data) { + int depth, int border, java.nio.ByteBuffer data) { org.lwjgl.opengl.GL13.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, data); } public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, - int data_imageSize, long data_buffer_offset) { + int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.GL13 - .glCompressedTexSubImage1D(target, level, xoffset, width, format, data_imageSize, data_buffer_offset); + .glCompressedTexSubImage1D(target, level, xoffset, width, format, data_imageSize, data_buffer_offset); } public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.GL13.glCompressedTexSubImage1D(target, level, xoffset, width, format, data); } public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, int data_imageSize, long data_buffer_offset) { + int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.GL13.glCompressedTexSubImage2D( - target, - level, - xoffset, - yoffset, - width, - height, - format, - data_imageSize, - data_buffer_offset); + target, + level, + xoffset, + yoffset, + width, + height, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, - int format, java.nio.ByteBuffer data) { + int format, java.nio.ByteBuffer data) { org.lwjgl.opengl.GL13.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, data); } public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int data_imageSize, long data_buffer_offset) { + int width, int height, int depth, int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.GL13.glCompressedTexSubImage3D( - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - data_imageSize, - data_buffer_offset); + target, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, java.nio.ByteBuffer data) { - org.lwjgl.opengl.GL13.glCompressedTexSubImage3D( - target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - data); + int width, int height, int depth, int format, java.nio.ByteBuffer data) { + org.lwjgl.opengl.GL13 + .glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, data); } public static void glGetCompressedTexImage(int target, int lod, long img_buffer_offset) { diff --git a/src/generated/java/org/lwjglx/opengl/GL14.java b/src/generated/java/org/lwjglx/opengl/GL14.java index 401e62e..1c6f151 100644 --- a/src/generated/java/org/lwjglx/opengl/GL14.java +++ b/src/generated/java/org/lwjglx/opengl/GL14.java @@ -68,9 +68,9 @@ public class GL14 { public static void glFogCoordPointer(int stride, java.nio.DoubleBuffer data) { org.lwjgl.opengl.GL14.glFogCoordPointer( - org.lwjgl.opengl.GL11.GL_DOUBLE, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(data)); + org.lwjgl.opengl.GL11.GL_DOUBLE, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(data)); } @@ -131,10 +131,10 @@ public class GL14 { public static void glSecondaryColorPointer(int size, int stride, java.nio.DoubleBuffer data) { org.lwjgl.opengl.GL14.glSecondaryColorPointer( - size, - org.lwjgl.opengl.GL11.GL_DOUBLE, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(data)); + size, + org.lwjgl.opengl.GL11.GL_DOUBLE, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(data)); } @@ -147,10 +147,10 @@ public class GL14 { public static void glSecondaryColorPointer(int size, boolean unsigned, int stride, java.nio.ByteBuffer data) { org.lwjgl.opengl.GL14.glSecondaryColorPointer( - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), - stride, - org.lwjglx.MemoryUtil.getAddress(data)); + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), + stride, + org.lwjglx.MemoryUtil.getAddress(data)); } diff --git a/src/generated/java/org/lwjglx/opengl/GL20.java b/src/generated/java/org/lwjglx/opengl/GL20.java index d4e241e..670c4c1 100644 --- a/src/generated/java/org/lwjglx/opengl/GL20.java +++ b/src/generated/java/org/lwjglx/opengl/GL20.java @@ -145,12 +145,12 @@ public class GL20 { } public static void glGetActiveAttrib(int program, int index, java.nio.IntBuffer length, java.nio.IntBuffer size, - java.nio.IntBuffer type, java.nio.ByteBuffer name) { + java.nio.IntBuffer type, java.nio.ByteBuffer name) { org.lwjgl.opengl.GL20.glGetActiveAttrib(program, index, length, size, type, name); } public static void glGetActiveUniform(int program, int index, java.nio.IntBuffer length, java.nio.IntBuffer size, - java.nio.IntBuffer type, java.nio.ByteBuffer name) { + java.nio.IntBuffer type, java.nio.ByteBuffer name) { org.lwjgl.opengl.GL20.glGetActiveUniform(program, index, length, size, type, name); } @@ -409,72 +409,72 @@ public class GL20 { } public static void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, - long buffer_buffer_offset) { + long buffer_buffer_offset) { org.lwjgl.opengl.GL20.glVertexAttribPointer(index, size, type, normalized, stride, buffer_buffer_offset); } public static void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, - java.nio.ByteBuffer buffer) { + java.nio.ByteBuffer buffer) { org.lwjgl.opengl.GL20.glVertexAttribPointer(index, size, type, normalized, stride, buffer); } public static void glVertexAttribPointer(int index, int size, boolean normalized, int stride, - java.nio.DoubleBuffer buffer) { + java.nio.DoubleBuffer buffer) { org.lwjgl.opengl.GL20.glVertexAttribPointer( - index, - size, - org.lwjgl.opengl.GL11.GL_DOUBLE, - normalized, - stride, - me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(buffer)); + index, + size, + org.lwjgl.opengl.GL11.GL_DOUBLE, + normalized, + stride, + me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(buffer)); } public static void glVertexAttribPointer(int index, int size, boolean normalized, int stride, - java.nio.FloatBuffer buffer) { + java.nio.FloatBuffer buffer) { org.lwjgl.opengl.GL20 - .glVertexAttribPointer(index, size, org.lwjgl.opengl.GL11.GL_FLOAT, normalized, stride, buffer); + .glVertexAttribPointer(index, size, org.lwjgl.opengl.GL11.GL_FLOAT, normalized, stride, buffer); } public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, - java.nio.ByteBuffer buffer) { + java.nio.ByteBuffer buffer) { org.lwjgl.opengl.GL20.glVertexAttribPointer( - index, - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), - normalized, - stride, - org.lwjglx.MemoryUtil.getAddress(buffer)); + index, + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE), + normalized, + stride, + org.lwjglx.MemoryUtil.getAddress(buffer)); } public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, - java.nio.IntBuffer buffer) { + java.nio.IntBuffer buffer) { org.lwjgl.opengl.GL20.glVertexAttribPointer( - index, - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT), - normalized, - stride, - org.lwjglx.MemoryUtil.getAddress(buffer)); + index, + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT), + normalized, + stride, + org.lwjglx.MemoryUtil.getAddress(buffer)); } public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, - java.nio.ShortBuffer buffer) { + java.nio.ShortBuffer buffer) { org.lwjgl.opengl.GL20.glVertexAttribPointer( - index, - size, - (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT), - normalized, - stride, - org.lwjglx.MemoryUtil.getAddress(buffer)); + index, + size, + (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT), + normalized, + stride, + org.lwjglx.MemoryUtil.getAddress(buffer)); } diff --git a/src/generated/java/org/lwjglx/opengl/GL30.java b/src/generated/java/org/lwjglx/opengl/GL30.java index e3551f2..01e9b80 100644 --- a/src/generated/java/org/lwjglx/opengl/GL30.java +++ b/src/generated/java/org/lwjglx/opengl/GL30.java @@ -279,7 +279,7 @@ public class GL30 { } public static void glBlitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, - int dstY1, int mask, int filter) { + int dstY1, int mask, int filter) { org.lwjgl.opengl.GL30.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } @@ -368,7 +368,7 @@ public class GL30 { } public static void glFramebufferTexture3D(int target, int attachment, int textarget, int texture, int level, - int zoffset) { + int zoffset) { org.lwjgl.opengl.GL30.glFramebufferTexture3D(target, attachment, textarget, texture, level, zoffset); } @@ -417,7 +417,7 @@ public class GL30 { } public static void glGetFramebufferAttachmentParameter(int target, int attachment, int pname, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.GL30.glGetFramebufferAttachmentParameteriv(target, attachment, pname, params); } @@ -458,12 +458,12 @@ public class GL30 { } public static java.lang.String glGetTransformFeedbackVarying(int program, int index, int bufSize, - java.nio.IntBuffer size, java.nio.IntBuffer type) { + java.nio.IntBuffer size, java.nio.IntBuffer type) { return org.lwjgl.opengl.GL30.glGetTransformFeedbackVarying(program, index, bufSize, size, type); } public static void glGetTransformFeedbackVarying(int program, int index, java.nio.IntBuffer length, - java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) { + java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) { org.lwjgl.opengl.GL30.glGetTransformFeedbackVarying(program, index, length, size, type, name); } @@ -496,7 +496,7 @@ public class GL30 { } public static java.nio.ByteBuffer glMapBufferRange(int target, long offset, long length, int access, - java.nio.ByteBuffer old_buffer) { + java.nio.ByteBuffer old_buffer) { return org.lwjgl.opengl.GL30.glMapBufferRange(target, offset, length, access, old_buffer); } @@ -505,7 +505,7 @@ public class GL30 { } public static void glRenderbufferStorageMultisample(int target, int samples, int internalformat, int width, - int height) { + int height) { org.lwjgl.opengl.GL30.glRenderbufferStorageMultisample(target, samples, internalformat, width, height); } diff --git a/src/generated/java/org/lwjglx/opengl/GL31.java b/src/generated/java/org/lwjglx/opengl/GL31.java index 2757d94..49f970c 100644 --- a/src/generated/java/org/lwjglx/opengl/GL31.java +++ b/src/generated/java/org/lwjglx/opengl/GL31.java @@ -67,7 +67,7 @@ public class GL31 { public static final int GL_UNIFORM_TYPE = (int) 35383; public static void glCopyBufferSubData(int readtarget, int writetarget, long readoffset, long writeoffset, - long size) { + long size) { org.lwjgl.opengl.GL31.glCopyBufferSubData(readtarget, writetarget, readoffset, writeoffset, size); } @@ -76,7 +76,7 @@ public class GL31 { } public static void glDrawElementsInstanced(int mode, int indices_count, int type, long indices_buffer_offset, - int primcount) { + int primcount) { org.lwjgl.opengl.GL31.glDrawElementsInstanced(mode, indices_count, type, indices_buffer_offset, primcount); } @@ -93,7 +93,7 @@ public class GL31 { } public static void glGetActiveUniformBlock(int program, int uniformBlockIndex, int pname, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.GL31.glGetActiveUniformBlockiv(program, uniformBlockIndex, pname, params); } @@ -102,7 +102,7 @@ public class GL31 { } public static void glGetActiveUniformBlockName(int program, int uniformBlockIndex, java.nio.IntBuffer length, - java.nio.ByteBuffer uniformBlockName) { + java.nio.ByteBuffer uniformBlockName) { org.lwjgl.opengl.GL31.glGetActiveUniformBlockName(program, uniformBlockIndex, length, uniformBlockName); } @@ -115,12 +115,12 @@ public class GL31 { } public static void glGetActiveUniformName(int program, int uniformIndex, java.nio.IntBuffer length, - java.nio.ByteBuffer uniformName) { + java.nio.ByteBuffer uniformName) { org.lwjgl.opengl.GL31.glGetActiveUniformName(program, uniformIndex, length, uniformName); } public static void glGetActiveUniforms(int program, java.nio.IntBuffer uniformIndices, int pname, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.GL31.glGetActiveUniformsiv(program, uniformIndices, pname, params); } @@ -137,7 +137,7 @@ public class GL31 { } public static void glGetUniformIndices(int program, java.lang.CharSequence[] uniformNames, - java.nio.IntBuffer uniformIndices) { + java.nio.IntBuffer uniformIndices) { org.lwjgl.opengl.GL31.glGetUniformIndices(program, uniformNames, uniformIndices); } diff --git a/src/generated/java/org/lwjglx/opengl/GL32.java b/src/generated/java/org/lwjglx/opengl/GL32.java index 87a1531..1821f37 100644 --- a/src/generated/java/org/lwjglx/opengl/GL32.java +++ b/src/generated/java/org/lwjglx/opengl/GL32.java @@ -68,7 +68,7 @@ public class GL32 { public static final int GL_WAIT_FAILED = (int) 37149; public static void glDrawElementsBaseVertex(int mode, int indices_count, int type, long indices_buffer_offset, - int basevertex) { + int basevertex) { org.lwjgl.opengl.GL32.glDrawElementsBaseVertex(mode, indices_count, type, indices_buffer_offset, basevertex); } @@ -85,62 +85,51 @@ public class GL32 { } public static void glDrawElementsInstancedBaseVertex(int mode, int indices_count, int type, - long indices_buffer_offset, int primcount, int basevertex) { - org.lwjgl.opengl.GL32.glDrawElementsInstancedBaseVertex( - mode, - indices_count, - type, - indices_buffer_offset, - primcount, - basevertex); + long indices_buffer_offset, int primcount, int basevertex) { + org.lwjgl.opengl.GL32 + .glDrawElementsInstancedBaseVertex(mode, indices_count, type, indices_buffer_offset, primcount, basevertex); } public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.ByteBuffer indices, int primcount, - int basevertex) { + int basevertex) { org.lwjgl.opengl.GL32.glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex); } public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.IntBuffer indices, int primcount, - int basevertex) { + int basevertex) { org.lwjgl.opengl.GL32.glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex); } public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.ShortBuffer indices, int primcount, - int basevertex) { + int basevertex) { org.lwjgl.opengl.GL32.glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex); } public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, int indices_count, int type, - long indices_buffer_offset, int basevertex) { - org.lwjgl.opengl.GL32.glDrawRangeElementsBaseVertex( - mode, - start, - end, - indices_count, - type, - indices_buffer_offset, - basevertex); + long indices_buffer_offset, int basevertex) { + org.lwjgl.opengl.GL32 + .glDrawRangeElementsBaseVertex(mode, start, end, indices_count, type, indices_buffer_offset, basevertex); } public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.ByteBuffer indices, - int basevertex) { + int basevertex) { org.lwjgl.opengl.GL32.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex); } public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.IntBuffer indices, - int basevertex) { + int basevertex) { org.lwjgl.opengl.GL32.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex); } public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.ShortBuffer indices, - int basevertex) { + int basevertex) { org.lwjgl.opengl.GL32.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex); } public static org.lwjglx.opengl.GLSync glFenceSync(int condition, int flags) { org.lwjglx.opengl.GLSync returnValue = new org.lwjglx.opengl.GLSync( - org.lwjgl.opengl.GL32.glFenceSync(condition, flags)); + org.lwjgl.opengl.GL32.glFenceSync(condition, flags)); return returnValue; } @@ -182,15 +171,15 @@ public class GL32 { } public static void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height, - boolean fixedsamplelocations) { + boolean fixedsamplelocations) { org.lwjgl.opengl.GL32 - .glTexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); + .glTexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); } public static void glTexImage3DMultisample(int target, int samples, int internalformat, int width, int height, - int depth, boolean fixedsamplelocations) { + int depth, boolean fixedsamplelocations) { org.lwjgl.opengl.GL32 - .glTexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations); + .glTexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations); } } diff --git a/src/generated/java/org/lwjglx/opengl/GL33.java b/src/generated/java/org/lwjglx/opengl/GL33.java index dd71b02..ce9a459 100644 --- a/src/generated/java/org/lwjglx/opengl/GL33.java +++ b/src/generated/java/org/lwjglx/opengl/GL33.java @@ -20,12 +20,12 @@ public class GL33 { public static final int GL_VERTEX_ATTRIB_ARRAY_DIVISOR = (int) 35070; public static void glBindFragDataLocationIndexed(int program, int colorNumber, int index, - java.lang.CharSequence name) { + java.lang.CharSequence name) { org.lwjgl.opengl.GL33.glBindFragDataLocationIndexed(program, colorNumber, index, name); } public static void glBindFragDataLocationIndexed(int program, int colorNumber, int index, - java.nio.ByteBuffer name) { + java.nio.ByteBuffer name) { org.lwjgl.opengl.GL33.glBindFragDataLocationIndexed(program, colorNumber, index, name); } diff --git a/src/generated/java/org/lwjglx/opengl/GL40.java b/src/generated/java/org/lwjglx/opengl/GL40.java index eaf505d..a1b3b36 100644 --- a/src/generated/java/org/lwjglx/opengl/GL40.java +++ b/src/generated/java/org/lwjglx/opengl/GL40.java @@ -164,22 +164,22 @@ public class GL40 { } public static void glGetActiveSubroutineName(int program, int shadertype, int index, java.nio.IntBuffer length, - java.nio.ByteBuffer name) { + java.nio.ByteBuffer name) { org.lwjgl.opengl.GL40.glGetActiveSubroutineName(program, shadertype, index, length, name); } public static void glGetActiveSubroutineUniform(int program, int shadertype, int index, int pname, - java.nio.IntBuffer values) { + java.nio.IntBuffer values) { org.lwjgl.opengl.GL40.glGetActiveSubroutineUniformiv(program, shadertype, index, pname, values); } public static java.lang.String glGetActiveSubroutineUniformName(int program, int shadertype, int index, - int bufsize) { + int bufsize) { return org.lwjgl.opengl.GL40.glGetActiveSubroutineUniformName(program, shadertype, index, bufsize); } public static void glGetActiveSubroutineUniformName(int program, int shadertype, int index, - java.nio.IntBuffer length, java.nio.ByteBuffer name) { + java.nio.IntBuffer length, java.nio.ByteBuffer name) { org.lwjgl.opengl.GL40.glGetActiveSubroutineUniformName(program, shadertype, index, length, name); } diff --git a/src/generated/java/org/lwjglx/opengl/GL41.java b/src/generated/java/org/lwjglx/opengl/GL41.java index 8cd7115..e494bdc 100644 --- a/src/generated/java/org/lwjglx/opengl/GL41.java +++ b/src/generated/java/org/lwjglx/opengl/GL41.java @@ -56,7 +56,7 @@ public class GL41 { public static int glCreateShaderProgram(int type, java.nio.ByteBuffer string) { int returnValue = org.lwjgl.opengl.GL41 - .glCreateShaderProgramv(type, me.eigenraven.lwjgl3ify.BufferCasts.bufferToCharSeq(string)); + .glCreateShaderProgramv(type, me.eigenraven.lwjgl3ify.BufferCasts.bufferToCharSeq(string)); return returnValue; } @@ -98,7 +98,7 @@ public class GL41 { } public static void glGetProgramBinary(int program, java.nio.IntBuffer length, java.nio.IntBuffer binaryFormat, - java.nio.ByteBuffer binary) { + java.nio.ByteBuffer binary) { org.lwjgl.opengl.GL41.glGetProgramBinary(program, length, binaryFormat, binary); } @@ -111,7 +111,7 @@ public class GL41 { } public static void glGetProgramPipelineInfoLog(int pipeline, java.nio.IntBuffer length, - java.nio.ByteBuffer infoLog) { + java.nio.ByteBuffer infoLog) { org.lwjgl.opengl.GL41.glGetProgramPipelineInfoLog(pipeline, length, infoLog); } @@ -120,7 +120,7 @@ public class GL41 { } public static void glGetShaderPrecisionFormat(int shadertype, int precisiontype, java.nio.IntBuffer range, - java.nio.IntBuffer precision) { + java.nio.IntBuffer precision) { org.lwjgl.opengl.GL41.glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision); } @@ -269,92 +269,92 @@ public class GL41 { } public static void glProgramUniformMatrix2(int program, int location, boolean transpose, - java.nio.DoubleBuffer value) { + java.nio.DoubleBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix2dv(program, location, transpose, value); } public static void glProgramUniformMatrix2(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix2fv(program, location, transpose, value); } public static void glProgramUniformMatrix2x3(int program, int location, boolean transpose, - java.nio.DoubleBuffer value) { + java.nio.DoubleBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix2x3dv(program, location, transpose, value); } public static void glProgramUniformMatrix2x3(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix2x3fv(program, location, transpose, value); } public static void glProgramUniformMatrix2x4(int program, int location, boolean transpose, - java.nio.DoubleBuffer value) { + java.nio.DoubleBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix2x4dv(program, location, transpose, value); } public static void glProgramUniformMatrix2x4(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix2x4fv(program, location, transpose, value); } public static void glProgramUniformMatrix3(int program, int location, boolean transpose, - java.nio.DoubleBuffer value) { + java.nio.DoubleBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix3dv(program, location, transpose, value); } public static void glProgramUniformMatrix3(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix3fv(program, location, transpose, value); } public static void glProgramUniformMatrix3x2(int program, int location, boolean transpose, - java.nio.DoubleBuffer value) { + java.nio.DoubleBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix3x2dv(program, location, transpose, value); } public static void glProgramUniformMatrix3x2(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix3x2fv(program, location, transpose, value); } public static void glProgramUniformMatrix3x4(int program, int location, boolean transpose, - java.nio.DoubleBuffer value) { + java.nio.DoubleBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix3x4dv(program, location, transpose, value); } public static void glProgramUniformMatrix3x4(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix3x4fv(program, location, transpose, value); } public static void glProgramUniformMatrix4(int program, int location, boolean transpose, - java.nio.DoubleBuffer value) { + java.nio.DoubleBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix4dv(program, location, transpose, value); } public static void glProgramUniformMatrix4(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix4fv(program, location, transpose, value); } public static void glProgramUniformMatrix4x2(int program, int location, boolean transpose, - java.nio.DoubleBuffer value) { + java.nio.DoubleBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix4x2dv(program, location, transpose, value); } public static void glProgramUniformMatrix4x2(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix4x2fv(program, location, transpose, value); } public static void glProgramUniformMatrix4x3(int program, int location, boolean transpose, - java.nio.DoubleBuffer value) { + java.nio.DoubleBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix4x3dv(program, location, transpose, value); } public static void glProgramUniformMatrix4x3(int program, int location, boolean transpose, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL41.glProgramUniformMatrix4x3fv(program, location, transpose, value); } diff --git a/src/generated/java/org/lwjglx/opengl/GL42.java b/src/generated/java/org/lwjglx/opengl/GL42.java index 81165df..ef4e850 100644 --- a/src/generated/java/org/lwjglx/opengl/GL42.java +++ b/src/generated/java/org/lwjglx/opengl/GL42.java @@ -112,69 +112,69 @@ public class GL42 { public static final int IMAGE_FORMAT_COMPATIBILITY_BY_CLASS = (int) 37065; public static void glBindImageTexture(int unit, int texture, int level, boolean layered, int layer, int access, - int format) { + int format) { org.lwjgl.opengl.GL42.glBindImageTexture(unit, texture, level, layered, layer, access, format); } public static void glDrawArraysInstancedBaseInstance(int mode, int first, int count, int primcount, - int baseinstance) { + int baseinstance) { org.lwjgl.opengl.GL42.glDrawArraysInstancedBaseInstance(mode, first, count, primcount, baseinstance); } public static void glDrawElementsInstancedBaseInstance(int mode, int indices_count, int type, - long indices_buffer_offset, int primcount, int baseinstance) { + long indices_buffer_offset, int primcount, int baseinstance) { org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance( - mode, - indices_count, - type, - indices_buffer_offset, - primcount, - baseinstance); + mode, + indices_count, + type, + indices_buffer_offset, + primcount, + baseinstance); } public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.ByteBuffer indices, int primcount, - int baseinstance) { + int baseinstance) { org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance); } public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.IntBuffer indices, int primcount, - int baseinstance) { + int baseinstance) { org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance); } public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.ShortBuffer indices, int primcount, - int baseinstance) { + int baseinstance) { org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance); } public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, int indices_count, int type, - long indices_buffer_offset, int primcount, int basevertex, int baseinstance) { + long indices_buffer_offset, int primcount, int basevertex, int baseinstance) { org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseVertexBaseInstance( - mode, - indices_count, - type, - indices_buffer_offset, - primcount, - basevertex, - baseinstance); + mode, + indices_count, + type, + indices_buffer_offset, + primcount, + basevertex, + baseinstance); } public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.ByteBuffer indices, - int primcount, int basevertex, int baseinstance) { + int primcount, int basevertex, int baseinstance) { org.lwjgl.opengl.GL42 - .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); + .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); } public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.IntBuffer indices, - int primcount, int basevertex, int baseinstance) { + int primcount, int basevertex, int baseinstance) { org.lwjgl.opengl.GL42 - .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); + .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); } public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.ShortBuffer indices, - int primcount, int basevertex, int baseinstance) { + int primcount, int basevertex, int baseinstance) { org.lwjgl.opengl.GL42 - .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); + .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance); } public static void glDrawTransformFeedbackInstanced(int mode, int id, int primcount) { @@ -186,7 +186,7 @@ public class GL42 { } public static void glGetActiveAtomicCounterBuffer(int program, int bufferIndex, int pname, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.GL42.glGetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params); } diff --git a/src/generated/java/org/lwjglx/opengl/GL43.java b/src/generated/java/org/lwjglx/opengl/GL43.java index f647086..ca7df6d 100644 --- a/src/generated/java/org/lwjglx/opengl/GL43.java +++ b/src/generated/java/org/lwjglx/opengl/GL43.java @@ -267,38 +267,38 @@ public class GL43 { } public static void glClearBufferData(int target, int internalformat, int format, int type, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.GL43.glClearBufferData(target, internalformat, format, type, data); } public static void glClearBufferSubData(int target, int internalformat, long offset, long size, int format, - int type, java.nio.ByteBuffer data) { + int type, java.nio.ByteBuffer data) { org.lwjgl.opengl.GL43.glClearBufferSubData(target, internalformat, offset, size, format, type, data); } public static void glCopyImageSubData(int srcName, int srcTarget, int srcLevel, int srcX, int srcY, int srcZ, - int dstName, int dstTarget, int dstLevel, int dstX, int dstY, int dstZ, int srcWidth, int srcHeight, - int srcDepth) { + int dstName, int dstTarget, int dstLevel, int dstX, int dstY, int dstZ, int srcWidth, int srcHeight, + int srcDepth) { org.lwjgl.opengl.GL43.glCopyImageSubData( - srcName, - srcTarget, - srcLevel, - srcX, - srcY, - srcZ, - dstName, - dstTarget, - dstLevel, - dstX, - dstY, - dstZ, - srcWidth, - srcHeight, - srcDepth); + srcName, + srcTarget, + srcLevel, + srcX, + srcY, + srcZ, + dstName, + dstTarget, + dstLevel, + dstX, + dstY, + dstZ, + srcWidth, + srcHeight, + srcDepth); } public static void glDebugMessageControl(int source, int type, int severity, java.nio.IntBuffer ids, - boolean enabled) { + boolean enabled) { org.lwjgl.opengl.GL43.glDebugMessageControl(source, type, severity, ids, enabled); } @@ -323,8 +323,8 @@ public class GL43 { } public static int glGetDebugMessageLog(int count, java.nio.IntBuffer sources, java.nio.IntBuffer types, - java.nio.IntBuffer ids, java.nio.IntBuffer severities, java.nio.IntBuffer lengths, - java.nio.ByteBuffer messageLog) { + java.nio.IntBuffer ids, java.nio.IntBuffer severities, java.nio.IntBuffer lengths, + java.nio.ByteBuffer messageLog) { return org.lwjgl.opengl.GL43.glGetDebugMessageLog(count, sources, types, ids, severities, lengths, messageLog); } @@ -349,7 +349,7 @@ public class GL43 { } public static void glGetObjectLabel(int identifier, int name, java.nio.IntBuffer length, - java.nio.ByteBuffer label) { + java.nio.ByteBuffer label) { org.lwjgl.opengl.GL43.glGetObjectLabel(identifier, name, length, label); } @@ -362,7 +362,7 @@ public class GL43 { } public static void glGetProgramResource(int program, int programInterface, int index, java.nio.IntBuffer props, - java.nio.IntBuffer length, java.nio.IntBuffer params) { + java.nio.IntBuffer length, java.nio.IntBuffer params) { org.lwjgl.opengl.GL43.glGetProgramResourceiv(program, programInterface, index, props, length, params); } @@ -383,7 +383,7 @@ public class GL43 { } public static int glGetProgramResourceLocationIndex(int program, int programInterface, - java.lang.CharSequence name) { + java.lang.CharSequence name) { return org.lwjgl.opengl.GL43.glGetProgramResourceLocationIndex(program, programInterface, name); } @@ -396,7 +396,7 @@ public class GL43 { } public static void glGetProgramResourceName(int program, int programInterface, int index, java.nio.IntBuffer length, - java.nio.ByteBuffer name) { + java.nio.ByteBuffer name) { org.lwjgl.opengl.GL43.glGetProgramResourceName(program, programInterface, index, length, name); } @@ -413,7 +413,7 @@ public class GL43 { } public static void glInvalidateSubFramebuffer(int target, java.nio.IntBuffer attachments, int x, int y, int width, - int height) { + int height) { org.lwjgl.opengl.GL43.glInvalidateSubFramebuffer(target, attachments, x, y, width, height); } @@ -422,7 +422,7 @@ public class GL43 { } public static void glInvalidateTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth) { + int height, int depth) { org.lwjgl.opengl.GL43.glInvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth); } @@ -439,17 +439,17 @@ public class GL43 { } public static void glMultiDrawElementsIndirect(int mode, int type, long indirect_buffer_offset, int primcount, - int stride) { + int stride) { org.lwjgl.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect_buffer_offset, primcount, stride); } public static void glMultiDrawElementsIndirect(int mode, int type, java.nio.ByteBuffer indirect, int primcount, - int stride) { + int stride) { org.lwjgl.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride); } public static void glMultiDrawElementsIndirect(int mode, int type, java.nio.IntBuffer indirect, int primcount, - int stride) { + int stride) { org.lwjgl.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride); } @@ -482,21 +482,21 @@ public class GL43 { } public static void glTexStorage2DMultisample(int target, int samples, int internalformat, int width, int height, - boolean fixedsamplelocations) { + boolean fixedsamplelocations) { org.lwjgl.opengl.GL43 - .glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); + .glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations); } public static void glTexStorage3DMultisample(int target, int samples, int internalformat, int width, int height, - int depth, boolean fixedsamplelocations) { + int depth, boolean fixedsamplelocations) { org.lwjgl.opengl.GL43 - .glTexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations); + .glTexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations); } public static void glTextureView(int texture, int target, int origtexture, int internalformat, int minlevel, - int numlevels, int minlayer, int numlayers) { + int numlevels, int minlayer, int numlayers) { org.lwjgl.opengl.GL43 - .glTextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers); + .glTextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers); } public static void glVertexAttribBinding(int attribindex, int bindingindex) { @@ -504,7 +504,7 @@ public class GL43 { } public static void glVertexAttribFormat(int attribindex, int size, int type, boolean normalized, - int relativeoffset) { + int relativeoffset) { org.lwjgl.opengl.GL43.glVertexAttribFormat(attribindex, size, type, normalized, relativeoffset); } diff --git a/src/generated/java/org/lwjglx/opengl/GL44.java b/src/generated/java/org/lwjglx/opengl/GL44.java index c118531..4914381 100644 --- a/src/generated/java/org/lwjglx/opengl/GL44.java +++ b/src/generated/java/org/lwjglx/opengl/GL44.java @@ -73,103 +73,53 @@ public class GL44 { } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ByteBuffer data) { - org.lwjgl.opengl.GL44.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.ByteBuffer data) { + org.lwjgl.opengl.GL44 + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.DoubleBuffer data) { - org.lwjgl.opengl.GL44.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.DoubleBuffer data) { + org.lwjgl.opengl.GL44 + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.FloatBuffer data) { - org.lwjgl.opengl.GL44.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.FloatBuffer data) { + org.lwjgl.opengl.GL44 + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.IntBuffer data) { - org.lwjgl.opengl.GL44.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.IntBuffer data) { + org.lwjgl.opengl.GL44 + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.LongBuffer data) { + int height, int depth, int format, int type, java.nio.LongBuffer data) { final java.nio.ByteBuffer wrappedArg10 = me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(data); org.lwjgl.opengl.GL44.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - wrappedArg10); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + wrappedArg10); me.eigenraven.lwjgl3ify.BufferCasts.updateBuffer(data, wrappedArg10); } public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ShortBuffer data) { - org.lwjgl.opengl.GL44.glClearTexSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - data); + int height, int depth, int format, int type, java.nio.ShortBuffer data) { + org.lwjgl.opengl.GL44 + .glClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data); } } diff --git a/src/generated/java/org/lwjglx/opengl/GL45.java b/src/generated/java/org/lwjglx/opengl/GL45.java index 33ed2c8..7270676 100644 --- a/src/generated/java/org/lwjglx/opengl/GL45.java +++ b/src/generated/java/org/lwjglx/opengl/GL45.java @@ -31,20 +31,20 @@ public class GL45 { } public static void glBlitNamedFramebuffer(int readFramebuffer, int drawFramebuffer, int srcX0, int srcY0, int srcX1, - int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) { + int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) { org.lwjgl.opengl.GL45.glBlitNamedFramebuffer( - readFramebuffer, - drawFramebuffer, - srcX0, - srcY0, - srcX1, - srcY1, - dstX0, - dstY0, - dstX1, - dstY1, - mask, - filter); + readFramebuffer, + drawFramebuffer, + srcX0, + srcY0, + srcX1, + srcY1, + dstX0, + dstY0, + dstX1, + dstY1, + mask, + filter); } public static int glCheckNamedFramebufferStatus(int framebuffer, int target) { @@ -52,17 +52,17 @@ public class GL45 { } public static void glClearNamedBufferData(int buffer, int internalformat, int format, int type, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.GL45.glClearNamedBufferData(buffer, internalformat, format, type, data); } public static void glClearNamedBufferSubData(int buffer, int internalformat, long offset, long size, int format, - int type, java.nio.ByteBuffer data) { + int type, java.nio.ByteBuffer data) { org.lwjgl.opengl.GL45.glClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data); } public static void glClearNamedFramebuffer(int framebuffer, int buffer, int drawbuffer, - java.nio.FloatBuffer value) { + java.nio.FloatBuffer value) { org.lwjgl.opengl.GL45.glClearNamedFramebufferfv(framebuffer, buffer, drawbuffer, value); } @@ -79,78 +79,72 @@ public class GL45 { } public static void glCompressedTextureSubImage1D(int texture, int level, int xoffset, int width, int format, - int data_imageSize, long data_buffer_offset) { - org.lwjgl.opengl.GL45.glCompressedTextureSubImage1D( - texture, - level, - xoffset, - width, - format, - data_imageSize, - data_buffer_offset); + int data_imageSize, long data_buffer_offset) { + org.lwjgl.opengl.GL45 + .glCompressedTextureSubImage1D(texture, level, xoffset, width, format, data_imageSize, data_buffer_offset); } public static void glCompressedTextureSubImage1D(int texture, int level, int xoffset, int width, int format, - java.nio.ByteBuffer data) { + java.nio.ByteBuffer data) { org.lwjgl.opengl.GL45.glCompressedTextureSubImage1D(texture, level, xoffset, width, format, data); } public static void glCompressedTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, - int height, int format, int data_imageSize, long data_buffer_offset) { + int height, int format, int data_imageSize, long data_buffer_offset) { org.lwjgl.opengl.GL45.glCompressedTextureSubImage2D( - texture, - level, - xoffset, - yoffset, - width, - height, - format, - data_imageSize, - data_buffer_offset); + texture, + level, + xoffset, + yoffset, + width, + height, + format, + data_imageSize, + data_buffer_offset); } public static void glCompressedTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, - int height, int format, java.nio.ByteBuffer data) { + int height, int format, java.nio.ByteBuffer data) { org.lwjgl.opengl.GL45 - .glCompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, data); + .glCompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, data); } public static void glCompressedTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int imageSize, long data_buffer_offset) { + int width, int height, int depth, int format, int imageSize, long data_buffer_offset) { org.lwjgl.opengl.GL45.glCompressedTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - imageSize, - data_buffer_offset); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + imageSize, + data_buffer_offset); } public static void glCompressedTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int format, int imageSize, java.nio.ByteBuffer data) { + int width, int height, int depth, int format, int imageSize, java.nio.ByteBuffer data) { org.lwjgl.opengl.GL45.glCompressedTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - imageSize, - org.lwjglx.MemoryUtil.getAddress(data)); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + imageSize, + org.lwjglx.MemoryUtil.getAddress(data)); } public static void glCopyNamedBufferSubData(int readBuffer, int writeBuffer, long readOffset, long writeOffset, - long size) { + long size) { org.lwjgl.opengl.GL45.glCopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size); } @@ -159,12 +153,12 @@ public class GL45 { } public static void glCopyTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int x, int y, - int width, int height) { + int width, int height) { org.lwjgl.opengl.GL45.glCopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height); } public static void glCopyTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int x, - int y, int width, int height) { + int y, int width, int height) { org.lwjgl.opengl.GL45.glCopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height); } @@ -257,7 +251,7 @@ public class GL45 { } public static void glGetCompressedTextureImage(int texture, int level, int pixels_bufSize, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.GL45.glGetCompressedTextureImage(texture, level, pixels_bufSize, pixels_buffer_offset); } @@ -266,88 +260,48 @@ public class GL45 { } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, int pixels_bufSize, long pixels_buffer_offset) { + int width, int height, int depth, int pixels_bufSize, long pixels_buffer_offset) { org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels_bufSize, - pixels_buffer_offset); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + pixels_bufSize, + pixels_buffer_offset); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.ByteBuffer pixels) { - org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.ByteBuffer pixels) { + org.lwjgl.opengl.GL45 + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.DoubleBuffer pixels) { - org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.DoubleBuffer pixels) { + org.lwjgl.opengl.GL45 + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.FloatBuffer pixels) { - org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.FloatBuffer pixels) { + org.lwjgl.opengl.GL45 + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.IntBuffer pixels) { - org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.IntBuffer pixels) { + org.lwjgl.opengl.GL45 + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, - int width, int height, int depth, java.nio.ShortBuffer pixels) { - org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - pixels); + int width, int height, int depth, java.nio.ShortBuffer pixels) { + org.lwjgl.opengl.GL45 + .glGetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, pixels); } public static int glGetGraphicsResetStatus() { @@ -391,7 +345,7 @@ public class GL45 { } public static void glGetNamedFramebufferAttachmentParameter(int framebuffer, int attachment, int pname, - java.nio.IntBuffer params) { + java.nio.IntBuffer params) { org.lwjgl.opengl.GL45.glGetNamedFramebufferAttachmentParameteriv(framebuffer, attachment, pname, params); } @@ -404,7 +358,7 @@ public class GL45 { } public static void glGetTextureImage(int texture, int level, int format, int type, int pixels_bufSize, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels_bufSize, pixels_buffer_offset); } @@ -477,100 +431,100 @@ public class GL45 { } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, int pixels_bufSize, long pixels_buffer_offset) { + int height, int depth, int format, int type, int pixels_bufSize, long pixels_buffer_offset) { org.lwjgl.opengl.GL45.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels_bufSize, - pixels_buffer_offset); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels_bufSize, + pixels_buffer_offset); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { + int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL45.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { + int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL45.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { + int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL45.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.IntBuffer pixels) { + int height, int depth, int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL45.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { + int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL45.glGetTextureSubImage( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels); } public static void glGetTransformFeedback(int xfb, int pname, int index, java.nio.IntBuffer param) { @@ -630,12 +584,12 @@ public class GL45 { } public static void glInvalidateNamedFramebufferSubData(int framebuffer, java.nio.IntBuffer attachments, int x, - int y, int width, int height) { + int y, int width, int height) { org.lwjgl.opengl.GL45.glInvalidateNamedFramebufferSubData(framebuffer, attachments, x, y, width, height); } public static java.nio.ByteBuffer glMapNamedBuffer(int buffer, int access, long length, - java.nio.ByteBuffer old_buffer) { + java.nio.ByteBuffer old_buffer) { return org.lwjgl.opengl.GL45.glMapNamedBuffer(buffer, access, length, old_buffer); } @@ -644,7 +598,7 @@ public class GL45 { } public static java.nio.ByteBuffer glMapNamedBufferRange(int buffer, long offset, long length, int access, - java.nio.ByteBuffer old_buffer) { + java.nio.ByteBuffer old_buffer) { return org.lwjgl.opengl.GL45.glMapNamedBufferRange(buffer, offset, length, access, old_buffer); } @@ -737,7 +691,7 @@ public class GL45 { } public static void glNamedFramebufferRenderbuffer(int framebuffer, int attachment, int renderbuffertarget, - int renderbuffer) { + int renderbuffer) { org.lwjgl.opengl.GL45.glNamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer); } @@ -746,7 +700,7 @@ public class GL45 { } public static void glNamedFramebufferTextureLayer(int framebuffer, int attachment, int texture, int level, - int layer) { + int layer) { org.lwjgl.opengl.GL45.glNamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer); } @@ -755,33 +709,33 @@ public class GL45 { } public static void glNamedRenderbufferStorageMultisample(int renderbuffer, int samples, int internalformat, - int width, int height) { + int width, int height) { org.lwjgl.opengl.GL45 - .glNamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height); + .glNamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height); } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, int pixels_bufSize, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels_bufSize, pixels_buffer_offset); } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, - java.nio.ByteBuffer pixels) { + java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels); } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, - java.nio.FloatBuffer pixels) { + java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels); } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, - java.nio.IntBuffer pixels) { + java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels); } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, - java.nio.ShortBuffer pixels) { + java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels); } @@ -830,196 +784,138 @@ public class GL45 { } public static void glTextureStorage2DMultisample(int texture, int samples, int internalformat, int width, - int height, boolean fixedsamplelocations) { + int height, boolean fixedsamplelocations) { org.lwjgl.opengl.GL45 - .glTextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations); + .glTextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations); } public static void glTextureStorage3D(int texture, int levels, int internalformat, int width, int height, - int depth) { + int depth) { org.lwjgl.opengl.GL45.glTextureStorage3D(texture, levels, internalformat, width, height, depth); } public static void glTextureStorage3DMultisample(int texture, int samples, int internalformat, int width, - int height, int depth, boolean fixedsamplelocations) { + int height, int depth, boolean fixedsamplelocations) { org.lwjgl.opengl.GL45.glTextureStorage3DMultisample( - texture, - samples, - internalformat, - width, - height, - depth, - fixedsamplelocations); + texture, + samples, + internalformat, + width, + height, + depth, + fixedsamplelocations); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels_buffer_offset); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.ByteBuffer pixels) { + java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.DoubleBuffer pixels) { + java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.FloatBuffer pixels) { + java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.IntBuffer pixels) { + java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type, - java.nio.ShortBuffer pixels) { + java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, long pixels_buffer_offset) { - org.lwjgl.opengl.GL45.glTextureSubImage2D( - texture, - level, - xoffset, - yoffset, - width, - height, - format, - type, - pixels_buffer_offset); + int format, int type, long pixels_buffer_offset) { + org.lwjgl.opengl.GL45 + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels_buffer_offset); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.ByteBuffer pixels) { + int format, int type, java.nio.ByteBuffer pixels) { org.lwjgl.opengl.GL45 - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.DoubleBuffer pixels) { + int format, int type, java.nio.DoubleBuffer pixels) { org.lwjgl.opengl.GL45 - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.FloatBuffer pixels) { + int format, int type, java.nio.FloatBuffer pixels) { org.lwjgl.opengl.GL45 - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.IntBuffer pixels) { + int format, int type, java.nio.IntBuffer pixels) { org.lwjgl.opengl.GL45 - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height, - int format, int type, java.nio.ShortBuffer pixels) { + int format, int type, java.nio.ShortBuffer pixels) { org.lwjgl.opengl.GL45 - .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); + .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, long pixels_buffer_offset) { + int height, int depth, int format, int type, long pixels_buffer_offset) { org.lwjgl.opengl.GL45.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels_buffer_offset); + texture, + level, + xoffset, + yoffset, + zoffset, + width, + height, + depth, + format, + type, + pixels_buffer_offset); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { - org.lwjgl.opengl.GL45.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.ByteBuffer pixels) { + org.lwjgl.opengl.GL45 + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { - org.lwjgl.opengl.GL45.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) { + org.lwjgl.opengl.GL45 + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { - org.lwjgl.opengl.GL45.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.FloatBuffer pixels) { + org.lwjgl.opengl.GL45 + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.IntBuffer pixels) { - org.lwjgl.opengl.GL45.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.IntBuffer pixels) { + org.lwjgl.opengl.GL45 + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width, - int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { - org.lwjgl.opengl.GL45.glTextureSubImage3D( - texture, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - format, - type, - pixels); + int height, int depth, int format, int type, java.nio.ShortBuffer pixels) { + org.lwjgl.opengl.GL45 + .glTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } public static void glTransformFeedbackBufferBase(int xfb, int index, int buffer) { @@ -1039,7 +935,7 @@ public class GL45 { } public static void glVertexArrayAttribFormat(int vaobj, int attribindex, int size, int type, boolean normalized, - int relativeoffset) { + int relativeoffset) { org.lwjgl.opengl.GL45.glVertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset); } diff --git a/src/generated/java/org/lwjglx/opengl/KHRDebug.java b/src/generated/java/org/lwjglx/opengl/KHRDebug.java index e97ac9b..865e9af 100644 --- a/src/generated/java/org/lwjglx/opengl/KHRDebug.java +++ b/src/generated/java/org/lwjglx/opengl/KHRDebug.java @@ -42,7 +42,7 @@ public class KHRDebug { public static final int GL_SHADER = (int) 33505; public static void glDebugMessageControl(int source, int type, int severity, java.nio.IntBuffer ids, - boolean enabled) { + boolean enabled) { org.lwjgl.opengl.KHRDebug.glDebugMessageControl(source, type, severity, ids, enabled); } @@ -55,10 +55,10 @@ public class KHRDebug { } public static int glGetDebugMessageLog(int count, java.nio.IntBuffer sources, java.nio.IntBuffer types, - java.nio.IntBuffer ids, java.nio.IntBuffer severities, java.nio.IntBuffer lengths, - java.nio.ByteBuffer messageLog) { + java.nio.IntBuffer ids, java.nio.IntBuffer severities, java.nio.IntBuffer lengths, + java.nio.ByteBuffer messageLog) { return org.lwjgl.opengl.KHRDebug - .glGetDebugMessageLog(count, sources, types, ids, severities, lengths, messageLog); + .glGetDebugMessageLog(count, sources, types, ids, severities, lengths, messageLog); } public static java.lang.String glGetObjectLabel(int identifier, int name, int bufSize) { @@ -66,7 +66,7 @@ public class KHRDebug { } public static void glGetObjectLabel(int identifier, int name, java.nio.IntBuffer length, - java.nio.ByteBuffer label) { + java.nio.ByteBuffer label) { org.lwjgl.opengl.KHRDebug.glGetObjectLabel(identifier, name, length, label); } diff --git a/src/generated/java/org/lwjglx/opengl/KHRRobustness.java b/src/generated/java/org/lwjglx/opengl/KHRRobustness.java index 02bafbb..57a0294 100644 --- a/src/generated/java/org/lwjglx/opengl/KHRRobustness.java +++ b/src/generated/java/org/lwjglx/opengl/KHRRobustness.java @@ -16,28 +16,28 @@ public class KHRRobustness { } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, int pixels_bufSize, - long pixels_buffer_offset) { + long pixels_buffer_offset) { org.lwjgl.opengl.KHRRobustness - .glReadnPixels(x, y, width, height, format, type, pixels_bufSize, pixels_buffer_offset); + .glReadnPixels(x, y, width, height, format, type, pixels_bufSize, pixels_buffer_offset); } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, - java.nio.ByteBuffer pixels) { + java.nio.ByteBuffer pixels) { org.lwjgl.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels); } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, - java.nio.FloatBuffer pixels) { + java.nio.FloatBuffer pixels) { org.lwjgl.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels); } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, - java.nio.IntBuffer pixels) { + java.nio.IntBuffer pixels) { org.lwjgl.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels); } public static void glReadnPixels(int x, int y, int width, int height, int format, int type, - java.nio.ShortBuffer pixels) { + java.nio.ShortBuffer pixels) { org.lwjgl.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels); } diff --git a/src/generated/java/org/lwjglx/opengl/NVBindlessMultiDrawIndirect.java b/src/generated/java/org/lwjglx/opengl/NVBindlessMultiDrawIndirect.java index c9db3b1..7f72ae0 100644 --- a/src/generated/java/org/lwjglx/opengl/NVBindlessMultiDrawIndirect.java +++ b/src/generated/java/org/lwjglx/opengl/NVBindlessMultiDrawIndirect.java @@ -3,36 +3,32 @@ package org.lwjglx.opengl; public class NVBindlessMultiDrawIndirect { public static void glMultiDrawArraysIndirectBindlessNV(int mode, long indirect_buffer_offset, int drawCount, - int stride, int vertexBufferCount) { - org.lwjgl.opengl.NVBindlessMultiDrawIndirect.glMultiDrawArraysIndirectBindlessNV( - mode, - indirect_buffer_offset, - drawCount, - stride, - vertexBufferCount); + int stride, int vertexBufferCount) { + org.lwjgl.opengl.NVBindlessMultiDrawIndirect + .glMultiDrawArraysIndirectBindlessNV(mode, indirect_buffer_offset, drawCount, stride, vertexBufferCount); } public static void glMultiDrawArraysIndirectBindlessNV(int mode, java.nio.ByteBuffer indirect, int drawCount, - int stride, int vertexBufferCount) { + int stride, int vertexBufferCount) { org.lwjgl.opengl.NVBindlessMultiDrawIndirect - .glMultiDrawArraysIndirectBindlessNV(mode, indirect, drawCount, stride, vertexBufferCount); + .glMultiDrawArraysIndirectBindlessNV(mode, indirect, drawCount, stride, vertexBufferCount); } public static void glMultiDrawElementsIndirectBindlessNV(int mode, int type, long indirect_buffer_offset, - int drawCount, int stride, int vertexBufferCount) { + int drawCount, int stride, int vertexBufferCount) { org.lwjgl.opengl.NVBindlessMultiDrawIndirect.glMultiDrawElementsIndirectBindlessNV( - mode, - type, - indirect_buffer_offset, - drawCount, - stride, - vertexBufferCount); + mode, + type, + indirect_buffer_offset, + drawCount, + stride, + vertexBufferCount); } public static void glMultiDrawElementsIndirectBindlessNV(int mode, int type, java.nio.ByteBuffer indirect, - int drawCount, int stride, int vertexBufferCount) { + int drawCount, int stride, int vertexBufferCount) { org.lwjgl.opengl.NVBindlessMultiDrawIndirect - .glMultiDrawElementsIndirectBindlessNV(mode, type, indirect, drawCount, stride, vertexBufferCount); + .glMultiDrawElementsIndirectBindlessNV(mode, type, indirect, drawCount, stride, vertexBufferCount); } } diff --git a/src/generated/java/org/lwjglx/opengl/NVCopyImage.java b/src/generated/java/org/lwjglx/opengl/NVCopyImage.java index b379305..132128c 100644 --- a/src/generated/java/org/lwjglx/opengl/NVCopyImage.java +++ b/src/generated/java/org/lwjglx/opengl/NVCopyImage.java @@ -3,23 +3,23 @@ package org.lwjglx.opengl; public class NVCopyImage { public static void glCopyImageSubDataNV(int srcName, int srcTarget, int srcLevel, int srcX, int srcY, int srcZ, - int dstName, int dstTarget, int dstLevel, int dstX, int dstY, int dstZ, int width, int height, int depth) { + int dstName, int dstTarget, int dstLevel, int dstX, int dstY, int dstZ, int width, int height, int depth) { org.lwjgl.opengl.NVCopyImage.glCopyImageSubDataNV( - srcName, - srcTarget, - srcLevel, - srcX, - srcY, - srcZ, - dstName, - dstTarget, - dstLevel, - dstX, - dstY, - dstZ, - width, - height, - depth); + srcName, + srcTarget, + srcLevel, + srcX, + srcY, + srcZ, + dstName, + dstTarget, + dstLevel, + dstX, + dstY, + dstZ, + width, + height, + depth); } } diff --git a/src/generated/java/org/lwjglx/opengl/NVDrawTexture.java b/src/generated/java/org/lwjglx/opengl/NVDrawTexture.java index ce84b90..ec3dfc5 100644 --- a/src/generated/java/org/lwjglx/opengl/NVDrawTexture.java +++ b/src/generated/java/org/lwjglx/opengl/NVDrawTexture.java @@ -3,7 +3,7 @@ package org.lwjglx.opengl; public class NVDrawTexture { public static void glDrawTextureNV(int texture, int sampler, float x0, float y0, float x1, float y1, float z, - float s0, float t0, float s1, float t1) { + float s0, float t0, float s1, float t1) { org.lwjgl.opengl.NVDrawTexture.glDrawTextureNV(texture, sampler, x0, y0, x1, y1, z, s0, t0, s1, t1); } diff --git a/src/generated/java/org/lwjglx/opengl/NVFramebufferMultisampleCoverage.java b/src/generated/java/org/lwjglx/opengl/NVFramebufferMultisampleCoverage.java index 80d7ff3..179f004 100644 --- a/src/generated/java/org/lwjglx/opengl/NVFramebufferMultisampleCoverage.java +++ b/src/generated/java/org/lwjglx/opengl/NVFramebufferMultisampleCoverage.java @@ -8,14 +8,14 @@ public class NVFramebufferMultisampleCoverage { public static final int GL_RENDERBUFFER_COVERAGE_SAMPLES_NV = (int) 36011; public static void glRenderbufferStorageMultisampleCoverageNV(int target, int coverageSamples, int colorSamples, - int internalformat, int width, int height) { + int internalformat, int width, int height) { org.lwjgl.opengl.NVFramebufferMultisampleCoverage.glRenderbufferStorageMultisampleCoverageNV( - target, - coverageSamples, - colorSamples, - internalformat, - width, - height); + target, + coverageSamples, + colorSamples, + internalformat, + width, + height); } } diff --git a/src/generated/java/org/lwjglx/opengl/NVPathRendering.java b/src/generated/java/org/lwjglx/opengl/NVPathRendering.java index 82bd1a6..a536d29 100644 --- a/src/generated/java/org/lwjglx/opengl/NVPathRendering.java +++ b/src/generated/java/org/lwjglx/opengl/NVPathRendering.java @@ -134,9 +134,9 @@ public class NVPathRendering { } public static void glCoverFillPathInstancedNV(int pathNameType, java.nio.ByteBuffer paths, int pathBase, - int coverMode, int transformType, java.nio.FloatBuffer transformValues) { + int coverMode, int transformType, java.nio.FloatBuffer transformValues) { org.lwjgl.opengl.NVPathRendering - .glCoverFillPathInstancedNV(pathNameType, paths, pathBase, coverMode, transformType, transformValues); + .glCoverFillPathInstancedNV(pathNameType, paths, pathBase, coverMode, transformType, transformValues); } public static void glCoverFillPathNV(int path, int coverMode) { @@ -144,9 +144,9 @@ public class NVPathRendering { } public static void glCoverStrokePathInstancedNV(int pathNameType, java.nio.ByteBuffer paths, int pathBase, - int coverMode, int transformType, java.nio.FloatBuffer transformValues) { + int coverMode, int transformType, java.nio.FloatBuffer transformValues) { org.lwjgl.opengl.NVPathRendering - .glCoverStrokePathInstancedNV(pathNameType, paths, pathBase, coverMode, transformType, transformValues); + .glCoverStrokePathInstancedNV(pathNameType, paths, pathBase, coverMode, transformType, transformValues); } public static void glCoverStrokePathNV(int name, int coverMode) { @@ -194,15 +194,15 @@ public class NVPathRendering { } public static void glGetPathMetricRangeNV(int metricQueryMask, int fistPathName, int numPaths, int stride, - java.nio.FloatBuffer metrics) { + java.nio.FloatBuffer metrics) { org.lwjgl.opengl.NVPathRendering - .glGetPathMetricRangeNV(metricQueryMask, fistPathName, numPaths, stride, metrics); + .glGetPathMetricRangeNV(metricQueryMask, fistPathName, numPaths, stride, metrics); } public static void glGetPathMetricsNV(int metricQueryMask, int pathNameType, java.nio.ByteBuffer paths, - int pathBase, int stride, java.nio.FloatBuffer metrics) { + int pathBase, int stride, java.nio.FloatBuffer metrics) { org.lwjgl.opengl.NVPathRendering - .glGetPathMetricsNV(metricQueryMask, pathNameType, paths, pathBase, stride, metrics); + .glGetPathMetricsNV(metricQueryMask, pathNameType, paths, pathBase, stride, metrics); } public static void glGetPathParameterNV(int name, int param, java.nio.IntBuffer value) { @@ -222,16 +222,16 @@ public class NVPathRendering { } public static void glGetPathSpacingNV(int pathListMode, int pathNameType, java.nio.ByteBuffer paths, int pathBase, - float advanceScale, float kerningScale, int transformType, java.nio.FloatBuffer returnedSpacing) { + float advanceScale, float kerningScale, int transformType, java.nio.FloatBuffer returnedSpacing) { org.lwjgl.opengl.NVPathRendering.glGetPathSpacingNV( - pathListMode, - pathNameType, - paths, - pathBase, - advanceScale, - kerningScale, - transformType, - returnedSpacing); + pathListMode, + pathNameType, + paths, + pathBase, + advanceScale, + kerningScale, + transformType, + returnedSpacing); } public static void glGetPathTexGenNV(int texCoordSet, int pname, java.nio.FloatBuffer value) { @@ -271,7 +271,7 @@ public class NVPathRendering { } public static void glPathCommandsNV(int path, java.nio.ByteBuffer commands, int coordType, - java.nio.ByteBuffer coords) { + java.nio.ByteBuffer coords) { org.lwjgl.opengl.NVPathRendering.glPathCommandsNV(path, commands, coordType, coords); } @@ -292,33 +292,32 @@ public class NVPathRendering { } public static void glPathGlyphRangeNV(int firstPathName, int fontTarget, java.nio.ByteBuffer fontName, - int fontStyle, int firstGlyph, int numGlyphs, int handleMissingGlyphs, int pathParameterTemplate, - float emScale) { + int fontStyle, int firstGlyph, int numGlyphs, int handleMissingGlyphs, int pathParameterTemplate, + float emScale) { org.lwjgl.opengl.NVPathRendering.glPathGlyphRangeNV( - firstPathName, - fontTarget, - fontName, - fontStyle, - firstGlyph, - numGlyphs, - handleMissingGlyphs, - pathParameterTemplate, - emScale); + firstPathName, + fontTarget, + fontName, + fontStyle, + firstGlyph, + numGlyphs, + handleMissingGlyphs, + pathParameterTemplate, + emScale); } public static void glPathGlyphsNV(int firstPathName, int fontTarget, java.nio.ByteBuffer fontName, int fontStyle, - int type, java.nio.ByteBuffer charcodes, int handleMissingGlyphs, int pathParameterTemplate, - float emScale) { + int type, java.nio.ByteBuffer charcodes, int handleMissingGlyphs, int pathParameterTemplate, float emScale) { org.lwjgl.opengl.NVPathRendering.glPathGlyphsNV( - firstPathName, - fontTarget, - fontName, - fontStyle, - type, - charcodes, - handleMissingGlyphs, - pathParameterTemplate, - emScale); + firstPathName, + fontTarget, + fontName, + fontStyle, + type, + charcodes, + handleMissingGlyphs, + pathParameterTemplate, + emScale); } public static void glPathParameterNV(int path, int pname, java.nio.FloatBuffer value) { @@ -346,9 +345,9 @@ public class NVPathRendering { } public static void glPathSubCommandsNV(int path, int commandStart, int commandsToDelete, - java.nio.ByteBuffer commands, int coordType, java.nio.ByteBuffer coords) { + java.nio.ByteBuffer commands, int coordType, java.nio.ByteBuffer coords) { org.lwjgl.opengl.NVPathRendering - .glPathSubCommandsNV(path, commandStart, commandsToDelete, commands, coordType, coords); + .glPathSubCommandsNV(path, commandStart, commandsToDelete, commands, coordType, coords); } public static void glPathSubCoordsNV(int path, int coordStart, int coordType, java.nio.ByteBuffer coords) { @@ -356,22 +355,21 @@ public class NVPathRendering { } public static boolean glPointAlongPathNV(int path, int startSegment, int numSegments, float distance, - java.nio.FloatBuffer x, java.nio.FloatBuffer y, java.nio.FloatBuffer tangentX, - java.nio.FloatBuffer tangentY) { + java.nio.FloatBuffer x, java.nio.FloatBuffer y, java.nio.FloatBuffer tangentX, java.nio.FloatBuffer tangentY) { return org.lwjgl.opengl.NVPathRendering - .glPointAlongPathNV(path, startSegment, numSegments, distance, x, y, tangentX, tangentY); + .glPointAlongPathNV(path, startSegment, numSegments, distance, x, y, tangentX, tangentY); } public static void glStencilFillPathInstancedNV(int pathNameType, java.nio.ByteBuffer paths, int pathBase, - int fillMode, int mask, int transformType, java.nio.FloatBuffer transformValues) { + int fillMode, int mask, int transformType, java.nio.FloatBuffer transformValues) { org.lwjgl.opengl.NVPathRendering.glStencilFillPathInstancedNV( - pathNameType, - paths, - pathBase, - fillMode, - mask, - transformType, - transformValues); + pathNameType, + paths, + pathBase, + fillMode, + mask, + transformType, + transformValues); } public static void glStencilFillPathNV(int path, int fillMode, int mask) { @@ -379,15 +377,15 @@ public class NVPathRendering { } public static void glStencilStrokePathInstancedNV(int pathNameType, java.nio.ByteBuffer paths, int pathBase, - int reference, int mask, int transformType, java.nio.FloatBuffer transformValues) { + int reference, int mask, int transformType, java.nio.FloatBuffer transformValues) { org.lwjgl.opengl.NVPathRendering.glStencilStrokePathInstancedNV( - pathNameType, - paths, - pathBase, - reference, - mask, - transformType, - transformValues); + pathNameType, + paths, + pathBase, + reference, + mask, + transformType, + transformValues); } public static void glStencilStrokePathNV(int path, int reference, int mask) { @@ -395,7 +393,7 @@ public class NVPathRendering { } public static void glTransformPathNV(int resultPath, int srcPath, int transformType, - java.nio.FloatBuffer transformValues) { + java.nio.FloatBuffer transformValues) { org.lwjgl.opengl.NVPathRendering.glTransformPathNV(resultPath, srcPath, transformType, transformValues); } diff --git a/src/generated/java/org/lwjglx/opengl/NVTextureMultisample.java b/src/generated/java/org/lwjglx/opengl/NVTextureMultisample.java index c24677e..d9bff44 100644 --- a/src/generated/java/org/lwjglx/opengl/NVTextureMultisample.java +++ b/src/generated/java/org/lwjglx/opengl/NVTextureMultisample.java @@ -6,80 +6,80 @@ public class NVTextureMultisample { public static final int GL_TEXTURE_COVERAGE_SAMPLES_NV = (int) 36933; public static void glTexImage2DMultisampleCoverageNV(int target, int coverageSamples, int colorSamples, - int internalFormat, int width, int height, boolean fixedSampleLocations) { + int internalFormat, int width, int height, boolean fixedSampleLocations) { org.lwjgl.opengl.NVTextureMultisample.glTexImage2DMultisampleCoverageNV( - target, - coverageSamples, - colorSamples, - internalFormat, - width, - height, - fixedSampleLocations); + target, + coverageSamples, + colorSamples, + internalFormat, + width, + height, + fixedSampleLocations); } public static void glTexImage3DMultisampleCoverageNV(int target, int coverageSamples, int colorSamples, - int internalFormat, int width, int height, int depth, boolean fixedSampleLocations) { + int internalFormat, int width, int height, int depth, boolean fixedSampleLocations) { org.lwjgl.opengl.NVTextureMultisample.glTexImage3DMultisampleCoverageNV( - target, - coverageSamples, - colorSamples, - internalFormat, - width, - height, - depth, - fixedSampleLocations); + target, + coverageSamples, + colorSamples, + internalFormat, + width, + height, + depth, + fixedSampleLocations); } public static void glTextureImage2DMultisampleCoverageNV(int texture, int target, int coverageSamples, - int colorSamples, int internalFormat, int width, int height, boolean fixedSampleLocations) { + int colorSamples, int internalFormat, int width, int height, boolean fixedSampleLocations) { org.lwjgl.opengl.NVTextureMultisample.glTextureImage2DMultisampleCoverageNV( - texture, - target, - coverageSamples, - colorSamples, - internalFormat, - width, - height, - fixedSampleLocations); + texture, + target, + coverageSamples, + colorSamples, + internalFormat, + width, + height, + fixedSampleLocations); } public static void glTextureImage2DMultisampleNV(int texture, int target, int samples, int internalFormat, - int width, int height, boolean fixedSampleLocations) { + int width, int height, boolean fixedSampleLocations) { org.lwjgl.opengl.NVTextureMultisample.glTextureImage2DMultisampleNV( - texture, - target, - samples, - internalFormat, - width, - height, - fixedSampleLocations); + texture, + target, + samples, + internalFormat, + width, + height, + fixedSampleLocations); } public static void glTextureImage3DMultisampleCoverageNV(int texture, int target, int coverageSamples, - int colorSamples, int internalFormat, int width, int height, int depth, boolean fixedSampleLocations) { + int colorSamples, int internalFormat, int width, int height, int depth, boolean fixedSampleLocations) { org.lwjgl.opengl.NVTextureMultisample.glTextureImage3DMultisampleCoverageNV( - texture, - target, - coverageSamples, - colorSamples, - internalFormat, - width, - height, - depth, - fixedSampleLocations); + texture, + target, + coverageSamples, + colorSamples, + internalFormat, + width, + height, + depth, + fixedSampleLocations); } public static void glTextureImage3DMultisampleNV(int texture, int target, int samples, int internalFormat, - int width, int height, int depth, boolean fixedSampleLocations) { + int width, int height, int depth, boolean fixedSampleLocations) { org.lwjgl.opengl.NVTextureMultisample.glTextureImage3DMultisampleNV( - texture, - target, - samples, - internalFormat, - width, - height, - depth, - fixedSampleLocations); + texture, + target, + samples, + internalFormat, + width, + height, + depth, + fixedSampleLocations); } } diff --git a/src/generated/java/org/lwjglx/opengl/NVTransformFeedback.java b/src/generated/java/org/lwjglx/opengl/NVTransformFeedback.java index 1ee7442..00bb4a6 100644 --- a/src/generated/java/org/lwjglx/opengl/NVTransformFeedback.java +++ b/src/generated/java/org/lwjglx/opengl/NVTransformFeedback.java @@ -58,7 +58,7 @@ public class NVTransformFeedback { } public static void glGetActiveVaryingNV(int program, int index, java.nio.IntBuffer length, java.nio.IntBuffer size, - java.nio.IntBuffer type, java.nio.ByteBuffer name) { + java.nio.IntBuffer type, java.nio.ByteBuffer name) { org.lwjgl.opengl.NVTransformFeedback.glGetActiveVaryingNV(program, index, length, size, type, name); } diff --git a/src/hotswap/java/me.eigenraven.lwjgl3ify.hotswap/Lwjgl3ifyHotswapPlugin.java b/src/hotswap/java/me.eigenraven.lwjgl3ify.hotswap/Lwjgl3ifyHotswapPlugin.java index 3c9cab8..bbee4af 100644 --- a/src/hotswap/java/me.eigenraven.lwjgl3ify.hotswap/Lwjgl3ifyHotswapPlugin.java +++ b/src/hotswap/java/me.eigenraven.lwjgl3ify.hotswap/Lwjgl3ifyHotswapPlugin.java @@ -9,10 +9,10 @@ import org.hotswap.agent.config.PluginManager; import org.hotswap.agent.logging.AgentLogger; @Plugin( - name = "Lwjgl3ifyHSA", - description = "Runs LaunchWrapper transformers as needed for reloaded classes.", - testedVersions = "1.7.10", - expectedVersions = "1.7.10") + name = "Lwjgl3ifyHSA", + description = "Runs LaunchWrapper transformers as needed for reloaded classes.", + testedVersions = "1.7.10", + expectedVersions = "1.7.10") public class Lwjgl3ifyHotswapPlugin { public static final String PLUGIN_PACKAGE = "me.eigenraven.lwjgl3ify.hotswap"; @@ -20,19 +20,22 @@ public class Lwjgl3ifyHotswapPlugin { @OnClassLoadEvent(classNameRegexp = ".*", events = LoadEvent.REDEFINE) public static byte[] reloadClass(byte[] inputClassBytes, ClassLoader classLoader, String className, - ProtectionDomain protectionDomain) { + ProtectionDomain protectionDomain) { final Thread curThread = Thread.currentThread(); final ClassLoader ctxLoader = curThread.getContextClassLoader(); try { - if (classLoader.getClass().getName().equals("net.minecraft.launchwrapper.LaunchClassLoader")) { + if (classLoader.getClass() + .getName() + .equals("net.minecraft.launchwrapper.LaunchClassLoader")) { LOGGER.debug("Retransforming {}", className); - PluginManager.getInstance().initClassLoader(classLoader, protectionDomain); + PluginManager.getInstance() + .initClassLoader(classLoader, protectionDomain); final Class helper = Class - .forName("me.eigenraven.lwjgl3ify.hotswap.TransformHelper", true, classLoader); + .forName("me.eigenraven.lwjgl3ify.hotswap.TransformHelper", true, classLoader); curThread.setContextClassLoader(classLoader); byte[] newClassBytes = (byte[]) helper - .getMethod("transform", classLoader.getClass(), String.class, byte[].class) - .invoke(null, classLoader, className, inputClassBytes); + .getMethod("transform", classLoader.getClass(), String.class, byte[].class) + .invoke(null, classLoader, className, inputClassBytes); curThread.setContextClassLoader(ctxLoader); return newClassBytes; } diff --git a/src/hotswap/java/me.eigenraven.lwjgl3ify.hotswap/TransformHelper.java b/src/hotswap/java/me.eigenraven.lwjgl3ify.hotswap/TransformHelper.java index f78af39..df25004 100644 --- a/src/hotswap/java/me.eigenraven.lwjgl3ify.hotswap/TransformHelper.java +++ b/src/hotswap/java/me.eigenraven.lwjgl3ify.hotswap/TransformHelper.java @@ -16,11 +16,13 @@ public class TransformHelper { public static byte[] transform(LaunchClassLoader loader, String name, byte[] classBytes) throws Exception { if (classLoaderExceptionsField == null) { - classLoaderExceptionsField = loader.getClass().getDeclaredField("classLoaderExceptions"); + classLoaderExceptionsField = loader.getClass() + .getDeclaredField("classLoaderExceptions"); classLoaderExceptionsField.setAccessible(true); } if (xformerExceptionsField == null) { - xformerExceptionsField = loader.getClass().getDeclaredField("transformerExceptions"); + xformerExceptionsField = loader.getClass() + .getDeclaredField("transformerExceptions"); xformerExceptionsField.setAccessible(true); } Set loaderExceptions = (Set) classLoaderExceptionsField.get(loader); diff --git a/src/main/java/me/eigenraven/lwjgl3ify/ClientProxy.java b/src/main/java/me/eigenraven/lwjgl3ify/ClientProxy.java index 403f189..b675b6e 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/ClientProxy.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/ClientProxy.java @@ -44,7 +44,7 @@ public class ClientProxy extends CommonProxy { final Field callablesField = FMLCommonHandler.class.getDeclaredField("crashCallables"); callablesField.setAccessible(true); List crashCallables = (List) callablesField - .get(FMLCommonHandler.instance()); + .get(FMLCommonHandler.instance()); for (int i = 0; i < crashCallables.size(); i++) { ICrashCallable original = crashCallables.get(i); if ("GL info".equals(original.getLabel()) && !(original instanceof GLInfoCrashCallable)) { @@ -60,7 +60,7 @@ public class ClientProxy extends CommonProxy { @SuppressWarnings("unused") // event handler public void onRenderGameOverlayTextEvent(RenderGameOverlayEvent.Text event) { if (Minecraft.getMinecraft().gameSettings.showDebugInfo - && event.type == RenderGameOverlayEvent.ElementType.TEXT) { + && event.type == RenderGameOverlayEvent.ElementType.TEXT) { if (Config.SHOW_LWJGL_VERSION) { event.right.add(Math.min(3, event.right.size()), lwjglVersion); } diff --git a/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ify.java b/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ify.java index 1041aec..0751de7 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ify.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ify.java @@ -19,12 +19,12 @@ import me.eigenraven.lwjgl3ify.api.ConfigUtils; import me.eigenraven.lwjgl3ify.core.Config; @Mod( - modid = "lwjgl3ify", - name = "Lwjgl3ify", - version = Tags.VERSION, - acceptedMinecraftVersions = "[1.7.10]", - acceptableRemoteVersions = "*", - guiFactory = "me.eigenraven.lwjgl3ify.client.GuiFactory") + modid = "lwjgl3ify", + name = "Lwjgl3ify", + version = Tags.VERSION, + acceptedMinecraftVersions = "[1.7.10]", + acceptableRemoteVersions = "*", + guiFactory = "me.eigenraven.lwjgl3ify.client.GuiFactory") public class Lwjgl3ify { public static Logger LOG = LogManager.getLogger(Tags.MODID); @@ -58,8 +58,10 @@ public class Lwjgl3ify { PROXY.registerF3Handler(); final LaunchClassLoader loader = Launch.classLoader; try { - final Field clExclusionsF = loader.getClass().getDeclaredField("classLoaderExceptions"); - final Field tfExclusionsF = loader.getClass().getDeclaredField("transformerExceptions"); + final Field clExclusionsF = loader.getClass() + .getDeclaredField("classLoaderExceptions"); + final Field tfExclusionsF = loader.getClass() + .getDeclaredField("transformerExceptions"); clExclusionsF.setAccessible(true); tfExclusionsF.setAccessible(true); @SuppressWarnings("unchecked") diff --git a/src/main/java/me/eigenraven/lwjgl3ify/UnsafeHacks.java b/src/main/java/me/eigenraven/lwjgl3ify/UnsafeHacks.java index 9e4b7a1..1ec2dd8 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/UnsafeHacks.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/UnsafeHacks.java @@ -84,7 +84,8 @@ public class UnsafeHacks { // Make sure we don't crash if any future versions change field names private static Optional findField(Class clazz, String name) { for (Field f : clazz.getDeclaredFields()) { - if (f.getName().equals(name)) { + if (f.getName() + .equals(name)) { return Optional.of(f); } } diff --git a/src/main/java/me/eigenraven/lwjgl3ify/api/ConfigUtils.java b/src/main/java/me/eigenraven/lwjgl3ify/api/ConfigUtils.java index 0a4f634..a93c6a3 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/api/ConfigUtils.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/api/ConfigUtils.java @@ -29,15 +29,17 @@ public class ConfigUtils { public ConfigUtils(Logger logger) { try { configClass = Class.forName("me.eigenraven.lwjgl3ify.core.Config"); - modVersion = (String) configClass.getField("LWJGL3IFY_VERSION").get(null); + modVersion = (String) configClass.getField("LWJGL3IFY_VERSION") + .get(null); - final MethodHandles.Lookup lookup = MethodHandles.publicLookup().in(configClass); + final MethodHandles.Lookup lookup = MethodHandles.publicLookup() + .in(configClass); getExtensibleEnumsHandle = lookup - .findStatic(configClass, "getExtensibleEnums", MethodType.methodType(Set.class)); + .findStatic(configClass, "getExtensibleEnums", MethodType.methodType(Set.class)); addExtensibleEnumHandle = lookup - .findStatic(configClass, "addExtensibleEnum", MethodType.methodType(void.class, String.class)); + .findStatic(configClass, "addExtensibleEnum", MethodType.methodType(void.class, String.class)); isConfigLoadedHandle = lookup - .findStatic(configClass, "isConfigLoaded", MethodType.methodType(boolean.class)); + .findStatic(configClass, "isConfigLoaded", MethodType.methodType(boolean.class)); } catch (ReflectiveOperationException e) { configClass = null; if (logger != null) { diff --git a/src/main/java/me/eigenraven/lwjgl3ify/client/GLInfoCrashCallable.java b/src/main/java/me/eigenraven/lwjgl3ify/client/GLInfoCrashCallable.java index 53cd4a1..07e17a1 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/client/GLInfoCrashCallable.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/client/GLInfoCrashCallable.java @@ -29,13 +29,14 @@ public class GLInfoCrashCallable implements ICrashCallable { } if (hasGlContext) { return "' Vendor: '" + glGetString(GL_VENDOR) - + "' Version: '" - + glGetString(GL_VERSION) - + "' Renderer: '" - + glGetString(GL_RENDERER) - + "'"; + + "' Version: '" + + glGetString(GL_VERSION) + + "' Renderer: '" + + glGetString(GL_RENDERER) + + "'"; } else { - return "No OpenGL context present in the calling thread: " + Thread.currentThread().getName(); + return "No OpenGL context present in the calling thread: " + Thread.currentThread() + .getName(); } } } diff --git a/src/main/java/me/eigenraven/lwjgl3ify/client/GuiConfigLwjgl3ify.java b/src/main/java/me/eigenraven/lwjgl3ify/client/GuiConfigLwjgl3ify.java index 94e33c1..f0da948 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/client/GuiConfigLwjgl3ify.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/client/GuiConfigLwjgl3ify.java @@ -21,16 +21,16 @@ public class GuiConfigLwjgl3ify extends GuiConfig { public GuiConfigLwjgl3ify(GuiScreen parent) { super( - parent, - Lists.newArrayList( - new ConfigElement<>(Config.config.getCategory(Config.CATEGORY_WINDOW)), - new ConfigElement<>(Config.config.getCategory(Config.CATEGORY_INPUT)), - new ConfigElement<>(Config.config.getCategory(Config.CATEGORY_GLCONTEXT))), - Tags.MODID, - "config", - false, - false, - "LWJGL3ify"); + parent, + Lists.newArrayList( + new ConfigElement<>(Config.config.getCategory(Config.CATEGORY_WINDOW)), + new ConfigElement<>(Config.config.getCategory(Config.CATEGORY_INPUT)), + new ConfigElement<>(Config.config.getCategory(Config.CATEGORY_GLCONTEXT))), + Tags.MODID, + "config", + false, + false, + "LWJGL3ify"); } @Override @@ -50,7 +50,9 @@ public class GuiConfigLwjgl3ify extends GuiConfig { Block wool = Blocks.wool; // Draw scroll test widget int ypos = 32 + (int) (16.0 * Mouse.totalScrollAmount); - Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft() + .getTextureManager() + .bindTexture(TextureMap.locationBlocksTexture); for (int i = 0; i < 8; i++) { while (ypos > height - 64) { ypos -= (height - 64); diff --git a/src/main/java/me/eigenraven/lwjgl3ify/core/Config.java b/src/main/java/me/eigenraven/lwjgl3ify/core/Config.java index 21a2913..67f89bf 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/core/Config.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/core/Config.java @@ -13,44 +13,44 @@ import me.eigenraven.lwjgl3ify.Tags; public class Config { public static final String[] DEFAULT_EXTENSIBLE_ENUMS = new String[] { - // From EnumHelper - "net.minecraft.item.EnumAction", "net.minecraft.item.ItemArmor$ArmorMaterial", - "net.minecraft.entity.item.EntityPainting$EnumArt", "net.minecraft.entity.EnumCreatureAttribute", - "net.minecraft.entity.EnumCreatureType", - "net.minecraft.world.gen.structure.StructureStrongholdPieces$Stronghold$Door", - "net.minecraft.enchantment.EnumEnchantmentType", "net.minecraft.entity.Entity$EnumEntitySize", - "net.minecraft.block.BlockPressurePlate$Sensitivity", - "net.minecraft.util.MovingObjectPosition$MovingObjectType", "net.minecraft.world.EnumSkyBlock", - "net.minecraft.entity.player.EntityPlayer$EnumStatus", "net.minecraft.item.Item$ToolMaterial", - "net.minecraft.item.EnumRarity", - // - "net.minecraftforge.event.terraingen.PopulateChunkEvent$Populate$EventType", - "net.minecraftforge.event.terraingen.InitMapGenEvent$EventType", - "net.minecraftforge.event.terraingen.OreGenEvent$GenerateMinable$EventType", - "net.minecraftforge.event.terraingen.DecorateBiomeEvent$Decorate$EventType", - // From GTNH crashes - "vswe.stevesfactory.Localization", "vswe.stevesfactory.blocks.ClusterMethodRegistration", - "vswe.stevesfactory.blocks.ConnectionBlockType", "vswe.stevesfactory.components.ComponentType", - "vswe.stevesfactory.components.ConnectionSet", "vswe.stevesfactory.components.ConnectionOption", - "ic2.core.init.InternalName", "gregtech.api.enums.Element", "gregtech.api.enums.OrePrefixes", - "net.minecraft.client.audio.MusicTicker$MusicType", "org.bukkit.Material", - "buildcraft.api.transport.IPipeTile.PipeType", "thaumcraft.common.entities.golems.EnumGolemType", - // Non-GTNH Mods Compat - // The Lord of the Rings Mod: Legacy - "net.minecraft.event.HoverEvent$Action", - // Reika's mods - "net.minecraft.client.audio.SoundCategory", - "Reika.RotaryCraft.TileEntities.Processing.TileEntityFuelConverter$Conversions", - "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Fertility", - "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Speeds", - "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Flowering", - "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Territory", - "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Life", - "Reika.DragonAPI.ModInteract.Bees.ButterflyAlleleRegistry$Fertility", - "Reika.DragonAPI.ModInteract.Bees.ButterflyAlleleRegistry$Life", - // Et Futurum Requiem - "net.minecraft.world.WorldSettings$GameType", - // + // From EnumHelper + "net.minecraft.item.EnumAction", "net.minecraft.item.ItemArmor$ArmorMaterial", + "net.minecraft.entity.item.EntityPainting$EnumArt", "net.minecraft.entity.EnumCreatureAttribute", + "net.minecraft.entity.EnumCreatureType", + "net.minecraft.world.gen.structure.StructureStrongholdPieces$Stronghold$Door", + "net.minecraft.enchantment.EnumEnchantmentType", "net.minecraft.entity.Entity$EnumEntitySize", + "net.minecraft.block.BlockPressurePlate$Sensitivity", + "net.minecraft.util.MovingObjectPosition$MovingObjectType", "net.minecraft.world.EnumSkyBlock", + "net.minecraft.entity.player.EntityPlayer$EnumStatus", "net.minecraft.item.Item$ToolMaterial", + "net.minecraft.item.EnumRarity", + // + "net.minecraftforge.event.terraingen.PopulateChunkEvent$Populate$EventType", + "net.minecraftforge.event.terraingen.InitMapGenEvent$EventType", + "net.minecraftforge.event.terraingen.OreGenEvent$GenerateMinable$EventType", + "net.minecraftforge.event.terraingen.DecorateBiomeEvent$Decorate$EventType", + // From GTNH crashes + "vswe.stevesfactory.Localization", "vswe.stevesfactory.blocks.ClusterMethodRegistration", + "vswe.stevesfactory.blocks.ConnectionBlockType", "vswe.stevesfactory.components.ComponentType", + "vswe.stevesfactory.components.ConnectionSet", "vswe.stevesfactory.components.ConnectionOption", + "ic2.core.init.InternalName", "gregtech.api.enums.Element", "gregtech.api.enums.OrePrefixes", + "net.minecraft.client.audio.MusicTicker$MusicType", "org.bukkit.Material", + "buildcraft.api.transport.IPipeTile.PipeType", "thaumcraft.common.entities.golems.EnumGolemType", + // Non-GTNH Mods Compat + // The Lord of the Rings Mod: Legacy + "net.minecraft.event.HoverEvent$Action", + // Reika's mods + "net.minecraft.client.audio.SoundCategory", + "Reika.RotaryCraft.TileEntities.Processing.TileEntityFuelConverter$Conversions", + "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Fertility", + "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Speeds", + "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Flowering", + "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Territory", + "Reika.DragonAPI.ModInteract.Bees.BeeAlleleRegistry$Life", + "Reika.DragonAPI.ModInteract.Bees.ButterflyAlleleRegistry$Fertility", + "Reika.DragonAPI.ModInteract.Bees.ButterflyAlleleRegistry$Life", + // Et Futurum Requiem + "net.minecraft.world.WorldSettings$GameType", + // }; private static final Set EXTENSIBLE_ENUMS = new HashSet<>(Arrays.asList(DEFAULT_EXTENSIBLE_ENUMS)); @@ -112,99 +112,98 @@ public class Config { public static void reloadConfigObject() { EXTENSIBLE_ENUMS.addAll( - Arrays.asList( - config.get( - CATEGORY_CORE, - "extensibleEnums", - EXTENSIBLE_ENUMS.toArray(new String[0]), - "Enums to make extensible at runtime").getStringList())); + Arrays.asList( + config + .get( + CATEGORY_CORE, + "extensibleEnums", + EXTENSIBLE_ENUMS.toArray(new String[0]), + "Enums to make extensible at runtime") + .getStringList())); MIXIN_STBI_TEXTURE_LOADING = config.getBoolean( - "stbiTextureLoading", - CATEGORY_MIXIN, - MIXIN_STBI_TEXTURE_LOADING, - "Use the faster stb_image-based texture loader"); + "stbiTextureLoading", + CATEGORY_MIXIN, + MIXIN_STBI_TEXTURE_LOADING, + "Use the faster stb_image-based texture loader"); MIXIN_STBI_TEXTURE_STICHING = config.getBoolean( - "stbiTextureStiching", - CATEGORY_MIXIN, - MIXIN_STBI_TEXTURE_STICHING, - "Use the much faster stb_rectpack-based texture stitcher"); + "stbiTextureStiching", + CATEGORY_MIXIN, + MIXIN_STBI_TEXTURE_STICHING, + "Use the much faster stb_rectpack-based texture stitcher"); MIXIN_STBI_IGNORE_FASTCRAFT = config.getBoolean( - "stbiIgnoreFastcraft", - CATEGORY_MIXIN, - MIXIN_STBI_IGNORE_FASTCRAFT, - "Force-enable the STB mixins even if FastCraft is present, may lead to a rapidly flashing screen and other visual artifacts"); + "stbiIgnoreFastcraft", + CATEGORY_MIXIN, + MIXIN_STBI_IGNORE_FASTCRAFT, + "Force-enable the STB mixins even if FastCraft is present, may lead to a rapidly flashing screen and other visual artifacts"); DEBUG_PRINT_KEY_EVENTS = config.getBoolean( - "printKeyEvents", - CATEGORY_DEBUG, - DEBUG_PRINT_KEY_EVENTS, - "Print keyboard-related events to the log"); + "printKeyEvents", + CATEGORY_DEBUG, + DEBUG_PRINT_KEY_EVENTS, + "Print keyboard-related events to the log"); DEBUG_PRINT_MOUSE_EVENTS = config.getBoolean( - "printMouseEvents", - CATEGORY_DEBUG, - DEBUG_PRINT_MOUSE_EVENTS, - "Print mouse-related events to the log"); + "printMouseEvents", + CATEGORY_DEBUG, + DEBUG_PRINT_MOUSE_EVENTS, + "Print mouse-related events to the log"); SHOW_JAVA_VERSION = config - .getBoolean("showJavaVersion", CATEGORY_CORE, SHOW_JAVA_VERSION, "Show java version in the debug hud"); - SHOW_LWJGL_VERSION = config.getBoolean( - "showLwjglVersion", - CATEGORY_CORE, - SHOW_LWJGL_VERSION, - "Show lwjgl version in the debug hud"); + .getBoolean("showJavaVersion", CATEGORY_CORE, SHOW_JAVA_VERSION, "Show java version in the debug hud"); + SHOW_LWJGL_VERSION = config + .getBoolean("showLwjglVersion", CATEGORY_CORE, SHOW_LWJGL_VERSION, "Show lwjgl version in the debug hud"); WINDOW_START_MAXIMIZED = config - .getBoolean("maximized", CATEGORY_WINDOW, WINDOW_START_MAXIMIZED, "Start maximized?"); + .getBoolean("maximized", CATEGORY_WINDOW, WINDOW_START_MAXIMIZED, "Start maximized?"); WINDOW_START_FOCUSED = config.getBoolean("focused", CATEGORY_WINDOW, WINDOW_START_FOCUSED, "Start focused?"); WINDOW_START_ICONIFIED = config - .getBoolean("iconified", CATEGORY_WINDOW, WINDOW_START_ICONIFIED, "Start iconified?"); + .getBoolean("iconified", CATEGORY_WINDOW, WINDOW_START_ICONIFIED, "Start iconified?"); WINDOW_DECORATED = config.getBoolean( - "decorated", - CATEGORY_WINDOW, - WINDOW_DECORATED, - "Should the window have decorations (titlebar, border, close button)"); + "decorated", + CATEGORY_WINDOW, + WINDOW_DECORATED, + "Should the window have decorations (titlebar, border, close button)"); X11_CLASS_NAME = config.getString( - "x11ClassName", - CATEGORY_WINDOW, - X11_CLASS_NAME, - "Linux-only - change the X11 class name, which is used by your window manager to identify the running application"); + "x11ClassName", + CATEGORY_WINDOW, + X11_CLASS_NAME, + "Linux-only - change the X11 class name, which is used by your window manager to identify the running application"); COCOA_FRAME_NAME = config.getString( - "cocoaFrameName", - CATEGORY_WINDOW, - COCOA_FRAME_NAME, - "OSX-only - identifier used to save and restore the window position and size"); + "cocoaFrameName", + CATEGORY_WINDOW, + COCOA_FRAME_NAME, + "OSX-only - identifier used to save and restore the window position and size"); INPUT_INVERT_WHEEL = config - .getBoolean("invertScrollWheel", CATEGORY_INPUT, INPUT_INVERT_WHEEL, "Invert scrolling direction"); + .getBoolean("invertScrollWheel", CATEGORY_INPUT, INPUT_INVERT_WHEEL, "Invert scrolling direction"); INPUT_SCROLL_SPEED = (double) config.getFloat( - "scrollSpeedMultiplier", - CATEGORY_INPUT, - (float) INPUT_SCROLL_SPEED, - +0.05f, - +20.0f, - "Scrolling speed multiplier"); + "scrollSpeedMultiplier", + CATEGORY_INPUT, + (float) INPUT_SCROLL_SPEED, + +0.05f, + +20.0f, + "Scrolling speed multiplier"); OPENGL_DEBUG_CONTEXT = config.getBoolean( - "debugContext", - CATEGORY_GLCONTEXT, - OPENGL_DEBUG_CONTEXT, - "Enable KHR_debug in the OpenGL context for advanced debugging capabilities"); + "debugContext", + CATEGORY_GLCONTEXT, + OPENGL_DEBUG_CONTEXT, + "Enable KHR_debug in the OpenGL context for advanced debugging capabilities"); OPENGL_SRGB_CONTEXT = config.getBoolean( - "srgb", - CATEGORY_GLCONTEXT, - OPENGL_SRGB_CONTEXT, - "Make the framebuffer use the sRGB color space"); + "srgb", + CATEGORY_GLCONTEXT, + OPENGL_SRGB_CONTEXT, + "Make the framebuffer use the sRGB color space"); OPENGL_DOUBLEBUFFER = config.getBoolean( - "doubleBuffer", - CATEGORY_GLCONTEXT, - OPENGL_DOUBLEBUFFER, - "Make the framebuffer double-buffered (will cause visual artifacts if disabled)"); + "doubleBuffer", + CATEGORY_GLCONTEXT, + OPENGL_DOUBLEBUFFER, + "Make the framebuffer double-buffered (will cause visual artifacts if disabled)"); OPENGL_CONTEXT_NO_ERROR = config.getBoolean( - "noError", - CATEGORY_GLCONTEXT, - OPENGL_CONTEXT_NO_ERROR, - "Enable GL_KHR_no_error to use faster driver code, but which can cause memory corruption in case of OpenGL errors"); + "noError", + CATEGORY_GLCONTEXT, + OPENGL_CONTEXT_NO_ERROR, + "Enable GL_KHR_no_error to use faster driver code, but which can cause memory corruption in case of OpenGL errors"); } public static Set getExtensibleEnums() { diff --git a/src/main/java/me/eigenraven/lwjgl3ify/core/ExtensibleEnumTransformerHelper.java b/src/main/java/me/eigenraven/lwjgl3ify/core/ExtensibleEnumTransformerHelper.java index 7b3fbd7..499151f 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/core/ExtensibleEnumTransformerHelper.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/core/ExtensibleEnumTransformerHelper.java @@ -30,10 +30,8 @@ public class ExtensibleEnumTransformerHelper { private final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); // Don't directly reference // this to prevent class // loading. - private final String ADD_DESC = Type.getMethodDescriptor( - Type.getType(Object[].class), - Type.getType(Object[].class), - Type.getType(Object.class)); + private final String ADD_DESC = Type + .getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class)); private final Type UNSAFE_HACKS = Type.getType("Lme/eigenraven/lwjgl3ify/UnsafeHacks;"); // Again, not direct // reference to prevent // class loading. @@ -52,8 +50,9 @@ public class ExtensibleEnumTransformerHelper { final int flags = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC; FieldNode values = classNode.fields.stream() - .filter(f -> f.desc.contentEquals(array.getDescriptor()) && ((f.access & flags) == flags)).findFirst() - .orElse(null); + .filter(f -> f.desc.contentEquals(array.getDescriptor()) && ((f.access & flags) == flags)) + .findFirst() + .orElse(null); boolean process = false; if (classNode.interfaces.contains(MARKER_IFACE.getInternalName())) { @@ -69,27 +68,31 @@ public class ExtensibleEnumTransformerHelper { return false; } - List constructors = classNode.methods.stream().filter(m -> m.name.equals("")) - .collect(Collectors.toList()); + List constructors = classNode.methods.stream() + .filter(m -> m.name.equals("")) + .collect(Collectors.toList()); // Static methods named "create" with first argument as a string - List candidates = constructors.stream().map(ctor -> { - final String[] exceptions = ctor.exceptions == null ? null : ctor.exceptions.toArray(new String[0]); - final Type ctorDesc = Type.getMethodType(ctor.desc); - final Type creatorDesc = Type.getMethodType(classType, ArrayUtils.remove(ctorDesc.getArgumentTypes(), 1)); - final MethodNode creator = new MethodNode( + List candidates = constructors.stream() + .map(ctor -> { + final String[] exceptions = ctor.exceptions == null ? null : ctor.exceptions.toArray(new String[0]); + final Type ctorDesc = Type.getMethodType(ctor.desc); + final Type creatorDesc = Type + .getMethodType(classType, ArrayUtils.remove(ctorDesc.getArgumentTypes(), 1)); + final MethodNode creator = new MethodNode( ctor.access, CREATE_METHOD_NAME, creatorDesc.getDescriptor(), null, exceptions); - creator.access = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC; - return creator; - }).collect(Collectors.toList()); + creator.access = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC; + return creator; + }) + .collect(Collectors.toList()); if (candidates.isEmpty()) { throw new IllegalStateException( - "IExtensibleEnum has no candidate factory methods: " + classType.getClassName()); + "IExtensibleEnum has no candidate factory methods: " + classType.getClassName()); } classNode.methods.addAll(candidates); @@ -99,36 +102,36 @@ public class ExtensibleEnumTransformerHelper { if (args.length == 0 || !args[0].equals(STRING)) { if (LOGGER.isErrorEnabled()) { String sb = "Enum has create method without String as first parameter:\n" + " Enum: " - + classType.getDescriptor() - + "\n" - + " Target: " - + mtd.name - + mtd.desc - + "\n"; + + classType.getDescriptor() + + "\n" + + " Target: " + + mtd.name + + mtd.desc + + "\n"; LOGGER.error(sb); } throw new IllegalStateException( - "Enum has create method without String as first parameter: " + mtd.name + mtd.desc); + "Enum has create method without String as first parameter: " + mtd.name + mtd.desc); } Type ret = Type.getReturnType(mtd.desc); if (!ret.equals(classType)) { if (LOGGER.isErrorEnabled()) { String sb = "Enum has create method with incorrect return type:\n" + " Enum: " - + classType.getDescriptor() - + "\n" - + " Target: " - + mtd.name - + mtd.desc - + "\n" - + " Found: " - + ret.getClassName() - + ", Expected: " - + classType.getClassName(); + + classType.getDescriptor() + + "\n" + + " Target: " + + mtd.name + + mtd.desc + + "\n" + + " Found: " + + ret.getClassName() + + ", Expected: " + + classType.getClassName(); LOGGER.error(sb); } throw new IllegalStateException( - "Enum has create method with incorrect return type: " + mtd.name + mtd.desc); + "Enum has create method with incorrect return type: " + mtd.name + mtd.desc); } Type[] ctrArgs = new Type[args.length + 1]; @@ -138,17 +141,29 @@ public class ExtensibleEnumTransformerHelper { String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs); - MethodNode ctr = classNode.methods.stream().filter(m -> m.name.equals("") && m.desc.equals(desc)) - .findFirst().orElse(null); + MethodNode ctr = classNode.methods.stream() + .filter(m -> m.name.equals("") && m.desc.equals(desc)) + .findFirst() + .orElse(null); if (ctr == null) { if (LOGGER.isErrorEnabled()) { StringBuilder sb = new StringBuilder(); sb.append("Enum has create method with no matching constructor:\n"); - sb.append(" Enum: ").append(classType.getDescriptor()).append("\n"); - sb.append(" Candidate: ").append(mtd.desc).append("\n"); - sb.append(" Target: ").append(desc).append("\n"); - classNode.methods.stream().filter(m -> m.name.equals("")) - .forEach(m -> sb.append(" : ").append(m.desc).append("\n")); + sb.append(" Enum: ") + .append(classType.getDescriptor()) + .append("\n"); + sb.append(" Candidate: ") + .append(mtd.desc) + .append("\n"); + sb.append(" Target: ") + .append(desc) + .append("\n"); + classNode.methods.stream() + .filter(m -> m.name.equals("")) + .forEach( + m -> sb.append(" : ") + .append(m.desc) + .append("\n")); LOGGER.error(sb.toString()); } throw new IllegalStateException("Enum has create method with no matching constructor: " + desc); @@ -158,8 +173,14 @@ public class ExtensibleEnumTransformerHelper { if (LOGGER.isErrorEnabled()) { StringBuilder sb = new StringBuilder(); sb.append("Enum has create method but we could not find $VALUES. Found:\n"); - classNode.fields.stream().filter(f -> (f.access & Opcodes.ACC_STATIC) != 0) - .forEach(m -> sb.append(" ").append(m.name).append(" ").append(m.desc).append("\n")); + classNode.fields.stream() + .filter(f -> (f.access & Opcodes.ACC_STATIC) != 0) + .forEach( + m -> sb.append(" ") + .append(m.name) + .append(" ") + .append(m.desc) + .append("\n")); LOGGER.error(sb.toString()); } throw new IllegalStateException("Enum has create method but we could not find $VALUES"); diff --git a/src/main/java/me/eigenraven/lwjgl3ify/core/FixConstantPoolInterfaceMethodRefHelper.java b/src/main/java/me/eigenraven/lwjgl3ify/core/FixConstantPoolInterfaceMethodRefHelper.java index b179a1a..ec6167b 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/core/FixConstantPoolInterfaceMethodRefHelper.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/core/FixConstantPoolInterfaceMethodRefHelper.java @@ -23,7 +23,9 @@ import me.eigenraven.lwjgl3ify.Lwjgl3ify; public class FixConstantPoolInterfaceMethodRefHelper { public boolean transform(ClassNode node) { - if (System.getProperty("java.specification.version", "1.8").trim().startsWith("1.8")) { + if (System.getProperty("java.specification.version", "1.8") + .trim() + .startsWith("1.8")) { return false; } final boolean iAmAnInterface = ((node.access & Opcodes.ACC_INTERFACE) != 0); @@ -64,10 +66,13 @@ public class FixConstantPoolInterfaceMethodRefHelper { private Handle fixHandle(String internalClassName, boolean iAmAnInterface, Handle handle, AtomicBoolean changed) { if (!handle.isInterface()) { - final boolean fixSelfReference = handle.getOwner().equals(internalClassName) && iAmAnInterface; + final boolean fixSelfReference = handle.getOwner() + .equals(internalClassName) && iAmAnInterface; boolean fixJavaReference = false; - if (!fixSelfReference && handle.getOwner().startsWith("java/")) { - final String regularName = handle.getOwner().replace('/', '.'); + if (!fixSelfReference && handle.getOwner() + .startsWith("java/")) { + final String regularName = handle.getOwner() + .replace('/', '.'); try { final Class javaClass = Class.forName(regularName); if (javaClass.isInterface()) { diff --git a/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java b/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java index 9aefd67..b81857c 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java @@ -46,7 +46,10 @@ public class Lwjgl3ifyCoremod implements IFMLLoadingPlugin, IEarlyMixinLoader { launchLoader.addClassLoaderExclusion("org.hotswap.agent"); launchLoader.addClassLoaderExclusion("org.lwjglx.debug"); } catch (ClassCastException e) { - LOGGER.warn("Unsupported launch class loader type " + getClass().getClassLoader().getClass(), e); + LOGGER.warn( + "Unsupported launch class loader type " + getClass().getClassLoader() + .getClass(), + e); } // Ensure javax.script.ScriptEngineManager gets loaded try { @@ -54,7 +57,8 @@ public class Lwjgl3ifyCoremod implements IFMLLoadingPlugin, IEarlyMixinLoader { } catch (ClassNotFoundException e) { throw new RuntimeException(e); } - if (FMLLaunchHandler.side().isClient()) { + if (FMLLaunchHandler.side() + .isClient()) { clientMacOsFix(); Sys.initialize(); } @@ -78,7 +82,7 @@ public class Lwjgl3ifyCoremod implements IFMLLoadingPlugin, IEarlyMixinLoader { } return new String[] { LwjglRedirectTransformer.class.getName(), - UnfinalizeObjectHoldersTransformer.class.getName() }; + UnfinalizeObjectHoldersTransformer.class.getName() }; } @Override @@ -115,7 +119,8 @@ public class Lwjgl3ifyCoremod implements IFMLLoadingPlugin, IEarlyMixinLoader { mixins.add("fml.JarDiscoverer"); mixins.add("fml.ObjectHolderRef"); mixins.add("fml.ObjectHolderRegistry"); - if (FMLLaunchHandler.side().isClient()) { + if (FMLLaunchHandler.side() + .isClient()) { // STB replacements for vanilla functions if (Config.MIXIN_STBI_TEXTURE_LOADING) { LOGGER.info("Enabling STB texture loading mixin"); @@ -128,7 +133,7 @@ public class Lwjgl3ifyCoremod implements IFMLLoadingPlugin, IEarlyMixinLoader { final boolean fcBugTriggered = hasFastcraft && !hasOptifine; if (fcBugTriggered && !Config.MIXIN_STBI_IGNORE_FASTCRAFT) { LOGGER.error( - "Not using STB stiching mixins because FastCraft is installed to prevent rapidly flashing screen. Remove FastCraft or add OptiFine to enable these performance-improving patches."); + "Not using STB stiching mixins because FastCraft is installed to prevent rapidly flashing screen. Remove FastCraft or add OptiFine to enable these performance-improving patches."); } else { if (Config.MIXIN_STBI_TEXTURE_STICHING) { LOGGER.info("Enabling STB texture stitching mixin"); diff --git a/src/main/java/me/eigenraven/lwjgl3ify/core/UnfinalizeObjectHoldersTransformer.java b/src/main/java/me/eigenraven/lwjgl3ify/core/UnfinalizeObjectHoldersTransformer.java index 1e357df..dc4d63a 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/core/UnfinalizeObjectHoldersTransformer.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/core/UnfinalizeObjectHoldersTransformer.java @@ -55,7 +55,7 @@ public class UnfinalizeObjectHoldersTransformer implements IClassTransformer { boolean transformClass = false; boolean workDone = false; if (transformedName.equals("net.minecraft.init.Blocks") - || transformedName.equals("net.minecraft.init.Items")) { + || transformedName.equals("net.minecraft.init.Items")) { transformClass = true; } transformClass |= isHolder(node.visibleAnnotations); @@ -74,7 +74,7 @@ public class UnfinalizeObjectHoldersTransformer implements IClassTransformer { if (field.visibleAnnotations == null) { field.visibleAnnotations = new ArrayList<>(1); field.visibleAnnotations - .add(new AnnotationNode(Type.getDescriptor(WasFinalObjectHolder.class))); + .add(new AnnotationNode(Type.getDescriptor(WasFinalObjectHolder.class))); } field.access = field.access & (~Opcodes.ACC_FINAL); } @@ -85,7 +85,8 @@ public class UnfinalizeObjectHoldersTransformer implements IClassTransformer { Lwjgl3ifyCoremod.LOGGER.info("Unfinalized {} Holder fields in {}", fieldsModified, transformedName); } - if (Config.getExtensibleEnums().contains(transformedName)) { + if (Config.getExtensibleEnums() + .contains(transformedName)) { if (node.interfaces == null) { node.interfaces = new ArrayList<>(1); } @@ -103,10 +104,8 @@ public class UnfinalizeObjectHoldersTransformer implements IClassTransformer { if (ifaceMethodRefsTransformed) { workDone = true; - Lwjgl3ifyCoremod.LOGGER.warn( - "Fixed missing CONSTANT_InterfaceMethodRef miscompilation in {}={}", - name, - transformedName); + Lwjgl3ifyCoremod.LOGGER + .warn("Fixed missing CONSTANT_InterfaceMethodRef miscompilation in {}={}", name, transformedName); } if (workDone) { diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ItemStackHolderRef.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ItemStackHolderRef.java index b53d2de..181e63f 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ItemStackHolderRef.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ItemStackHolderRef.java @@ -41,7 +41,8 @@ public class ItemStackHolderRef { private static void makeWritable(Field f) { try { f.setAccessible(true); - fieldSetter = MethodHandles.lookup().unreflectSetter(f); + fieldSetter = MethodHandles.lookup() + .unreflectSetter(f); } catch (Exception e) { throw Throwables.propagate(e); } @@ -57,20 +58,23 @@ public class ItemStackHolderRef { try { is = GameRegistry.makeItemStack(itemName, meta, 1, serializednbt); } catch (RuntimeException e) { - FMLLog.getLogger().log( + FMLLog.getLogger() + .log( Level.ERROR, "Caught exception processing itemstack {},{},{} in annotation at {}.{}", itemName, meta, serializednbt, - field.getClass().getName(), + field.getClass() + .getName(), field.getName()); throw e; } try { fieldSetter.invoke(is); } catch (Throwable e) { - FMLLog.getLogger().log( + FMLLog.getLogger() + .log( Level.WARN, "Unable to set {} with value {},{},{}", this.field, diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/JarDiscoverer.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/JarDiscoverer.java index fb353b8..467cf29 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/JarDiscoverer.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/JarDiscoverer.java @@ -10,19 +10,19 @@ import org.spongepowered.asm.mixin.injection.Redirect; public class JarDiscoverer { @Redirect( - method = { - "Lcpw/mods/fml/common/discovery/JarDiscoverer;discover(Lcpw/mods/fml/common/discovery/ModCandidate;Lcpw/mods/fml/common/discovery/ASMDataTable;)Ljava/util/List;" }, - at = @At(ordinal = 1, value = "INVOKE", target = "Ljava/util/zip/ZipEntry;getName()Ljava/lang/String;"), - remap = false, - require = 1) + method = { + "Lcpw/mods/fml/common/discovery/JarDiscoverer;discover(Lcpw/mods/fml/common/discovery/ModCandidate;Lcpw/mods/fml/common/discovery/ASMDataTable;)Ljava/util/List;" }, + at = @At(ordinal = 1, value = "INVOKE", target = "Ljava/util/zip/ZipEntry;getName()Ljava/lang/String;"), + remap = false, + require = 1) public String getZipEntryName(ZipEntry ze) { String name = ze.getName(); if (name == null) { return null; } if (name.contains("module-info.class") || name.startsWith("META-INF/versions/") - || name.contains("org/openjdk/nashorn") - || name.contains("jakarta/servlet/")) { + || name.contains("org/openjdk/nashorn") + || name.contains("jakarta/servlet/")) { // Triggers the continue in the loop return "__MACOSX_ignoreme"; } diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ObjectHolderRef.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ObjectHolderRef.java index 0d32d47..e947167 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ObjectHolderRef.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ObjectHolderRef.java @@ -54,25 +54,29 @@ public class ObjectHolderRef { public void apply() { if (fieldSetter == null) { try { - fieldSetter = MethodHandles.lookup().unreflectSetter(this.field); + fieldSetter = MethodHandles.lookup() + .unreflectSetter(this.field); } catch (IllegalAccessException e) { throw new RuntimeException(e); } } Object thing; if (isBlock) { - thing = GameData.getBlockRegistry().getObject(injectedObject); + thing = GameData.getBlockRegistry() + .getObject(injectedObject); if (thing == Blocks.air) { thing = null; } } else if (isItem) { - thing = GameData.getItemRegistry().getObject(injectedObject); + thing = GameData.getItemRegistry() + .getObject(injectedObject); } else { thing = null; } if (thing == null) { - FMLLog.getLogger().log( + FMLLog.getLogger() + .log( Level.DEBUG, "Unable to lookup {} for {}. This means the object wasn't registered. It's likely just mod options.", injectedObject, diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ObjectHolderRegistry.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ObjectHolderRegistry.java index c8e4d6e..9d057a0 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ObjectHolderRegistry.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/fml/ObjectHolderRegistry.java @@ -13,10 +13,10 @@ import me.eigenraven.lwjgl3ify.WasFinalObjectHolder; public abstract class ObjectHolderRegistry { @Redirect( - method = { "cpw.mods.fml.common.registry.ObjectHolderRegistry.scanClassForFields" }, - at = @At(value = "INVOKE", target = "Ljava/lang/reflect/Field;getModifiers()I"), - remap = false, - require = 1) + method = { "cpw.mods.fml.common.registry.ObjectHolderRegistry.scanClassForFields" }, + at = @At(value = "INVOKE", target = "Ljava/lang/reflect/Field;getModifiers()I"), + remap = false, + require = 1) public int getFieldModifiersProxy(Field f) { int mods = f.getModifiers(); if (f.isAnnotationPresent(WasFinalObjectHolder.class)) { diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java index 375f641..447d567 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java @@ -37,7 +37,7 @@ public abstract class MixinStitcher { @Overwrite public void doStitch() { Stitcher.Holder[] aholder = (Stitcher.Holder[]) this.setStitchHolders - .toArray(new Stitcher.Holder[this.setStitchHolders.size()]); + .toArray(new Stitcher.Holder[this.setStitchHolders.size()]); Arrays.sort(aholder); Pair size = StbStitcher.packRects(aholder); diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinTextureAtlasSprite.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinTextureAtlasSprite.java index 2f2b7aa..54ed6e8 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinTextureAtlasSprite.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinTextureAtlasSprite.java @@ -15,7 +15,7 @@ public class MixinTextureAtlasSprite { @Inject(method = "loadSprite", at = @At("TAIL")) void cleanupAfterLoadSprite(BufferedImage[] frames, AnimationMetadataSection aniData, boolean anisotropicFiltering, - CallbackInfo info) { + CallbackInfo info) { for (BufferedImage img : frames) { // Close any NativeBackedImage instances if (img instanceof AutoCloseable) { diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinTextureMap.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinTextureMap.java index 7d74432..e2835ed 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinTextureMap.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinTextureMap.java @@ -16,11 +16,11 @@ import me.eigenraven.lwjgl3ify.textures.NativeBackedImage; public abstract class MixinTextureMap { @Redirect( - method = "loadTextureAtlas", - at = @At( - value = "INVOKE", - target = "Ljavax/imageio/ImageIO;read(Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;", - remap = false)) + method = "loadTextureAtlas", + at = @At( + value = "INVOKE", + target = "Ljavax/imageio/ImageIO;read(Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;", + remap = false)) private BufferedImage redirectImageRead(InputStream stream) { try { return NativeBackedImage.make(stream); diff --git a/src/main/java/me/eigenraven/lwjgl3ify/textures/NativeBackedImage.java b/src/main/java/me/eigenraven/lwjgl3ify/textures/NativeBackedImage.java index 6b00201..b4e62d8 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/textures/NativeBackedImage.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/textures/NativeBackedImage.java @@ -92,7 +92,7 @@ public class NativeBackedImage extends BufferedImage implements AutoCloseable { private void checkBounds(int x, int z) { if (x < 0 || x >= this.width || z < 0 || z >= this.height) { throw new IllegalStateException( - "Out of bounds: " + x + ", " + z + " (width: " + this.width + ", height: " + this.height + ")"); + "Out of bounds: " + x + ", " + z + " (width: " + this.width + ", height: " + this.height + ")"); } } diff --git a/src/main/java/me/eigenraven/lwjgl3ify/textures/StbStitcher.java b/src/main/java/me/eigenraven/lwjgl3ify/textures/StbStitcher.java index 743b0f6..c4095a0 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/textures/StbStitcher.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/textures/StbStitcher.java @@ -33,14 +33,17 @@ public class StbStitcher { for (int j = 0; j < holderSize; ++j) { Stitcher.Holder holder = holders[j]; if ((j % 100) == 0 && bar.getStep() < bar.getSteps()) { - bar.step(holder.getAtlasSprite().getIconName()); + bar.step( + holder.getAtlasSprite() + .getIconName()); } int width = holder.getWidth(); int height = holder.getHeight(); // The ID here is just the array index, for easy lookup later - rectBuf.get(j).set(j, width, height, 0, 0, false); + rectBuf.get(j) + .set(j, width, height, 0, 0, false); sqSize += width * height; maxW = Math.max(maxW, width); @@ -78,15 +81,16 @@ public class StbStitcher { // Ensure that everything is properly packed! if (!rect.was_packed()) { throw new StitcherException( - holder, - "Could not fit " + holder.getAtlasSprite() - .getIconName() + " into " + atlasWidth + "x" + atlasHeight + " atlas!"); + holder, + "Could not fit " + holder.getAtlasSprite() + .getIconName() + " into " + atlasWidth + "x" + atlasHeight + " atlas!"); } // Initialize the sprite now with the position and size that we've calculated so far // texture should not be rotated, so use false - holder.getAtlasSprite().initSprite(atlasWidth, atlasHeight, rect.x(), rect.y(), false); + holder.getAtlasSprite() + .initSprite(atlasWidth, atlasHeight, rect.x(), rect.y(), false); } // Safeguard in case our calculation was off @@ -101,7 +105,7 @@ public class StbStitcher { } } throw new IllegalStateException( - "Could not fit all sprites into an atlas of size " + atlasWidth + "x" + atlasHeight); + "Could not fit all sprites into an atlas of size " + atlasWidth + "x" + atlasHeight); } } } diff --git a/src/main/java/org/lwjglx/BufferChecks.java b/src/main/java/org/lwjglx/BufferChecks.java index e07c711..2366ef8 100644 --- a/src/main/java/org/lwjglx/BufferChecks.java +++ b/src/main/java/org/lwjglx/BufferChecks.java @@ -147,29 +147,29 @@ public class BufferChecks { */ private static void throwBufferSizeException(Buffer buf, int size) { throw new IllegalArgumentException( - "Number of remaining buffer elements is " + buf.remaining() - + ", must be at least " - + size - + ". Because at most " - + size - + " elements can be returned, a buffer with at least " - + size - + " elements is required, regardless of actual returned element count"); + "Number of remaining buffer elements is " + buf.remaining() + + ", must be at least " + + size + + ". Because at most " + + size + + " elements can be returned, a buffer with at least " + + size + + " elements is required, regardless of actual returned element count"); } private static void throwBufferSizeException(PointerBuffer buf, int size) { throw new IllegalArgumentException( - "Number of remaining pointer buffer elements is " + buf.remaining() + ", must be at least " + size); + "Number of remaining pointer buffer elements is " + buf.remaining() + ", must be at least " + size); } private static void throwArraySizeException(Object[] array, int size) { throw new IllegalArgumentException( - "Number of array elements is " + array.length + ", must be at least " + size); + "Number of array elements is " + array.length + ", must be at least " + size); } private static void throwArraySizeException(long[] array, int size) { throw new IllegalArgumentException( - "Number of array elements is " + array.length + ", must be at least " + size); + "Number of array elements is " + array.length + ", must be at least " + size); } /** diff --git a/src/main/java/org/lwjglx/BufferUtils.java b/src/main/java/org/lwjglx/BufferUtils.java index bff4506..e9f9796 100644 --- a/src/main/java/org/lwjglx/BufferUtils.java +++ b/src/main/java/org/lwjglx/BufferUtils.java @@ -40,7 +40,8 @@ public final class BufferUtils { * @return a ByteBuffer */ public static ByteBuffer createByteBuffer(int size) { - return ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder()); + return ByteBuffer.allocateDirect(size) + .order(ByteOrder.nativeOrder()); } /** diff --git a/src/main/java/org/lwjglx/LWJGLUtil.java b/src/main/java/org/lwjglx/LWJGLUtil.java index 8e3c485..f0c2069 100644 --- a/src/main/java/org/lwjglx/LWJGLUtil.java +++ b/src/main/java/org/lwjglx/LWJGLUtil.java @@ -52,198 +52,198 @@ public class LWJGLUtil { public static final String PLATFORM_WINDOWS_NAME = "windows"; private static final String LWJGL_ICON_DATA_16x16 = "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\376\377\377\377\302\327\350\377" - + "\164\244\313\377\120\213\275\377\124\216\277\377\206\257\322\377" - + "\347\357\366\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\365\365\365\377\215\217\221\377\166\202\215\377" - + "\175\215\233\377\204\231\252\377\224\267\325\377\072\175\265\377" - + "\110\206\272\377\332\347\361\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\364\370\373\377\234\236\240\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\344\344\344\377\204\255\320\377" - + "\072\175\265\377\133\222\301\377\374\375\376\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\221\266\325\377\137\137\137\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\042\042\042\377\377\377\377\377\350\360\366\377" - + "\071\174\265\377\072\175\265\377\304\330\351\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\306\331\351\377" - + "\201\253\316\377\035\035\035\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\146\146\146\377\377\377\377\377\320\340\355\377" - + "\072\175\265\377\072\175\265\377\215\264\324\377\377\377\377\377" - + "\362\362\362\377\245\245\245\377\337\337\337\377\242\301\334\377" - + "\260\305\326\377\012\012\012\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\250\250\250\377\377\377\377\377\227\272\330\377" - + "\072\175\265\377\072\175\265\377\161\241\312\377\377\377\377\377" - + "\241\241\241\377\000\000\000\377\001\001\001\377\043\043\043\377" - + "\314\314\314\377\320\320\320\377\245\245\245\377\204\204\204\377" - + "\134\134\134\377\357\357\357\377\377\377\377\377\140\226\303\377" - + "\072\175\265\377\072\175\265\377\155\236\310\377\377\377\377\377" - + "\136\136\136\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\317\317\317\377\037\037\037\377\003\003\003\377\053\053\053\377" - + "\154\154\154\377\306\306\306\377\372\374\375\377\236\277\332\377" - + "\167\245\314\377\114\211\274\377\174\250\316\377\377\377\377\377" - + "\033\033\033\377\000\000\000\377\000\000\000\377\027\027\027\377" - + "\326\326\326\377\001\001\001\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\122\122\122\377\345\345\345\377\075\075\075\377" - + "\150\150\150\377\246\246\247\377\332\336\341\377\377\377\377\377" - + "\164\164\164\377\016\016\016\377\000\000\000\377\131\131\131\377" - + "\225\225\225\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\221\221\221\377\233\233\233\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\002\002\002\377\103\103\103\377" - + "\377\377\377\377\356\356\356\377\214\214\214\377\277\277\277\377" - + "\126\126\126\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\323\323\323\377\130\130\130\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\063\063\063\377" - + "\377\377\377\377\377\377\377\377\374\375\376\377\377\377\377\377" - + "\300\300\300\377\100\100\100\377\002\002\002\377\000\000\000\377" - + "\033\033\033\377\373\373\373\377\027\027\027\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\170\170\170\377" - + "\377\377\377\377\377\377\377\377\322\341\356\377\176\251\316\377" - + "\340\352\363\377\377\377\377\377\324\324\324\377\155\155\155\377" - + "\204\204\204\377\323\323\323\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\275\275\275\377" - + "\377\377\377\377\377\377\377\377\376\376\376\377\146\232\305\377" - + "\075\177\266\377\202\254\320\377\344\355\365\377\377\377\377\377" - + "\377\377\377\377\345\345\345\377\055\055\055\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\014\014\014\377\366\366\366\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\342\354\364\377" - + "\115\211\274\377\072\175\265\377\076\200\266\377\207\260\322\377" - + "\347\357\366\377\377\377\377\377\376\376\376\377\274\274\274\377" - + "\117\117\117\377\003\003\003\377\112\112\112\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\353\362\370\377\214\263\324\377\126\220\300\377\120\214\275\377" - + "\167\245\314\377\355\363\370\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\337\337\337\377\346\346\346\377\377\377\377\377"; + + "\377\377\377\377\377\377\377\377\376\377\377\377\302\327\350\377" + + "\164\244\313\377\120\213\275\377\124\216\277\377\206\257\322\377" + + "\347\357\366\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\365\365\365\377\215\217\221\377\166\202\215\377" + + "\175\215\233\377\204\231\252\377\224\267\325\377\072\175\265\377" + + "\110\206\272\377\332\347\361\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\364\370\373\377\234\236\240\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\344\344\344\377\204\255\320\377" + + "\072\175\265\377\133\222\301\377\374\375\376\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\221\266\325\377\137\137\137\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\042\042\042\377\377\377\377\377\350\360\366\377" + + "\071\174\265\377\072\175\265\377\304\330\351\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\306\331\351\377" + + "\201\253\316\377\035\035\035\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\146\146\146\377\377\377\377\377\320\340\355\377" + + "\072\175\265\377\072\175\265\377\215\264\324\377\377\377\377\377" + + "\362\362\362\377\245\245\245\377\337\337\337\377\242\301\334\377" + + "\260\305\326\377\012\012\012\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\250\250\250\377\377\377\377\377\227\272\330\377" + + "\072\175\265\377\072\175\265\377\161\241\312\377\377\377\377\377" + + "\241\241\241\377\000\000\000\377\001\001\001\377\043\043\043\377" + + "\314\314\314\377\320\320\320\377\245\245\245\377\204\204\204\377" + + "\134\134\134\377\357\357\357\377\377\377\377\377\140\226\303\377" + + "\072\175\265\377\072\175\265\377\155\236\310\377\377\377\377\377" + + "\136\136\136\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\317\317\317\377\037\037\037\377\003\003\003\377\053\053\053\377" + + "\154\154\154\377\306\306\306\377\372\374\375\377\236\277\332\377" + + "\167\245\314\377\114\211\274\377\174\250\316\377\377\377\377\377" + + "\033\033\033\377\000\000\000\377\000\000\000\377\027\027\027\377" + + "\326\326\326\377\001\001\001\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\122\122\122\377\345\345\345\377\075\075\075\377" + + "\150\150\150\377\246\246\247\377\332\336\341\377\377\377\377\377" + + "\164\164\164\377\016\016\016\377\000\000\000\377\131\131\131\377" + + "\225\225\225\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\221\221\221\377\233\233\233\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\002\002\002\377\103\103\103\377" + + "\377\377\377\377\356\356\356\377\214\214\214\377\277\277\277\377" + + "\126\126\126\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\323\323\323\377\130\130\130\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\063\063\063\377" + + "\377\377\377\377\377\377\377\377\374\375\376\377\377\377\377\377" + + "\300\300\300\377\100\100\100\377\002\002\002\377\000\000\000\377" + + "\033\033\033\377\373\373\373\377\027\027\027\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\170\170\170\377" + + "\377\377\377\377\377\377\377\377\322\341\356\377\176\251\316\377" + + "\340\352\363\377\377\377\377\377\324\324\324\377\155\155\155\377" + + "\204\204\204\377\323\323\323\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\275\275\275\377" + + "\377\377\377\377\377\377\377\377\376\376\376\377\146\232\305\377" + + "\075\177\266\377\202\254\320\377\344\355\365\377\377\377\377\377" + + "\377\377\377\377\345\345\345\377\055\055\055\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\014\014\014\377\366\366\366\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\342\354\364\377" + + "\115\211\274\377\072\175\265\377\076\200\266\377\207\260\322\377" + + "\347\357\366\377\377\377\377\377\376\376\376\377\274\274\274\377" + + "\117\117\117\377\003\003\003\377\112\112\112\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\353\362\370\377\214\263\324\377\126\220\300\377\120\214\275\377" + + "\167\245\314\377\355\363\370\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\337\337\337\377\346\346\346\377\377\377\377\377"; private static final String LWJGL_ICON_DATA_32x32 = "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\374\375\377" - + "\313\335\354\377\223\267\326\377\157\240\311\377\134\223\302\377\140\226\303\377\172\247\315\377\254\310\340\377\355\363\370\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\374\375\376\377\265\316\343\377\132\222\301\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\105\205\271\377" - + "\241\301\334\377\374\375\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\374\374\374\377\342\352\361\377\270\317\343\377\256\311\340\377" - + "\243\302\334\377\230\272\330\377\214\263\323\377\201\254\317\377\156\237\310\377\075\177\266\377\072\175\265\377\072\175\265\377" - + "\072\175\265\377\162\242\312\377\365\370\373\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\330\330\330\377\061\061\061\377\044\044\044\377\061\061\061\377\100\100\100\377" - + "\122\122\122\377\145\145\145\377\164\164\164\377\217\217\217\377\367\370\370\377\254\310\337\377\073\175\265\377\072\175\265\377" - + "\072\175\265\377\072\175\265\377\171\247\315\377\374\375\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\376\376\376\377\150\150\150\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\266\266\266\377\376\376\376\377\206\256\321\377\072\175\265\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\256\312\341\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\323\342\356\377\341\352\362\377\050\050\050\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\002\002\002\377\336\336\336\377\377\377\377\377\365\370\373\377\133\222\301\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\110\206\272\377\364\370\373\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\354\363\370\377\144\231\305\377\327\331\333\377\005\005\005\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\044\044\044\377\376\376\376\377\377\377\377\377\377\377\377\377\300\325\347\377" - + "\071\174\265\377\072\175\265\377\072\175\265\377\072\175\265\377\253\310\340\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\376\377\377\377" - + "\170\246\314\377\173\247\315\377\236\236\236\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\145\145\145\377\377\377\377\377\377\377\377\377\377\377\377\377\342\354\364\377" - + "\067\173\264\377\072\175\265\377\072\175\265\377\072\175\265\377\146\232\305\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\303\327\350\377" - + "\071\175\265\377\262\314\341\377\130\130\130\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\251\251\251\377\377\377\377\377\377\377\377\377\377\377\377\377\274\322\345\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\100\201\267\377\356\364\371\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\374\375\377\132\222\301\377" - + "\075\177\266\377\335\345\355\377\034\034\034\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\007\007\007\377\347\347\347\377\377\377\377\377\377\377\377\377\377\377\377\377\205\256\321\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\071\175\265\377\314\336\354\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377\377\272\322\345\377\072\175\265\377" - + "\127\220\277\377\320\321\321\377\003\003\003\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\063\063\063\377\375\375\375\377\377\377\377\377\377\377\377\377\373\374\375\377\120\213\275\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\071\175\265\377\261\314\342\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\312\312\312\377\067\067\067\377\141\141\141\377\242\242\242\377\335\335\335\377\344\354\363\377\261\313\341\377" - + "\264\315\342\377\346\346\346\377\043\043\043\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\162\162\162\377\377\377\377\377\377\377\377\377\377\377\377\377\330\345\360\377\072\175\265\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\240\300\333\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\146\146\146\377\000\000\000\377\000\000\000\377\000\000\000\377\006\006\006\377\047\047\047\377\146\146\146\377" - + "\324\324\324\377\377\377\377\377\366\366\366\377\320\320\320\377\227\227\227\377\136\136\136\377\047\047\047\377\004\004\004\377" - + "\000\000\000\377\003\003\003\377\300\300\300\377\377\377\377\377\377\377\377\377\377\377\377\377\242\301\333\377\072\175\265\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\236\277\332\377\377\377\377\377\377\377\377\377" - + "\373\373\373\377\045\045\045\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\134\134\134\377\377\377\377\377\352\352\352\377\217\217\217\377\265\265\265\377\351\351\351\377\375\375\375\377\347\347\347\377" - + "\262\262\262\377\275\275\275\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377\377\153\235\307\377\072\175\265\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\241\301\334\377\377\377\377\377\377\377\377\377" - + "\333\333\333\377\003\003\003\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\203\203\203\377\377\377\377\377\137\137\137\377\000\000\000\377\000\000\000\377\013\013\013\377\067\067\067\377\166\166\166\377" - + "\267\267\267\377\360\360\360\377\377\377\377\377\377\377\377\377\377\377\377\377\360\365\371\377\113\210\273\377\075\177\266\377" - + "\071\174\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\262\314\342\377\377\377\377\377\377\377\377\377" - + "\232\232\232\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\305\305\305\377\367\367\367\377\035\035\035\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\007\007\007\377\074\074\074\377\337\337\337\377\377\377\377\377\373\374\375\377\374\375\376\377\363\367\372\377" - + "\314\335\353\377\236\276\332\377\162\241\311\377\114\211\273\377\072\175\265\377\311\334\353\377\377\377\377\377\377\377\377\377" - + "\126\126\126\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\017\017\017\377" - + "\371\371\371\377\321\321\321\377\003\003\003\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\216\216\216\377\377\377\377\377\371\371\371\377\204\204\204\377\160\160\160\377" - + "\260\260\260\377\352\352\352\377\377\377\377\377\371\373\374\377\334\350\362\377\366\371\374\377\377\377\377\377\377\377\377\377" - + "\025\025\025\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\116\116\116\377" - + "\377\377\377\377\221\221\221\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\273\273\273\377\377\377\377\377\236\236\236\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\004\004\004\377\057\057\057\377\160\160\160\377\260\260\260\377\346\346\346\377\376\376\376\377\377\377\377\377" - + "\071\071\071\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\220\220\220\377" - + "\377\377\377\377\115\115\115\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\020\020\020\377\360\360\360\377\377\377\377\377\132\132\132\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\011\011\011\377\062\062\062\377\261\261\261\377" - + "\366\366\366\377\241\241\241\377\065\065\065\377\002\002\002\377\000\000\000\377\000\000\000\377\002\002\002\377\321\321\321\377" - + "\365\365\365\377\023\023\023\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\105\105\105\377\376\376\376\377\370\370\370\377\035\035\035\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\053\053\053\377" - + "\377\377\377\377\377\377\377\377\374\374\374\377\276\276\276\377\120\120\120\377\005\005\005\377\045\045\045\377\371\371\371\377" - + "\302\302\302\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\206\206\206\377\377\377\377\377\322\322\322\377\001\001\001\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\103\103\103\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\376\376\376\377\334\334\334\377\340\340\340\377\377\377\377\377" - + "\225\225\225\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\001\001\001\377\310\310\310\377\377\377\377\377\216\216\216\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\210\210\210\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\337\337\337\377\051\051\051\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\030\030\030\377\365\365\365\377\377\377\377\377\112\112\112\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\317\317\317\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\361\366\372\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\371\371\371\377\265\265\265\377\113\113\113\377\006\006\006\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\122\122\122\377\377\377\377\377\370\370\370\377\020\020\020\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\034\034\034\377\370\370\370\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\206\257\321\377\220\265\325\377\352\361\367\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\333\333\333\377\170\170\170\377\033\033\033\377\000\000\000\377" - + "\000\000\000\377\226\226\226\377\377\377\377\377\306\306\306\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\132\132\132\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\303\330\351\377\072\175\265\377\103\203\270\377" - + "\224\270\326\377\355\363\370\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\364\364\364\377\247\247\247\377" - + "\205\205\205\377\364\364\364\377\377\377\377\377\206\206\206\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\235\235\235\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\373\375\377\135\224\302\377\072\175\265\377" - + "\072\175\265\377\106\205\271\377\230\273\330\377\357\364\371\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\233\233\233\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\005\005\005\377\335\335\335\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\305\331\351\377\073\176\266\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\110\206\272\377\236\276\332\377\362\366\372\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\373\373\373\377\216\216\216\377\045\045\045\377\001\001\001\377\000\000\000\377" - + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\054\054\054\377\374\374\374\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\217\265\325\377" - + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\112\207\273\377\243\302\334\377\363\367\372\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\372\372\377\260\260\260\377\105\105\105\377" - + "\004\004\004\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\156\156\156\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\374\375\376\377" - + "\205\257\321\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\115\211\274\377" - + "\250\305\336\377\366\371\374\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\376\376\376\377" - + "\322\322\322\377\150\150\150\377\016\016\016\377\000\000\000\377\001\001\001\377\270\270\270\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\376\376\377\377\261\313\342\377\114\211\274\377\071\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377" - + "\072\175\265\377\115\211\274\377\277\324\347\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\354\354\354\377\223\223\223\377\233\233\233\377\375\375\375\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\363\367\372\377\265\316\343\377\201\254\320\377\145\231\305\377\141\227\304\377\154\236\310\377" - + "\217\265\325\377\305\331\351\377\367\372\374\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"; + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\374\375\377" + + "\313\335\354\377\223\267\326\377\157\240\311\377\134\223\302\377\140\226\303\377\172\247\315\377\254\310\340\377\355\363\370\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\374\375\376\377\265\316\343\377\132\222\301\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\105\205\271\377" + + "\241\301\334\377\374\375\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\374\374\374\377\342\352\361\377\270\317\343\377\256\311\340\377" + + "\243\302\334\377\230\272\330\377\214\263\323\377\201\254\317\377\156\237\310\377\075\177\266\377\072\175\265\377\072\175\265\377" + + "\072\175\265\377\162\242\312\377\365\370\373\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\330\330\330\377\061\061\061\377\044\044\044\377\061\061\061\377\100\100\100\377" + + "\122\122\122\377\145\145\145\377\164\164\164\377\217\217\217\377\367\370\370\377\254\310\337\377\073\175\265\377\072\175\265\377" + + "\072\175\265\377\072\175\265\377\171\247\315\377\374\375\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\376\376\376\377\150\150\150\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\266\266\266\377\376\376\376\377\206\256\321\377\072\175\265\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\256\312\341\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\323\342\356\377\341\352\362\377\050\050\050\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\002\002\002\377\336\336\336\377\377\377\377\377\365\370\373\377\133\222\301\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\110\206\272\377\364\370\373\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\354\363\370\377\144\231\305\377\327\331\333\377\005\005\005\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\044\044\044\377\376\376\376\377\377\377\377\377\377\377\377\377\300\325\347\377" + + "\071\174\265\377\072\175\265\377\072\175\265\377\072\175\265\377\253\310\340\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\376\377\377\377" + + "\170\246\314\377\173\247\315\377\236\236\236\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\145\145\145\377\377\377\377\377\377\377\377\377\377\377\377\377\342\354\364\377" + + "\067\173\264\377\072\175\265\377\072\175\265\377\072\175\265\377\146\232\305\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\303\327\350\377" + + "\071\175\265\377\262\314\341\377\130\130\130\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\251\251\251\377\377\377\377\377\377\377\377\377\377\377\377\377\274\322\345\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\100\201\267\377\356\364\371\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\374\375\377\132\222\301\377" + + "\075\177\266\377\335\345\355\377\034\034\034\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\007\007\007\377\347\347\347\377\377\377\377\377\377\377\377\377\377\377\377\377\205\256\321\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\071\175\265\377\314\336\354\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377\377\272\322\345\377\072\175\265\377" + + "\127\220\277\377\320\321\321\377\003\003\003\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\063\063\063\377\375\375\375\377\377\377\377\377\377\377\377\377\373\374\375\377\120\213\275\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\071\175\265\377\261\314\342\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\312\312\312\377\067\067\067\377\141\141\141\377\242\242\242\377\335\335\335\377\344\354\363\377\261\313\341\377" + + "\264\315\342\377\346\346\346\377\043\043\043\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\162\162\162\377\377\377\377\377\377\377\377\377\377\377\377\377\330\345\360\377\072\175\265\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\240\300\333\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\146\146\146\377\000\000\000\377\000\000\000\377\000\000\000\377\006\006\006\377\047\047\047\377\146\146\146\377" + + "\324\324\324\377\377\377\377\377\366\366\366\377\320\320\320\377\227\227\227\377\136\136\136\377\047\047\047\377\004\004\004\377" + + "\000\000\000\377\003\003\003\377\300\300\300\377\377\377\377\377\377\377\377\377\377\377\377\377\242\301\333\377\072\175\265\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\236\277\332\377\377\377\377\377\377\377\377\377" + + "\373\373\373\377\045\045\045\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\134\134\134\377\377\377\377\377\352\352\352\377\217\217\217\377\265\265\265\377\351\351\351\377\375\375\375\377\347\347\347\377" + + "\262\262\262\377\275\275\275\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377\377\153\235\307\377\072\175\265\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\241\301\334\377\377\377\377\377\377\377\377\377" + + "\333\333\333\377\003\003\003\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\203\203\203\377\377\377\377\377\137\137\137\377\000\000\000\377\000\000\000\377\013\013\013\377\067\067\067\377\166\166\166\377" + + "\267\267\267\377\360\360\360\377\377\377\377\377\377\377\377\377\377\377\377\377\360\365\371\377\113\210\273\377\075\177\266\377" + + "\071\174\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\262\314\342\377\377\377\377\377\377\377\377\377" + + "\232\232\232\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\305\305\305\377\367\367\367\377\035\035\035\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\007\007\007\377\074\074\074\377\337\337\337\377\377\377\377\377\373\374\375\377\374\375\376\377\363\367\372\377" + + "\314\335\353\377\236\276\332\377\162\241\311\377\114\211\273\377\072\175\265\377\311\334\353\377\377\377\377\377\377\377\377\377" + + "\126\126\126\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\017\017\017\377" + + "\371\371\371\377\321\321\321\377\003\003\003\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\216\216\216\377\377\377\377\377\371\371\371\377\204\204\204\377\160\160\160\377" + + "\260\260\260\377\352\352\352\377\377\377\377\377\371\373\374\377\334\350\362\377\366\371\374\377\377\377\377\377\377\377\377\377" + + "\025\025\025\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\116\116\116\377" + + "\377\377\377\377\221\221\221\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\273\273\273\377\377\377\377\377\236\236\236\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\004\004\004\377\057\057\057\377\160\160\160\377\260\260\260\377\346\346\346\377\376\376\376\377\377\377\377\377" + + "\071\071\071\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\220\220\220\377" + + "\377\377\377\377\115\115\115\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\020\020\020\377\360\360\360\377\377\377\377\377\132\132\132\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\011\011\011\377\062\062\062\377\261\261\261\377" + + "\366\366\366\377\241\241\241\377\065\065\065\377\002\002\002\377\000\000\000\377\000\000\000\377\002\002\002\377\321\321\321\377" + + "\365\365\365\377\023\023\023\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\105\105\105\377\376\376\376\377\370\370\370\377\035\035\035\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\053\053\053\377" + + "\377\377\377\377\377\377\377\377\374\374\374\377\276\276\276\377\120\120\120\377\005\005\005\377\045\045\045\377\371\371\371\377" + + "\302\302\302\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\206\206\206\377\377\377\377\377\322\322\322\377\001\001\001\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\103\103\103\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\376\376\376\377\334\334\334\377\340\340\340\377\377\377\377\377" + + "\225\225\225\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\001\001\001\377\310\310\310\377\377\377\377\377\216\216\216\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\210\210\210\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\337\337\337\377\051\051\051\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\030\030\030\377\365\365\365\377\377\377\377\377\112\112\112\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\317\317\317\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\361\366\372\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\371\371\371\377\265\265\265\377\113\113\113\377\006\006\006\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\122\122\122\377\377\377\377\377\370\370\370\377\020\020\020\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\034\034\034\377\370\370\370\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\206\257\321\377\220\265\325\377\352\361\367\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\333\333\333\377\170\170\170\377\033\033\033\377\000\000\000\377" + + "\000\000\000\377\226\226\226\377\377\377\377\377\306\306\306\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\132\132\132\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\303\330\351\377\072\175\265\377\103\203\270\377" + + "\224\270\326\377\355\363\370\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\364\364\364\377\247\247\247\377" + + "\205\205\205\377\364\364\364\377\377\377\377\377\206\206\206\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\235\235\235\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\373\375\377\135\224\302\377\072\175\265\377" + + "\072\175\265\377\106\205\271\377\230\273\330\377\357\364\371\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\233\233\233\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\005\005\005\377\335\335\335\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\305\331\351\377\073\176\266\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\110\206\272\377\236\276\332\377\362\366\372\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\373\373\373\377\216\216\216\377\045\045\045\377\001\001\001\377\000\000\000\377" + + "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\054\054\054\377\374\374\374\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\217\265\325\377" + + "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\112\207\273\377\243\302\334\377\363\367\372\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\372\372\377\260\260\260\377\105\105\105\377" + + "\004\004\004\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\156\156\156\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\374\375\376\377" + + "\205\257\321\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\115\211\274\377" + + "\250\305\336\377\366\371\374\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\376\376\376\377" + + "\322\322\322\377\150\150\150\377\016\016\016\377\000\000\000\377\001\001\001\377\270\270\270\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\376\376\377\377\261\313\342\377\114\211\274\377\071\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377" + + "\072\175\265\377\115\211\274\377\277\324\347\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\354\354\354\377\223\223\223\377\233\233\233\377\375\375\375\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\363\367\372\377\265\316\343\377\201\254\320\377\145\231\305\377\141\227\304\377\154\236\310\377" + + "\217\265\325\377\305\331\351\377\367\372\374\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" + + "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"; /** LWJGL Logo - 16 by 16 pixels */ public static final ByteBuffer LWJGLIcon16x16 = loadIcon(LWJGL_ICON_DATA_16x16); @@ -336,9 +336,9 @@ public class LWJGLUtil { if (lwjgl_classloader_path != null) { log("getPathFromClassLoader: Path found: " + lwjgl_classloader_path); possible_paths.add( - lwjgl_classloader_path.substring(0, lwjgl_classloader_path.lastIndexOf(File.separator)) - + File.separator - + platform_lib_name); + lwjgl_classloader_path.substring(0, lwjgl_classloader_path.lastIndexOf(File.separator)) + + File.separator + + platform_lib_name); } // add Installer path @@ -433,7 +433,7 @@ public class LWJGLUtil { */ public static Integer getPrivilegedInteger(final String property_name, final int default_val) { return AccessController - .doPrivileged((PrivilegedAction) () -> Integer.getInteger(property_name, default_val)); + .doPrivileged((PrivilegedAction) () -> Integer.getInteger(property_name, default_val)); } /** @@ -483,7 +483,7 @@ public class LWJGLUtil { * @return the token map */ public static Map getClassTokens(final TokenFilter filter, final Map target, - final Class... tokenClasses) { + final Class... tokenClasses) { return getClassTokens(filter, target, Arrays.asList(tokenClasses)); } @@ -501,7 +501,7 @@ public class LWJGLUtil { * @return the token map */ public static Map getClassTokens(final TokenFilter filter, Map target, - final Iterable tokenClasses) { + final Iterable tokenClasses) { if (target == null) target = new HashMap<>(); final int TOKEN_MODIFIERS = Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL; @@ -536,7 +536,8 @@ public class LWJGLUtil { * @return the hex string representation */ public static String toHexString(final int value) { - return "0x" + Integer.toHexString(value).toUpperCase(); + return "0x" + Integer.toHexString(value) + .toUpperCase(); } /** Simple interface for Field filtering. */ diff --git a/src/main/java/org/lwjglx/PointerBuffer.java b/src/main/java/org/lwjglx/PointerBuffer.java index 1bca362..1cd17b8 100644 --- a/src/main/java/org/lwjglx/PointerBuffer.java +++ b/src/main/java/org/lwjglx/PointerBuffer.java @@ -42,7 +42,7 @@ public class PointerBuffer extends org.lwjgl.PointerBuffer { } protected PointerBuffer(long address, @Nullable ByteBuffer container, int mark, int position, int limit, - int capacity) { + int capacity) { super(address, container, mark, position, limit, capacity); } diff --git a/src/main/java/org/lwjglx/PointerWrapperAbstract.java b/src/main/java/org/lwjglx/PointerWrapperAbstract.java index 36717fa..4a549eb 100644 --- a/src/main/java/org/lwjglx/PointerWrapperAbstract.java +++ b/src/main/java/org/lwjglx/PointerWrapperAbstract.java @@ -68,6 +68,9 @@ public abstract class PointerWrapperAbstract implements PointerWrapper { } public String toString() { - return getClass().getSimpleName() + " pointer (0x" + Long.toHexString(pointer).toUpperCase() + ")"; + return getClass().getSimpleName() + " pointer (0x" + + Long.toHexString(pointer) + .toUpperCase() + + ")"; } } diff --git a/src/main/java/org/lwjglx/Sys.java b/src/main/java/org/lwjglx/Sys.java index cfc5d2b..53306ff 100644 --- a/src/main/java/org/lwjglx/Sys.java +++ b/src/main/java/org/lwjglx/Sys.java @@ -76,7 +76,9 @@ public class Sys { } public static boolean is64Bit() { - return Platform.getArchitecture().toString().endsWith("64"); + return Platform.getArchitecture() + .toString() + .endsWith("64"); } public String getClipboard() { diff --git a/src/main/java/org/lwjglx/input/Cursor.java b/src/main/java/org/lwjglx/input/Cursor.java index 6ef4c2b..f037252 100644 --- a/src/main/java/org/lwjglx/input/Cursor.java +++ b/src/main/java/org/lwjglx/input/Cursor.java @@ -61,7 +61,7 @@ public class Cursor { * @throws LWJGLException if the cursor could not be created for any reason */ public Cursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays) - throws LWJGLException { + throws LWJGLException { // TODO cursors = null; } @@ -104,7 +104,7 @@ public class Cursor { * Creates the actual cursor, using a platform specific class */ private static CursorElement[] createCursors(int width, int height, int xHotspot, int yHotspot, int numImages, - IntBuffer images, IntBuffer delays) throws LWJGLException { + IntBuffer images, IntBuffer delays) throws LWJGLException { // TODO return null; } diff --git a/src/main/java/org/lwjglx/input/Keyboard.java b/src/main/java/org/lwjglx/input/Keyboard.java index 263f811..378f021 100644 --- a/src/main/java/org/lwjglx/input/Keyboard.java +++ b/src/main/java/org/lwjglx/input/Keyboard.java @@ -191,13 +191,17 @@ public class Keyboard { try { for (Field field : fields) { if (Modifier.isStatic(field.getModifiers()) && Modifier.isPublic(field.getModifiers()) - && Modifier.isFinal(field.getModifiers()) - && field.getType().equals(int.class) - && field.getName().startsWith("KEY_") - && !field.getName().endsWith("WIN")) { + && Modifier.isFinal(field.getModifiers()) + && field.getType() + .equals(int.class) + && field.getName() + .startsWith("KEY_") + && !field.getName() + .endsWith("WIN")) { /* Don't use deprecated names */ int key = field.getInt(null); - String name = field.getName().substring(4); + String name = field.getName() + .substring(4); keyName[key] = name; keyCounter++; } @@ -219,12 +223,12 @@ public class Keyboard { } if (Config.DEBUG_PRINT_KEY_EVENTS) { Lwjgl3ify.LOG.info( - "[DEBUG-KEY-QUEUE] queued key event key:{} action:{} state:{} charname:{} naive-char:{}", - event.key, - event.state, - event.state, - java.awt.event.KeyEvent.getKeyText(KeyCodes.lwjglToAwt(KeyCodes.glfwToLwjgl(event.key))), - (event.key >= 32 && event.key < 127) ? ((char) event.key) : '?'); + "[DEBUG-KEY-QUEUE] queued key event key:{} action:{} state:{} charname:{} naive-char:{}", + event.key, + event.state, + event.state, + java.awt.event.KeyEvent.getKeyText(KeyCodes.lwjglToAwt(KeyCodes.glfwToLwjgl(event.key))), + (event.key >= 32 && event.key < 127) ? ((char) event.key) : '?'); } try { eventQueue.add(event); diff --git a/src/main/java/org/lwjglx/input/Mouse.java b/src/main/java/org/lwjglx/input/Mouse.java index 6df1f17..dd4e799 100644 --- a/src/main/java/org/lwjglx/input/Mouse.java +++ b/src/main/java/org/lwjglx/input/Mouse.java @@ -164,9 +164,9 @@ public class Mouse { return; } GLFW.glfwSetInputMode( - Display.getWindow(), - GLFW.GLFW_CURSOR, - grab ? GLFW.GLFW_CURSOR_DISABLED : GLFW.GLFW_CURSOR_NORMAL); + Display.getWindow(), + GLFW.GLFW_CURSOR, + grab ? GLFW.GLFW_CURSOR_DISABLED : GLFW.GLFW_CURSOR_NORMAL); grabbed = grab; if (!grab) { // The old cursor position is sent instead of the new one in the events following mouse ungrab. diff --git a/src/main/java/org/lwjglx/openal/AL.java b/src/main/java/org/lwjglx/openal/AL.java index d60fad1..40f26a1 100644 --- a/src/main/java/org/lwjglx/openal/AL.java +++ b/src/main/java/org/lwjglx/openal/AL.java @@ -24,12 +24,12 @@ public class AL { } public static void create(String deviceArguments, int contextFrequency, int contextRefresh, - boolean contextSynchronized) { + boolean contextSynchronized) { create(deviceArguments, contextFrequency, contextRefresh, contextSynchronized, true); } public static void create(String deviceArguments, int contextFrequency, int contextRefresh, - boolean contextSynchronized, boolean openDevice) { + boolean contextSynchronized, boolean openDevice) { IntBuffer attribs = BufferUtils.createIntBuffer(16); attribs.put(org.lwjgl.openal.ALC10.ALC_FREQUENCY); diff --git a/src/main/java/org/lwjglx/openal/EFXUtil.java b/src/main/java/org/lwjglx/openal/EFXUtil.java index ba1db06..b81629a 100644 --- a/src/main/java/org/lwjglx/openal/EFXUtil.java +++ b/src/main/java/org/lwjglx/openal/EFXUtil.java @@ -138,7 +138,8 @@ public final class EFXUtil { } catch (OpenALException debugBuildException) { // Hack because OpenALException hides the original error code (short of parsing the // error message String which would break if it gets changed). - if (debugBuildException.getMessage().contains("AL_OUT_OF_MEMORY")) { + if (debugBuildException.getMessage() + .contains("AL_OUT_OF_MEMORY")) { genError = AL_OUT_OF_MEMORY; } else { genError = AL_INVALID_OPERATION; diff --git a/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java b/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java index 7ab5d23..f69a150 100644 --- a/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java +++ b/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java @@ -65,7 +65,7 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener, public AWTGLCanvas(GraphicsDevice device, PixelFormat pixel_format, Drawable drawable) throws LWJGLException {} public AWTGLCanvas(GraphicsDevice device, PixelFormat pixel_format, Drawable drawable, ContextAttribs attribs) - throws LWJGLException {} + throws LWJGLException {} public void addNotify() {} diff --git a/src/main/java/org/lwjglx/opengl/ContextCapabilities.java b/src/main/java/org/lwjglx/opengl/ContextCapabilities.java index b1c2e83..5caa2b0 100644 --- a/src/main/java/org/lwjglx/opengl/ContextCapabilities.java +++ b/src/main/java/org/lwjglx/opengl/ContextCapabilities.java @@ -20,7 +20,8 @@ public class ContextCapabilities { boolean value = field.getBoolean(cap); try { - Field f = this.getClass().getField(name); + Field f = this.getClass() + .getField(name); f.setBoolean(this, value); } catch (Exception e) {} } diff --git a/src/main/java/org/lwjglx/opengl/Display.java b/src/main/java/org/lwjglx/opengl/Display.java index bd76621..b8ba830 100644 --- a/src/main/java/org/lwjglx/opengl/Display.java +++ b/src/main/java/org/lwjglx/opengl/Display.java @@ -161,14 +161,14 @@ public class Display { public void invoke(long window, int key, int scancode, int action, int mods) { if (Config.DEBUG_PRINT_KEY_EVENTS) { Lwjgl3ify.LOG.info( - "[DEBUG-KEY] key window:{} key:{} scancode:{} action:{} mods:{} charname:{} naive-char:{}", - window, - key, - scancode, - action, - mods, - KeyEvent.getKeyText(KeyCodes.lwjglToAwt(KeyCodes.glfwToLwjgl(key))), - (key >= 32 && key < 127) ? ((char) key) : '?'); + "[DEBUG-KEY] key window:{} key:{} scancode:{} action:{} mods:{} charname:{} naive-char:{}", + window, + key, + scancode, + action, + mods, + KeyEvent.getKeyText(KeyCodes.lwjglToAwt(KeyCodes.glfwToLwjgl(key))), + (key >= 32 && key < 127) ? ((char) key) : '?'); } cancelNextChar = false; if (key > GLFW_KEY_SPACE && key <= GLFW_KEY_GRAVE_ACCENT) { // Handle keys have a char. Exclude space to @@ -185,10 +185,10 @@ public class Display { } else if (action > 0) { // Delay press and repeat key event to actual char input. There is ALWAYS a // char after them ingredientKeyEvent = new Keyboard.KeyEvent( - KeyCodes.glfwToLwjgl(key), - '\0', - action > 1 ? Keyboard.KeyState.REPEAT : Keyboard.KeyState.PRESS, - Sys.getNanoTime()); + KeyCodes.glfwToLwjgl(key), + '\0', + action > 1 ? Keyboard.KeyState.REPEAT : Keyboard.KeyState.PRESS, + Sys.getNanoTime()); } else { // Release event if (ingredientKeyEvent != null && ingredientKeyEvent.key == KeyCodes.glfwToLwjgl(key)) { ingredientKeyEvent.queueOutOfOrderRelease = true; @@ -213,11 +213,8 @@ public class Display { @Override public void invoke(long window, int codepoint) { if (Config.DEBUG_PRINT_KEY_EVENTS) { - Lwjgl3ify.LOG.info( - "[DEBUG-KEY] char window:{} codepoint:{} char:{}", - window, - codepoint, - (char) codepoint); + Lwjgl3ify.LOG + .info("[DEBUG-KEY] char window:{} codepoint:{} char:{}", window, codepoint, (char) codepoint); } if (cancelNextChar) { // Char event being cancelled cancelNextChar = false; @@ -253,11 +250,11 @@ public class Display { public void invoke(long window, int button, int action, int mods) { if (Config.DEBUG_PRINT_MOUSE_EVENTS) { Lwjgl3ify.LOG.info( - "[DEBUG-MOUSE] button window:{} button:{} action:{} mods:{}", - window, - button, - action, - mods); + "[DEBUG-MOUSE] button window:{} button:{} action:{} mods:{}", + window, + button, + action, + mods); } Mouse.addButtonEvent(button, action == GLFW.GLFW_PRESS ? true : false); } @@ -534,7 +531,10 @@ public class Display { if (dimension * dimension * 4 != nativeBuffers[icon].limit()) { throw new IllegalStateException(); } - glfwImages.put(icon, GLFWImage.create().set(dimension, dimension, nativeBuffers[icon])); + glfwImages.put( + icon, + GLFWImage.create() + .set(dimension, dimension, nativeBuffers[icon])); } GLFW.glfwSetWindowIcon(getWindow(), glfwImages); glfwImages.free(); diff --git a/src/main/java/org/lwjglx/opengl/DisplayImplementation.java b/src/main/java/org/lwjglx/opengl/DisplayImplementation.java index 9e47652..ce5b823 100644 --- a/src/main/java/org/lwjglx/opengl/DisplayImplementation.java +++ b/src/main/java/org/lwjglx/opengl/DisplayImplementation.java @@ -122,7 +122,7 @@ interface DisplayImplementation extends InputImplementation { * Method to create a Pbuffer */ PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, ContextAttribs attribs, - IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException; + IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException; void setPbufferAttrib(PeerInfo handle, int attrib, int value); diff --git a/src/main/java/org/lwjglx/opengl/GL20x.java b/src/main/java/org/lwjglx/opengl/GL20x.java index f2f3081..4519818 100644 --- a/src/main/java/org/lwjglx/opengl/GL20x.java +++ b/src/main/java/org/lwjglx/opengl/GL20x.java @@ -13,19 +13,19 @@ import org.lwjgl.system.MemoryUtil; public class GL20x { public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, - ByteBuffer buffer) { + ByteBuffer buffer) { int type = unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE; GL20.glVertexAttribPointer(index, size, type, normalized, stride, buffer); } public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, - ShortBuffer buffer) { + ShortBuffer buffer) { int type = unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT; GL20.nglVertexAttribPointer(index, size, type, normalized, stride, MemoryUtil.memAddress(buffer)); } public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, - IntBuffer buffer) { + IntBuffer buffer) { int type = unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT; GL20.nglVertexAttribPointer(index, size, type, normalized, stride, MemoryUtil.memAddress(buffer)); } diff --git a/src/main/java/org/lwjglx/opengl/InputImplementation.java b/src/main/java/org/lwjglx/opengl/InputImplementation.java index a846eab..1683a40 100644 --- a/src/main/java/org/lwjglx/opengl/InputImplementation.java +++ b/src/main/java/org/lwjglx/opengl/InputImplementation.java @@ -106,7 +106,7 @@ public interface InputImplementation { /** Native cursor handles */ Object createCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, - IntBuffer delays) throws LWJGLException; + IntBuffer delays) throws LWJGLException; void destroyCursor(Object cursor_handle); diff --git a/src/main/java/org/lwjglx/opengl/Pbuffer.java b/src/main/java/org/lwjglx/opengl/Pbuffer.java index c26468e..c1caaa5 100644 --- a/src/main/java/org/lwjglx/opengl/Pbuffer.java +++ b/src/main/java/org/lwjglx/opengl/Pbuffer.java @@ -173,7 +173,7 @@ public final class Pbuffer extends DrawableGL { * Pbuffer will share with the Display context (if created). */ public Pbuffer(int width, int height, PixelFormat pixel_format, RenderTexture renderTexture, - Drawable shared_drawable) throws LWJGLException { + Drawable shared_drawable) throws LWJGLException { this(width, height, pixel_format, renderTexture, shared_drawable, null); } @@ -200,7 +200,7 @@ public final class Pbuffer extends DrawableGL { * @param attribs The ContextAttribs to use when creating the context. (optional, may be null) */ public Pbuffer(int width, int height, PixelFormat pixel_format, RenderTexture renderTexture, - Drawable shared_drawable, ContextAttribs attribs) throws LWJGLException { + Drawable shared_drawable, ContextAttribs attribs) throws LWJGLException { if (pixel_format == null) throw new NullPointerException("Pixel format must be non-null"); this.width = width; this.height = height; @@ -212,15 +212,16 @@ public final class Pbuffer extends DrawableGL { } private static PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, ContextAttribs attribs, - RenderTexture renderTexture) throws LWJGLException { + RenderTexture renderTexture) throws LWJGLException { if (renderTexture == null) { // Though null is a perfectly valid argument, Matrox Parhelia drivers expect // a 0 terminated list, or else they crash. Supplying NULL or 0, should // cause the drivers to use default settings IntBuffer defaultAttribs = BufferUtils.createIntBuffer(1); return Display.getImplementation() - .createPbuffer(width, height, pixel_format, attribs, null, defaultAttribs); - } else return Display.getImplementation().createPbuffer( + .createPbuffer(width, height, pixel_format, attribs, null, defaultAttribs); + } else return Display.getImplementation() + .createPbuffer( width, height, pixel_format, @@ -238,7 +239,8 @@ public final class Pbuffer extends DrawableGL { */ public synchronized boolean isBufferLost() { checkDestroyed(); - return Display.getImplementation().isBufferLost(peer_info); + return Display.getImplementation() + .isBufferLost(peer_info); } /** @@ -247,7 +249,8 @@ public final class Pbuffer extends DrawableGL { * @return a bitmask of Pbuffer capabilities. */ public static int getCapabilities() { - return Display.getImplementation().getPbufferCapabilities(); + return Display.getImplementation() + .getPbufferCapabilities(); } // ----------------------------------------------------------------------------------------- @@ -268,7 +271,8 @@ public final class Pbuffer extends DrawableGL { */ public synchronized void setAttrib(int attrib, int value) { checkDestroyed(); - Display.getImplementation().setPbufferAttrib(peer_info, attrib, value); + Display.getImplementation() + .setPbufferAttrib(peer_info, attrib, value); } /** @@ -280,7 +284,8 @@ public final class Pbuffer extends DrawableGL { */ public synchronized void bindTexImage(int buffer) { checkDestroyed(); - Display.getImplementation().bindTexImageToPbuffer(peer_info, buffer); + Display.getImplementation() + .bindTexImageToPbuffer(peer_info, buffer); } /** @@ -290,7 +295,8 @@ public final class Pbuffer extends DrawableGL { */ public synchronized void releaseTexImage(int buffer) { checkDestroyed(); - Display.getImplementation().releaseTexImageFromPbuffer(peer_info, buffer); + Display.getImplementation() + .releaseTexImageFromPbuffer(peer_info, buffer); } /** diff --git a/src/main/java/org/lwjglx/opengl/PixelFormat.java b/src/main/java/org/lwjglx/opengl/PixelFormat.java index e638ffb..2345505 100644 --- a/src/main/java/org/lwjglx/opengl/PixelFormat.java +++ b/src/main/java/org/lwjglx/opengl/PixelFormat.java @@ -91,12 +91,12 @@ public final class PixelFormat implements PixelFormatLWJGL { } public PixelFormat(int bpp, int alpha, int depth, int stencil, int samples, int num_aux_buffers, int accum_bpp, - int accum_alpha, boolean stereo) { + int accum_alpha, boolean stereo) { this(bpp, alpha, depth, stencil, samples, num_aux_buffers, accum_bpp, accum_alpha, stereo, false); } public PixelFormat(int bpp, int alpha, int depth, int stencil, int samples, int num_aux_buffers, int accum_bpp, - int accum_alpha, boolean stereo, boolean floating_point) { + int accum_alpha, boolean stereo, boolean floating_point) { this.bpp = bpp; this.alpha = alpha; this.depth = depth; @@ -257,10 +257,10 @@ public final class PixelFormat implements PixelFormatLWJGL { */ public PixelFormat withCoverageSamples(final int colorSamples, final int coverageSamples) { if (coverageSamples < 0 || colorSamples < 0 - || (coverageSamples == 0 && 0 < colorSamples) - || coverageSamples < colorSamples) + || (coverageSamples == 0 && 0 < colorSamples) + || coverageSamples < colorSamples) throw new IllegalArgumentException( - "Invalid number of coverage samples specified: " + coverageSamples + " - " + colorSamples); + "Invalid number of coverage samples specified: " + coverageSamples + " - " + colorSamples); final PixelFormat pf = new PixelFormat(this); pf.samples = coverageSamples; @@ -303,7 +303,7 @@ public final class PixelFormat implements PixelFormatLWJGL { */ public PixelFormat withAccumulationBitsPerPixel(final int accum_bpp) { if (accum_bpp < 0) throw new IllegalArgumentException( - "Invalid number of bits per pixel in the accumulation buffer specified: " + accum_bpp); + "Invalid number of bits per pixel in the accumulation buffer specified: " + accum_bpp); final PixelFormat pf = new PixelFormat(this); pf.accum_bpp = accum_bpp; @@ -324,7 +324,7 @@ public final class PixelFormat implements PixelFormatLWJGL { */ public PixelFormat withAccumulationAlpha(final int accum_alpha) { if (accum_alpha < 0) throw new IllegalArgumentException( - "Invalid number of alpha bits in the accumulation buffer specified: " + accum_alpha); + "Invalid number of alpha bits in the accumulation buffer specified: " + accum_alpha); final PixelFormat pf = new PixelFormat(this); pf.accum_alpha = accum_alpha; diff --git a/src/main/java/org/lwjglx/opengl/RenderTexture.java b/src/main/java/org/lwjglx/opengl/RenderTexture.java index 363e311..73e8109 100644 --- a/src/main/java/org/lwjglx/opengl/RenderTexture.java +++ b/src/main/java/org/lwjglx/opengl/RenderTexture.java @@ -172,13 +172,13 @@ public final class RenderTexture { * @param mipmaps - How many mipmap levels to allocate on the P-buffer. */ public RenderTexture(boolean useRGB, boolean useRGBA, boolean useDepth, boolean isRectangle, int target, - int mipmaps) { + int mipmaps) { if (useRGB && useRGBA) throw new IllegalArgumentException("A RenderTexture can't be both RGB and RGBA."); if (mipmaps < 0) throw new IllegalArgumentException("The mipmap levels can't be negative."); if (isRectangle && target != RENDER_TEXTURE_RECTANGLE) throw new IllegalArgumentException( - "When the RenderTexture is rectangle the target must be RENDER_TEXTURE_RECTANGLE."); + "When the RenderTexture is rectangle the target must be RENDER_TEXTURE_RECTANGLE."); pixelFormatCaps = BufferUtils.createIntBuffer(4); pBufferAttribs = BufferUtils.createIntBuffer(8); diff --git a/src/main/java/org/lwjglx/util/Color.java b/src/main/java/org/lwjglx/util/Color.java index 91641d4..2d9a20a 100644 --- a/src/main/java/org/lwjglx/util/Color.java +++ b/src/main/java/org/lwjglx/util/Color.java @@ -203,10 +203,10 @@ public final class Color implements ReadableColor, Serializable, WritableColor { */ public boolean equals(Object o) { return (o != null) && (o instanceof ReadableColor) - && (((ReadableColor) o).getRed() == this.getRed()) - && (((ReadableColor) o).getGreen() == this.getGreen()) - && (((ReadableColor) o).getBlue() == this.getBlue()) - && (((ReadableColor) o).getAlpha() == this.getAlpha()); + && (((ReadableColor) o).getRed() == this.getRed()) + && (((ReadableColor) o).getGreen() == this.getGreen()) + && (((ReadableColor) o).getBlue() == this.getBlue()) + && (((ReadableColor) o).getAlpha() == this.getAlpha()); } /** diff --git a/src/main/java/org/lwjglx/util/Display.java b/src/main/java/org/lwjglx/util/Display.java index 41e5876..1b62013 100644 --- a/src/main/java/org/lwjglx/util/Display.java +++ b/src/main/java/org/lwjglx/util/Display.java @@ -48,7 +48,7 @@ public final class Display { * @return an array of matching display modes */ public static DisplayMode[] getAvailableDisplayModes(int minWidth, int minHeight, int maxWidth, int maxHeight, - int minBPP, int maxBPP, int minFreq, int maxFreq) throws LWJGLException { + int minBPP, int maxBPP, int minFreq, int maxFreq) throws LWJGLException { // First get the available display modes DisplayMode[] modes = org.lwjglx.opengl.Display.getAvailableDisplayModes(); @@ -147,10 +147,10 @@ public final class Display { int idx = param[i].indexOf('='); if (idx > 0) { accessors[i] = new FieldAccessor( - param[i].substring(0, idx), - 0, - Integer.parseInt(param[i].substring(idx + 1, param[i].length())), - true); + param[i].substring(0, idx), + 0, + Integer.parseInt(param[i].substring(idx + 1, param[i].length())), + true); } else if (param[i].charAt(0) == '-') { accessors[i] = new FieldAccessor(param[i].substring(1), -1, 0, false); } else { diff --git a/src/main/java/org/lwjglx/util/WaveData.java b/src/main/java/org/lwjglx/util/WaveData.java index baab30e..ca068dd 100644 --- a/src/main/java/org/lwjglx/util/WaveData.java +++ b/src/main/java/org/lwjglx/util/WaveData.java @@ -97,7 +97,10 @@ public class WaveData { * @return WaveData containing data, or null if a failure occured */ public static WaveData create(String path) { - return create(Thread.currentThread().getContextClassLoader().getResource(path)); + return create( + Thread.currentThread() + .getContextClassLoader() + .getResource(path)); } /** @@ -191,9 +194,11 @@ public class WaveData { try { int available = ais.available(); if (available <= 0) { - available = ais.getFormat().getChannels() * (int) ais.getFrameLength() - * ais.getFormat().getSampleSizeInBits() - / 8; + available = ais.getFormat() + .getChannels() * (int) ais.getFrameLength() + * ais.getFormat() + .getSampleSizeInBits() + / 8; } byte[] buf = new byte[ais.available()]; int read = 0, total = 0; @@ -201,9 +206,9 @@ public class WaveData { total += read; } buffer = convertAudioBytes( - buf, - audioformat.getSampleSizeInBits() == 16, - audioformat.isBigEndian() ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN); + buf, + audioformat.getSampleSizeInBits() == 16, + audioformat.isBigEndian() ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN); } catch (IOException ioe) { return null; } diff --git a/src/main/java/org/lwjglx/util/XPMFile.java b/src/main/java/org/lwjglx/util/XPMFile.java index 7a2af27..539f744 100644 --- a/src/main/java/org/lwjglx/util/XPMFile.java +++ b/src/main/java/org/lwjglx/util/XPMFile.java @@ -156,9 +156,9 @@ public class XPMFile { StringTokenizer st = new StringTokenizer(format); return new int[] { Integer.parseInt(st.nextToken()), /* width */ - Integer.parseInt(st.nextToken()), /* height */ - Integer.parseInt(st.nextToken()), /* colors */ - Integer.parseInt(st.nextToken()) /* chars per pixel */ + Integer.parseInt(st.nextToken()), /* height */ + Integer.parseInt(st.nextToken()), /* colors */ + Integer.parseInt(st.nextToken()) /* chars per pixel */ }; } @@ -201,8 +201,8 @@ public class XPMFile { // each iteration equals one pixel for (int i = 0; i < format[WIDTH]; i++) { String key = line.substring( - i * format[CHARACTERS_PER_PIXEL], - (i * format[CHARACTERS_PER_PIXEL] + format[CHARACTERS_PER_PIXEL])); + i * format[CHARACTERS_PER_PIXEL], + (i * format[CHARACTERS_PER_PIXEL] + format[CHARACTERS_PER_PIXEL])); int color = colors.get(key); bytes[offset + (i * 4)] = (byte) ((color & 0x00ff0000) >> 16); bytes[offset + ((i * 4) + 1)] = (byte) ((color & 0x0000ff00) >> 8); diff --git a/src/main/java/org/lwjglx/util/glu/GLU.java b/src/main/java/org/lwjglx/util/glu/GLU.java index 17a778b..1e6fa09 100644 --- a/src/main/java/org/lwjglx/util/glu/GLU.java +++ b/src/main/java/org/lwjglx/util/glu/GLU.java @@ -231,7 +231,7 @@ public class GLU { * @param upz */ public static void gluLookAt(float eyex, float eyey, float eyez, float centerx, float centery, float centerz, - float upx, float upy, float upz) { + float upx, float upy, float upz) { Project.gluLookAt(eyex, eyey, eyez, centerx, centery, centerz, upx, upy, upz); } @@ -274,7 +274,7 @@ public class GLU { * @param win_pos */ public static boolean gluProject(float objx, float objy, float objz, FloatBuffer modelMatrix, - FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer win_pos) { + FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer win_pos) { return Project.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, win_pos); } @@ -290,7 +290,7 @@ public class GLU { * @param obj_pos */ public static boolean gluUnProject(float winx, float winy, float winz, FloatBuffer modelMatrix, - FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer obj_pos) { + FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer obj_pos) { return Project.gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, obj_pos); } @@ -342,7 +342,7 @@ public class GLU { * @return int */ public static int gluBuild2DMipmaps(int target, int components, int width, int height, int format, int type, - ByteBuffer data) { + ByteBuffer data) { return MipMap.gluBuild2DMipmaps(target, components, width, height, format, type, data); } @@ -362,7 +362,7 @@ public class GLU { * @return int */ public static int gluScaleImage(int format, int widthIn, int heightIn, int typeIn, ByteBuffer dataIn, int widthOut, - int heightOut, int typeOut, ByteBuffer dataOut) { + int heightOut, int typeOut, ByteBuffer dataOut) { return MipMap.gluScaleImage(format, widthIn, heightIn, typeIn, dataIn, widthOut, heightOut, typeOut, dataOut); } diff --git a/src/main/java/org/lwjglx/util/glu/MipMap.java b/src/main/java/org/lwjglx/util/glu/MipMap.java index c42c1fb..31690af 100644 --- a/src/main/java/org/lwjglx/util/glu/MipMap.java +++ b/src/main/java/org/lwjglx/util/glu/MipMap.java @@ -46,7 +46,7 @@ public class MipMap extends Util { * @return int */ public static int gluBuild2DMipmaps(final int target, final int components, final int width, final int height, - final int format, final int type, final ByteBuffer data) { + final int format, final int type, final ByteBuffer data) { if (width < 1 || height < 1) return GLU_INVALID_VALUE; final int bpp = bytesPerPixel(format, type); @@ -127,7 +127,7 @@ public class MipMap extends Util { * @return int */ public static int gluScaleImage(int format, int widthIn, int heightIn, int typein, ByteBuffer dataIn, int widthOut, - int heightOut, int typeOut, ByteBuffer dataOut) { + int heightOut, int typeOut, ByteBuffer dataOut) { final int components = compPerPix(format); final int alphaIdx = formatAlphaIndex(format); @@ -144,31 +144,31 @@ public class MipMap extends Util { switch (typein) { case GL_UNSIGNED_BYTE -> { if (!stbir_resize_uint8_srgb( - dataIn, - widthIn, - heightIn, - strideIn, - dataOut, - widthOut, - heightOut, - strideOut, - components, - alphaIdx, - 0)) { + dataIn, + widthIn, + heightIn, + strideIn, + dataOut, + widthOut, + heightOut, + strideOut, + components, + alphaIdx, + 0)) { throw new RuntimeException("Couldn't resize image with stbir"); } } case GL_FLOAT -> { if (!stbir_resize_float( - dataIn.asFloatBuffer(), - widthIn, - heightIn, - strideIn * 4, - dataOut.asFloatBuffer(), - widthOut, - heightOut, - strideOut * 4, - components)) { + dataIn.asFloatBuffer(), + widthIn, + heightIn, + strideIn * 4, + dataOut.asFloatBuffer(), + widthOut, + heightOut, + strideOut * 4, + components)) { throw new RuntimeException("Couldn't resize image with stbir"); } } diff --git a/src/main/java/org/lwjglx/util/glu/Project.java b/src/main/java/org/lwjglx/util/glu/Project.java index 62f722d..9fbebb4 100644 --- a/src/main/java/org/lwjglx/util/glu/Project.java +++ b/src/main/java/org/lwjglx/util/glu/Project.java @@ -33,7 +33,7 @@ import org.lwjglx.BufferUtils; public class Project extends Util { private static final float[] IDENTITY_MATRIX = new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }; + 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }; private static final FloatBuffer matrix = BufferUtils.createFloatBuffer(16); private static final FloatBuffer finalMatrix = BufferUtils.createFloatBuffer(16); @@ -65,8 +65,8 @@ public class Project extends Util { private static void __gluMultMatrixVecf(FloatBuffer m, float[] in, float[] out) { for (int i = 0; i < 4; i++) { out[i] = in[0] * m.get(m.position() + 0 * 4 + i) + in[1] * m.get(m.position() + 1 * 4 + i) - + in[2] * m.get(m.position() + 2 * 4 + i) - + in[3] * m.get(m.position() + 3 * 4 + i); + + in[2] * m.get(m.position() + 2 * 4 + i) + + in[3] * m.get(m.position() + 3 * 4 + i); } } @@ -155,11 +155,11 @@ public class Project extends Util { for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { r.put( - r.position() + i * 4 + j, - a.get(a.position() + i * 4 + 0) * b.get(b.position() + 0 * 4 + j) - + a.get(a.position() + i * 4 + 1) * b.get(b.position() + 1 * 4 + j) - + a.get(a.position() + i * 4 + 2) * b.get(b.position() + 2 * 4 + j) - + a.get(a.position() + i * 4 + 3) * b.get(b.position() + 3 * 4 + j)); + r.position() + i * 4 + j, + a.get(a.position() + i * 4 + 0) * b.get(b.position() + 0 * 4 + j) + + a.get(a.position() + i * 4 + 1) * b.get(b.position() + 1 * 4 + j) + + a.get(a.position() + i * 4 + 2) * b.get(b.position() + 2 * 4 + j) + + a.get(a.position() + i * 4 + 3) * b.get(b.position() + 3 * 4 + j)); } } } @@ -211,7 +211,7 @@ public class Project extends Util { * @param upz */ public static void gluLookAt(float eyex, float eyey, float eyez, float centerx, float centery, float centerz, - float upx, float upy, float upz) { + float upx, float upy, float upz) { float[] forward = Project.forward; float[] side = Project.side; float[] up = Project.up; @@ -262,7 +262,7 @@ public class Project extends Util { * @param win_pos */ public static boolean gluProject(float objx, float objy, float objz, FloatBuffer modelMatrix, - FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer win_pos) { + FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer win_pos) { float[] in = Project.in; float[] out = Project.out; @@ -304,7 +304,7 @@ public class Project extends Util { * @param obj_pos */ public static boolean gluUnProject(float winx, float winy, float winz, FloatBuffer modelMatrix, - FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer obj_pos) { + FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer obj_pos) { float[] in = Project.in; float[] out = Project.out; @@ -355,9 +355,9 @@ public class Project extends Util { /* Translate and scale the picked region to the entire window */ glTranslatef( - (viewport.get(viewport.position() + 2) - 2 * (x - viewport.get(viewport.position() + 0))) / deltaX, - (viewport.get(viewport.position() + 3) - 2 * (y - viewport.get(viewport.position() + 1))) / deltaY, - 0); + (viewport.get(viewport.position() + 2) - 2 * (x - viewport.get(viewport.position() + 0))) / deltaX, + (viewport.get(viewport.position() + 3) - 2 * (y - viewport.get(viewport.position() + 1))) / deltaY, + 0); glScalef(viewport.get(viewport.position() + 2) / deltaX, viewport.get(viewport.position() + 3) / deltaY, 1.0f); } } diff --git a/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java b/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java index 902bee7..b466976 100644 --- a/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java +++ b/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java @@ -239,9 +239,9 @@ public class GLUtessellatorImpl implements GLUtessellator { } case GLU_TESS_WINDING_RULE -> { assert (windingRule == GLU_TESS_WINDING_ODD || windingRule == GLU_TESS_WINDING_NONZERO - || windingRule == GLU_TESS_WINDING_POSITIVE - || windingRule == GLU_TESS_WINDING_NEGATIVE - || windingRule == GLU_TESS_WINDING_ABS_GEQ_TWO); + || windingRule == GLU_TESS_WINDING_POSITIVE + || windingRule == GLU_TESS_WINDING_NEGATIVE + || windingRule == GLU_TESS_WINDING_ABS_GEQ_TWO); value[value_offset] = windingRule; } case GLU_TESS_BOUNDARY_ONLY -> { @@ -530,12 +530,12 @@ public class GLUtessellatorImpl implements GLUtessellator { Mesh.__gl_meshCheckMesh(mesh); if (callBegin != NULL_CB || callEnd != NULL_CB - || callVertex != NULL_CB - || callEdgeFlag != NULL_CB - || callBeginData != NULL_CB - || callEndData != NULL_CB - || callVertexData != NULL_CB - || callEdgeFlagData != NULL_CB) { + || callVertex != NULL_CB + || callEdgeFlag != NULL_CB + || callBeginData != NULL_CB + || callEndData != NULL_CB + || callVertexData != NULL_CB + || callEdgeFlagData != NULL_CB) { if (boundaryOnly) { Render.__gl_renderBoundary(this, mesh); /* output boundary contours */ } else { diff --git a/src/main/java/org/lwjglx/util/glu/tessellation/Mesh.java b/src/main/java/org/lwjglx/util/glu/tessellation/Mesh.java index 8b2643a..62d42be 100644 --- a/src/main/java/org/lwjglx/util/glu/tessellation/Mesh.java +++ b/src/main/java/org/lwjglx/util/glu/tessellation/Mesh.java @@ -696,10 +696,10 @@ class Mesh { assert (e.Onext.Sym.Lnext == e); } assert (e.Sym.next == ePrev.Sym && e.Sym == mesh.eHeadSym - && e.Sym.Sym == e - && e.Org == null - && e.Sym.Org == null - && e.Lface == null - && e.Sym.Lface == null); + && e.Sym.Sym == e + && e.Org == null + && e.Sym.Org == null + && e.Lface == null + && e.Sym.Lface == null); } } diff --git a/src/main/java/org/lwjglx/util/glu/tessellation/Render.java b/src/main/java/org/lwjglx/util/glu/tessellation/Render.java index 367b342..9116735 100644 --- a/src/main/java/org/lwjglx/util/glu/tessellation/Render.java +++ b/src/main/java/org/lwjglx/util/glu/tessellation/Render.java @@ -386,13 +386,13 @@ class Render { private static final int SIGN_INCONSISTENT = 2; static int ComputeNormal(GLUtessellatorImpl tess, double[] norm, - boolean check) /* - * If check==false, we compute the polygon normal and place it in norm[]. If check==true, we - * check that each triangle in the fan from v0 has a consistent orientation with respect to - * norm[]. If triangles are consistently oriented CCW, return 1; if CW, return -1; if all - * triangles are degenerate return 0; otherwise (no consistent orientation) return - * SIGN_INCONSISTENT. - */ { + boolean check) /* + * If check==false, we compute the polygon normal and place it in norm[]. If check==true, we + * check that each triangle in the fan from v0 has a consistent orientation with respect to + * norm[]. If triangles are consistently oriented CCW, return 1; if CW, return -1; if all + * triangles are degenerate return 0; otherwise (no consistent orientation) return + * SIGN_INCONSISTENT. + */ { CachedVertex[] v = tess.cache; // CachedVertex vn = v0 + tess.cacheCount; int vn = tess.cacheCount; @@ -516,7 +516,7 @@ class Render { } tess.callBeginOrBeginData( - tess.boundaryOnly ? GL_LINE_LOOP : (tess.cacheCount > 3) ? GL_TRIANGLE_FAN : GL_TRIANGLES); + tess.boundaryOnly ? GL_LINE_LOOP : (tess.cacheCount > 3) ? GL_TRIANGLE_FAN : GL_TRIANGLES); tess.callVertexOrVertexData(v[0].data); if (sign > 0) { diff --git a/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java b/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java index 210b395..26b6224 100644 --- a/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java +++ b/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java @@ -89,14 +89,14 @@ class Sweep { } static boolean EdgeLeq(GLUtessellatorImpl tess, ActiveRegion reg1, - ActiveRegion reg2) /* - * Both edges must be directed from right to left (this is the canonical direction for - * the upper edge of each region). The strategy is to evaluate a "t" value for each edge - * at the current sweep line position, given by tess.event. The calculations are designed - * to be very stable, but of course they are not perfect. Special case: if both edge - * destinations are at the sweep event, we sort the edges by slope (they would otherwise - * compare equally). - */ { + ActiveRegion reg2) /* + * Both edges must be directed from right to left (this is the canonical direction for + * the upper edge of each region). The strategy is to evaluate a "t" value for each edge + * at the current sweep line position, given by tess.event. The calculations are designed + * to be very stable, but of course they are not perfect. Special case: if both edge + * destinations are at the sweep event, we sort the edges by slope (they would otherwise + * compare equally). + */ { GLUvertex event = tess.event; GLUhalfEdge e1, e2; double t1, t2; @@ -139,9 +139,9 @@ class Sweep { } static boolean FixUpperEdge(ActiveRegion reg, - GLUhalfEdge newEdge) /* - * Replace an upper edge which needs fixing (see ConnectRightVertex). - */ { + GLUhalfEdge newEdge) /* + * Replace an upper edge which needs fixing (see ConnectRightVertex). + */ { assert (reg.fixUpperEdge); if (!Mesh.__gl_meshDelete(reg.eUp)) return false; reg.fixUpperEdge = false; @@ -183,11 +183,11 @@ class Sweep { } static ActiveRegion AddRegionBelow(GLUtessellatorImpl tess, ActiveRegion regAbove, - GLUhalfEdge eNewUp) /* - * Add a new active region to the sweep line, *somewhere* below "regAbove" (according to - * where the new edge belongs in the sweep-line dictionary). The upper edge of the new - * region will be "eNewUp". Winding number and "inside" flag are not updated. - */ { + GLUhalfEdge eNewUp) /* + * Add a new active region to the sweep line, *somewhere* below "regAbove" (according to + * where the new edge belongs in the sweep-line dictionary). The upper edge of the new + * region will be "eNewUp". Winding number and "inside" flag are not updated. + */ { ActiveRegion regNew = new ActiveRegion(); // if (regNew == null) throw new RuntimeException(); @@ -233,12 +233,12 @@ class Sweep { } static void FinishRegion(GLUtessellatorImpl tess, - ActiveRegion reg) /* - * Delete a region from the sweep line. This happens when the upper and lower chains of a - * region meet (at a vertex on the sweep line). The "inside" flag is copied to the - * appropriate mesh face (we could not do this before -- since the structure of the mesh - * is always changing, this face may not have even existed until now). - */ { + ActiveRegion reg) /* + * Delete a region from the sweep line. This happens when the upper and lower chains of a + * region meet (at a vertex on the sweep line). The "inside" flag is copied to the + * appropriate mesh face (we could not do this before -- since the structure of the mesh + * is always changing, this face may not have even existed until now). + */ { GLUhalfEdge e = reg.eUp; GLUface f = e.Lface; @@ -248,16 +248,16 @@ class Sweep { } static GLUhalfEdge FinishLeftRegions(GLUtessellatorImpl tess, ActiveRegion regFirst, - ActiveRegion regLast) /* - * We are given a vertex with one or more left-going edges. All affected edges should - * be in the edge dictionary. Starting at regFirst.eUp, we walk down deleting all - * regions where both edges have the same origin vOrg. At the same time we copy the - * "inside" flag from the active region to the face, since at this point each face - * will belong to at most one region (this was not necessarily true until this point - * in the sweep). The walk stops at the region above regLast; if regLast is null we - * walk as far as possible. At the same time we relink the mesh if necessary, so that - * the ordering of edges around vOrg is the same as in the dictionary. - */ { + ActiveRegion regLast) /* + * We are given a vertex with one or more left-going edges. All affected edges should + * be in the edge dictionary. Starting at regFirst.eUp, we walk down deleting all + * regions where both edges have the same origin vOrg. At the same time we copy the + * "inside" flag from the active region to the face, since at this point each face + * will belong to at most one region (this was not necessarily true until this point + * in the sweep). The walk stops at the region above regLast; if regLast is null we + * walk as far as possible. At the same time we relink the mesh if necessary, so that + * the ordering of edges around vOrg is the same as in the dictionary. + */ { ActiveRegion reg, regPrev; GLUhalfEdge e, ePrev; @@ -299,7 +299,7 @@ class Sweep { } static void AddRightEdges(GLUtessellatorImpl tess, ActiveRegion regUp, GLUhalfEdge eFirst, GLUhalfEdge eLast, - GLUhalfEdge eTopLeft, boolean cleanUp) + GLUhalfEdge eTopLeft, boolean cleanUp) /* * Purpose: insert right-going edges into the edge dictionary, and update winding numbers and mesh connectivity * appropriately. All right-going edges share a common origin vOrg. Edges are inserted CCW starting at eFirst; the @@ -391,10 +391,10 @@ class Sweep { } static void SpliceMergeVertices(GLUtessellatorImpl tess, GLUhalfEdge e1, - GLUhalfEdge e2) /* - * Two vertices with idential coordinates are combined into one. e1.Org is kept, while - * e2.Org is discarded. - */ { + GLUhalfEdge e2) /* + * Two vertices with idential coordinates are combined into one. e1.Org is kept, while + * e2.Org is discarded. + */ { Object[] data = new Object[4]; float[] weights = new float[] { 0.5f, 0.5f, 0.0f, 0.0f }; @@ -405,12 +405,12 @@ class Sweep { } static void VertexWeights(GLUvertex isect, GLUvertex org, GLUvertex dst, - float[] weights) /* - * Find some weights which describe how the intersection vertex is a linear combination of - * "org" and "dest". Each of the two edges which generated "isect" is allocated 50% of the - * weight; each edge splits the weight between its org and dst according to the relative - * distance to "isect". - */ { + float[] weights) /* + * Find some weights which describe how the intersection vertex is a linear combination of + * "org" and "dest". Each of the two edges which generated "isect" is allocated 50% of the + * weight; each edge splits the weight between its org and dst according to the relative + * distance to "isect". + */ { double t1 = Geom.VertL1dist(org, isect); double t2 = Geom.VertL1dist(dst, isect); @@ -422,7 +422,7 @@ class Sweep { } static void GetIntersectData(GLUtessellatorImpl tess, GLUvertex isect, GLUvertex orgUp, GLUvertex dstUp, - GLUvertex orgLo, GLUvertex dstLo) + GLUvertex orgLo, GLUvertex dstLo) /* * We've computed a new intersection point, now we need a "data" pointer from the user so that we can refer to this * new vertex in the rendering callbacks. @@ -447,24 +447,24 @@ class Sweep { } static boolean CheckForRightSplice(GLUtessellatorImpl tess, - ActiveRegion regUp) /* - * Check the upper and lower edge of "regUp", to make sure that the eUp.Org is above - * eLo, or eLo.Org is below eUp (depending on which origin is leftmost). The main - * purpose is to splice right-going edges with the same dest vertex and nearly identical - * slopes (ie. we can't distinguish the slopes numerically). However the splicing can - * also help us to recover from numerical errors. For example, suppose at one point we - * checked eUp and eLo, and decided that eUp.Org is barely above eLo. Then later, we - * split eLo into two edges (eg. from a splice operation like this one). This can change - * the result of our test so that now eUp.Org is incident to eLo, or barely below it. We - * must correct this condition to maintain the dictionary invariants. One possibility is - * to check these edges for intersection again (ie. CheckForIntersect). This is what we - * do if possible. However CheckForIntersect requires that tess.event lies between eUp - * and eLo, so that it has something to fall back on when the intersection calculation - * gives us an unusable answer. So, for those cases where we can't check for - * intersection, this routine fixes the problem by just splicing the offending vertex - * into the other edge. This is a guaranteed solution, no matter how degenerate things - * get. Basically this is a combinatorial solution to a numerical problem. - */ { + ActiveRegion regUp) /* + * Check the upper and lower edge of "regUp", to make sure that the eUp.Org is above + * eLo, or eLo.Org is below eUp (depending on which origin is leftmost). The main + * purpose is to splice right-going edges with the same dest vertex and nearly identical + * slopes (ie. we can't distinguish the slopes numerically). However the splicing can + * also help us to recover from numerical errors. For example, suppose at one point we + * checked eUp and eLo, and decided that eUp.Org is barely above eLo. Then later, we + * split eLo into two edges (eg. from a splice operation like this one). This can change + * the result of our test so that now eUp.Org is incident to eLo, or barely below it. We + * must correct this condition to maintain the dictionary invariants. One possibility is + * to check these edges for intersection again (ie. CheckForIntersect). This is what we + * do if possible. However CheckForIntersect requires that tess.event lies between eUp + * and eLo, so that it has something to fall back on when the intersection calculation + * gives us an unusable answer. So, for those cases where we can't check for + * intersection, this routine fixes the problem by just splicing the offending vertex + * into the other edge. This is a guaranteed solution, no matter how degenerate things + * get. Basically this is a combinatorial solution to a numerical problem. + */ { ActiveRegion regLo = RegionBelow(regUp); GLUhalfEdge eUp = regUp.eUp; GLUhalfEdge eLo = regLo.eUp; @@ -496,19 +496,19 @@ class Sweep { } static boolean CheckForLeftSplice(GLUtessellatorImpl tess, - ActiveRegion regUp) /* - * Check the upper and lower edge of "regUp", to make sure that the eUp.Sym.Org is above - * eLo, or eLo.Sym.Org is below eUp (depending on which destination is rightmost). - * Theoretically, this should always be true. However, splitting an edge into two pieces - * can change the results of previous tests. For example, suppose at one point we - * checked eUp and eLo, and decided that eUp.Sym.Org is barely above eLo. Then later, we - * split eLo into two edges (eg. from a splice operation like this one). This can change - * the result of the test so that now eUp.Sym.Org is incident to eLo, or barely below - * it. We must correct this condition to maintain the dictionary invariants (otherwise - * new edges might get inserted in the wrong place in the dictionary, and bad stuff will - * happen). We fix the problem by just splicing the offending vertex into the other - * edge. - */ { + ActiveRegion regUp) /* + * Check the upper and lower edge of "regUp", to make sure that the eUp.Sym.Org is above + * eLo, or eLo.Sym.Org is below eUp (depending on which destination is rightmost). + * Theoretically, this should always be true. However, splitting an edge into two pieces + * can change the results of previous tests. For example, suppose at one point we + * checked eUp and eLo, and decided that eUp.Sym.Org is barely above eLo. Then later, we + * split eLo into two edges (eg. from a splice operation like this one). This can change + * the result of the test so that now eUp.Sym.Org is incident to eLo, or barely below + * it. We must correct this condition to maintain the dictionary invariants (otherwise + * new edges might get inserted in the wrong place in the dictionary, and bad stuff will + * happen). We fix the problem by just splicing the offending vertex into the other + * edge. + */ { ActiveRegion regLo = RegionBelow(regUp); GLUhalfEdge eUp = regUp.eUp; GLUhalfEdge eLo = regLo.eUp; @@ -539,13 +539,13 @@ class Sweep { } static boolean CheckForIntersect(GLUtessellatorImpl tess, - ActiveRegion regUp) /* - * Check the upper and lower edges of the given region to see if they intersect. If so, - * create the intersection and add it to the data structures. Returns true if adding the - * new intersection resulted in a recursive call to AddRightEdges(); in this case all - * "dirty" regions have been checked for intersections, and possibly regUp has been - * deleted. - */ { + ActiveRegion regUp) /* + * Check the upper and lower edges of the given region to see if they intersect. If so, + * create the intersection and add it to the data structures. Returns true if adding the + * new intersection resulted in a recursive call to AddRightEdges(); in this case all + * "dirty" regions have been checked for intersections, and possibly regUp has been + * deleted. + */ { ActiveRegion regLo = RegionBelow(regUp); GLUhalfEdge eUp = regUp.eUp; GLUhalfEdge eLo = regLo.eUp; @@ -613,7 +613,7 @@ class Sweep { } if ((!Geom.VertEq(dstUp, tess.event) && Geom.EdgeSign(dstUp, tess.event, isect) >= 0) - || (!Geom.VertEq(dstLo, tess.event) && Geom.EdgeSign(dstLo, tess.event, isect) <= 0)) { + || (!Geom.VertEq(dstLo, tess.event) && Geom.EdgeSign(dstLo, tess.event, isect) <= 0)) { /* * Very unusual -- the new upper or lower edge would pass on the wrong side of the sweep event, or through * it. This can happen due to very small numerical errors in the intersection calculation. @@ -685,12 +685,12 @@ class Sweep { } static void WalkDirtyRegions(GLUtessellatorImpl tess, - ActiveRegion regUp) /* - * When the upper or lower edge of any region changes, the region is marked "dirty". - * This routine walks through all the dirty regions and makes sure that the dictionary - * invariants are satisfied (see the comments at the beginning of this file). Of course - * new dirty regions can be created as we make changes to restore the invariants. - */ { + ActiveRegion regUp) /* + * When the upper or lower edge of any region changes, the region is marked "dirty". + * This routine walks through all the dirty regions and makes sure that the dictionary + * invariants are satisfied (see the comments at the beginning of this file). Of course + * new dirty regions can be created as we make changes to restore the invariants. + */ { ActiveRegion regLo = RegionBelow(regUp); GLUhalfEdge eUp, eLo; @@ -735,8 +735,8 @@ class Sweep { } if (eUp.Org != eLo.Org) { if (eUp.Sym.Org != eLo.Sym.Org && !regUp.fixUpperEdge - && !regLo.fixUpperEdge - && (eUp.Sym.Org == tess.event || eLo.Sym.Org == tess.event)) { + && !regLo.fixUpperEdge + && (eUp.Sym.Org == tess.event || eLo.Sym.Org == tess.event)) { /* * When all else fails in CheckForIntersect(), it uses tess.event as the intersection location. To * make this possible, it requires that tess.event lie between the upper and lower edges, and also @@ -767,31 +767,31 @@ class Sweep { } static void ConnectRightVertex(GLUtessellatorImpl tess, ActiveRegion regUp, - GLUhalfEdge eBottomLeft) /* - * Purpose: connect a "right" vertex vEvent (one where all edges go left) to the - * unprocessed portion of the mesh. Since there are no right-going edges, two - * regions (one above vEvent and one below) are being merged into one. "regUp" is - * the upper of these two regions. There are two reasons for doing this (adding a - * right-going edge): - if the two regions being merged are "inside", we must add - * an edge to keep them separated (the combined region would not be monotone). - in - * any case, we must leave some record of vEvent in the dictionary, so that we can - * merge vEvent with features that we have not seen yet. For example, maybe there - * is a vertical edge which passes just to the right of vEvent; we would like to - * splice vEvent into this edge. However, we don't want to connect vEvent to just - * any vertex. We don''t want the new edge to cross any other edges; otherwise we - * will create intersection vertices even when the input data had no - * self-intersections. (This is a bad thing; if the user's input data has no - * intersections, we don't want to generate any false intersections ourselves.) Our - * eventual goal is to connect vEvent to the leftmost unprocessed vertex of the - * combined region (the union of regUp and regLo). But because of unseen vertices - * with all right-going edges, and also new vertices which may be created by edge - * intersections, we don''t know where that leftmost unprocessed vertex is. In the - * meantime, we connect vEvent to the closest vertex of either chain, and mark the - * region as "fixUpperEdge". This flag says to delete and reconnect this edge to - * the next processed vertex on the boundary of the combined region. Quite possibly - * the vertex we connected to will turn out to be the closest one, in which case we - * won''t need to make any changes. - */ { + GLUhalfEdge eBottomLeft) /* + * Purpose: connect a "right" vertex vEvent (one where all edges go left) to the + * unprocessed portion of the mesh. Since there are no right-going edges, two + * regions (one above vEvent and one below) are being merged into one. "regUp" is + * the upper of these two regions. There are two reasons for doing this (adding a + * right-going edge): - if the two regions being merged are "inside", we must add + * an edge to keep them separated (the combined region would not be monotone). - in + * any case, we must leave some record of vEvent in the dictionary, so that we can + * merge vEvent with features that we have not seen yet. For example, maybe there + * is a vertical edge which passes just to the right of vEvent; we would like to + * splice vEvent into this edge. However, we don't want to connect vEvent to just + * any vertex. We don''t want the new edge to cross any other edges; otherwise we + * will create intersection vertices even when the input data had no + * self-intersections. (This is a bad thing; if the user's input data has no + * intersections, we don't want to generate any false intersections ourselves.) Our + * eventual goal is to connect vEvent to the leftmost unprocessed vertex of the + * combined region (the union of regUp and regLo). But because of unseen vertices + * with all right-going edges, and also new vertices which may be created by edge + * intersections, we don''t know where that leftmost unprocessed vertex is. In the + * meantime, we connect vEvent to the closest vertex of either chain, and mark the + * region as "fixUpperEdge". This flag says to delete and reconnect this edge to + * the next processed vertex on the boundary of the combined region. Quite possibly + * the vertex we connected to will turn out to be the closest one, in which case we + * won''t need to make any changes. + */ { GLUhalfEdge eNew; GLUhalfEdge eTopLeft = eBottomLeft.Onext; ActiveRegion regLo = RegionBelow(regUp); @@ -854,10 +854,10 @@ class Sweep { private static final boolean TOLERANCE_NONZERO = false; static void ConnectLeftDegenerate(GLUtessellatorImpl tess, ActiveRegion regUp, - GLUvertex vEvent) /* - * The event vertex lies exacty on an already-processed edge or vertex. Adding the new - * vertex involves splicing it into the already-processed part of the mesh. - */ { + GLUvertex vEvent) /* + * The event vertex lies exacty on an already-processed edge or vertex. Adding the new + * vertex involves splicing it into the already-processed part of the mesh. + */ { GLUhalfEdge e, eTopLeft, eTopRight, eLast; ActiveRegion reg; @@ -912,16 +912,16 @@ class Sweep { } static void ConnectLeftVertex(GLUtessellatorImpl tess, - GLUvertex vEvent) /* - * Purpose: connect a "left" vertex (one where both edges go right) to the processed - * portion of the mesh. Let R be the active region containing vEvent, and let U and L be - * the upper and lower edge chains of R. There are two possibilities: - the normal case: - * split R into two regions, by connecting vEvent to the rightmost vertex of U or L lying - * to the left of the sweep line - the degenerate case: if vEvent is close enough to U or - * L, we merge vEvent into that edge chain. The subcases are: - merging with the rightmost - * vertex of U or L - merging with the active edge of U or L - merging with an - * already-processed portion of U or L - */ { + GLUvertex vEvent) /* + * Purpose: connect a "left" vertex (one where both edges go right) to the processed + * portion of the mesh. Let R be the active region containing vEvent, and let U and L be + * the upper and lower edge chains of R. There are two possibilities: - the normal case: + * split R into two regions, by connecting vEvent to the rightmost vertex of U or L lying + * to the left of the sweep line - the degenerate case: if vEvent is close enough to U or + * L, we merge vEvent into that edge chain. The subcases are: - merging with the rightmost + * vertex of U or L - merging with the active edge of U or L - merging with an + * already-processed portion of U or L + */ { ActiveRegion regUp, regLo, reg; GLUhalfEdge eUp, eLo, eNew; ActiveRegion tmp = new ActiveRegion(); @@ -975,10 +975,10 @@ class Sweep { } static void SweepEvent(GLUtessellatorImpl tess, - GLUvertex vEvent) /* - * Does everything necessary when the sweep line crosses a vertex. Updates the mesh and - * the edge dictionary. - */ { + GLUvertex vEvent) /* + * Does everything necessary when the sweep line crosses a vertex. Updates the mesh and + * the edge dictionary. + */ { ActiveRegion regUp, reg; GLUhalfEdge e, eTopLeft, eBottomLeft; @@ -1059,13 +1059,13 @@ class Sweep { } static void InitEdgeDict( - final GLUtessellatorImpl tess) /* - * We maintain an ordering of edge intersections with the sweep line. This - * order is maintained in a dynamic dictionary. - */ { + final GLUtessellatorImpl tess) /* + * We maintain an ordering of edge intersections with the sweep line. This + * order is maintained in a dynamic dictionary. + */ { /* __gl_dictListNewDict */ tess.dict = Dict - .dictNewDict(tess, (frame, key1, key2) -> EdgeLeq(tess, (ActiveRegion) key1, (ActiveRegion) key2)); + .dictNewDict(tess, (frame, key1, key2) -> EdgeLeq(tess, (ActiveRegion) key1, (ActiveRegion) key2)); if (tess.dict == null) throw new RuntimeException(); AddSentinel(tess, -SENTINEL_COORD); @@ -1095,9 +1095,9 @@ class Sweep { } static void RemoveDegenerateEdges( - GLUtessellatorImpl tess) /* - * Remove zero-length edges, and contours with fewer than 3 vertices. - */ { + GLUtessellatorImpl tess) /* + * Remove zero-length edges, and contours with fewer than 3 vertices. + */ { GLUhalfEdge e, eNext, eLnext; GLUhalfEdge eHead = tess.mesh.eHead; @@ -1132,10 +1132,10 @@ class Sweep { } static boolean InitPriorityQ( - GLUtessellatorImpl tess) /* - * Insert all vertices into the priority queue which determines the order in which - * vertices cross the sweep line. - */ { + GLUtessellatorImpl tess) /* + * Insert all vertices into the priority queue which determines the order in which + * vertices cross the sweep line. + */ { PriorityQ pq; GLUvertex v, vHead; @@ -1163,16 +1163,16 @@ class Sweep { } static boolean RemoveDegenerateFaces( - GLUmesh mesh) /* - * Delete any degenerate faces with only two edges. WalkDirtyRegions() will catch almost all - * of these, but it won't catch degenerate faces produced by splice operations on - * already-processed edges. The two places this can happen are in FinishLeftRegions(), when we - * splice in a "temporary" edge produced by ConnectRightVertex(), and in CheckForLeftSplice(), - * where we splice already-processed edges to ensure that our dictionary invariants are not - * violated by numerical errors. In both these cases it is *very* dangerous to delete the - * offending edge at the time, since one of the routines further up the stack will sometimes - * be keeping a pointer to that edge. - */ { + GLUmesh mesh) /* + * Delete any degenerate faces with only two edges. WalkDirtyRegions() will catch almost all + * of these, but it won't catch degenerate faces produced by splice operations on + * already-processed edges. The two places this can happen are in FinishLeftRegions(), when we + * splice in a "temporary" edge produced by ConnectRightVertex(), and in CheckForLeftSplice(), + * where we splice already-processed edges to ensure that our dictionary invariants are not + * violated by numerical errors. In both these cases it is *very* dangerous to delete the + * offending edge at the time, since one of the routines further up the stack will sometimes + * be keeping a pointer to that edge. + */ { GLUface f, fNext; GLUhalfEdge e; @@ -1192,12 +1192,12 @@ class Sweep { } public static boolean __gl_computeInterior( - GLUtessellatorImpl tess) /* - * __gl_computeInterior( tess ) computes the planar arrangement specified by the - * given contours, and further subdivides this arrangement into regions. Each - * region is marked "inside" if it belongs to the polygon, according to the rule - * given by tess.windingRule. Each interior region is guaranteed be monotone. - */ { + GLUtessellatorImpl tess) /* + * __gl_computeInterior( tess ) computes the planar arrangement specified by the + * given contours, and further subdivides this arrangement into regions. Each + * region is marked "inside" if it belongs to the polygon, according to the rule + * given by tess.windingRule. Each interior region is guaranteed be monotone. + */ { GLUvertex v, vNext; tess.fatalError = false; diff --git a/src/main/java/org/lwjglx/util/glu/tessellation/TessMono.java b/src/main/java/org/lwjglx/util/glu/tessellation/TessMono.java index d76c0fc..6e65950 100644 --- a/src/main/java/org/lwjglx/util/glu/tessellation/TessMono.java +++ b/src/main/java/org/lwjglx/util/glu/tessellation/TessMono.java @@ -82,7 +82,7 @@ class TessMono { * progress even when some triangles are CW, given that the upper and lower chains are truly monotone. */ while (lo.Lnext != up - && (Geom.EdgeGoesLeft(lo.Lnext) || Geom.EdgeSign(lo.Org, lo.Sym.Org, lo.Lnext.Sym.Org) <= 0)) { + && (Geom.EdgeGoesLeft(lo.Lnext) || Geom.EdgeSign(lo.Org, lo.Sym.Org, lo.Lnext.Sym.Org) <= 0)) { GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(lo.Lnext, lo); if (tempHalfEdge == null) return false; lo = tempHalfEdge.Sym; @@ -90,8 +90,8 @@ class TessMono { lo = lo.Onext.Sym; } else { /* lo.Org is on the left. We can make CCW triangles from up.Sym.Org. */ - while (lo.Lnext != up && (Geom.EdgeGoesRight(up.Onext.Sym) - || Geom.EdgeSign(up.Sym.Org, up.Org, up.Onext.Sym.Org) >= 0)) { + while (lo.Lnext != up + && (Geom.EdgeGoesRight(up.Onext.Sym) || Geom.EdgeSign(up.Sym.Org, up.Org, up.Onext.Sym.Org) >= 0)) { GLUhalfEdge tempHalfEdge = Mesh.__gl_meshConnect(up, up.Onext.Sym); if (tempHalfEdge == null) return false; up = tempHalfEdge.Sym; diff --git a/src/main/java/org/lwjglx/util/vector/Matrix2f.java b/src/main/java/org/lwjglx/util/vector/Matrix2f.java index ca2d403..5f7d7b3 100644 --- a/src/main/java/org/lwjglx/util/vector/Matrix2f.java +++ b/src/main/java/org/lwjglx/util/vector/Matrix2f.java @@ -294,8 +294,16 @@ public class Matrix2f extends Matrix implements Serializable { */ public String toString() { StringBuilder buf = new StringBuilder(); - buf.append(m00).append(' ').append(m10).append(' ').append('\n'); - buf.append(m01).append(' ').append(m11).append(' ').append('\n'); + buf.append(m00) + .append(' ') + .append(m10) + .append(' ') + .append('\n'); + buf.append(m01) + .append(' ') + .append(m11) + .append(' ') + .append('\n'); return buf.toString(); } diff --git a/src/main/java/org/lwjglx/util/vector/Matrix3f.java b/src/main/java/org/lwjglx/util/vector/Matrix3f.java index 12355a0..9b697dd 100644 --- a/src/main/java/org/lwjglx/util/vector/Matrix3f.java +++ b/src/main/java/org/lwjglx/util/vector/Matrix3f.java @@ -317,9 +317,27 @@ public class Matrix3f extends Matrix implements Serializable { */ public String toString() { StringBuilder buf = new StringBuilder(); - buf.append(m00).append(' ').append(m10).append(' ').append(m20).append(' ').append('\n'); - buf.append(m01).append(' ').append(m11).append(' ').append(m21).append(' ').append('\n'); - buf.append(m02).append(' ').append(m12).append(' ').append(m22).append(' ').append('\n'); + buf.append(m00) + .append(' ') + .append(m10) + .append(' ') + .append(m20) + .append(' ') + .append('\n'); + buf.append(m01) + .append(' ') + .append(m11) + .append(' ') + .append(m21) + .append(' ') + .append('\n'); + buf.append(m02) + .append(' ') + .append(m12) + .append(' ') + .append(m22) + .append(' ') + .append('\n'); return buf.toString(); } diff --git a/src/main/java/org/lwjglx/util/vector/Matrix4f.java b/src/main/java/org/lwjglx/util/vector/Matrix4f.java index 71acd89..fc3854f 100644 --- a/src/main/java/org/lwjglx/util/vector/Matrix4f.java +++ b/src/main/java/org/lwjglx/util/vector/Matrix4f.java @@ -47,10 +47,38 @@ public class Matrix4f extends Matrix implements Serializable { */ public String toString() { StringBuilder buf = new StringBuilder(); - buf.append(m00).append(' ').append(m10).append(' ').append(m20).append(' ').append(m30).append('\n'); - buf.append(m01).append(' ').append(m11).append(' ').append(m21).append(' ').append(m31).append('\n'); - buf.append(m02).append(' ').append(m12).append(' ').append(m22).append(' ').append(m32).append('\n'); - buf.append(m03).append(' ').append(m13).append(' ').append(m23).append(' ').append(m33).append('\n'); + buf.append(m00) + .append(' ') + .append(m10) + .append(' ') + .append(m20) + .append(' ') + .append(m30) + .append('\n'); + buf.append(m01) + .append(' ') + .append(m11) + .append(' ') + .append(m21) + .append(' ') + .append(m31) + .append('\n'); + buf.append(m02) + .append(' ') + .append(m12) + .append(' ') + .append(m22) + .append(' ') + .append(m32) + .append('\n'); + buf.append(m03) + .append(' ') + .append(m13) + .append(' ') + .append(m23) + .append(' ') + .append(m33) + .append('\n'); return buf.toString(); } @@ -687,17 +715,17 @@ public class Matrix4f extends Matrix implements Serializable { */ public float determinant() { float f = m00 * ((m11 * m22 * m33 + m12 * m23 * m31 + m13 * m21 * m32) - m13 * m22 * m31 - - m11 * m23 * m32 - - m12 * m21 * m33); + - m11 * m23 * m32 + - m12 * m21 * m33); f -= m01 * ((m10 * m22 * m33 + m12 * m23 * m30 + m13 * m20 * m32) - m13 * m22 * m30 - - m10 * m23 * m32 - - m12 * m20 * m33); + - m10 * m23 * m32 + - m12 * m20 * m33); f += m02 * ((m10 * m21 * m33 + m11 * m23 * m30 + m13 * m20 * m31) - m13 * m21 * m30 - - m10 * m23 * m31 - - m11 * m20 * m33); + - m10 * m23 * m31 + - m11 * m20 * m33); f -= m03 * ((m10 * m21 * m32 + m11 * m22 * m30 + m12 * m20 * m31) - m12 * m21 * m30 - - m10 * m22 * m31 - - m11 * m20 * m32); + - m10 * m22 * m31 + - m11 * m20 * m32); return f; } @@ -707,7 +735,7 @@ public class Matrix4f extends Matrix implements Serializable { * @return result */ private static float determinant3x3(float t00, float t01, float t02, float t10, float t11, float t12, float t20, - float t21, float t22) { + float t21, float t22) { return t00 * (t11 * t22 - t12 * t21) + t01 * (t12 * t20 - t10 * t22) + t02 * (t10 * t21 - t11 * t20); } @@ -740,94 +768,94 @@ public class Matrix4f extends Matrix implements Serializable { // first row float t00 = determinant3x3(src.m11, src.m12, src.m13, src.m21, src.m22, src.m23, src.m31, src.m32, src.m33); float t01 = -determinant3x3( - src.m10, - src.m12, - src.m13, - src.m20, - src.m22, - src.m23, - src.m30, - src.m32, - src.m33); + src.m10, + src.m12, + src.m13, + src.m20, + src.m22, + src.m23, + src.m30, + src.m32, + src.m33); float t02 = determinant3x3(src.m10, src.m11, src.m13, src.m20, src.m21, src.m23, src.m30, src.m31, src.m33); float t03 = -determinant3x3( - src.m10, - src.m11, - src.m12, - src.m20, - src.m21, - src.m22, - src.m30, - src.m31, - src.m32); + src.m10, + src.m11, + src.m12, + src.m20, + src.m21, + src.m22, + src.m30, + src.m31, + src.m32); // second row float t10 = -determinant3x3( - src.m01, - src.m02, - src.m03, - src.m21, - src.m22, - src.m23, - src.m31, - src.m32, - src.m33); + src.m01, + src.m02, + src.m03, + src.m21, + src.m22, + src.m23, + src.m31, + src.m32, + src.m33); float t11 = determinant3x3(src.m00, src.m02, src.m03, src.m20, src.m22, src.m23, src.m30, src.m32, src.m33); float t12 = -determinant3x3( - src.m00, - src.m01, - src.m03, - src.m20, - src.m21, - src.m23, - src.m30, - src.m31, - src.m33); + src.m00, + src.m01, + src.m03, + src.m20, + src.m21, + src.m23, + src.m30, + src.m31, + src.m33); float t13 = determinant3x3(src.m00, src.m01, src.m02, src.m20, src.m21, src.m22, src.m30, src.m31, src.m32); // third row float t20 = determinant3x3(src.m01, src.m02, src.m03, src.m11, src.m12, src.m13, src.m31, src.m32, src.m33); float t21 = -determinant3x3( - src.m00, - src.m02, - src.m03, - src.m10, - src.m12, - src.m13, - src.m30, - src.m32, - src.m33); + src.m00, + src.m02, + src.m03, + src.m10, + src.m12, + src.m13, + src.m30, + src.m32, + src.m33); float t22 = determinant3x3(src.m00, src.m01, src.m03, src.m10, src.m11, src.m13, src.m30, src.m31, src.m33); float t23 = -determinant3x3( - src.m00, - src.m01, - src.m02, - src.m10, - src.m11, - src.m12, - src.m30, - src.m31, - src.m32); + src.m00, + src.m01, + src.m02, + src.m10, + src.m11, + src.m12, + src.m30, + src.m31, + src.m32); // fourth row float t30 = -determinant3x3( - src.m01, - src.m02, - src.m03, - src.m11, - src.m12, - src.m13, - src.m21, - src.m22, - src.m23); + src.m01, + src.m02, + src.m03, + src.m11, + src.m12, + src.m13, + src.m21, + src.m22, + src.m23); float t31 = determinant3x3(src.m00, src.m02, src.m03, src.m10, src.m12, src.m13, src.m20, src.m22, src.m23); float t32 = -determinant3x3( - src.m00, - src.m01, - src.m03, - src.m10, - src.m11, - src.m13, - src.m20, - src.m21, - src.m23); + src.m00, + src.m01, + src.m03, + src.m10, + src.m11, + src.m13, + src.m20, + src.m21, + src.m23); float t33 = determinant3x3(src.m00, src.m01, src.m02, src.m10, src.m11, src.m12, src.m20, src.m21, src.m22); // transpose and divide by the determinant diff --git a/src/main/java/org/lwjglx/util/vector/Quaternion.java b/src/main/java/org/lwjglx/util/vector/Quaternion.java index 18073e4..3f5e7dc 100644 --- a/src/main/java/org/lwjglx/util/vector/Quaternion.java +++ b/src/main/java/org/lwjglx/util/vector/Quaternion.java @@ -330,10 +330,10 @@ public class Quaternion extends Vector implements ReadableVector4f { public static Quaternion mul(Quaternion left, Quaternion right, Quaternion dest) { if (dest == null) dest = new Quaternion(); dest.set( - left.x * right.w + left.w * right.x + left.y * right.z - left.z * right.y, - left.y * right.w + left.w * right.y + left.z * right.x - left.x * right.z, - left.z * right.w + left.w * right.z + left.x * right.y - left.y * right.x, - left.w * right.w - left.x * right.x - left.y * right.y - left.z * right.z); + left.x * right.w + left.w * right.x + left.y * right.z - left.z * right.y, + left.y * right.w + left.w * right.y + left.z * right.x - left.x * right.z, + left.z * right.w + left.w * right.z + left.x * right.y - left.y * right.x, + left.w * right.w - left.x * right.x - left.y * right.y - left.z * right.z); return dest; } @@ -352,10 +352,10 @@ public class Quaternion extends Vector implements ReadableVector4f { // store on stack once for aliasing-safty if (dest == null) dest = new Quaternion(); dest.set( - (left.x * right.w - left.w * right.x - left.y * right.z + left.z * right.y) * n, - (left.y * right.w - left.w * right.y - left.z * right.x + left.x * right.z) * n, - (left.z * right.w - left.w * right.z - left.x * right.y + left.y * right.x) * n, - (left.w * right.w + left.x * right.x + left.y * right.y + left.z * right.z) * n); + (left.x * right.w - left.w * right.x - left.y * right.z + left.z * right.y) * n, + (left.y * right.w - left.w * right.y - left.z * right.x + left.x * right.z) * n, + (left.z * right.w - left.w * right.z - left.x * right.y + left.y * right.x) * n, + (left.w * right.w + left.x * right.x + left.y * right.y + left.z * right.z) * n); return dest; } @@ -423,7 +423,7 @@ public class Quaternion extends Vector implements ReadableVector4f { * Private method to perform the matrix-to-quaternion conversion */ private Quaternion setFromMat(float m00, float m01, float m02, float m10, float m11, float m12, float m20, - float m21, float m22) { + float m21, float m22) { float s; float tr = m00 + m11 + m22; diff --git a/src/main/java/org/lwjglx/util/vector/Vector3f.java b/src/main/java/org/lwjglx/util/vector/Vector3f.java index f12e44b..650db43 100644 --- a/src/main/java/org/lwjglx/util/vector/Vector3f.java +++ b/src/main/java/org/lwjglx/util/vector/Vector3f.java @@ -150,9 +150,9 @@ public class Vector3f extends Vector implements Serializable, ReadableVector3f, if (dest == null) dest = new Vector3f(); dest.set( - left.y * right.z - left.z * right.y, - right.x * left.z - right.z * left.x, - left.x * right.y - left.y * right.x); + left.y * right.z - left.z * right.y, + right.x * left.z - right.z * left.x, + left.x * right.y - left.y * right.x); return dest; } diff --git a/src/util/java/me/eigenraven/lwjgl3ify/ComparisonTool.java b/src/util/java/me/eigenraven/lwjgl3ify/ComparisonTool.java index 5274b60..63ca863 100644 --- a/src/util/java/me/eigenraven/lwjgl3ify/ComparisonTool.java +++ b/src/util/java/me/eigenraven/lwjgl3ify/ComparisonTool.java @@ -23,7 +23,7 @@ import com.google.common.collect.Streams; public class ComparisonTool { final String[] EXCLUDES = new String[] { "AWTGLCanvas", "FastIntMap", "FastIntMap$Entry", - "FastIntMap$EntryIterator", "MappedObjectClassLoader" }; + "FastIntMap$EntryIterator", "MappedObjectClassLoader" }; public static void main(String[] args) { new ComparisonTool().run(args); @@ -46,9 +46,12 @@ public class ComparisonTool { final JarApiSet gl2 = new JarApiSet(); final JarApiSet gl3 = new JarApiSet(); final JarApiSet mod = new JarApiSet(); - gl2Jars.stream().forEach(path -> gl2.addJar(new File(path))); - gl3Jars.stream().forEach(path -> gl3.addJar(new File(path))); - modJars.stream().forEach(path -> mod.addJar(new File(path))); + gl2Jars.stream() + .forEach(path -> gl2.addJar(new File(path))); + gl3Jars.stream() + .forEach(path -> gl3.addJar(new File(path))); + modJars.stream() + .forEach(path -> mod.addJar(new File(path))); try { FileUtils.writeStringToFile(new File("run/gl2dump.txt"), gl2.dump(), StandardCharsets.UTF_8); FileUtils.writeStringToFile(new File("run/gl3dump.txt"), gl3.dump(), StandardCharsets.UTF_8); @@ -64,7 +67,7 @@ public class ComparisonTool { final JarApiSet.ClassApi gl3Class = gl3.classes.get(gl2Entry.getKey()); final JarApiSet.ClassApi modClass = mod.classes.get(gl2Entry.getKey()); if (gl2Class.className.contains("CL") || gl2Class.className.contains("opencl") - || gl2Class.className.contains("opengles")) { + || gl2Class.className.contains("opengles")) { continue; } if (modClass != null) { @@ -77,7 +80,8 @@ public class ComparisonTool { } final boolean existsInGl3 = (gl3Class != null); - if (Arrays.stream(EXCLUDES).anyMatch(gl2Class.className::endsWith)) { + if (Arrays.stream(EXCLUDES) + .anyMatch(gl2Class.className::endsWith)) { continue; } @@ -85,13 +89,12 @@ public class ComparisonTool { final PrintWriter proxyClassP = new PrintWriter(proxyClass); final String javaName = gl2Class.className.replace('/', '.'); final String transformedClassName = existsInGl3 ? gl2Class.className.replace("/lwjgl/", "/lwjglx/") - : gl2Class.className; + : gl2Class.className; final File javaFile = new File(outputRoot, transformedClassName + ".java"); final int lastDot = javaName.lastIndexOf('.'); final String packageName = javaName.substring(0, lastDot); - final String transformedPackageName = existsInGl3 - ? javaName.substring(0, lastDot).replace(".lwjgl.", ".lwjglx.") - : javaName.substring(0, lastDot); + final String transformedPackageName = existsInGl3 ? javaName.substring(0, lastDot) + .replace(".lwjgl.", ".lwjglx.") : javaName.substring(0, lastDot); final String className = javaName.substring(lastDot + 1); String classType = "class"; if ((gl2Class.asmNode.access & Opcodes.ACC_INTERFACE) != 0) { @@ -101,13 +104,9 @@ public class ComparisonTool { } final String superName = gl2Class.asmNode.superName.replace('/', '.'); final String extendSpec = (superName == null || "java.lang.Object".equals(superName)) ? "" - : " extends " + (existsInGl3 ? superName.replace(".lwjgl.", ".lwjglx.") : superName); - proxyClassP.printf( - "package %s;%n%npublic %s %s%s {%n", - transformedPackageName, - classType, - className, - extendSpec); + : " extends " + (existsInGl3 ? superName.replace(".lwjgl.", ".lwjglx.") : superName); + proxyClassP + .printf("package %s;%n%npublic %s %s%s {%n", transformedPackageName, classType, className, extendSpec); for (FieldNode gl2Field : gl2Class.fields.values()) { if (gl2Field.name.contains("<")) { @@ -128,9 +127,11 @@ public class ComparisonTool { protKws += " final"; } String initializer; - final String fieldType = Type.getType(gl2Field.desc).getClassName(); + final String fieldType = Type.getType(gl2Field.desc) + .getClassName(); if (gl2Field.value == null) { - switch (Type.getType(gl2Field.desc).getClassName()) { + switch (Type.getType(gl2Field.desc) + .getClassName()) { case "boolean": initializer = " = false"; break; @@ -160,11 +161,11 @@ public class ComparisonTool { } } proxyClassP.printf( - " public%s %s %s%s;%n", - protKws, - existsInGl3 ? fieldType.replace("org.lwjgl.", "org.lwjglx.") : fieldType, - gl2Field.name, - initializer); + " public%s %s %s%s;%n", + protKws, + existsInGl3 ? fieldType.replace("org.lwjgl.", "org.lwjglx.") : fieldType, + gl2Field.name, + initializer); } if (!existsInGl3) { @@ -194,17 +195,20 @@ public class ComparisonTool { body = ";"; } final Type mType = Type.getMethodType(gl2Method.desc); - final String retType = mType.getReturnType().getClassName(); - final String[] argTypes = Arrays.stream(mType.getArgumentTypes()).map(Type::getClassName) - .toArray(String[]::new); - final String[] argNames = IntStream.range(0, argTypes.length).mapToObj(i -> "arg" + i) - .toArray(String[]::new); + final String retType = mType.getReturnType() + .getClassName(); + final String[] argTypes = Arrays.stream(mType.getArgumentTypes()) + .map(Type::getClassName) + .toArray(String[]::new); + final String[] argNames = IntStream.range(0, argTypes.length) + .mapToObj(i -> "arg" + i) + .toArray(String[]::new); final String argDefs = StringUtils.join( - Streams.zip(Arrays.stream(argTypes), Arrays.stream(argNames), (t, n) -> t + " " + n) - .toArray(String[]::new), - ", "); + Streams.zip(Arrays.stream(argTypes), Arrays.stream(argNames), (t, n) -> t + " " + n) + .toArray(String[]::new), + ", "); proxyClassP - .printf(" public%s %s %s(%s)%s%n", protKws, retType, gl2Method.name, argDefs, body); + .printf(" public%s %s %s(%s)%s%n", protKws, retType, gl2Method.name, argDefs, body); } proxyClassP.printf("%n}%n"); @@ -221,7 +225,8 @@ public class ComparisonTool { continue; } final Map.Entry gl3Entry = gl3.classes.floorEntry(gl2Entry.getKey()); - if (!gl3Entry.getKey().equals(gl2Entry.getKey())) { + if (!gl3Entry.getKey() + .equals(gl2Entry.getKey())) { throw new IllegalStateException(); } System.out.println(gl2Entry.getKey()); diff --git a/src/util/java/me/eigenraven/lwjgl3ify/JarApiSet.java b/src/util/java/me/eigenraven/lwjgl3ify/JarApiSet.java index c82cc2b..e437c6c 100644 --- a/src/util/java/me/eigenraven/lwjgl3ify/JarApiSet.java +++ b/src/util/java/me/eigenraven/lwjgl3ify/JarApiSet.java @@ -28,14 +28,15 @@ public class JarApiSet { throw new UnsupportedOperationException("Input does not exist: " + jarFile); } try (FileInputStream fis = FileUtils.openInputStream(jarFile); - BufferedInputStream bis = new BufferedInputStream(fis); - JarInputStream jis = new JarInputStream(bis)) { + BufferedInputStream bis = new BufferedInputStream(fis); + JarInputStream jis = new JarInputStream(bis)) { JarEntry entry; while ((entry = jis.getNextJarEntry()) != null) { if (entry.isDirectory()) { continue; } - if (entry.getName().endsWith(".class")) { + if (entry.getName() + .endsWith(".class")) { byte[] classBytes = IOUtils.toByteArray(CloseShieldInputStream.wrap(jis)); addClassBytes(classBytes); } @@ -92,17 +93,19 @@ public class JarApiSet { public String dump() { StringBuilder builder = new StringBuilder(1024); builder.append("## METHODS\n"); - methods.keySet().forEach(key -> { - builder.append(' '); - builder.append(key); - builder.append('\n'); - }); + methods.keySet() + .forEach(key -> { + builder.append(' '); + builder.append(key); + builder.append('\n'); + }); builder.append("## FIELDS\n"); - fields.keySet().forEach(key -> { - builder.append(' '); - builder.append(key); - builder.append('\n'); - }); + fields.keySet() + .forEach(key -> { + builder.append(' '); + builder.append(key); + builder.append('\n'); + }); return builder.toString(); } } @@ -113,7 +116,9 @@ public class JarApiSet { builder.append("##### "); builder.append(entry.getKey()); builder.append('\n'); - builder.append(entry.getValue().dump()); + builder.append( + entry.getValue() + .dump()); builder.append('\n'); } return builder.toString(); diff --git a/src/util/java/me/eigenraven/lwjgl3ify/MethodMatcher.java b/src/util/java/me/eigenraven/lwjgl3ify/MethodMatcher.java index 1ee69eb..1c439a5 100644 --- a/src/util/java/me/eigenraven/lwjgl3ify/MethodMatcher.java +++ b/src/util/java/me/eigenraven/lwjgl3ify/MethodMatcher.java @@ -25,7 +25,8 @@ public class MethodMatcher { public final String[] argNames; public static String[] getArgumentNames(MethodNode method) { - Type[] asmTypes = Type.getMethodType(method.desc).getArgumentTypes(); + Type[] asmTypes = Type.getMethodType(method.desc) + .getArgumentTypes(); String[] argNames = new String[asmTypes.length]; for (int i = 0; i < argNames.length; i++) { if (method.localVariables != null && method.localVariables.size() > i) { @@ -42,7 +43,7 @@ public class MethodMatcher { } public MethodMatcher(JarApiSet oldApi, JarApiSet newApi, Map.Entry oldClassNode, - Map.Entry newClassNode, Map.Entry oldMethodNode) { + Map.Entry newClassNode, Map.Entry oldMethodNode) { this.oldApi = oldApi; this.newApi = newApi; this.oldClassNode = oldClassNode; @@ -51,7 +52,9 @@ public class MethodMatcher { this.oldMethod = oldMethodNode.getValue(); this.methodType = Type.getMethodType(oldMethod.desc); Type[] asmTypes = methodType.getArgumentTypes(); - this.argTypes = Arrays.stream(asmTypes).map(Type::getClassName).toArray(String[]::new); + this.argTypes = Arrays.stream(asmTypes) + .map(Type::getClassName) + .toArray(String[]::new); this.argNames = getArgumentNames(oldMethod); } @@ -88,12 +91,15 @@ public class MethodMatcher { } } } - final String bufferArg = Arrays.stream(argTypes).filter(a -> a.contains("Buffer")).findFirst().orElse(null); + final String bufferArg = Arrays.stream(argTypes) + .filter(a -> a.contains("Buffer")) + .findFirst() + .orElse(null); final int bufferArgIdx = ArrayUtils.indexOf(argTypes, bufferArg); // Check if adding a type is enough if (nativeCallName != null) { final String descWithType = (nativeCallName.substring(1) + ":(I" + oldMethod.desc.substring(1)) - .replace("DoubleBuffer", "ByteBuffer"); + .replace("DoubleBuffer", "ByteBuffer"); final MethodNode withTypeMatch = newClassNode.getValue().methods.get(descWithType); if (withTypeMatch != null) { final String[] newArgNames = getArgumentNames(withTypeMatch); @@ -120,8 +126,8 @@ public class MethodMatcher { case "java.nio.DoubleBuffer": glType = "org.lwjgl.opengl.GL11.GL_DOUBLE"; changedArgs[bufferArgIdx] = "me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(" - + changedArgs[bufferArgIdx] - + ")"; + + changedArgs[bufferArgIdx] + + ")"; break; default: throw new IllegalStateException(bufferArg); @@ -138,8 +144,9 @@ public class MethodMatcher { final Map.Entry fuzzyMatch = newClassNode.getValue().methods.ceilingEntry(newKey); if (fuzzyMatch.getValue().name.equals(nativeCallName.substring(1))) { final Type newType = Type.getMethodType(fuzzyMatch.getValue().desc); - final String[] newArgTypes = Arrays.stream(newType.getArgumentTypes()).map(Type::getClassName) - .toArray(String[]::new); + final String[] newArgTypes = Arrays.stream(newType.getArgumentTypes()) + .map(Type::getClassName) + .toArray(String[]::new); boolean success = true; if (newArgTypes.length == argTypes.length) { final StringBuilder preCode = new StringBuilder(); @@ -154,14 +161,16 @@ public class MethodMatcher { if (paramAnnotations != null && paramAnnotations.length > i && !paramAnnotations[i].isEmpty()) { for (AnnotationNode annotation : paramAnnotations[i]) { if (annotation.desc.equals("Lorg/lwjgl/system/NativeType;")) { - newNativeType = annotation.values.get(1).toString().trim(); + newNativeType = annotation.values.get(1) + .toString() + .trim(); } } } if (!oldArgType.equals(newArgType)) { if (newArgType.startsWith("java.nio.") && newArgType.endsWith("Buffer") - && oldArgType.startsWith("java.nio.") - && oldArgType.endsWith("Buffer")) { + && oldArgType.startsWith("java.nio.") + && oldArgType.endsWith("Buffer")) { final String oldBufferType = StringUtils.removeStart(oldArgType, "java.nio."); final String newBufferType = StringUtils.removeStart(newArgType, "java.nio."); preCode.append(" final java.nio.ByteBuffer wrappedArg"); @@ -184,80 +193,74 @@ public class MethodMatcher { argTypes[i] = "org.lwjglx.openal.ALCdevice"; changedArgs[i] = argNames[i] + ".device"; } else if (newArgType.equals("java.lang.CharSequence") - && oldArgType.equals("java.lang.String")) { - // no-op - } else - if ((newArgType.equals("java.nio.IntBuffer") || newArgType.equals("int[]")) - && oldArgType.equals("int")) { - changedArgs[i] = "new int[]{" + argNames[i] + "}"; - } else - if ((newArgType.equals("java.nio.LongBuffer") || newArgType.equals("long[]")) - && oldArgType.equals("long")) { - changedArgs[i] = "new long[]{" + argNames[i] + "}"; - } else - if (newArgType.equals("long") && newNativeType.endsWith("*") - && oldArgType.startsWith("java.nio.") - && oldArgType.endsWith("Buffer")) { - changedArgs[i] = "org.lwjglx.MemoryUtil.getAddress(" + argNames[i] - + ")"; - } else - if (newArgType.equals("java.lang.CharSequence") - && oldArgType.equals("java.nio.ByteBuffer")) { - changedArgs[i] = "me.eigenraven.lwjgl3ify.BufferCasts.bufferToCharSeq(" - + argNames[i] - + ")"; - } else - if (newArgType.equals("int") && oldArgType.equals("boolean") - && argNames[i].equals("unsigned") - && newArgNames[i].equals("type")) { - final String newArg; - switch (bufferArg) { - case "java.nio.ByteBuffer": - newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE)"; - break; - case "java.nio.ShortBuffer": - newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT)"; - break; - case "java.nio.IntBuffer": - newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT)"; - break; - case "java.nio.LongBuffer": - newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_LONG : org.lwjgl.opengl.GL11.GL_LONG)"; - break; - case "java.nio.FloatBuffer": - newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_FLOAT : org.lwjgl.opengl.GL11.GL_FLOAT)"; - break; - case "java.nio.DoubleBuffer": - newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_DOUBLE : org.lwjgl.opengl.GL11.GL_DOUBLE)"; - changedArgs[bufferArgIdx] = "me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(" - + changedArgs[bufferArgIdx] - + ")"; - break; - default: - throw new IllegalStateException(bufferArg); - } - changedArgs[i] = newArg; - } else { - success = false; - System.out.println( - new UnsupportedOperationException( - oldArgType + " -> " - + newArgType - + " in " - + oldClassNode.getKey() - + " : " - + oldMethodNode.getKey()) - .toString()); + && oldArgType.equals("java.lang.String")) { + // no-op + } else if ((newArgType.equals("java.nio.IntBuffer") || newArgType.equals("int[]")) + && oldArgType.equals("int")) { + changedArgs[i] = "new int[]{" + argNames[i] + "}"; + } else if ((newArgType.equals("java.nio.LongBuffer") || newArgType.equals("long[]")) + && oldArgType.equals("long")) { + changedArgs[i] = "new long[]{" + argNames[i] + "}"; + } else if (newArgType.equals("long") && newNativeType.endsWith("*") + && oldArgType.startsWith("java.nio.") + && oldArgType.endsWith("Buffer")) { + changedArgs[i] = "org.lwjglx.MemoryUtil.getAddress(" + argNames[i] + + ")"; + } else if (newArgType.equals("java.lang.CharSequence") + && oldArgType.equals("java.nio.ByteBuffer")) { + changedArgs[i] = "me.eigenraven.lwjgl3ify.BufferCasts.bufferToCharSeq(" + + argNames[i] + + ")"; + } else if (newArgType.equals("int") && oldArgType.equals("boolean") + && argNames[i].equals("unsigned") + && newArgNames[i].equals("type")) { + final String newArg; + switch (bufferArg) { + case "java.nio.ByteBuffer": + newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE)"; + break; + case "java.nio.ShortBuffer": + newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT)"; + break; + case "java.nio.IntBuffer": + newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT)"; + break; + case "java.nio.LongBuffer": + newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_LONG : org.lwjgl.opengl.GL11.GL_LONG)"; + break; + case "java.nio.FloatBuffer": + newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_FLOAT : org.lwjgl.opengl.GL11.GL_FLOAT)"; + break; + case "java.nio.DoubleBuffer": + newArg = "(unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_DOUBLE : org.lwjgl.opengl.GL11.GL_DOUBLE)"; + changedArgs[bufferArgIdx] = "me.eigenraven.lwjgl3ify.BufferCasts.toByteBuffer(" + + changedArgs[bufferArgIdx] + + ")"; + break; + default: + throw new IllegalStateException(bufferArg); } + changedArgs[i] = newArg; + } else { + success = false; + System.out.println( + new UnsupportedOperationException( + oldArgType + " -> " + + newArgType + + " in " + + oldClassNode.getKey() + + " : " + + oldMethodNode.getKey()).toString()); + } } } if (success) { return new MethodRedirector.TransformingRedirector( - this, - fuzzyMatch.getValue(), - preCode.toString(), - postCode.toString(), - changedArgs); + this, + fuzzyMatch.getValue(), + preCode.toString(), + postCode.toString(), + changedArgs); } } } @@ -270,7 +273,7 @@ public class MethodMatcher { throw new IllegalStateException(); } return new MethodMatcher(oldApi, newApi, oldClassNode, newApi.classes.floorEntry(superName), oldMethodNode) - .findMatch(); + .findMatch(); } return null; } diff --git a/src/util/java/me/eigenraven/lwjgl3ify/MethodRedirector.java b/src/util/java/me/eigenraven/lwjgl3ify/MethodRedirector.java index 08b4117..9c8aeaa 100644 --- a/src/util/java/me/eigenraven/lwjgl3ify/MethodRedirector.java +++ b/src/util/java/me/eigenraven/lwjgl3ify/MethodRedirector.java @@ -28,7 +28,8 @@ public abstract class MethodRedirector { access = access + " static"; } this.access = access; - this.javaClassName = matcher.oldClassNode.getValue().className.replace('/', '.').replace(".lwjglx.", ".lwjgl."); + this.javaClassName = matcher.oldClassNode.getValue().className.replace('/', '.') + .replace(".lwjglx.", ".lwjgl."); final int lastDot = javaClassName.lastIndexOf('.'); this.packageName = javaClassName.substring(0, lastDot); this.className = javaClassName.substring(lastDot + 1); @@ -36,15 +37,17 @@ public abstract class MethodRedirector { public void outputRedirector(final PrintWriter writer) { final String[] argDefs = Streams - .zip(Arrays.stream(matcher.argTypes), Arrays.stream(matcher.argNames), ((t, n) -> t + " " + n)) - .toArray(String[]::new); + .zip(Arrays.stream(matcher.argTypes), Arrays.stream(matcher.argNames), ((t, n) -> t + " " + n)) + .toArray(String[]::new); final String argDef = StringUtils.join(argDefs, ", "); writer.printf( - " %s %s %s(%s) {%n", - access, - matcher.methodType.getReturnType().getClassName().replace(".lwjgl.", ".lwjglx."), - matcher.oldMethod.name, - argDef); + " %s %s %s(%s) {%n", + access, + matcher.methodType.getReturnType() + .getClassName() + .replace(".lwjgl.", ".lwjglx."), + matcher.oldMethod.name, + argDef); this.writeBody(writer); writer.printf(" }%n%n"); } @@ -64,11 +67,12 @@ public abstract class MethodRedirector { protected void writeBody(PrintWriter writer) { final String argCall = StringUtils.join(matcher.argNames, ", "); writer.printf( - " %s%s.%s(%s);%n", - matcher.methodType.getReturnType().equals(Type.VOID_TYPE) ? "" : "return ", - this.javaClassName, - newMethod.name, - argCall); + " %s%s.%s(%s);%n", + matcher.methodType.getReturnType() + .equals(Type.VOID_TYPE) ? "" : "return ", + this.javaClassName, + newMethod.name, + argCall); } } @@ -78,7 +82,7 @@ public abstract class MethodRedirector { public final String[] argumentReplacements; public TransformingRedirector(MethodMatcher matcher, MethodNode newMethod, String preCode, String postCode, - String[] argumentReplacements) { + String[] argumentReplacements) { super(matcher, newMethod); this.preCode = preCode; this.postCode = postCode; @@ -88,7 +92,7 @@ public abstract class MethodRedirector { @Override protected void writeBody(PrintWriter writer) { final String[] transformedArgNames = Arrays - .copyOf(matcher.argNames, Math.max(matcher.argNames.length, argumentReplacements.length)); + .copyOf(matcher.argNames, Math.max(matcher.argNames.length, argumentReplacements.length)); for (int i = 0; i < transformedArgNames.length; i++) { if (i < argumentReplacements.length && argumentReplacements[i] != null) { transformedArgNames[i] = argumentReplacements[i]; @@ -98,10 +102,13 @@ public abstract class MethodRedirector { if (preCode != null) { writer.println(preCode); } - if (matcher.methodType.getReturnType().equals(Type.VOID_TYPE)) { + 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."); + final String retType = matcher.methodType.getReturnType() + .getClassName() + .replace(".lwjgl.", ".lwjglx."); String preRet = "", postRet = ""; if (retType.endsWith("ALCdevice")) { preRet = "new org.lwjglx.openal.ALCdevice("; @@ -112,18 +119,19 @@ public abstract class MethodRedirector { postRet = ")"; } writer.printf( - " %s returnValue = %s%s.%s(%s)%s;%n", - retType, - preRet, - this.javaClassName, - newMethod.name, - argCall, - postRet); + " %s returnValue = %s%s.%s(%s)%s;%n", + retType, + preRet, + this.javaClassName, + newMethod.name, + argCall, + postRet); } if (postCode != null) { writer.println(postCode); } - if (!matcher.methodType.getReturnType().equals(Type.VOID_TYPE)) { + if (!matcher.methodType.getReturnType() + .equals(Type.VOID_TYPE)) { writer.println(" return returnValue;"); } }