disposable singletons to an array in loader; single float for both notification and tooltip

This commit is contained in:
minjaesong
2019-05-24 20:38:35 +09:00
parent d08aae5db0
commit 3f692da03c
13 changed files with 116 additions and 69 deletions

View File

@@ -5,6 +5,7 @@ import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.*
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.glutils.FrameBuffer
import com.badlogic.gdx.utils.Disposable
import com.badlogic.gdx.utils.ScreenUtils
import net.torvald.terrarum.*
import net.torvald.terrarum.gameactors.ActorWithBody
@@ -23,7 +24,7 @@ import javax.swing.JFileChooser
*
* For the entire render path, see AppLoader.
*/
object IngameRenderer {
object IngameRenderer : Disposable {
/** for non-private use, use with care! */
lateinit var batch: SpriteBatch
private lateinit var camera: OrthographicCamera
@@ -61,6 +62,10 @@ object IngameRenderer {
private var debugMode = 0
init {
AppLoader.disposableSingletonsPool.add(this)
}
operator fun invoke(
gamePaused: Boolean,
world: GameWorldExtension,
@@ -604,7 +609,7 @@ object IngameRenderer {
private val TILE_SIZEF = CreateTileAtlas.TILE_SIZE.toFloat()
fun dispose() {
override fun dispose() {
fboRGB.dispose()
fboA.dispose()
fboRGB_lightMixed.dispose()