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

font bug sorta fixed, new splash: warning health and safety

Browse Source 
Former-commit-id: f79503873f57e781480fa742ed1a058becb6c7a1
Former-commit-id: daeeed816b339958786746c3717670c724676a44
This commit is contained in:
Song Minjae
2016-08-05 01:59:43 +09:00
parent 17c39c1824
commit fa5e95a89d
38 changed files with 483 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/weather/BaseModularWeather.kt
View File

@@ -14,5 +14,7 @@ data class BaseModularWeather(
val globalLightColourMap: Image,
var skyboxGradColourMap: Image,
val classification: String,
var extraImages: ArrayList<Image>
var extraImages: ArrayList<Image>,
val mixFrom: String? = null,
val mixPercentage: Double? = null
)

14
src/net/torvald/terrarum/weather/WeatherMixer.kt
View File

@@ -27,12 +27,15 @@ object WeatherMixer {
lateinit var currentWeather: BaseModularWeather
lateinit var nextWeather: BaseModularWeather
lateinit var mixedWeather: BaseModularWeather
private var skyBoxCurrent = Rectangle(0f, 0f, Terrarum.WIDTH.toFloat(), Terrarum.HEIGHT.toFloat())
private var skyBoxNext = Rectangle(0f, 0f, Terrarum.WIDTH.toFloat(), Terrarum.HEIGHT.toFloat())
val globalLightNow = Light10B(0)
// Weather indices
const val WEATHER_GENERIC = "generic"
const val WEATHER_GENERIC_RAIN = "genericrain"
// TODO add weather classification indices manually
const val RAW_DIR = "./assets/raw/weathers"
@@ -169,6 +172,12 @@ object WeatherMixer {
val skybox: Image
val extraImages = ArrayList<Image>()
val classification = JSON.get("classification").asJsonPrimitive.asString
val mixFrom: String?
try { mixFrom = JSON.get("mixFrom").asJsonPrimitive.asString }
catch (e: NullPointerException) { mixFrom = null }
val mixPercentage: Double?
try { mixPercentage = JSON.get("mixPercentage").asJsonPrimitive.asDouble }
catch (e: NullPointerException) { mixPercentage = null }
// parse globalLight
if (globalLightInJson.isString)
@@ -196,7 +205,10 @@ object WeatherMixer {
// get extra images
for (i in extraImagesPath)
extraImages.add(Image("$pathToImage/$i"))
extraImages.add(Image("$pathToImage/${i.asString}"))
// get mix from
return BaseModularWeather(globalLight, skybox, classification, extraImages)
}