@@ -112,21 +112,22 @@ public void draw() {
112
112
glActiveTexture (GL_TEXTURE0 );
113
113
worldRenderer .draw ();
114
114
115
- Texture skin = textures .getTexture (game .getSkin ());
116
- int frame = game .getSkin ().contains ("floof" ) ? (int ) (Window .getTimeElapsed () * 8.0D ) % 8
117
- : game .getSkin ().contains ("staggo" ) ? 1 : 0 ;
118
- double walk = game .getSkin ().contains ("staggo" ) ? Math .sin (Window .getTimeElapsed () * 8.0D ) : 0.0 ;
119
- float minX = frame < 5 ? skin .uCoord (32 ) : skin .uCoord (64 );
120
- float maxX = frame < 5 ? skin .uCoord (64 ) : skin .uCoord (32 );
121
- float minY = frame < 5 ? skin .vCoord (frame * 32 ) : skin .vCoord ((8 - frame ) * 32 );
122
- float maxY = minY + skin .vCoord (32 );
115
+ String skin = game .getSkin ();
116
+ Texture skinTex = textures .getTexture (skin );
117
+ int frame = skin .contains ("floof" ) || skin .contains ("talon" ) ? (int ) (Window .getTimeElapsed () * 8.0D ) % 8
118
+ : skin .contains ("staggo" ) || skin .contains ("talon" ) ? 1 : 0 ;
119
+ double walk = skin .contains ("staggo" ) || skin .contains ("talon" ) ? Math .sin (Window .getTimeElapsed () * 8.0D ) : 0.0 ;
120
+ float minX = frame < 5 ? skinTex .uCoord (32 ) : skinTex .uCoord (64 );
121
+ float maxX = frame < 5 ? skinTex .uCoord (64 ) : skinTex .uCoord (32 );
122
+ float minY = frame < 5 ? skinTex .vCoord (frame * 32 ) : skinTex .vCoord ((8 - frame ) * 32 );
123
+ float maxY = minY + skinTex .vCoord (32 );
123
124
124
125
if (walk > 0.2 ) {
125
- minX += skin .uCoord (32 );
126
- maxX += skin .uCoord (32 );
126
+ minX += skinTex .uCoord (32 );
127
+ maxX += skinTex .uCoord (32 );
127
128
} else if (walk < -0.2 ) {
128
- minX -= skin .uCoord (32 );
129
- maxX -= skin .uCoord (32 );
129
+ minX -= skinTex .uCoord (32 );
130
+ maxX -= skinTex .uCoord (32 );
130
131
}
131
132
132
133
Texture .stop ();
@@ -138,7 +139,7 @@ public void draw() {
138
139
.scale (2.0f , 2.0f )
139
140
.align (0.5f , 0.0f )
140
141
.setSpherical (false )
141
- .withTexture (skin )
142
+ .withTexture (skinTex )
142
143
.withUV (minX , minY , maxX , maxY ));
143
144
}
144
145
@@ -154,7 +155,7 @@ public void draw() {
154
155
Quad quad = new Quad ();
155
156
draw2D .drawQuad (quad .clear ().at (0 , screen .getHeight () - 32 - (float ) Math .abs (walk / 2.0 ) * 16.0f )
156
157
.size (32 , 32 )
157
- .withTexture (skin )
158
+ .withTexture (skinTex )
158
159
.withUV (minX , minY , maxX , maxY ));
159
160
160
161
fonts .outlined .print ("§00ffffVOXEL THING §00ff00" + Game .VERSION , 5 , 5 , 1.0f , 1.0f , 1.0f );
0 commit comments