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

[orx-shapes] Remove #version from BezierPatchDrawer shader generator

Browse Source
This commit is contained in:
Edwin Jakobs
2023-06-09 00:07:04 +02:00
parent 43189a6f89
commit 9412e41c3d
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
orx-shapes/src/commonMain/kotlin/drawers/BezierPatchDrawer.kt
View File

@@ -17,13 +17,10 @@ import org.openrndr.extra.color.spaces.ColorOKLABa
import org.openrndr.math.Vector4 import org.openrndr.math.Vector4
import kotlin.jvm.JvmName import kotlin.jvm.JvmName
private val glslVersion = "410 core"
class BezierPatchDrawer { class BezierPatchDrawer {
private fun vsGenerator(structure: ShadeStructure): String { private fun vsGenerator(structure: ShadeStructure): String {
return """ return """
|// BezierPatchDrawer.kt / vsGenerator |// BezierPatchDrawer.kt / vsGenerator
|#version $glslVersion
|${drawerUniforms()} |${drawerUniforms()}
|${structure.attributes.orEmpty()} |${structure.attributes.orEmpty()}
|${structure.varyingOut.orEmpty()} |${structure.varyingOut.orEmpty()}
@@ -38,7 +35,6 @@ class BezierPatchDrawer {
private fun fsGenerator(structure: ShadeStructure): String { private fun fsGenerator(structure: ShadeStructure): String {
return (""" return ("""
|// BezierPatchDrawer.kt / fsGenerator |// BezierPatchDrawer.kt / fsGenerator
|#version $glslVersion
|${drawerUniforms()} |${drawerUniforms()}
|${structure.varyingIn.orEmpty()} |${structure.varyingIn.orEmpty()}
@@ -56,7 +52,6 @@ class BezierPatchDrawer {
private fun fsGeneratorOKLab(structure: ShadeStructure): String { private fun fsGeneratorOKLab(structure: ShadeStructure): String {
return (""" return ("""
|// BezierPatchDrawer.kt / fsGeneratorOKLab |// BezierPatchDrawer.kt / fsGeneratorOKLab
|#version $glslVersion
|${drawerUniforms()} |${drawerUniforms()}
|${ColorPhraseBook.oklabToLinearRgb.phrase} |${ColorPhraseBook.oklabToLinearRgb.phrase}
|${ColorPhraseBook.linearRgbToSRgb.phrase} |${ColorPhraseBook.linearRgbToSRgb.phrase}
@@ -76,7 +71,6 @@ class BezierPatchDrawer {
private fun tseGenerator(structure: ShadeStructure): String { private fun tseGenerator(structure: ShadeStructure): String {
BezierPhraseBook.register() BezierPhraseBook.register()
return """ return """
|#version $glslVersion
| |
|#pragma import beziers.bezier_patch42 |#pragma import beziers.bezier_patch42
|#pragma import beziers.bezier_patch43 |#pragma import beziers.bezier_patch43
@@ -101,7 +95,6 @@ class BezierPatchDrawer {
private fun tscGenerator(structure: ShadeStructure): String { private fun tscGenerator(structure: ShadeStructure): String {
return """ return """
|#version $glslVersion
|uniform int u_subdivisions; |uniform int u_subdivisions;
|${drawerUniforms()} |${drawerUniforms()}
|layout(vertices = 16) out; // 16 points per patch |layout(vertices = 16) out; // 16 points per patch