Merge pull request #64 from zardoru/future

Remove internal linear-to-gamma clamp (fixes glow effects)
zardoru · Sep 27, 2017 · 662dd11 · 662dd11
2 parents abd3041 + 9e57d6b
commit 662dd11
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,6 +1,17 @@
 {
         "version": "0.2.0",
         "configurations": [
+            {
+                "name": "(Windows) Test Screen",
+                "type": "cppvsdbg",
+                "request": "launch",
+                "program": "${workspaceRoot}/msvc/Debug/raindrop.exe",
+                "args": ["-L", "screen_btest.lua"],
+                "stopAtEntry": false,
+                "cwd": "${workspaceRoot}/debug",
+                "environment": [],
+                "externalConsole": false
+            },
             {
                 "name": "(Windows) Attach",
                 "type": "cppvsdbg",
@@ -16,7 +27,7 @@
                 "stopAtEntry": false,
                 "cwd": "${workspaceRoot}/debug",
                 "environment": [],
-                "externalConsole": true
+                "externalConsole": false
             },
             {
                 "name": "(Windows) Run Test BMS file - Autoplay (debug/test.bms)",
@@ -27,7 +38,7 @@
                 "stopAtEntry": false,
                 "cwd": "${workspaceRoot}/debug",
                 "environment": [],
-                "externalConsole": true
+                "externalConsole": false
             },
             {
                 "name": "(Windows) Run Test BMS file (debug/test.bms)",
@@ -38,7 +49,7 @@
                 "stopAtEntry": false,
                 "cwd": "${workspaceRoot}/debug",
                 "environment": [],
-                "externalConsole": true
+                "externalConsole": false
             },
             {
                 "name": "(Windows) Run Tests",
@@ -49,7 +60,7 @@
                 "stopAtEntry": false,
                 "cwd": "${workspaceRoot}/debug",
                 "environment": [],
-                "externalConsole": true
+                "externalConsole": false
             },
             {
                 "name": "(Windows) Debug Launch",
@@ -60,7 +71,7 @@
                 "stopAtEntry": false,
                 "cwd": "${workspaceRoot}/debug",
                 "environment": [],
-                "externalConsole": true
+                "externalConsole": false
             }
         ]
     }
diff --git a/GameData b/GameData
diff --git a/src/Rendering.h b/src/Rendering.h
@@ -37,8 +37,9 @@ namespace Renderer {
 }
 
 inline float l2gamma (float c) {
-	if (c > 1.) return 1.;
+	/*if (c > 1.) return 1.;
 	else if (c < 0.) return 0.;
-	else if (c <= 0.04045) return c / 12.92;
+	else */
+	if (c <= 0.04045) return c / 12.92;
 	else return pow((c + 0.055) / 1.055, 2.4);
 };
+3 −2		Skins/arctichare/components.lua
+3 −1		Skins/default/Scripts/AnimatedObjects.lua
+58 −0		Skins/default/screen_btest.lua
+1 −4		Skins/default/screenselectmusic.lua
+15 −11		Skins/ftb2d/screengameplay7k.lua
+9 −8		Skins/ftb2d/screenloading.lua
+3 −0		Skins/simple/screengameplay7k.lua