From c77947c782680a55615e9515f5175d6eebf3cd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 20 Feb 2015 02:17:46 +0100 Subject: [PATCH 1/2] Trying to fix some rendering glitches. --- .../li/cil/oc/client/renderer/TextBufferRenderCache.scala | 2 +- src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala b/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala index 7e66eed3e..e2087ea05 100644 --- a/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala +++ b/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala @@ -62,9 +62,9 @@ object TextBufferRenderCache extends Callable[Int] with RemovalListener[TileEnti GL11.glEndList() RenderState.checkError(getClass.getName + ".compileOrDraw: glEndList") - } + RenderState.bindTexture(0) RenderState.checkError(getClass.getName + ".compileOrDraw: leaving") true diff --git a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala index 93cba98cf..41bf5edf8 100644 --- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala +++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala @@ -183,7 +183,7 @@ class ClassTransformer extends IClassTransformer { // if (entity instanceof Drone) { // d5 = 0.0; // d6 = 0.0; - // d7 = -0.75; + // d7 = -0.25; // } // before the `instanceof EntityHanging` check in func_110827_b. if (ObfNames.Class_RenderLiving.contains(name.replace('.', '/'))) { @@ -202,7 +202,7 @@ class ClassTransformer extends IClassTransformer { toInject.add(new VarInsnNode(Opcodes.DSTORE, 17)) toInject.add(new LdcInsnNode(double2Double(0.0))) toInject.add(new VarInsnNode(Opcodes.DSTORE, 19)) - toInject.add(new LdcInsnNode(double2Double(-0.75))) + toInject.add(new LdcInsnNode(double2Double(-0.25))) toInject.add(new VarInsnNode(Opcodes.DSTORE, 21)) toInject.add(skip) instructions.insertBefore(varNode, toInject) From d24eff48d8288553aa831acf1b1f07f6725c0dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 20 Feb 2015 02:28:30 +0100 Subject: [PATCH 2/2] Yay case sensitivity. --- .../item/{chunkLoaderUpgrade.json => chunkloaderUpgrade.json} | 0 .../scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/assets/opencomputers/models/item/{chunkLoaderUpgrade.json => chunkloaderUpgrade.json} (100%) diff --git a/src/main/resources/assets/opencomputers/models/item/chunkLoaderUpgrade.json b/src/main/resources/assets/opencomputers/models/item/chunkloaderUpgrade.json similarity index 100% rename from src/main/resources/assets/opencomputers/models/item/chunkLoaderUpgrade.json rename to src/main/resources/assets/opencomputers/models/item/chunkloaderUpgrade.json diff --git a/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala b/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala index e2087ea05..30856969e 100644 --- a/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala +++ b/src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala @@ -64,13 +64,13 @@ object TextBufferRenderCache extends Callable[Int] with RemovalListener[TileEnti RenderState.checkError(getClass.getName + ".compileOrDraw: glEndList") } - RenderState.bindTexture(0) RenderState.checkError(getClass.getName + ".compileOrDraw: leaving") true } else { GL11.glCallList(list) + RenderState.bindTexture(0) RenderState.checkError(getClass.getName + ".compileOrDraw: glCallList") }