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

more testing on skydome / font change

Browse Source
This commit is contained in:
minjaesong
2020-04-29 08:48:06 +09:00
parent 826a13ff57
commit 226c8342cb
19 changed files with 468 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/net/torvald/parametricsky/Application.kt
View File

@@ -5,16 +5,22 @@ import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Screen
import com.badlogic.gdx.backends.lwjgl.LwjglApplication
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.Pixmap
import com.badlogic.gdx.graphics.Texture
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.EMDASH
import net.torvald.colourutil.*
import net.torvald.parametricsky.datasets.DatasetCIEXYZ
import net.torvald.parametricsky.datasets.DatasetRGB
import net.torvald.parametricsky.datasets.DatasetSpectral
import net.torvald.terrarum.inUse
import net.torvald.terrarum.modulebasegame.worldgenerator.HALF_PI
import net.torvald.terrarum.modulebasegame.worldgenerator.TWO_PI
import java.awt.Dimension
import javax.swing.*
import kotlin.math.PI
import kotlin.math.pow
const val WIDTH = 1200
@@ -50,8 +56,9 @@ class Application : Game() {
private lateinit var testTex: Texture
var turbidity = 5.0
var albedo = 0.0
var albedo = 0.1
var elevation = 0.0
var scalefactor = 1f
override fun getScreen(): Screen {
return super.getScreen()
@@ -64,12 +71,14 @@ class Application : Game() {
override fun render() {
Gdx.graphics.setTitle("Daylight Model $EMDASH F: ${Gdx.graphics.framesPerSecond}")
if (turbidity <= 0) throw IllegalStateException()
// we need to use different modelstate to accomodate different albedo for each spectral band but oh well...
genTexLoop(ArHosekSkyModel.arhosek_xyz_skymodelstate_alloc_init(turbidity, albedo, elevation))
val tex = Texture(oneScreen)
tex.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear)
tex.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest)
batch.inUse {
batch.draw(tex, 0f, 0f, WIDTH.toFloat(), HEIGHT.toFloat())
@@ -94,8 +103,8 @@ class Application : Game() {
oneScreen.dispose()
}
val outTexWidth = 32
val outTexHeight = 16
val outTexWidth = 256
val outTexHeight = 256
/**
* Generated texture is as if you took the panorama picture of sky: up 70deg to horizon, east-south-west;
@@ -112,6 +121,28 @@ class Application : Game() {
}
for (y in 0 until oneScreen.height) {
for (x in 0 until oneScreen.width) {
val gamma = (x / oneScreen.width.toDouble()) * TWO_PI // 0deg..360deg
val theta = (1.0 - (y / oneScreen.height.toDouble())) * HALF_PI // 90deg..0deg
val xyz = CIEXYZ(
ArHosekSkyModel.arhosek_tristim_skymodel_radiance(state, theta, gamma, 0).toFloat().times(scalefactor / 10f),
ArHosekSkyModel.arhosek_tristim_skymodel_radiance(state, theta, gamma, 1).toFloat().times(scalefactor / 10f),
ArHosekSkyModel.arhosek_tristim_skymodel_radiance(state, theta, gamma, 2).toFloat().times(scalefactor / 10f)
)
val rgb = xyz.toRGB().toColor()
rgb.a = 1f
oneScreen.setColor(rgb)
oneScreen.drawPixel(x, y)
//println("x: ${xyz.X}, y: ${xyz.Y}, z: ${xyz.Z}")
}
}
//System.exit(0)
}
/**
@@ -190,14 +221,21 @@ class Application : Game() {
val mainPanel = JPanel()
val turbidityControl = JSpinner(SpinnerNumberModel(5, 1, 10, 1))
val albedoControl = JSpinner(SpinnerNumberModel(0.3, 0.0, 1.0, 0.05))
val elevationControl = JSpinner(SpinnerNumberModel(45, 0, 90, 5))
val turbidityControl = JSpinner(SpinnerNumberModel(5.0, 1.0, 10.0, 0.1))
val albedoControl = JSpinner(SpinnerNumberModel(0.1, 0.0, 1.0, 0.05))
val elevationControl = JSpinner(SpinnerNumberModel(0.0, 0.0, 90.0, 0.5))
val scalefactorControl = JSpinner(SpinnerNumberModel(1.0, 0.0, 2.0, 0.01))
init {
val turbidityPanel = JPanel()
val albedoPanel = JPanel()
val elevationPanel = JPanel()
val scalefactorPanel = JPanel()
turbidityControl.preferredSize = Dimension(45, 18)
albedoControl.preferredSize = Dimension(45, 18)
elevationControl.preferredSize = Dimension(45, 18)
scalefactorControl.preferredSize = Dimension(45, 18)
turbidityPanel.add(JLabel("Turbidity"))
turbidityPanel.add(turbidityControl)
@@ -208,9 +246,13 @@ class Application : Game() {
elevationPanel.add(JLabel("Elevation"))
elevationPanel.add(elevationControl)
scalefactorPanel.add(JLabel("Scaling Factor"))
scalefactorPanel.add(scalefactorControl)
mainPanel.add(turbidityPanel)
mainPanel.add(albedoPanel)
mainPanel.add(elevationPanel)
mainPanel.add(scalefactorPanel)
this.isVisible = true
this.defaultCloseOperation = WindowConstants.EXIT_ON_CLOSE
@@ -228,7 +270,11 @@ class Application : Game() {
}
elevationControl.addChangeListener {
app.elevation = Math.toRadians((elevationControl.value as Int).toDouble())
app.elevation = Math.toRadians(elevationControl.value as Double)
}
scalefactorControl.addChangeListener {
app.scalefactor = (scalefactorControl.value as Double).toFloat()
}
}

21
src/net/torvald/parametricsky/ArHosekSkyModel.kt
View File

@@ -160,8 +160,10 @@ object ArHosekSkyModel {
// internal definitions
private class DoubleArrayPtr(val arr: DoubleArray, var ptrOffset: Int) {
init {
if (ptrOffset < 0) throw IllegalArgumentException("Negative ptrOffset: $ptrOffset")
}
operator fun get(i: Int) = arr[ptrOffset + i]
}
private class DoubleArrayArrayPtr(var arr: Array<DoubleArray>, var ptrOffset: Int) {
@@ -185,6 +187,8 @@ object ArHosekSkyModel {
albedo: Double,
solar_elevation: Double
) {
if (turbidity < 1) throw IllegalArgumentException("Turbidity must be equal to or greater than 1 (got $turbidity)")
var elev_matrix: DoubleArrayPtr
val int_turbidity = turbidity.toInt()
@@ -193,7 +197,6 @@ object ArHosekSkyModel {
val solar_elevation = pow(solar_elevation / (MATH_PI / 2.0), (1.0 / 3.0))
// alb 0 low turb
elev_matrix = DoubleArrayPtr(dataset, 9 * 6 * (int_turbidity - 1))
@@ -672,13 +675,13 @@ object ArHosekSkyModel {
state.configs[channel],
theta,
gamma
) * state.radiances[channel];
) * state.radiances[channel]
}
private const val pieces = 45
private const val order = 4
fun arhosekskymodel_sr_internal(
private fun arhosekskymodel_sr_internal(
state: ArHosekSkyModelState,
turbidity: Int,
wl: Int,
@@ -686,7 +689,7 @@ object ArHosekSkyModel {
): Double {
var pos = (pow(2.0 * elevation / MATH_PI, 1.0 / 3.0) * pieces).toInt() // floor
if (pos > 44) pos = 44;
if (pos > 44) pos = 44
val break_x = pow((pos.toDouble() / pieces.toDouble()), 3.0) * (MATH_PI * 0.5)
@@ -773,7 +776,7 @@ object ArHosekSkyModel {
val singamma = sin(gamma)
var sc2 = 1.0 - ar2 * singamma * singamma
if (sc2 < 0.0) sc2 = 0.0
var sampleCosine = sqrt (sc2);
var sampleCosine = sqrt(sc2)
// The following will be improved in future versions of the model:
// here, we directly use fitted 5th order polynomials provided by the
@@ -791,9 +794,9 @@ object ArHosekSkyModel {
ldCoefficient[4] * pow(sampleCosine, 4.0) +
ldCoefficient[5] * pow(sampleCosine, 5.0)
direct_radiance *= darkeningFactor;
direct_radiance *= darkeningFactor
return direct_radiance;
return direct_radiance
}
fun arhosekskymodel_solar_radiance(
@@ -816,7 +819,7 @@ object ArHosekSkyModel {
wavelength
)
return direct_radiance + inscattered_radiance;
return direct_radiance + inscattered_radiance
}
}

2
src/net/torvald/parametricsky/datasets/DatasetSpectral.kt
View File

@@ -194,6 +194,8 @@ object DatasetSpectral {
solarDataset720
)
val waves = floatArrayOf(320f, 360f, 400f, 440f, 480f, 520f, 560f, 600f, 640f, 680f, 720f)
val limbDarkeningDataset320 = doubleArrayOf(0.087657, 0.767174, 0.658123, -1.02953, 0.703297, -0.186735)
val limbDarkeningDataset360 = doubleArrayOf(0.122953, 1.01278, 0.238687, -1.12208, 1.17087, -0.424947)