Added filmic tone mapping option

cutelab-fairies · Feb 1, 2019 · 97fba46 · 97fba46
1 parent 1383646
commit 97fba46
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/foxEssentials/app/index.html b/foxEssentials/app/index.html
@@ -107,6 +107,10 @@ <h1>graphics</h1>
 							<td class="checkbox"></td>
 							<td><h2 style="margin-left:8px"><svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11 9h2v2h-2zm-2 2h2v2H9zm4 0h2v2h-2zm2-2h2v2h-2zM7 9h2v2H7zm12-6H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 18H7v-2h2v2zm4 0h-2v-2h2v2zm4 0h-2v-2h2v2zm2-7h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v2H9v-2H7v2H5v-2h2v-2H5V5h14v6z"/></svg> disable anti-aliasing</h2></td>
 						</tr>
+						<tr class="pointer" id="settings-enableFilmicToneMapping">
+							<td class="checkbox"></td>
+							<td><h2 style="margin-left:8px"><svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18 4V3c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1v4c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V6h1v4H9v11c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-9h8V4h-3z"/></svg> enable filmic tone mapping</h2></td>
+						</tr>
 					</table>
 				</div>
 				<br>
@@ -155,6 +159,7 @@ <h1>graphics</h1>
 						{id:"fixPointerPosition", event:"click", callback:()=>{changeSetting("fixPointerPosition")}},
 						// graphics
 						{id:"disableAntiAliasing", event:"click", callback:()=>{changeSetting("disableAntiAliasing")}},
+						{id:"enableFilmicToneMapping", event:"click", callback:()=>{changeSetting("enableFilmicToneMapping")}},
 					].forEach(setting=>{
 
 						document.getElementById("settings-"+setting.id).addEventListener(setting.event, setting.callback);
@@ -392,12 +397,16 @@ <h2>settings</h2>
 
 								document.getElementById("settings-displayName").value = json.value.displayName;
 
+								setClassToEl(
+									document.querySelector("#settings-disableTrackingSmoothing .checkbox"),
+									"active", json.value.disableTrackingSmoothing);
+
 								setClassToEl(
 									document.querySelector("#settings-disableAntiAliasing .checkbox"),
 									"active", json.value.disableAntiAliasing);
 								setClassToEl(
-									document.querySelector("#settings-disableTrackingSmoothing .checkbox"),
-									"active", json.value.disableTrackingSmoothing);
+									document.querySelector("#settings-enableFilmicToneMapping .checkbox"),
+									"active", json.value.enableFilmicToneMapping);
 							break;
 							case "updateScripts":
 								let scriptsEnabled = {};

diff --git a/foxEssentials/foxEssentials.js b/foxEssentials/foxEssentials.js
@@ -212,6 +212,14 @@ function changeSetting(key, value) {
 			}
 		break;
 
+		case "enableFilmicToneMapping":
+			var newEnableFilmicToneMapping = (value!=undefined)? value: !Settings.getValue("cat.maki.foxEssentials.enableFilmicToneMapping");
+			Settings.setValue("cat.maki.foxEssentials.enableFilmicToneMapping", newEnableFilmicToneMapping);
+
+			// uses indicies from /scripts/developer/utilities/render/deferredLighting.qml
+			Render.getConfig("RenderMainView.ToneMapping")["curve"] = (newEnableFilmicToneMapping)? 3: 1;
+		break;
+
 		default: somethingChanged = false; break;
 	}
 
@@ -269,6 +277,7 @@ function updateSettings(override) {
 		disableTrackingSmoothing: (Settings.getValue("cat.maki.foxEssentials.disableTrackingSmoothing"))? true: false,
 
 		disableAntiAliasing: (Settings.getValue("cat.maki.foxEssentials.disableAntiAliasing"))? true: false,
+		enableFilmicToneMapping: (Settings.getValue("cat.maki.foxEssentials.enableFilmicToneMapping"))? true: false,
 	})
 }
 
@@ -331,9 +340,8 @@ function getValueAndChangeSetting(key) {
 
 getValueAndChangeSetting("disableAntiAliasing");
 getValueAndChangeSetting("disableTrackingSmoothing");
-Script.setInterval(function() {
-	getValueAndChangeSetting("collisionsEnabled");
-}, 1000);
+getValueAndChangeSetting("enableFilmicToneMapping");
+//getValueAndChangeSetting("collisionsEnabled");
 
 function collisionsEnabledChanged(enabled) { updateSettings({disableCollisions: !enabled}); }
 function scaleChanged() { updateSettings(); }