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

[orx-shader-phrases] Add Shader.preprocessedFromUrls()

Browse Source
This commit is contained in:
Edwin Jakobs
2020-07-18 18:55:36 +02:00
parent 51d527a42c
commit b528d5bac9
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
orx-shader-phrases/src/main/kotlin/ShaderPreprocessor.kt
View File

@@ -1,7 +1,9 @@
package org.openrndr.extra.shaderphrases package org.openrndr.extra.shaderphrases
import org.openrndr.draw.Shader
import org.openrndr.draw.codeFromURL import org.openrndr.draw.codeFromURL
import org.openrndr.extra.shaderphrases.annotations.ShaderPhrases import org.openrndr.extra.shaderphrases.annotations.ShaderPhrases
import org.openrndr.internal.Driver
/** /**
* Preprocess shader source. * Preprocess shader source.
@@ -67,6 +69,9 @@ fun preprocessShader(source: String, symbols: Set<String> = emptySet()): String
return processed.joinToString("\n") return processed.joinToString("\n")
} }
fun String.preprocess() = preprocessShader(this)
/** /**
* Preprocess shader source from url * Preprocess shader source from url
* Looks for "#pragma import" statements and injects found phrases. * Looks for "#pragma import" statements and injects found phrases.
@@ -76,3 +81,20 @@ fun preprocessShader(source: String, symbols: Set<String> = emptySet()): String
fun preprocessShaderFromUrl(url: String, symbols: Set<String> = emptySet()): String { fun preprocessShaderFromUrl(url: String, symbols: Set<String> = emptySet()): String {
return preprocessShader(codeFromURL(url), symbols) return preprocessShader(codeFromURL(url), symbols)
} }
fun Shader.Companion.preprocessedFromUrls(
vsUrl: String,
tcsUrl: String? = null,
tesUrl: String? = null,
gsUrl: String? = null,
fsUrl: String): Shader {
val vsCode = codeFromURL(vsUrl).preprocess()
val tcsCode = tcsUrl?.let { codeFromURL(it) }?.preprocess()
val tesCode = tesUrl?.let { codeFromURL(it) }?.preprocess()
val gsCode = gsUrl?.let { codeFromURL(it) }?.preprocess()
val fsCode = codeFromURL(fsUrl).preprocess()
val name = "$$vsUrl / $gsUrl / $fsUrl"
return Shader.createFromCode(vsCode, tcsCode, tesCode, gsCode, fsCode, name)
}