diff --git a/orx-shader-phrases/src/commonMain/kotlin/ShaderPreprocessor.kt b/orx-shader-phrases/src/commonMain/kotlin/ShaderPreprocessor.kt index 15f351e3..81972f7c 100644 --- a/orx-shader-phrases/src/commonMain/kotlin/ShaderPreprocessor.kt +++ b/orx-shader-phrases/src/commonMain/kotlin/ShaderPreprocessor.kt @@ -61,7 +61,7 @@ object ShaderPhraseRegistry { */ fun getGLSLFunctionName(glsl: String): String { val functionRex = - Regex("""\s*(float|int|[bi]?vec[234]|mat[34])\s+(\w+)\s*\(.*\).*""") + Regex("""\s*(float|int|[bi]?vec[234]|mat[234])\s+(\w+)\s*\(.*\).*""") val defs = glsl.split("\n").filter { functionRex.matches(it) }.take(1).mapNotNull { diff --git a/orx-shader-phrases/src/jvmTest/kotlin/TestFunctionNameRx.kt b/orx-shader-phrases/src/jvmTest/kotlin/TestFunctionNameRx.kt index 75544cf3..00ec5104 100644 --- a/orx-shader-phrases/src/jvmTest/kotlin/TestFunctionNameRx.kt +++ b/orx-shader-phrases/src/jvmTest/kotlin/TestFunctionNameRx.kt @@ -17,6 +17,7 @@ object TestFunctionNameRx : Spek({ "vec4 ggg() {" to "ggg", "vec3 hhh() {" to "hhh", "vec2 iii() {" to "iii", + "mat2 ii2() {" to "ii2", "mat3 jjj() {" to "jjj", "mat4 kkk() {" to "kkk", "float lll() {" to "lll",