Skip to content

Commit d6daea2

Browse files
Merge branch 'main' into modernize-codebase-cleanup
2 parents db7cbdb + b2509cf commit d6daea2

4 files changed

Lines changed: 14 additions & 0 deletions

File tree

.github/copilot-instructions.md

Whitespace-only changes.

CLAUDE.md

Whitespace-only changes.

src/main/java/com/bobsgame/client/GLUtils.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.lwjgl.opengl.GL14;
2020

2121
import static org.lwjgl.opengl.GL11.*;
22+
import com.bobsgame.client.engine.text.BobFont.BitmapFont;
2223

2324
public class GLUtils {
2425
public static Logger log = (Logger) LoggerFactory.getLogger(GLUtils.class);
@@ -40,6 +41,17 @@ public class GLUtils {
4041

4142
public static float globalDrawScale = 1.0f;
4243

44+
public static class DummyFont {
45+
public int getWidth(String text) {
46+
if (text == null) return 0;
47+
return text.length() * 10;
48+
}
49+
50+
public void drawString(float x, float y, String text, BobColor color) {
51+
// TODO
52+
}
53+
}
54+
4355
public GLUtils() {
4456
blankTexture = GLUtils.loadTexture("res/misc/blank.png");
4557
boxTexture = GLUtils.loadTexture("res/misc/box.png");
@@ -357,6 +369,7 @@ public static void drawOutlinedString(String text, int screenX, int screenY, Bob
357369
}
358370

359371
public static void drawOutlinedString(int screenX0, int screenY0, String text, BobColor color) {
372+
// TODO: Reimplement Font rendering using STB Truetype or similar
360373
if (font == null) {
361374
log.error("Font is null");
362375
return;

src/main/java/com/bobsgame/client/engine/text/TextManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import com.bobsgame.client.Texture;
1414

15+
1516
import ch.qos.logback.classic.Logger;
1617

1718
import com.bobsgame.client.GLUtils;

0 commit comments

Comments
 (0)