kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-fx] Fix problems with content scales in ApproximateGaussianBlur

Browse Source
This commit is contained in:
Edwin Jakobs
2020-07-20 17:52:34 +02:00
parent f0013b96a7
commit b4908b3cd8
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
orx-fx/src/main/kotlin/blur/MipBloom.kt
View File

@@ -15,9 +15,9 @@ class BloomDownscale : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-
} }
class BloomUpscale : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-upscale.frag"))) { class BloomUpscale : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-upscale.frag"))) {
var gain:Double by parameters var gain: Double by parameters
var shape:Double by parameters var shape: Double by parameters
var seed:Double by parameters var seed: Double by parameters
init { init {
gain = 1.0 gain = 1.0
@@ -26,7 +26,7 @@ class BloomUpscale : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-up
} }
} }
class BloomCombine: Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-combine.frag"))) { class BloomCombine : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-combine.frag"))) {
var gain: Double by parameters var gain: Double by parameters
var bias: ColorRGBa by parameters var bias: ColorRGBa by parameters
@@ -37,7 +37,7 @@ class BloomCombine: Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-com
} }
@Description("MipBloom") @Description("MipBloom")
open class MipBloom<T:Filter>(val blur:T) : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-combine.frag"))) { open class MipBloom<T : Filter>(val blur: T) : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-combine.frag"))) {
var passes = 6 var passes = 6
@DoubleParameter("shape", 0.0, 4.0) @DoubleParameter("shape", 0.0, 4.0)
@@ -57,30 +57,28 @@ open class MipBloom<T:Filter>(val blur:T) : Filter(filterShaderFromUrl(filterFra
val combine = BloomCombine() val combine = BloomCombine()
override fun apply(source: Array<ColorBuffer>, target: Array<ColorBuffer>) { override fun apply(source: Array<ColorBuffer>, target: Array<ColorBuffer>) {
sourceCopy?.let { sourceCopy?.let {
if (it.width != source[0].width || it.height != source[0].height) { if (!it.isEquivalentTo(source[0], ignoreType = true)) {
it.destroy() it.destroy()
sourceCopy = null sourceCopy = null
} }
} }
if (sourceCopy == null) { if (sourceCopy == null) {
sourceCopy = colorBuffer(source[0].width, source[0].height, type = ColorType.FLOAT16) sourceCopy = source[0].createEquivalent(type = ColorType.FLOAT16)
} }
source[0].copyTo(sourceCopy!!) source[0].copyTo(sourceCopy!!)
upscale.shape = shape upscale.shape = shape
if (intermediates.size != passes if (intermediates.size != passes
|| (intermediates.isNotEmpty() && (intermediates[0].width!=target[0].width || intermediates[0].height != target[0].height) )) { || (intermediates.isNotEmpty() && (!intermediates[0].isEquivalentTo(target[0], ignoreType = true, ignoreFormat = true)))) {
intermediates.forEach { intermediates.forEach {
it.destroy() it.destroy()
} }
intermediates.clear() intermediates.clear()
for (pass in 0 until passes) { for (pass in 0 until passes) {
val tdiv = 1 shl (pass+1) val tdiv = 1 shl (pass + 1)
val cb = colorBuffer(target[0].width / tdiv, target[0].height / tdiv, type = ColorType.FLOAT16) val cb = colorBuffer(target[0].width / tdiv, target[0].height / tdiv, type = ColorType.FLOAT16)
intermediates.add(cb) intermediates.add(cb)
} }
@@ -95,7 +93,7 @@ open class MipBloom<T:Filter>(val blur:T) : Filter(filterShaderFromUrl(filterFra
blur.apply(intermediates[0], intermediates[0]) blur.apply(intermediates[0], intermediates[0])
for (pass in 1 until passes) { for (pass in 1 until passes) {
downScale.apply(intermediates[pass-1], intermediates[pass]) downScale.apply(intermediates[pass - 1], intermediates[pass])
blur.apply(intermediates[pass], intermediates[pass]) blur.apply(intermediates[pass], intermediates[pass])
} }