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

dunno why but setting camera position to negative works...

Browse Source
This commit is contained in:
minjaesong
2017-07-03 23:42:59 +09:00
parent b7fb8ff4da
commit 7b2b6caf82
10 changed files with 112 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
View File

@@ -207,9 +207,9 @@ class BasicDebugInfoWindow : UICanvas {
private fun drawHistogram(batch: SpriteBatch, histogram: LightmapRenderer.Histogram, x: Int, y: Int) {
val uiColour = Color(0x000000_80.toInt())
val barR = Color(0xDD0000_FF.toInt())
val barG = Color(0x00DD00_FF.toInt())
val barB = Color(0x0000DD_FF.toInt())
val barR = Color(0xFF0000_FF.toInt())
val barG = Color(0x00FF00_FF.toInt())
val barB = Color(0x0000FF_FF.toInt())
val barColour = arrayOf(barR, barG, barB)
val w = histogramW.toFloat()
val h = histogramH.toFloat()
@@ -223,7 +223,7 @@ class BasicDebugInfoWindow : UICanvas {
TerrarumGDX.fontSmallNumbers.draw(batch, "255", x.toFloat() + w + 1 - 8*3, y.toFloat() + h + 2)
TerrarumGDX.fontSmallNumbers.draw(batch, "Histogramme", x + w / 2 - 5.5f * 8, y.toFloat() + h + 2)
//blendScreen()
blendScreen()
for (c in 0..2) {
for (i in 0..255) {
var histogram_value = if (i == 255) 0 else histogram.get(c)[i]
@@ -242,7 +242,7 @@ class BasicDebugInfoWindow : UICanvas {
batch.fillRect(bar_x, bar_y, bar_w, bar_h)
}
}
//blendNormal()
blendNormal()
}
private fun drawGamepadAxis(batch: SpriteBatch, axisX: Float, axisY: Float, uiX: Int, uiY: Int) {

4
src/net/torvald/terrarum/ui/UIHandler.kt
View File

@@ -18,7 +18,7 @@ import net.torvald.terrarum.gamecontroller.KeyToggler
class UIHandler(val UI: UICanvas,
val toggleKey: Int? = null, val toggleButton: Int? = null,
// UI positions itself? (you must g.flush() yourself after the g.translate(Int, Int))
var customPositioning: Boolean = false,
var customPositioning: Boolean = false, // mainly used by vital meter
val doNotWarnConstant: Boolean = false
) {
@@ -141,7 +141,7 @@ class UIHandler(val UI: UICanvas,
if (!customPositioning)
TerrarumGDX.ingame?.setCameraPosition(posX.toFloat(), posY.toFloat())
batch.color = Color.WHITE
UI.render(batch)
//ingameGraphics.flush()
}

1
src/net/torvald/terrarum/ui/UIQuickBar.kt
View File

@@ -34,6 +34,7 @@ class UIQuickBar : UICanvas, MouseControlled {
}
override fun render(batch: SpriteBatch) {
for (i in 0..SLOT_COUNT - 1) {
val image = if (i == selection)
ItemSlotImageBuilder.produceLarge(false, i + 1)