Code clean-up.

Author: bryanedds

Nu/Nu/OpenGL/OpenGL.SpriteBatch.fs

@@ -44,9 +44,10 @@ module SpriteBatch =
     type [<ReferenceEquality>] SpriteBatchEnv =
         private
             { mutable SpriteIndex : int
-              mutable ViewProjectionAbsolute : Matrix4x4
-              mutable ViewProjectionRelative : Matrix4x4
-              mutable ViewProjectionClip : Matrix4x4
+              mutable ViewProjection2dAbsolute : Matrix4x4
+              mutable ViewProjection2dRelative : Matrix4x4
+              mutable ViewProjectionClipAbsolute : Matrix4x4
+              mutable ViewProjectionClipRelative : Matrix4x4
               PerimetersUniform : int
               TexCoordsesUniform : int
               PivotsUniform : int
@@ -99,7 +100,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.ViewProjectionClip
+                let viewProjection = if env.State.Absolute then env.ViewProjectionClipAbsolute else env.ViewProjectionClipRelative
                 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
@@ -125,7 +126,7 @@ module SpriteBatch =
             Gl.Uniform2 (env.PivotsUniform, env.Pivots)
             Gl.Uniform1 (env.RotationsUniform, env.Rotations)
             Gl.Uniform4 (env.ColorsUniform, env.Colors)
-            Gl.UniformMatrix4 (env.ViewProjectionUniform, false, if env.State.Absolute then env.ViewProjectionAbsolute.ToArray () else env.ViewProjectionRelative.ToArray ())
+            Gl.UniformMatrix4 (env.ViewProjectionUniform, false, if env.State.Absolute then env.ViewProjection2dAbsolute.ToArray () else env.ViewProjection2dRelative.ToArray ())
             Gl.Uniform1 (env.TexUniform, 0)
             Gl.ActiveTexture TextureUnit.Texture0
             Gl.BindTexture (TextureTarget.Texture2d, texture.TextureId)
@@ -163,13 +164,15 @@ module SpriteBatch =
 
     /// Beging a new sprite batch frame3.
     let BeginSpriteBatchFrame
-        (viewProjectionAbsolute : Matrix4x4 inref,
-         viewProjectionRelative : Matrix4x4 inref,
-         viewProjectionClip : Matrix4x4 inref,
+        (viewProjection2dAbsolute : Matrix4x4 inref,
+         viewProjection2dRelative : Matrix4x4 inref,
+         viewProjectionClipAbsolute : Matrix4x4 inref,
+         viewProjectionClipRelative : Matrix4x4 inref,
          env) =
-        env.ViewProjectionAbsolute <- viewProjectionAbsolute
-        env.ViewProjectionRelative <- viewProjectionRelative
-        env.ViewProjectionClip <- viewProjectionClip
+        env.ViewProjection2dAbsolute <- viewProjection2dAbsolute
+        env.ViewProjection2dRelative <- viewProjection2dRelative
+        env.ViewProjectionClipAbsolute <- viewProjectionClipAbsolute
+        env.ViewProjectionClipRelative <- viewProjectionClipRelative
         BeginSpriteBatch SpriteBatchState.defaultState env
 
     /// End the current sprite batch frame, if any.
@@ -239,7 +242,9 @@ module SpriteBatch =
         Hl.Assert ()
 
         // create env
-        { SpriteIndex = 0; ViewProjectionAbsolute = m4Identity; ViewProjectionRelative = m4Identity; ViewProjectionClip = m4Identity
+        { SpriteIndex = 0
+          ViewProjection2dAbsolute = m4Identity; ViewProjection2dRelative = m4Identity
+          ViewProjectionClipAbsolute = m4Identity; ViewProjectionClipRelative = m4Identity
           PerimetersUniform = perimetersUniform; PivotsUniform = pivotsUniform; RotationsUniform = rotationsUniform
           TexCoordsesUniform = texCoordsesUniform; ColorsUniform = colorsUniform; ViewProjectionUniform = viewProjectionUniform
           TexUniform = texUniform; Shader = shader

Nu/Nu/Render/Renderer2d.fs

@@ -677,7 +677,7 @@ type [<ReferenceEquality>] GlRenderer2d =
                 let position = perimeter.Min.V2 * virtualScalar
                 let size = perimeter.Size.V2 * virtualScalar
                 let viewProjection2d = Viewport.getViewProjection2d absolute eyeCenter eyeSize renderer.Viewport
-                let viewProjectionClip = Viewport.getViewProjectionClip eyeCenter eyeSize renderer.Viewport
+                let viewProjectionClip = Viewport.getViewProjectionClip absolute eyeCenter eyeSize renderer.Viewport
                 match GlRenderer2d.tryGetRenderAsset font renderer with
                 | ValueSome renderAsset ->
                     match renderAsset with
@@ -849,8 +849,9 @@ 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
-        let viewProjectionClip = Viewport.getViewProjectionClip eyeCenter eyeSize viewport
-        OpenGL.SpriteBatch.BeginSpriteBatchFrame (&viewProjectionAbsolute, &viewProjectionRelative, &viewProjectionClip, renderer.SpriteBatchEnv)
+        let viewProjectionClipAbsolute = Viewport.getViewProjectionClip true eyeCenter eyeSize viewport
+        let viewProjectionClipRelative = Viewport.getViewProjectionClip false eyeCenter eyeSize viewport
+        OpenGL.SpriteBatch.BeginSpriteBatchFrame (&viewProjectionAbsolute, &viewProjectionRelative, &viewProjectionClipAbsolute, &viewProjectionClipRelative, renderer.SpriteBatchEnv)
         OpenGL.Hl.Assert ()
 
         // render frame

Nu/Nu/Transform/Viewport.fs

@@ -98,13 +98,27 @@ type [<StructuralEquality; NoComparison>] Viewport =
         let projection = viewport.Projection2d
         view * projection
 
+    /// Compute the scissor clip absolute view matrix.
+    static member getViewClipAbsolute (_ : Vector2) (eyeSize : Vector2) viewport =
+        let virtualScalar = (v2iDup viewport.DisplayScalar).V2
+        let translation = eyeSize * 0.5f * virtualScalar
+        Matrix4x4.CreateTranslation translation.V3
+
+    /// Compute the scissor clip relative view matrix.
+    static member getViewClipRelative (eyeCenter : Vector2) (eyeSize : Vector2) viewport =
+        let virtualScalar = (v2iDup viewport.DisplayScalar).V2
+        let translation = -eyeCenter + eyeSize * 0.5f * virtualScalar
+        Matrix4x4.CreateTranslation translation.V3
+
     /// Compute the scissor clip view matrix.
-    static member getViewClip (eyeCenter : Vector2) eyeSize viewport =
-        Viewport.getView2d false (eyeCenter / single viewport.DisplayScalar) eyeSize viewport
+    static member getViewClip absolute (eyeCenter : Vector2) eyeSize viewport =
+        if absolute
+        then Viewport.getViewClipAbsolute eyeCenter eyeSize viewport
+        else Viewport.getViewClipRelative eyeCenter eyeSize viewport
 
     /// Compute the scissor clip view projection matrix.
-    static member getViewProjectionClip eyeCenter eyeSize viewport =
-        let view = Viewport.getViewClip eyeCenter eyeSize viewport
+    static member getViewProjectionClip absolute eyeCenter eyeSize viewport =
+        let view = Viewport.getViewClip absolute eyeCenter eyeSize viewport
         let projection = viewport.Projection2d
         view * projection