Skip to content
This repository was archived by the owner on Nov 24, 2024. It is now read-only.

Commit 6fe8276

Browse files
committed
Got bored. I added the one other guy who is watching my repo.
1 parent 00ac4ec commit 6fe8276

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

client/src/main/java/io/bluestaggo/voxelthing/Game.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public class Game {
4040
private static final String[] SKINS = {
4141
"joel",
4242
"staggo",
43-
"floof"
43+
"floof",
44+
"talon"
4445
};
4546
private int currentSkin;
4647
private boolean thirdPerson;

client/src/main/java/io/bluestaggo/voxelthing/renderer/MainRenderer.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,22 @@ public void draw() {
112112
glActiveTexture(GL_TEXTURE0);
113113
worldRenderer.draw();
114114

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);
123124

124125
if (walk > 0.2) {
125-
minX += skin.uCoord(32);
126-
maxX += skin.uCoord(32);
126+
minX += skinTex.uCoord(32);
127+
maxX += skinTex.uCoord(32);
127128
} 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);
130131
}
131132

132133
Texture.stop();
@@ -138,7 +139,7 @@ public void draw() {
138139
.scale(2.0f, 2.0f)
139140
.align(0.5f, 0.0f)
140141
.setSpherical(false)
141-
.withTexture(skin)
142+
.withTexture(skinTex)
142143
.withUV(minX, minY, maxX, maxY));
143144
}
144145

@@ -154,7 +155,7 @@ public void draw() {
154155
Quad quad = new Quad();
155156
draw2D.drawQuad(quad.clear().at(0, screen.getHeight() - 32 - (float) Math.abs(walk / 2.0) * 16.0f)
156157
.size(32, 32)
157-
.withTexture(skin)
158+
.withTexture(skinTex)
158159
.withUV(minX, minY, maxX, maxY));
159160

160161
fonts.outlined.print("§00ffffVOXEL THING §00ff00" + Game.VERSION, 5, 5, 1.0f, 1.0f, 1.0f);
-38 Bytes
Loading
Loading
Loading

0 commit comments

Comments
 (0)