un-hardcode fog config

This commit is contained in:
2023-08-17 21:17:28 +10:00
parent 2c5547320d
commit d045560ef5
7 changed files with 218 additions and 63 deletions

View File

@ -2,7 +2,6 @@ package gay.pizza.CavesOfJolk
import com.badlogic.gdx.ApplicationAdapter
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.audio.Sound
import com.badlogic.gdx.graphics.*
import com.badlogic.gdx.graphics.g2d.BitmapFont
import com.badlogic.gdx.graphics.g2d.SpriteBatch
@ -13,7 +12,6 @@ import com.badlogic.gdx.graphics.g3d.attributes.IntAttribute
import com.badlogic.gdx.graphics.g3d.attributes.TextureAttribute
import com.badlogic.gdx.graphics.g3d.environment.DirectionalLight
import com.badlogic.gdx.graphics.g3d.shaders.DefaultShader
import com.badlogic.gdx.graphics.g3d.utils.DefaultShaderProvider
import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder
import com.badlogic.gdx.graphics.g3d.utils.TextureDescriptor
import com.badlogic.gdx.math.*
@ -24,7 +22,6 @@ class Game: ApplicationAdapter()
{
private lateinit var texJolk: Texture
private lateinit var fntComic: BitmapFont
private lateinit var nut: Sound
private lateinit var cube: Model
private lateinit var floor: Model
@ -95,18 +92,28 @@ class Game: ApplicationAdapter()
spriteBatch = SpriteBatch()
env = Environment()
env.set(IntAttribute.createCullFace(GL20.GL_BACK))
env.set(ColorAttribute.createAmbientLight(XnaColor.DarkSlateGray.lighten(-0.6)))
env.set(ColorAttribute.createFog(XnaColor.CornflowerBlue))
env.set(
IntAttribute.createCullFace(GL20.GL_BACK),
ColorAttribute.createAmbientLight(XnaColor.DarkSlateGray.lighten(-0.6)),
ColorAttribute.createFog(XnaColor.CornflowerBlue))
env.set(
CustomIntAttribute.createFogMode(CustomIntAttribute.FogModes.Depth),
CustomIntAttribute.createFogType(CustomIntAttribute.FogTypes.Smooth),
CustomFloatAttribute.createFogNear(0.75f),
CustomFloatAttribute.createFogFar(20.5f))
/*
env.set(
CustomIntAttribute.createFogMode(CustomIntAttribute.FogModes.Distance),
CustomIntAttribute.createFogType(CustomIntAttribute.FogTypes.Exp2),
CustomFloatAttribute.createFogDensity(0.1f))
*/
env.add(DirectionalLight().set(XnaColor.White, Vector3(1.0f, -1.0f, -1.0f).nor()))
val shaderConfig = DefaultShader.Config(
Gdx.files.internal("lit.vert.glsl").readString(),
Gdx.files.internal("lit.frag.glsl").readString())
val shaderConfig = DefaultShader.Config()
shaderConfig.numDirectionalLights = 1
shaderConfig.numPointLights = 0
shaderConfig.numBones = 0
modelBatch = ModelBatch(DefaultShaderProvider(shaderConfig))
modelBatch = ModelBatch(CustomDefaultShaderProvider(shaderConfig))
colin = Colin()
@ -136,9 +143,7 @@ class Game: ApplicationAdapter()
val deltaTime = Gdx.graphics.deltaTime
update(deltaTime)
val fogColour = XnaColor.CornflowerBlue.lighten(Math.sin(0.056 * jolkRot.toDouble()) * 0.15 - 0.15)
ScreenUtils.clear(fogColour, true)
env.set(ColorAttribute.createFog(fogColour))
ScreenUtils.clear(XnaColor.CornflowerBlue, true)
val jolkPos = Vector3(0.0f, 1.0f + MathUtils.sin(jolkRot * 0.25f) * 0.25f, -4.0f)
val world = Matrix4()