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

torches' flicker time is now determined by FPS to get same speed from alternating frame rate

Browse Source 
Former-commit-id: c88c54f7613f8f3bbc3b89153ca30400b2a124ac
Former-commit-id: 505ebdaf930f257e1a2521a5b07b65843e56a201
This commit is contained in:
Song Minjae
2016-06-17 01:49:19 +09:00
parent c4ad69525b
commit 175f6de01b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/torvald/terrarum/tileproperties/TilePropUtil.kt
View File

@@ -10,7 +10,7 @@ import net.torvald.terrarum.mapdrawer.LightmapRenderer
*/ */
object TilePropUtil { object TilePropUtil {
var flickerFuncX = 0 // in milliseconds; saves current status of func var flickerFuncX = 0 // in milliseconds; saves current status of func
val flickerFuncDomain = 50 // time between two noise sample, in milliseconds val flickerFuncDomain = 100 // time between two noise sample, in milliseconds
val flickerFuncRange = 0.012f // intensity [0, 1] val flickerFuncRange = 0.012f // intensity [0, 1]
//val torchIntensityOffset = -0.04f //val torchIntensityOffset = -0.04f
@@ -33,7 +33,8 @@ object TilePropUtil {
} }
fun torchFlickerTickClock() { fun torchFlickerTickClock() {
flickerFuncX += Terrarum.game.DELTA_T if (Terrarum.appgc.fps > 0)
flickerFuncX += 1000 / Terrarum.appgc.fps
if (flickerFuncX > flickerFuncDomain) { if (flickerFuncX > flickerFuncDomain) {
flickerFuncX -= flickerFuncDomain flickerFuncX -= flickerFuncDomain