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

Merge branch 'master' of github.com:openrndr/orx into destroyMidiOnQuit

Browse Source
This commit is contained in:
Abe Pazos
2020-03-20 16:57:39 +01:00
parent 32a82bb37f 772283a0c6
commit 830d6c1cef
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
orx-fx/src/main/kotlin/distort/Raycast.kt
View File

@@ -10,7 +10,6 @@ import org.openrndr.math.transforms.transform
@Description("Perspective plane")
class PerspectivePlane : Filter(Shader.createFromCode(filterVertexCode, filterFragmentCode("distort/perspective-plane.frag"))) {
// @DoubleParameter("camera x", -1.0, 1.0, order = 0)
var cameraX: Double = 0.0
// @DoubleParameter("camera y", -1.0, 1.0, order = 1)
@@ -37,9 +36,7 @@ class PerspectivePlane : Filter(Shader.createFromCode(filterVertexCode, filterFr
@BooleanParameter("tile input")
var tile: Boolean by parameters
var seconds:Double by parameters
init {
seconds = 0.0
tile = false
}

1
orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/distort/perspective-plane.frag
View File

@@ -6,7 +6,6 @@ uniform sampler2D tex0;
in vec2 v_texCoord0;
uniform vec3 cameraPosition;
uniform vec3 planePosition;
uniform float seconds;
uniform mat4 planeMatrix;
uniform bool tile;
uniform vec2 targetSize;