From 94b753b996d5cf76f61efe3b17b5a7e4a193ac73 Mon Sep 17 00:00:00 2001 From: iamgreaser Date: Mon, 22 Aug 2016 10:51:05 +0000 Subject: [PATCH] GlHandler classes and whatnot (#30) * GlState.CapabilityTracker + fields in GlState * AlphaTestState * DepthTestState (+ capState for alphaTest) * ClearState * Color4 * LogicOp * (Src|Dst)BlendFunc and more blend stuff * finish BlendFuncState * Texture2DState * ColorMaterialState + activeTexture fix * PolygonOffsetState * move DstBlendFactor into obf alpha order * ColorMask * fog, fog, and more fog * CullFace * fix alpha ordering for $p/$r * the oh-so-used stencil buffer classes * glTexGen stuff * glColor3f * very minor fix just had to reverse the meaning of enable and disable that's all * name those two buffers * RenderMode start + fix an enum * RenderMode done properly this time --- .../net/minecraft/client/GlHandler.mapping | 203 +++++++++++++++++- 1 file changed, 194 insertions(+), 9 deletions(-) diff --git a/mappings/net/minecraft/client/GlHandler.mapping b/mappings/net/minecraft/client/GlHandler.mapping index d4854bc7c6..a7f8649e82 100644 --- a/mappings/net/minecraft/client/GlHandler.mapping +++ b/mappings/net/minecraft/client/GlHandler.mapping @@ -1,30 +1,172 @@ CLASS none/bos net/minecraft/client/GlHandler - CLASS none/bos$b + CLASS none/bos$a AlphaTestState + FIELD a capState Lnone/bos$c; + FIELD b func I + FIELD c ref F + CLASS none/bos$b BlendFuncState + FIELD a capState Lnone/bos$c; FIELD b sfactor I FIELD c dfactor I - CLASS none/bos$d + FIELD d srcAlpha I + FIELD e dstAlpha I + CLASS none/bos$c CapabilityTracker + FIELD a cap I + FIELD b state Z + METHOD a disable ()V + METHOD b enable ()V + METHOD a setState (Z)V + ARG 0 newState + CLASS none/bos$d ClearState FIELD a clearDepth D FIELD b clearColor Lnone/bos$e; - CLASS none/bos$e - CLASS none/bos$h + CLASS none/bos$e Color4 + FIELD a red F + FIELD b green F + FIELD c blue F + FIELD d alpha F + CLASS none/bos$f LogicOpState + FIELD a capState Lnone/bos$c; + FIELD b opcode I + CLASS none/bos$g ColorMask + FIELD a red Z + FIELD b green Z + FIELD c blue Z + FIELD d alpha Z + CLASS none/bos$h ColorMaterialState + FIELD a capState Lnone/bos$c; FIELD b face I FIELD c mode I - CLASS none/bos$k + CLASS none/bos$i FaceSides + FIELD a FRONT Lnone/bos$i; + FIELD b BACK Lnone/bos$i; + FIELD c FRONT_AND_BACK Lnone/bos$i; + CLASS none/bos$j CullFaceState + FIELD a capState Lnone/bos$c; + FIELD b mode I + CLASS none/bos$k DepthTestState + FIELD a capState Lnone/bos$c; FIELD b mask Z FIELD c func I - CLASS none/bos$p + CLASS none/bos$l DstBlendFactor + FIELD a CONSTANT_ALPHA Lnone/bos$l; + FIELD b CONSTANT_COLOR Lnone/bos$l; + FIELD c DST_ALPHA Lnone/bos$l; + FIELD d DST_COLOR Lnone/bos$l; + FIELD e ONE Lnone/bos$l; + FIELD f ONE_MINUS_CONSTANT_ALPHA Lnone/bos$l; + FIELD g ONE_MINUS_CONSTANT_COLOR Lnone/bos$l; + FIELD h ONE_MINUS_DST_ALPHA Lnone/bos$l; + FIELD i ONE_MINUS_DST_COLOR Lnone/bos$l; + FIELD j ONE_MINUS_SRC_ALPHA Lnone/bos$l; + FIELD k ONE_MINUS_SRC_COLOR Lnone/bos$l; + FIELD l SRC_ALPHA Lnone/bos$l; + FIELD m SRC_COLOR Lnone/bos$l; + FIELD n ZERO Lnone/bos$l; + CLASS none/bos$m FogMode + FIELD a LINEAR Lnone/bos$m; + FIELD b EXP Lnone/bos$m; + FIELD c EXP2 Lnone/bos$m; + CLASS none/bos$n FogState + FIELD a capState Lnone/bos$c; + FIELD b mode I + FIELD c density F + FIELD d start F + FIELD e end F + CLASS none/bos$o LogicOp + FIELD a AND Lnone/bos$o; + FIELD b AND_INVERTED Lnone/bos$o; + FIELD c AND_REVERSE Lnone/bos$o; + FIELD d CLEAR Lnone/bos$o; + FIELD e COPY Lnone/bos$o; + FIELD f COPY_INVERTED Lnone/bos$o; + FIELD g EQUIV Lnone/bos$o; + FIELD h INVERT Lnone/bos$o; + FIELD i NAND Lnone/bos$o; + FIELD j NOOP Lnone/bos$o; + FIELD k NOR Lnone/bos$o; + FIELD l OR Lnone/bos$o; + FIELD m OR_INVERTED Lnone/bos$o; + FIELD n OR_REVERSE Lnone/bos$o; + FIELD o SET Lnone/bos$o; + FIELD p XOR Lnone/bos$o; + CLASS none/bos$p PolygonOffsetState + FIELD a capFill Lnone/bos$c; + FIELD b capLine Lnone/bos$c; FIELD c factor F FIELD d units F - CLASS none/bos$x + CLASS none/bos$q RenderMode + FIELD a DEFAULT Lnone/bos$q; + FIELD b PLAYER_SKIN Lnone/bos$q; + FIELD c TRANSPARENT_MODEL Lnone/bos$q; + METHOD a begin ()V + METHOD b end ()V + CLASS none/bos$r SrcBlendFactor + FIELD a CONSTANT_ALPHA Lnone/bos$r; + FIELD b CONSTANT_COLOR Lnone/bos$r; + FIELD c DST_ALPHA Lnone/bos$r; + FIELD d DST_COLOR Lnone/bos$r; + FIELD e ONE Lnone/bos$r; + FIELD f ONE_MINUS_CONSTANT_ALPHA Lnone/bos$r; + FIELD g ONE_MINUS_CONSTANT_COLOR Lnone/bos$r; + FIELD h ONE_MINUS_DST_ALPHA Lnone/bos$r; + FIELD i ONE_MINUS_DST_COLOR Lnone/bos$r; + FIELD j ONE_MINUS_SRC_ALPHA Lnone/bos$r; + FIELD k ONE_MINUS_SRC_COLOR Lnone/bos$r; + FIELD l SRC_ALPHA Lnone/bos$r; + FIELD m SRC_ALPHA_SATURATE Lnone/bos$r; + FIELD n SRC_COLOR Lnone/bos$r; + FIELD o ZERO Lnone/bos$r; + CLASS none/bos$s StencilSubState + FIELD a func I + CLASS none/bos$t StencilState + FIELD a subState Lnone/bos$s; + FIELD c sfail I + FIELD d dpfail I + FIELD e dppass I + CLASS none/bos$u TexCoord + FIELD a S Lnone/bos$u; + FIELD b T Lnone/bos$u; + FIELD c R Lnone/bos$u; + FIELD d Q Lnone/bos$u; + CLASS none/bos$v TexGenCoordState + FIELD a capState Lnone/bos$c; + FIELD b coord I + FIELD c mode I + CLASS none/bos$w TexGenState + FIELD a s Lnone/bos$v; + FIELD b t Lnone/bos$v; + FIELD c r Lnone/bos$v; + FIELD d q Lnone/bos$v; + CLASS none/bos$x Texture2DState + FIELD a capState Lnone/bos$c; FIELD b boundTexture I + FIELD a matrixBuf Ljava/nio/FloatBuffer; + FIELD b vectorBuf Ljava/nio/FloatBuffer; + FIELD c alphaTestState Lnone/bos$a; + FIELD d lightSystemEnabled Lnone/bos$c; + FIELD e lightSourceEnabled [Lnone/bos$c; FIELD f colorMaterial Lnone/bos$h; FIELD g blendFunc Lnone/bos$b; FIELD h depth Lnone/bos$k; + FIELD i fogState Lnone/bos$n; + FIELD j cullFaceState Lnone/bos$j; FIELD k polygonOffset Lnone/bos$p; + FIELD l logicOpState Lnone/bos$f; + FIELD m texGenState Lnone/bos$w; + FIELD n clearState Lnone/bos$d; + FIELD o stencilState Lnone/bos$t; + FIELD p normalizeEnabled Lnone/bos$c; + FIELD q activeTexture I + FIELD r texture2DState [Lnone/bos$x; FIELD s shadeModel I + FIELD t rescaleNormalEnabled Lnone/bos$c; FIELD u colorMask Lnone/bos$g; FIELD v color Lnone/bos$e; METHOD A genTextures ()I + METHOD B enableNormalize ()V + METHOD C disableNormalize ()V + METHOD D enableRescaleNormal ()V + METHOD E disableRescaleNormal ()V METHOD F loadIdentity ()V METHOD G pushMatrix ()V METHOD H popMatrix ()V @@ -35,17 +177,22 @@ CLASS none/bos net/minecraft/client/GlHandler METHOD a clearDepth (D)V METHOD a scale (DDD)V METHOD a ortho (DDDDDD)V + METHOD a fogDensity (F)V METHOD a polygonOffset (FF)V ARG 0 factor ARG 1 units METHOD a normal (FFF)V METHOD a clearColor (FFFF)V + METHOD a enableLight (I)V METHOD a alphaFunc (IF)V + ARG 0 func + ARG 1 ref METHOD a colorMaterial (II)V ARG 0 face ARG 1 mode METHOD a texEnv (IIF)V METHOD a texEnv (III)V + METHOD a blendFuncSeparate (IIII)V METHOD a copyTexSubImage2D (IIIIIIII)V METHOD a texImage2D (IIIIIIIILjava/nio/IntBuffer;)V METHOD a readPixels (IIIIIILjava/nio/IntBuffer;)V @@ -56,51 +203,89 @@ CLASS none/bos net/minecraft/client/GlHandler METHOD a lightModel (ILjava/nio/FloatBuffer;)V METHOD a getInteger (ILjava/nio/IntBuffer;)V METHOD a multMatrix (Ljava/nio/FloatBuffer;)V - METHOD a (Lnone/bos$u;ILjava/nio/FloatBuffer;)V + METHOD a cullFace (Lnone/bos$i;)V + METHOD a fogMode (Lnone/bos$m;)V + METHOD a logicOp (Lnone/bos$o;)V + METHOD a blendFunc (Lnone/bos$r;Lnone/bos$l;)V + METHOD a beginRenderMode (Lnone/bos$q;)V + METHOD a blendFuncSeparate (Lnone/bos$r;Lnone/bos$l;Lnone/bos$r;Lnone/bos$l;)V + METHOD a enableTextureGen (Lnone/bos$u;)V + METHOD a texGenMode (Lnone/bos$u;I)V + METHOD a texGen (Lnone/bos$u;ILjava/nio/FloatBuffer;)V METHOD a multMatrix (Lorg/lwjgl/util/vector/Quaternion;)V METHOD a depthMask (Z)V METHOD a colorMask (ZZZZ)V METHOD b translate (DDD)V + METHOD b fogStart (F)V METHOD b texCoord (FF)V METHOD b scale (FFF)V METHOD b rotate (FFFF)V + METHOD b disableLight (I)V METHOD b blendFunc (II)V + METHOD b fog (ILjava/nio/FloatBuffer;)V METHOD b texParameter (IIF)V METHOD b texParameter (III)V METHOD b viewport (IIII)V METHOD b texSubImage2D (IIIIIIIILjava/nio/IntBuffer;)V METHOD b vertexPointer (IIILjava/nio/ByteBuffer;)V METHOD b texEnv (IILjava/nio/FloatBuffer;)V + METHOD b endRenderMode (Lnone/bos$q;)V + METHOD b disableTextureGen (Lnone/bos$u;)V METHOD c popAttrib ()V - METHOD c (F)V + METHOD c fogEnd (F)V METHOD c translate (FFF)V METHOD c color (FFFF)V METHOD c depthFunc (I)V + METHOD c fog (II)V METHOD c getTexLevelParameter (III)I METHOD c texCoordPointer (IIII)V METHOD c colorPointer (IIILjava/nio/ByteBuffer;)V METHOD c getFloat (ILjava/nio/FloatBuffer;)V + METHOD c getTexGenCoordState (Lnone/bos$u;)Lnone/bos$v; + METHOD d disableAlphaTest ()V METHOD d lineWidth (F)V + METHOD d color (FFF)V METHOD d blendEquation (I)V METHOD d polygonMode (II)V METHOD d vertexPointer (IIII)V + METHOD e enableAlphaTest ()V METHOD e vertex (FFF)V METHOD e deleteLists (II)V METHOD e colorPointer (IIII)V + METHOD f enableLightSystem ()V METHOD f logicOp (I)V METHOD f newList (II)V METHOD f drawArrays (III)V + METHOD g disableLightSystem ()V + METHOD g activeTexture (I)V METHOD g pixelStore (II)V + METHOD h enableColorMaterial ()V METHOD h deleteTextures (I)V + METHOD i disableColorMaterial ()V METHOD i bindTexture (I)V + METHOD j disableDepthTest ()V METHOD j shadeModel (I)V + METHOD k enableDepthTest ()V + METHOD l disableBlend ()V + METHOD m enableBlend ()V METHOD m clear (I)V METHOD n matrixMode (I)V + METHOD o enableFog ()V + METHOD p disableFog ()V METHOD p disableClientState (I)V + METHOD q enableCullFace ()V METHOD q enableClientState (I)V + METHOD r disableCullFace ()V METHOD r begin (I)V + METHOD s enablePolygonOffsetFill ()V METHOD s callList (I)V + METHOD t disablePolygonOffsetFill ()V METHOD t genLists (I)I METHOD u getString (I)Ljava/lang/String; METHOD v getInteger (I)I + METHOD w enableColorLogicOp ()V + METHOD w fogMode (I)V + METHOD x disableColorLogicOp ()V METHOD x cullFace (I)V + METHOD y enableTexture2D ()V + METHOD z disableTexture2D ()V