commit 2885d4f1412ffcc972eb96d22168fb65b52879a2 Author: LeszekKoltunski Date: Mon Apr 28 15:03:03 2025 +0200 migrate the 'effect' package. diff --git a/src/main/java/org/distorted/library/effect/EffectName.kt b/src/main/java/org/distorted/library/effect/EffectName.kt index e6612e2..ed281ae 100644 --- a/src/main/java/org/distorted/library/effect/EffectName.kt +++ b/src/main/java/org/distorted/library/effect/EffectName.kt @@ -37,7 +37,7 @@ package org.distorted.library.effect * This is used by the EffectQueue classes to decide if the final form of the Effect is NULL - and * thus if it can safely be removed from Effect Queues without affecting the visual in any way. */ -enum class EffectName( type: EffectType, unity: FloatArray, dim: Int, regionDim: Int, centerDim: Int, effectClass: Class) +enum class EffectName( t: EffectType, u: FloatArray, d: Int, r: Int, c: Int, e: Class) { // EFFECT NAME /////// EFFECT TYPE ////////// EFFECT UNITY //////////// DIM REGION CENTER // CLASS ROTATE (EffectType.MATRIX, floatArrayOf(0.0f), 4, 0, 3, MatrixEffectRotate::class.java), @@ -116,12 +116,12 @@ enum class EffectName( type: EffectType, unity: FloatArray, dim: Int, regionDim: /////////////////////////////////////////////////////////////////////////////////////////////// init { - this.type = type - this.unity = unity - this.dimension = dim - this.regionDim = regionDim - this.centerDim = centerDim - this.effectClass = effectClass + type = t + unity = u + dimension = d + regionDim = r + centerDim = c + effectClass = e } /////////////////////////////////////////////////////////////////////////////////////////////// fun getName(ordinal: Int): EffectName? = names[ordinal] diff --git a/src/main/java/org/distorted/library/effect/FragmentEffect.kt b/src/main/java/org/distorted/library/effect/FragmentEffect.kt index 0246926..bd94ad3 100644 --- a/src/main/java/org/distorted/library/effect/FragmentEffect.kt +++ b/src/main/java/org/distorted/library/effect/FragmentEffect.kt @@ -41,7 +41,12 @@ abstract class FragmentEffect internal constructor(name: EffectName) : Effect(na private var mGLSL = "" private var numEnabled: Int = 0 // number of Fragment effects enabled. val MAX_REGION: Static3D = Static3D(1000000f, 1000000f, 1000000f) - @JvmStatic val gLSL: String get() = mGLSL+"{}" + + /////////////////////////////////////////////////////////////////////////////////////////// + @JvmStatic fun getGLSL(): String = mGLSL+"{}" + + /////////////////////////////////////////////////////////////////////////////////////////// + @JvmStatic fun getNumEnabled(): Int = numEnabled /////////////////////////////////////////////////////////////////////////////////////////////////// // prepare code to be injected into the 'main_fragment_shader' main() function. diff --git a/src/main/java/org/distorted/library/effect/VertexEffect.kt b/src/main/java/org/distorted/library/effect/VertexEffect.kt index 99b7221..ddeffe9 100644 --- a/src/main/java/org/distorted/library/effect/VertexEffect.kt +++ b/src/main/java/org/distorted/library/effect/VertexEffect.kt @@ -40,10 +40,10 @@ abstract class VertexEffect internal constructor(name: EffectName) : Effect(name { const val NUM_FLOAT_UNIFORMS = 12 // 5 per-effect interpolated values, 3-dimensional center, 4-dimensional Region const val NUM_INT_UNIFORMS = 4 // name, AND association, reserved, EQU Association - const val VALUES_OFFSET = 0 const val CENTER_OFFSET = 5 const val REGION_OFFSET = 8 + private var mGLSL = "" private var numEnabled: Int = 0 // number of Vertex effects enabled. private var mFullGLSL = "" @@ -52,7 +52,6 @@ abstract class VertexEffect internal constructor(name: EffectName) : Effect(name val MAX_REGION: Static4D = Static4D(0f,0f,0f,1000000f) - @JvmStatic val gLSL: String get() = mGLSL+"{}" @JvmStatic val allGLSL: String get() { @@ -76,6 +75,12 @@ abstract class VertexEffect internal constructor(name: EffectName) : Effect(name return mFullEnabled } + /////////////////////////////////////////////////////////////////////////////////////////// + @JvmStatic fun getNumEnabled(): Int = numEnabled + + /////////////////////////////////////////////////////////////////////////////////////////// + @JvmStatic fun getGLSL(): String = mGLSL+"{}" + /////////////////////////////////////////////////////////////////////////////////////////// private fun retSection(effect: Int, code: String?): String { diff --git a/src/main/java/org/distorted/library/effectqueue/EffectQueuePostprocess.kt b/src/main/java/org/distorted/library/effectqueue/EffectQueuePostprocess.kt index 0f45d17..e04b952 100644 --- a/src/main/java/org/distorted/library/effectqueue/EffectQueuePostprocess.kt +++ b/src/main/java/org/distorted/library/effectqueue/EffectQueuePostprocess.kt @@ -199,7 +199,7 @@ class EffectQueuePostprocess : EffectQueue } /////////////////////////////////////////////////////////////////////////////////////////////// - fun postprocess(buffer: DistortedFramebuffer?): Int + fun postprocess(buffer: DistortedFramebuffer): Int { var numRenders = 0 val array = mUBF!!.backingArray diff --git a/src/main/java/org/distorted/library/main/DistortedEffects.java b/src/main/java/org/distorted/library/main/DistortedEffects.java index ed8f782..e30ae49 100644 --- a/src/main/java/org/distorted/library/main/DistortedEffects.java +++ b/src/main/java/org/distorted/library/main/DistortedEffects.java @@ -159,7 +159,7 @@ public class DistortedEffects */ public int abortByName(EffectName name) { - int num = name.type.ordinal(); + int num = name.getType().ordinal(); return mQueues[num].removeByName(name); } diff --git a/src/main/java/org/distorted/library/message/EffectMessageSender.kt b/src/main/java/org/distorted/library/message/EffectMessageSender.kt index 091929f..7a2284b 100644 --- a/src/main/java/org/distorted/library/message/EffectMessageSender.kt +++ b/src/main/java/org/distorted/library/message/EffectMessageSender.kt @@ -112,12 +112,12 @@ private constructor() : Thread() if (numListeners>0) { - val id = effect.id + val id = effect.iD for (i in 0 until numListeners) { val listener = effect.removeFirstListener() - val msg = Message(listener, id) + val msg = Message(listener!!, id) mList!!.add(msg) }