mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-03-11 06:11:50 +09:00
more tiles (green sand, sandstones), lightmaprenderer now search for all luminous cator, solid tiles now WILL NOT "hide" walls, EnvColourOverlay will also make screen warm (haven't tested)
Former-commit-id: fc45b4c8992d7bdaf8612ec9b1048eeafe862573 Former-commit-id: 5514775225b569ba2423d97a253b28def9680bc3
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
package com.Torvald.ImageFont;
|
||||
|
||||
import com.Torvald.Terrarum.Terrarum;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.newdawn.slick.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -318,6 +320,11 @@ public class GameFontBase implements Font {
|
||||
|
||||
@Override
|
||||
public void drawString(float x, float y, String s) {
|
||||
drawString(x, y, s, Color.white);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawString(float x, float y, String s, Color color) {
|
||||
// hangul fonts first
|
||||
hangulSheet.startUse();
|
||||
// WANSEONG
|
||||
@@ -498,11 +505,6 @@ public class GameFontBase implements Font {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawString(float x, float y, String s, Color color) {
|
||||
drawString(x, y, s);
|
||||
}
|
||||
|
||||
private int getSheetType(char c) {
|
||||
// EFs
|
||||
if (isAsciiEF(c)) return SHEET_ASCII_EF;
|
||||
@@ -553,4 +555,14 @@ public class GameFontBase implements Font {
|
||||
public void setInterchar(int margin) {
|
||||
interchar = margin;
|
||||
}
|
||||
|
||||
private void setBlendModeMul() {
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
}
|
||||
|
||||
private void setBlendModeNormal() {
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
Terrarum.appgc.getGraphics().setDrawMode(Graphics.MODE_NORMAL);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user