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

Merge pull request #45 from ricardomatias/glslify-fix

Browse Source 
Ignore pragma indentation
This commit is contained in:
Edwin Jakobs
2020-03-09 12:20:40 +01:00
committed by GitHub
parent fc784c8947 45a8dfc55d
commit fee87d5e53
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orx-glslify/src/main/kotlin/Glslify.kt
View File

@@ -31,7 +31,7 @@ fun preprocessGlslify(source: String, glslifyPath: String = "src/main/resources/
importTree = mutableSetOf() importTree = mutableSetOf()
return source.split("\n").map { line -> return source.split("\n").map { line ->
if (line.startsWith(PRAGMA_IDENTIFIER)) { if (line.trimStart().startsWith(PRAGMA_IDENTIFIER)) {
Regex(IMPORT_PATT).find(line)?.let { Regex(IMPORT_PATT).find(line)?.let {
if (it.groupValues.size > 1) { if (it.groupValues.size > 1) {
val functionName = it.groupValues[1] val functionName = it.groupValues[1]

2
orx-glslify/src/test/kotlin/TestGlslify.kt
View File

@@ -20,7 +20,7 @@ object TestGlslify : Spek({
describe("should download shader with just the module's name") { describe("should download shader with just the module's name") {
val shader = """#version 330 val shader = """#version 330
#pragma glslify: luma = require(glsl-luma) #pragma glslify: luma = require(glsl-luma)
""" """
val processed = preprocessGlslify(shader, glslifyPath = glslifyPath) val processed = preprocessGlslify(shader, glslifyPath = glslifyPath)