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

[orx-temporal-blur] Fix addition shader

Browse Source
This commit is contained in:
Edwin Jakobs
2020-09-07 19:19:15 +02:00
parent 148371c942
commit 49b5bae9ac
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
orx-temporal-blur/src/main/kotlin/TemporalBlur.kt
View File

@@ -1,5 +1,6 @@
package org.openrndr.extra.temporalblur package org.openrndr.extra.temporalblur
import org.intellij.lang.annotations.Language
import org.openrndr.Extension import org.openrndr.Extension
import org.openrndr.Program import org.openrndr.Program
import org.openrndr.color.ColorRGBa import org.openrndr.color.ColorRGBa
@@ -13,7 +14,29 @@ import org.openrndr.math.Matrix55
import org.openrndr.math.Vector2 import org.openrndr.math.Vector2
import org.openrndr.math.transforms.translate import org.openrndr.math.transforms.translate
private val add by lazy { Add() }
private fun glslFull(@Language("GLSL") glsl: String) = glsl
class PlainAdd : Filter(filterShaderFromCode(glslFull("""
#version 330
uniform sampler2D tex0;
uniform sampler2D tex1;
in vec2 v_texCoord0;
out vec4 o_output;
void main() {
vec4 a = texture(tex0, v_texCoord0);
vec4 b = texture(tex1, v_texCoord0);
o_output = a + b;
}
"""), "plain-add"))
private val add by lazy { PlainAdd() }
/** /**
* Temporal blur extension. * Temporal blur extension.
@@ -156,7 +179,7 @@ class TemporalBlur : Extension {
} }
image?.unbind() image?.unbind()
image!!.colorBuffer(0).resolveTo(imageResolved!!.colorBuffer(0)) image!!.colorBuffer(0).copyTo(imageResolved!!.colorBuffer(0))
if (linearizeInput) { if (linearizeInput) {
imageResolved?.let { imageResolved?.let {
@@ -178,7 +201,7 @@ class TemporalBlur : Extension {
override fun afterDraw(drawer: Drawer, program: Program) { override fun afterDraw(drawer: Drawer, program: Program) {
// -- we receive one last frame here // -- we receive one last frame here
image?.unbind() image?.unbind()
image!!.colorBuffer(0).resolveTo(imageResolved!!.colorBuffer(0)) image!!.colorBuffer(0).copyTo(imageResolved!!.colorBuffer(0))
add.apply(arrayOf(imageResolved!!.colorBuffer(0), accumulator!!.colorBuffer(0)), accumulator!!.colorBuffer(0)) add.apply(arrayOf(imageResolved!!.colorBuffer(0), accumulator!!.colorBuffer(0)), accumulator!!.colorBuffer(0))