diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLTransformableColorableProgram.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLTransformableColorableProgram.kt deleted file mode 100644 index cfa26bf3..00000000 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLTransformableColorableProgram.kt +++ /dev/null @@ -1,4 +0,0 @@ -package ru.dbotthepony.kstarbound.client.gl.shader - -import ru.dbotthepony.kstarbound.client.gl.GLStateTracker -import ru.dbotthepony.kvector.vector.Color diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLTransformableProgram.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLTransformableProgram.kt deleted file mode 100644 index bd996a92..00000000 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLTransformableProgram.kt +++ /dev/null @@ -1,4 +0,0 @@ -package ru.dbotthepony.kstarbound.client.gl.shader - -import ru.dbotthepony.kstarbound.client.gl.GLStateTracker -import ru.dbotthepony.kvector.matrix.nfloat.Matrix4f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt index a454b081..e0afd9db 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt @@ -11,6 +11,18 @@ import ru.dbotthepony.kstarbound.client.render.GPULightRenderer import ru.dbotthepony.kvector.matrix.nfloat.Matrix4f import ru.dbotthepony.kvector.vector.Color +private fun GLStateTracker.shaders(name: String): List<GLStateTracker.Shader> { + return listOf(internalVertex("shaders/$name.vsh"), internalFragment("shaders/$name.fsh")) +} + +private fun GLStateTracker.gshaders(name: String): List<GLStateTracker.Shader> { + return listOf( + internalVertex(name), + internalFragment(name), + internalGeometry(name) + ) +} + open class GLTransformableProgram(state: GLStateTracker, shaders: Iterable<GLStateTracker.Shader>) : GLShaderProgram(state, shaders) { val transform = F4x4Uniform("_transform") @@ -27,18 +39,6 @@ open class GLTransformableColorableProgram(state: GLStateTracker, shaders: Itera } } -private fun GLStateTracker.shaders(name: String): List<GLStateTracker.Shader> { - return listOf(internalVertex("shaders/$name.vsh"), internalFragment("shaders/$name.fsh")) -} - -private fun GLStateTracker.gshaders(name: String): List<GLStateTracker.Shader> { - return listOf( - internalVertex(name), - internalFragment(name), - internalGeometry(name) - ) -} - class GLLiquidProgram(state: GLStateTracker) : GLShaderProgram(state, state.shaders("liquid")) { val baselineColor = F4Uniform("baselineColor") val transform = F4x4Uniform("transform")