From 95f86982e1da1810d10029d4920ec4c3778642d2 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 15 Dec 2021 22:20:08 +0100 Subject: [PATCH] render system: rename setBlendFunc to setBlendFunction --- .../java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt | 4 ++-- .../minosoft/gui/rendering/system/base/RenderSystem.kt | 4 ++-- .../gui/rendering/system/opengl/OpenGLRenderSystem.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt index 09dc7d80d..798917b72 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt @@ -112,7 +112,7 @@ class SkyRenderer( } renderSystem.enable(RenderingCapabilities.BLENDING) - renderSystem.setBlendFunc(BlendingFunctions.SOURCE_ALPHA, BlendingFunctions.ONE, BlendingFunctions.ONE, BlendingFunctions.ZERO) + renderSystem.setBlendFunction(BlendingFunctions.SOURCE_ALPHA, BlendingFunctions.ONE, BlendingFunctions.ONE, BlendingFunctions.ZERO) skySunShader.use() skySunMesh.draw() } @@ -137,7 +137,7 @@ class SkyRenderer( } private fun drawSkybox() { - renderSystem.setBlendFunc(BlendingFunctions.SOURCE_ALPHA, BlendingFunctions.ONE_MINUS_SOURCE_ALPHA, BlendingFunctions.ONE, BlendingFunctions.ZERO) // ToDo + renderSystem.setBlendFunction(BlendingFunctions.ONE_MINUS_CONSTANT_COLOR, BlendingFunctions.ONE_MINUS_SOURCE_COLOR, BlendingFunctions.ONE, BlendingFunctions.ZERO) // ToDo checkSkyColor() skyboxShader.use() skyboxMesh.draw() diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt index 60eb3d475..044ce4fdc 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt @@ -46,7 +46,7 @@ interface RenderSystem { depth: DepthFunctions = DepthFunctions.LESS, clearColor: RGBColor = Colors.TRANSPARENT, ) { - setBlendFunc(sourceAlpha, destinationAlpha, BlendingFunctions.ONE, BlendingFunctions.ZERO) + setBlendFunction(sourceAlpha, destinationAlpha, BlendingFunctions.ONE, BlendingFunctions.ZERO) this[RenderingCapabilities.DEPTH_TEST] = depthTest this[RenderingCapabilities.BLENDING] = blending this[RenderingCapabilities.FACE_CULLING] = faceCulling @@ -63,7 +63,7 @@ interface RenderSystem { operator fun set(source: BlendingFunctions, destination: BlendingFunctions) - fun setBlendFunc(sourceRGB: BlendingFunctions, destinationRGB: BlendingFunctions, sourceAlphaFactor: BlendingFunctions, destinationAlphaFactor: BlendingFunctions) + fun setBlendFunction(sourceRGB: BlendingFunctions, destinationRGB: BlendingFunctions, sourceAlpha: BlendingFunctions, destinationAlpha: BlendingFunctions) var depth: DepthFunctions var depthMask: Boolean diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt index e6f36fdbc..994e9c3c1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt @@ -161,8 +161,8 @@ class OpenGLRenderSystem( glBlendFunc(source.gl, destination.gl) } - override fun setBlendFunc(sourceRGB: BlendingFunctions, destinationRGB: BlendingFunctions, sourceAlphaFactor: BlendingFunctions, destinationAlphaFactor: BlendingFunctions) { - glBlendFuncSeparate(sourceRGB.gl, destinationRGB.gl, sourceAlphaFactor.gl, destinationAlphaFactor.gl) + override fun setBlendFunction(sourceRGB: BlendingFunctions, destinationRGB: BlendingFunctions, sourceAlpha: BlendingFunctions, destinationAlpha: BlendingFunctions) { + glBlendFuncSeparate(sourceRGB.gl, destinationRGB.gl, sourceAlpha.gl, destinationAlpha.gl) } override var depth: DepthFunctions = DepthFunctions.LESS