Attempt to fix relative gui rendering.

Author: bryanedds

Nu/Nu/OpenGL/OpenGL.Sprite.fs

@@ -87,7 +87,9 @@ module Sprite =
     let DrawSprite
         (vertices,
          indices,
-         viewProjection : Matrix4x4 inref,
+         absolute,
+         viewProjectionAbsolute : Matrix4x4 inref,
+         viewProjectionClip : Matrix4x4 inref,
          modelViewProjection : single array,
          insetOpt : Box2 voption inref,
          clipOpt : Box2 voption inref,
@@ -149,6 +151,7 @@ module Sprite =
         Gl.Enable EnableCap.CullFace
         match clipOpt with
         | ValueSome clip ->
+            let viewProjection = if absolute then viewProjectionAbsolute else viewProjectionClip
             let minClip = Vector4.Transform (Vector4 (clip.Min, 0.0f, 1.0f), viewProjection)
             let minNdc = minClip / minClip.W * single viewport.DisplayScalar
             let minScissor = (minNdc.V2 + v2One) * 0.5f * viewport.Bounds.Size.V2

Nu/Nu/OpenGL/OpenGL.SpriteBatch.fs

@@ -46,6 +46,7 @@ module SpriteBatch =
             { mutable SpriteIndex : int
               mutable ViewProjectionAbsolute : Matrix4x4
               mutable ViewProjectionRelative : Matrix4x4
+              mutable ViewProjectionClip : Matrix4x4
               PerimetersUniform : int
               TexCoordsesUniform : int
               PivotsUniform : int
@@ -98,7 +99,7 @@ module SpriteBatch =
             Gl.Enable EnableCap.CullFace
             match env.State.ClipOpt with
             | ValueSome clip ->
-                let viewProjection = if env.State.Absolute then env.ViewProjectionAbsolute else env.ViewProjectionRelative
+                let viewProjection = if env.State.Absolute then env.ViewProjectionAbsolute else env.ViewProjectionClip
                 let minClip = Vector4.Transform (Vector4 (clip.Min, 0.0f, 1.0f), viewProjection)
                 let minNdc = minClip / minClip.W * single viewport.DisplayScalar
                 let minScissor = (minNdc.V2 + v2One) * 0.5f * viewport.Bounds.Size.V2
@@ -161,9 +162,14 @@ module SpriteBatch =
         BeginSpriteBatch state env
 
     /// Beging a new sprite batch frame3.
-    let BeginSpriteBatchFrame (viewProjectionAbsolute : Matrix4x4 inref, viewProjectionRelative : Matrix4x4 inref, env) =
+    let BeginSpriteBatchFrame
+        (viewProjectionAbsolute : Matrix4x4 inref,
+         viewProjectionRelative : Matrix4x4 inref,
+         viewProjectionClip : Matrix4x4 inref,
+         env) =
         env.ViewProjectionAbsolute <- viewProjectionAbsolute
         env.ViewProjectionRelative <- viewProjectionRelative
+        env.ViewProjectionClip <- viewProjectionClip
         BeginSpriteBatch SpriteBatchState.defaultState env
 
     /// End the current sprite batch frame, if any.
@@ -233,7 +239,7 @@ module SpriteBatch =
         Hl.Assert ()
 
         // create env
-        { SpriteIndex = 0; ViewProjectionAbsolute = m4Identity; ViewProjectionRelative = m4Identity
+        { SpriteIndex = 0; ViewProjectionAbsolute = m4Identity; ViewProjectionRelative = m4Identity; ViewProjectionClip = m4Identity
           PerimetersUniform = perimetersUniform; PivotsUniform = pivotsUniform; RotationsUniform = rotationsUniform
           TexCoordsesUniform = texCoordsesUniform; ColorsUniform = colorsUniform; ViewProjectionUniform = viewProjectionUniform
           TexUniform = texUniform; Shader = shader

Nu/Nu/Render/Renderer2d.fs

@@ -676,7 +676,8 @@ type [<ReferenceEquality>] GlRenderer2d =
                 let virtualScalar = (v2iDup renderer.Viewport.DisplayScalar).V2
                 let position = perimeter.Min.V2 * virtualScalar
                 let size = perimeter.Size.V2 * virtualScalar
-                let viewProjection = Viewport.getViewProjection2d absolute eyeCenter eyeSize renderer.Viewport
+                let viewProjection2d = Viewport.getViewProjection2d absolute eyeCenter eyeSize renderer.Viewport
+                let viewProjectionClip = Viewport.getViewProjectionClip eyeCenter eyeSize renderer.Viewport
                 match GlRenderer2d.tryGetRenderAsset font renderer with
                 | ValueSome renderAsset ->
                     match renderAsset with
@@ -756,7 +757,7 @@ type [<ReferenceEquality>] GlRenderer2d =
                             let modelTranslation = Matrix4x4.CreateTranslation translation
                             let modelScale = Matrix4x4.CreateScale scale
                             let modelMatrix = modelScale * modelTranslation
-                            let modelViewProjection = modelMatrix * viewProjection
+                            let modelViewProjection = modelMatrix * viewProjection2d
 
                             // upload texture data
                             let textTextureId = OpenGL.Gl.GenTexture ()
@@ -779,7 +780,7 @@ type [<ReferenceEquality>] GlRenderer2d =
                             let (vertices, indices) = renderer.TextQuad
                             let insetOpt : Box2 voption = ValueNone
                             let color = Color.White
-                            OpenGL.Sprite.DrawSprite (vertices, indices, &viewProjection, modelViewProjection.ToArray (), &insetOpt, &clipOpt, &color, FlipNone, textSurfaceWidth, textSurfaceHeight, textTexture, renderer.Viewport, modelViewProjectionUniform, texCoords4Uniform, colorUniform, textureUniform, shader, vao)
+                            OpenGL.Sprite.DrawSprite (vertices, indices, absolute, &viewProjection2d, &viewProjectionClip, modelViewProjection.ToArray (), &insetOpt, &clipOpt, &color, FlipNone, textSurfaceWidth, textSurfaceHeight, textTexture, renderer.Viewport, modelViewProjectionUniform, texCoords4Uniform, colorUniform, textureUniform, shader, vao)
                             OpenGL.Hl.Assert ()
 
                             // destroy texture
@@ -848,7 +849,8 @@ type [<ReferenceEquality>] GlRenderer2d =
         // begin sprite batch frame
         let viewProjectionAbsolute = Viewport.getViewProjection2d true eyeCenter eyeSize renderer.Viewport
         let viewProjectionRelative = Viewport.getViewProjection2d false eyeCenter eyeSize renderer.Viewport
-        OpenGL.SpriteBatch.BeginSpriteBatchFrame (&viewProjectionAbsolute, &viewProjectionRelative, renderer.SpriteBatchEnv)
+        let viewProjectionClip = Viewport.getViewProjectionClip eyeCenter eyeSize viewport
+        OpenGL.SpriteBatch.BeginSpriteBatchFrame (&viewProjectionAbsolute, &viewProjectionRelative, &viewProjectionClip, renderer.SpriteBatchEnv)
         OpenGL.Hl.Assert ()
 
         // render frame

Nu/Nu/Transform/Viewport.fs

@@ -98,6 +98,16 @@ type [<StructuralEquality; NoComparison>] Viewport =
         let projection = viewport.Projection2d
         view * projection
 
+    /// Compute the scissor clip view matrix.
+    static member getViewClip (eyeCenter : Vector2) eyeSize viewport =
+        Viewport.getView2d false (eyeCenter / single viewport.DisplayScalar) eyeSize viewport
+
+    /// Compute the scissor clip view projection matrix.
+    static member getViewProjectionClip eyeCenter eyeSize viewport =
+        let view = Viewport.getViewClip eyeCenter eyeSize viewport
+        let projection = viewport.Projection2d
+        view * projection
+
     /// Compute the absolute 2d position from the given relative 3d position.
     static member position3dToPosition2d eyeCenter (eyeRotation : Quaternion) eyeFieldOfView (position : Vector3) viewport =
         let view = Viewport.getView3d eyeCenter eyeRotation