[Text] added option to disable sample shading in the shader at all & …

…version bump
aardvark-platform · Dec 21, 2023 · 500bec9 · 500bec9
1 parent c28d488
commit 500bec9
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 5 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 5.4.10-prerelease0005
+- [Text] added option to disable sample shading
+
 ### 5.4.10-prerelease0004
 - [GL] added flag to disable multidraw (experimental)
 

diff --git a/src/Aardvark.Rendering.Text/Font.fs b/src/Aardvark.Rendering.Text/Font.fs
@@ -502,6 +502,11 @@ type Font private(impl : FontImpl, family : string) =
 
     new(family : string) = Font(family, 400, false)
 
+
+module FontRenderingSettings =
+    let mutable DisableSampleShading = false
+
+
 type ShapeCache(r : IRuntime) =
     static let cache = ConcurrentDictionary<IRuntime, ShapeCache>()
 
@@ -519,19 +524,26 @@ type ShapeCache(r : IRuntime) =
     let boundarySurfaceCache = ConcurrentDictionary<IFramebufferSignature, IBackendSurface>()
     let billboardSurfaceCache = ConcurrentDictionary<IFramebufferSignature, IBackendSurface>()
 
+
+    let pathShader =
+        if FontRenderingSettings.DisableSampleShading then
+            Path.Shader.pathFragmentNoSampleShading |> toEffect
+        else
+            Path.Shader.pathFragment |> toEffect
+
     let effect =
         FShade.Effect.compose [
             Path.Shader.pathVertex      |> toEffect
             //Path.Shader.pathTrafo       |> toEffect
             Path.Shader.depthBiasVs     |> toEffect
-            Path.Shader.pathFragment    |> toEffect
+            pathShader 
         ]
 
     let instancedEffect =
         FShade.Effect.compose [
             Path.Shader.pathVertexInstanced |> toEffect
             Path.Shader.depthBiasVs         |> toEffect
-            Path.Shader.pathFragment        |> toEffect
+            pathShader 
         ]
 
     let boundaryEffect =
@@ -551,22 +563,22 @@ type ShapeCache(r : IRuntime) =
         FShade.Effect.compose [
             Path.Shader.pathVertexBillboard |> toEffect
             Path.Shader.depthBiasVs         |> toEffect
-            Path.Shader.pathFragment        |> toEffect
+            pathShader 
         ]
 
     let instancedBillboardEffect =
         FShade.Effect.compose [
             Path.Shader.pathVertexInstancedBillboard |> toEffect
             Path.Shader.depthBiasVs         |> toEffect
-            Path.Shader.pathFragment        |> toEffect
+            pathShader
         ]
 
     let surface (s : IFramebufferSignature) =
         surfaceCache.GetOrAdd(s, fun s -> 
             r.PrepareEffect(
                 s, [
                     Path.Shader.pathVertex      |> toEffect
-                    Path.Shader.pathFragment    |> toEffect
+                    pathShader
                 ]
             )
         )

diff --git a/src/Aardvark.Rendering.Text/Path.fs b/src/Aardvark.Rendering.Text/Path.fs
@@ -55,6 +55,22 @@ module Path =
                 [<DepthLayer>] layer : float
 
 
+                [<TrafoOffsetAndScale>] instanceTrafo : M34d
+            }
+
+        type VertexNoSampleShading =
+            {
+                [<Position>] p : V4d
+                [<KLMKind>] klmKind : V4d
+                [<ShapeTrafoR0>] tr0 : V4d
+                [<ShapeTrafoR1>] tr1 : V4d
+                [<PathColor>] color : V4d
+
+                [<SamplePosition>] samplePos : V2d
+
+                [<DepthLayer>] layer : float
+
+
                 [<TrafoOffsetAndScale>] instanceTrafo : M34d
             }
 
@@ -240,6 +256,45 @@ module Path =
 
             }
 
+        let pathFragmentNoSampleShading(v : VertexNoSampleShading) =
+            fragment {
+                let kind = v.klmKind.W 
+
+                let mutable color = v.color
+
+                if uniform.FillGlyphs then
+                    if kind > 1.5 && kind < 3.5 then
+                        // bezier2
+                        let ci = v.klmKind.XYZ
+                        let f = (ci.X * ci.X - ci.Y) * ci.Z
+                        if f > 0.0 then
+                            discard()
+
+                    elif kind > 3.5 && kind < 5.5 then
+                        // arc
+                        let ci = v.klmKind.XYZ
+                        let f = ((ci.X * ci.X + ci.Y*ci.Y) - 1.0) * ci.Z
+
+                        if f > 0.0 then
+                            discard()
+
+                     elif kind > 5.5  then
+                        let ci = v.klmKind.XYZ
+                        let f = ci.X * ci.X * ci.X - ci.Y * ci.Z
+                        if f > 0.0 then
+                            discard()
+                else
+                    if kind > 1.5 && kind < 3.5 then
+                        color <- V4d.IOOI
+                    elif kind > 3.5 && kind < 5.5 then
+                        color <- V4d.OIOI
+                    elif kind > 5.5  then
+                        color <- V4d.OOII
+
+                return color
+
+            }
+
         let boundaryVertex (v : Vertex) =
             vertex {
                 return { v with p = uniform.ModelViewProjTrafo * v.p }