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

transition works as intended but ui is not tangible

Browse Source
This commit is contained in:
minjaesong
2020-09-14 15:19:34 +09:00
parent 1aadde9e9f
commit bd7a66728b
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/AppLoader.java
View File

@@ -213,6 +213,8 @@ public class AppLoader implements ApplicationListener {
public static final int minimumW = 1080; public static final int minimumW = 1080;
public static final int minimumH = 720; public static final int minimumH = 720;
public static final String FONT_DIR = "assets/graphics/fonts/terrarum-sans-bitmap";
private static ShaderProgram shaderBayerSkyboxFill; // ONLY to be used by the splash screen private static ShaderProgram shaderBayerSkyboxFill; // ONLY to be used by the splash screen
@@ -481,14 +483,12 @@ public class AppLoader implements ApplicationListener {
}*/ }*/
fontGame = new GameFontBase("assets/graphics/fonts/terrarum-sans-bitmap", false, true, fontGame = new GameFontBase(FONT_DIR, false, true,
false, Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest, false, 256, false false, Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest, false, 256, false
); );
Lang.invoke(); Lang.invoke();
// make loading list // make loading list
CommonResourcePool.INSTANCE.loadAll(); CommonResourcePool.INSTANCE.loadAll();
} }

9
src/net/torvald/terrarum/ui/UIItemHorizontalFadeSlide.kt
View File

@@ -1,6 +1,7 @@
package net.torvald.terrarum.ui package net.torvald.terrarum.ui
import com.jme3.math.FastMath import com.jme3.math.FastMath
import kotlin.math.absoluteValue
import kotlin.math.roundToInt import kotlin.math.roundToInt
/** /**
@@ -19,11 +20,7 @@ class UIItemHorizontalFadeSlide(
) : UIItemTransitionContainer(parent, initialX, initialY, width, height, 0.15f, currentPosition, uis) { ) : UIItemTransitionContainer(parent, initialX, initialY, width, height, 0.15f, currentPosition, uis) {
fun getOffX(index: Int) = ((currentPosition - index) * width / 2f).roundToInt() fun getOffX(index: Int) = ((currentPosition - index) * width / 2f).roundToInt()
fun getOpacity(index: Int) = 1f fun getOpacity(index: Int) = 1f - (currentPosition - index).absoluteValue.coerceIn(0f, 1f)
/*if (currentPosition >= index)
1f - (currentPosition - index).coerceIn(0f, 1f)
else
(currentPosition - index).coerceIn(0f, 1f) - 1f*/
init { init {
@@ -39,7 +36,7 @@ class UIItemHorizontalFadeSlide(
override fun onTransition(currentPosition: Float, uis: Array<out UICanvas>) { override fun onTransition(currentPosition: Float, uis: Array<out UICanvas>) {
uis.forEachIndexed { index, it -> uis.forEachIndexed { index, it ->
it.posX = it.initialX - getOffX(index) it.posX = -getOffX(index)
it.posY = it.initialY it.posY = it.initialY
it.opacity = getOpacity(index) it.opacity = getOpacity(index)
} }