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

[orx-shader-phrases] Include symbols from transitive imports

Browse Source
This commit is contained in:
Edwin Jakobs
2022-09-25 17:07:31 +02:00
parent 227c82f73a
commit 2fc1a3abf7
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
orx-shader-phrases/src/commonMain/kotlin/ShaderPreprocessor.kt
View File

@@ -22,11 +22,13 @@ class ShaderPhrase(val phrase: String) {
ShaderPhraseRegistry.registerPhrase("$prefix$id", this) ShaderPhraseRegistry.registerPhrase("$prefix$id", this)
} }
} }
/** /**
* A book of shader phrases. * A book of shader phrases.
*/ */
expect open class ShaderPhraseBook(bookId: String) { expect open class ShaderPhraseBook(bookId: String) {
val bookId: String val bookId: String
/** /**
* Registers all known shader phrases * Registers all known shader phrases
*/ */
@@ -39,12 +41,14 @@ expect open class ShaderPhraseBook(bookId: String) {
*/ */
object ShaderPhraseRegistry { object ShaderPhraseRegistry {
private val phrases = mutableMapOf<String, ShaderPhrase>() private val phrases = mutableMapOf<String, ShaderPhrase>()
/** /**
* Registers a [phrase] with [id] * Registers a [phrase] with [id]
*/ */
fun registerPhrase(id: String, phrase: ShaderPhrase) { fun registerPhrase(id: String, phrase: ShaderPhrase) {
phrases[id] = phrase phrases[id] = phrase
} }
/** /**
* Finds a phrase for [id], returns null when no phrase found * Finds a phrase for [id], returns null when no phrase found
*/ */
@@ -79,10 +83,7 @@ object ShaderPhraseRegistry {
* @param source GLSL source code encoded as string * @param source GLSL source code encoded as string
* @return GLSL source code with injected shader phrases * @return GLSL source code with injected shader phrases
*/ */
fun preprocessShader(source: String, symbols: Set<String> = emptySet()): String { fun preprocessShader(source: String, symbols: MutableSet<String> = mutableSetOf()): String {
val newSymbols = mutableSetOf<String>()
newSymbols.addAll(symbols)
val lines = source.split("\n") val lines = source.split("\n")
val funcName = Regex("""^\s*#pragma\s+import\s+([a-zA-Z0-9_.]+)""") val funcName = Regex("""^\s*#pragma\s+import\s+([a-zA-Z0-9_.]+)""")
val processed = lines.map { line -> val processed = lines.map { line ->
@@ -92,10 +93,10 @@ fun preprocessShader(source: String, symbols: Set<String> = emptySet()): String
val fieldName = fullTokens.last().replace(";", "").trim() val fieldName = fullTokens.last().replace(";", "").trim()
val packageClassTokens = fullTokens.dropLast(1) val packageClassTokens = fullTokens.dropLast(1)
val packageClass = packageClassTokens.joinToString(".") val packageClass = packageClassTokens.joinToString(".")
if (symbol !in newSymbols) { if (symbol !in symbols) {
newSymbols.add(symbol) symbols.add(symbol)
val registryPhrase = ShaderPhraseRegistry.findPhrase(symbol) val registryPhrase = ShaderPhraseRegistry.findPhrase(symbol)
registryPhrase?.let { preprocessShader(it.phrase, newSymbols) } registryPhrase?.let { preprocessShader(it.phrase, symbols) }
} else { } else {
"" ""
} }
@@ -114,7 +115,7 @@ fun String.preprocess() = preprocessShader(this)
* @param url url pointing to GLSL shader source * @param url url pointing to GLSL shader source
* @return GLSL source code with injected shader phrases * @return GLSL source code with injected shader phrases
*/ */
fun preprocessShaderFromUrl(url: String, symbols: Set<String> = emptySet()): String { fun preprocessShaderFromUrl(url: String, symbols: MutableSet<String> = mutableSetOf()): String {
return preprocessShader(textFromURL(url), symbols) return preprocessShader(textFromURL(url), symbols)
} }