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

Fix parameter order of wave effects

Browse Source
This commit is contained in:
Edwin Jakobs
2020-02-10 20:37:54 +01:00
parent 9c04c53575
commit a22239cce6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
orx-fx/src/main/kotlin/distort/Wave.kt
View File

@@ -8,16 +8,16 @@ import org.openrndr.extra.parameters.IntParameter
@Description("Horizontal wave") @Description("Horizontal wave")
class HorizontalWave : Filter(Shader.createFromCode(filterVertexCode, filterFragmentCode("distort/horizontal-wave.frag"))) { class HorizontalWave : Filter(Shader.createFromCode(filterVertexCode, filterFragmentCode("distort/horizontal-wave.frag"))) {
@DoubleParameter("frequency", 0.0, 64.0) @DoubleParameter("frequency", 0.0, 64.0, order = 1)
var frequency: Double by parameters var frequency: Double by parameters
@DoubleParameter("amplitude", 0.0, 1.0) @DoubleParameter("amplitude", 0.0, 1.0, order = 0)
var amplitude: Double by parameters var amplitude: Double by parameters
@DoubleParameter("phase", -0.5, 0.5) @DoubleParameter("phase", -0.5, 0.5, order = 2)
var phase: Double by parameters var phase: Double by parameters
@IntParameter("segments", 0, 256) @IntParameter("segments", 0, 256, order = 3)
var segments: Int by parameters var segments: Int by parameters
@@ -40,16 +40,16 @@ class HorizontalWave : Filter(Shader.createFromCode(filterVertexCode, filterFrag
@Description("Vertical wave") @Description("Vertical wave")
class VerticalWave : Filter(Shader.createFromCode(filterVertexCode, filterFragmentCode("distort/vertical-wave.frag"))) { class VerticalWave : Filter(Shader.createFromCode(filterVertexCode, filterFragmentCode("distort/vertical-wave.frag"))) {
@DoubleParameter("frequency", 0.0, 64.0) @DoubleParameter("frequency", 0.0, 64.0, order = 1)
var frequency: Double by parameters var frequency: Double by parameters
@DoubleParameter("amplitude", 0.0, 1.0) @DoubleParameter("amplitude", 0.0, 1.0, order = 0)
var amplitude: Double by parameters var amplitude: Double by parameters
@DoubleParameter("phase", -0.5, 0.5) @DoubleParameter("phase", -0.5, 0.5, order = 2)
var phase: Double by parameters var phase: Double by parameters
@IntParameter("segments", 0, 256) @IntParameter("segments", 0, 256, order = 3)
var segments: Int by parameters var segments: Int by parameters