small number font moved to apploader

This commit is contained in:
minjaesong
2019-01-22 23:05:29 +09:00
parent a192abd657
commit 14b485dc32
3 changed files with 25 additions and 8 deletions

View File

@@ -16,6 +16,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive; import com.google.gson.JsonPrimitive;
import net.torvald.dataclass.ArrayListMap; import net.torvald.dataclass.ArrayListMap;
import net.torvald.terrarum.imagefont.TinyAlphNum;
import net.torvald.terrarum.modulebasegame.IngameRenderer; import net.torvald.terrarum.modulebasegame.IngameRenderer;
import net.torvald.terrarum.utils.JsonFetcher; import net.torvald.terrarum.utils.JsonFetcher;
import net.torvald.terrarum.utils.JsonWriter; import net.torvald.terrarum.utils.JsonWriter;
@@ -145,6 +146,7 @@ public class AppLoader implements ApplicationListener {
public static LwjglApplicationConfiguration appConfig; public static LwjglApplicationConfiguration appConfig;
public static GameFontBase fontGame; public static GameFontBase fontGame;
public static TinyAlphNum fontSmallNumbers;
/** /**
* For the events depends on rendering frame (e.g. flicker on post-hit invincibility) * For the events depends on rendering frame (e.g. flicker on post-hit invincibility)
@@ -413,6 +415,7 @@ public class AppLoader implements ApplicationListener {
fontGame = new GameFontBase("assets/graphics/fonts/terrarum-sans-bitmap", false, true, fontGame = new GameFontBase("assets/graphics/fonts/terrarum-sans-bitmap", false, true,
Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest, false, 256, false Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest, false, 256, false
); );
fontSmallNumbers = TinyAlphNum.INSTANCE;
audioDevice = Gdx.audio.newAudioDevice(48000, false); audioDevice = Gdx.audio.newAudioDevice(48000, false);

View File

@@ -3,6 +3,7 @@ package net.torvald.terrarum
import com.badlogic.gdx.Gdx import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.GL20 import com.badlogic.gdx.graphics.GL20
import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.Texture import com.badlogic.gdx.graphics.Texture
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.glutils.FrameBuffer import com.badlogic.gdx.graphics.glutils.FrameBuffer
@@ -18,9 +19,7 @@ object PostProcessor {
private lateinit var batch: SpriteBatch // not nulling to save some lines of code private lateinit var batch: SpriteBatch // not nulling to save some lines of code
private lateinit var shapeRenderer: ShapeRenderer private lateinit var shapeRenderer: ShapeRenderer
//private lateinit var camera: OrthographicCamera private lateinit var camera: OrthographicCamera
//private var textureRegion: TextureRegion? = null
private lateinit var lutTex: Texture private lateinit var lutTex: Texture
@@ -34,8 +33,12 @@ object PostProcessor {
// init // init
if (!init) { if (!init) {
//textureRegion = TextureRegion(fbo.colorBufferTexture)
batch = SpriteBatch() batch = SpriteBatch()
camera = OrthographicCamera(AppLoader.screenW.toFloat(), AppLoader.screenH.toFloat())
camera.setToOrtho(true)
batch.projectionMatrix = camera.combined
shapeRenderer = ShapeRenderer() shapeRenderer = ShapeRenderer()
Gdx.gl20.glViewport(0, 0, AppLoader.appConfig.width, AppLoader.appConfig.height) Gdx.gl20.glViewport(0, 0, AppLoader.appConfig.width, AppLoader.appConfig.height)
} }
@@ -74,10 +77,24 @@ object PostProcessor {
AppLoader.defaultH.toFloat() AppLoader.defaultH.toFloat()
) )
} }
try {
batch.color = Color.CYAN
batch.inUse {
AppLoader.fontSmallNumbers.draw(
batch, defaultResStr,
(AppLoader.screenW - AppLoader.defaultW).div(2).toFloat(),
(AppLoader.screenH - AppLoader.defaultH).div(2).minus(10).toFloat()
)
}
}
catch (doNothing: NullPointerException) { }
} }
} }
} }
private val defaultResStr = "${AppLoader.defaultW}x${AppLoader.defaultH}"
/** /**
* Camera will be moved so that (newX, newY) would be sit on the top-left edge. * Camera will be moved so that (newX, newY) would be sit on the top-left edge.
*/ */

View File

@@ -122,7 +122,7 @@ object Terrarum : Screen {
val fontGame: GameFontBase = AppLoader.fontGame val fontGame: GameFontBase = AppLoader.fontGame
lateinit var fontSmallNumbers: TinyAlphNum val fontSmallNumbers: TinyAlphNum = AppLoader.fontSmallNumbers
var joypadLabelStart: Char = 0xE000.toChar() // lateinit var joypadLabelStart: Char = 0xE000.toChar() // lateinit
var joypadLableSelect: Char = 0xE000.toChar() // lateinit var joypadLableSelect: Char = 0xE000.toChar() // lateinit
@@ -311,10 +311,7 @@ object Terrarum : Screen {
shapeRender = ShapeRenderer() shapeRender = ShapeRenderer()
fontSmallNumbers = TinyAlphNum
ShaderProgram.pedantic = false
shaderBlur = AppLoader.loadShader("assets/blur.vert", "assets/blur.frag") shaderBlur = AppLoader.loadShader("assets/blur.vert", "assets/blur.frag")