curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 11:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

removing default batch on blendxxx() funs

Browse Source
This commit is contained in:
minjaesong
2019-01-20 03:09:23 +09:00
parent 9ca078687f
commit 5786b843e4
16 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/modulebasegame/ui/MessageWindow.kt
View File

@@ -3,9 +3,9 @@ package net.torvald.terrarum.modulebasegame.ui
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.Second
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.blendNormal
import net.torvald.terrarum.Second
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
@@ -36,7 +36,7 @@ class MessageWindow(override var width: Int, isBlackVariant: Boolean) : UICanvas
}
override fun renderUI(batch: SpriteBatch, camera: Camera) {
blendNormal()
blendNormal(batch)
val textWidth = messagesList.map { Terrarum.fontGame.getWidth(it) }.sorted()[1]

4
src/net/torvald/terrarum/modulebasegame/ui/UIBasicNotifier.kt
View File

@@ -114,7 +114,7 @@ class UIBasicNotifier(private val player: ActorHumanoid?) : UICanvas() {
override fun renderUI(batch: SpriteBatch, camera: Camera) {
// light overlay or EL
if (ELon) {
blendNormal()
blendNormal(batch)
batch.draw(atlas.get(0, 2), 0f, 0f)
}
else {
@@ -124,7 +124,7 @@ class UIBasicNotifier(private val player: ActorHumanoid?) : UICanvas() {
}
// LCD back
blendNormal()
blendNormal(batch)
batch.draw(atlas.get(0, 3), 0f, 0f)

4
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
View File

@@ -188,7 +188,7 @@ class UIInventoryFull(
)
// encumbrance bar background
blendMul()
blendMul(batch)
batch.color = Color(0xa0a0a0_ff.toInt())
batch.fillRect(
xEnd - 3 - weightBarWidth,
@@ -197,7 +197,7 @@ class UIInventoryFull(
controlHelpHeight - 6f
)
// encumbrance bar
blendNormal()
blendNormal(batch)
batch.color = if (isEncumbered) Color(0xff0000_cc.toInt()) else Color(0x00ff00_cc.toInt())
batch.fillRect(
xEnd - 3 - weightBarWidth,

2
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryEquippedView.kt
View File

@@ -62,7 +62,7 @@ class UIItemInventoryEquippedView(
override fun render(batch: SpriteBatch, camera: Camera) {
// sprite background
blendNormal()
blendNormal(batch)
batch.color = spriteViewBackCol
batch.fillRect(
posX.toFloat(), posY.toFloat(),

2
src/net/torvald/terrarum/modulebasegame/ui/UIItemModuleInfoCell.kt
View File

@@ -23,7 +23,7 @@ class UIItemModuleInfoCell(
private val numberAreaWidth = Terrarum.fontSmallNumbers.W * 3 + 4
override fun render(batch: SpriteBatch, camera: Camera) {
blendNormal()
blendNormal(batch)
if (ModMgr.moduleInfo.containsKey(moduleName)) {
val modInfo = ModMgr.moduleInfo[moduleName]!!

4
src/net/torvald/terrarum/modulebasegame/ui/UITierOneWatch.kt
View File

@@ -63,7 +63,7 @@ class UITierOneWatch(private val player: ActorHumanoid?) : UICanvas() {
override fun renderUI(batch: SpriteBatch, camera: Camera) {
// light overlay or EL
if (ELon) {
blendNormal()
blendNormal(batch)
batch.draw(atlas.get(0, 2), 0f, 0f)
}
else {
@@ -73,7 +73,7 @@ class UITierOneWatch(private val player: ActorHumanoid?) : UICanvas() {
}
// LCD back
blendNormal()
blendNormal(batch)
batch.draw(atlas.get(0, 3), 0f, 0f)

2
src/net/torvald/terrarum/modulebasegame/ui/UITitleCharactersList.kt
View File

@@ -51,7 +51,7 @@ class UITitleCharactersList : UICanvas() {
override fun renderUI(batch: SpriteBatch, camera: Camera) {
batch.color = Color.WHITE
blendNormal()
blendNormal(batch)
mouduleArea.render(batch, camera)
}

2
src/net/torvald/terrarum/modulebasegame/ui/UITitleModules.kt
View File

@@ -58,7 +58,7 @@ class UITitleModules : UICanvas() {
override fun renderUI(batch: SpriteBatch, camera: Camera) {
batch.color = Color.WHITE
blendNormal()
blendNormal(batch)
mouduleArea.render(batch, camera)
}