From 0f4fa9dc4191aaee9661c1e6d73725436ae64ac2 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 23 Jul 2019 03:30:10 -0400
Subject: [PATCH] Complete min shader.

---
 CameraPane.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CameraPane.java b/CameraPane.java
index be97bb1..69d4882 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -12402,7 +12402,7 @@
         String program =
                 // Min shader
                 "!!ARBfp1.0\n" +
-                "PARAM zero123      = { 0.0, 1.0, 2.0, 3.0 };" +
+                "PARAM zero123      = { 0.0, 1.0, 2.0, 1.25 };" +
                 "PARAM pow2      = { 0.5, 0.25, 0.125, 0.0 };" +
                 "PARAM one      = { 1.0, 1.0, 1.0, 1.0 };" +
                 "PARAM eps      = { 0.001, 0.001, 0.001, 1.0 };" +
@@ -12433,6 +12433,7 @@
                 "MAX ndotl.x, ndotl.x, pow2.y;" +
                 
                 "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
+                "LRP temp, zero123.w, temp, one;" + // texture proportion
                 "MUL temp, temp, ndotl.x;" +
                 
                 "MUL temp, temp, zero123.z;" +
@@ -13396,20 +13397,20 @@
         return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
                 "SGE " + src + ".w, " + src + ".x, eps.x;" +
                 "SGE " + src + ".z, " + src + ".y, eps.x;" +
+                "SLT " + dest + ".x, " + src + ".x, one.x;" +
+                "SLT " + dest + ".y, " + src + ".y, one.x;" +
                 "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
-                "SLT " + src + ".z, " + src + ".x, one.x;" +
-                "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
-                "SLT " + src + ".z, " + src + ".y, one.x;" +
-                "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
+                "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
+                "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
                 //"SWZ buffer, temp, w,w,w,w;";
-                "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
+                //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
                 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
                 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
                 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
-                "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
+                //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
 
-    //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
-    //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
+    //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
+    "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
     }
 
     String Shadow(String depth, String shadow)

--
Gitblit v1.6.2