Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 05:52:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6703 from samcake/hdr

Browse source 
Change the default tone curve to jusimple gamma correct and fix the r…
This commit is contained in:
samcake 2015-12-18 15:36:44 -08:00
commit d5bac4c257
2 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
examples/utilities/tools/renderEngineDebug.js
View file

@ -50,46 +50,46 @@ function CounterWidget(parentPanel, name, feedGetter, drawGetter, capSetter, cap
}; };
var opaquesCounter = new CounterWidget(panel, "Opaques", var opaquesCounter = new CounterWidget(panel, "Opaques",
function () { return Scene.getEngineNumFeedOpaqueItems(); }, function () { return Render.getEngineNumFeedOpaqueItems(); },
function () { return Scene.getEngineNumDrawnOpaqueItems(); }, function () { return Render.getEngineNumDrawnOpaqueItems(); },
function(value) { Scene.setEngineMaxDrawnOpaqueItems(value); }, function(value) { Render.setEngineMaxDrawnOpaqueItems(value); },
function () { return Scene.getEngineMaxDrawnOpaqueItems(); } function () { return Render.getEngineMaxDrawnOpaqueItems(); }
); );
var transparentsCounter = new CounterWidget(panel, "Transparents", var transparentsCounter = new CounterWidget(panel, "Transparents",
function () { return Scene.getEngineNumFeedTransparentItems(); }, function () { return Render.getEngineNumFeedTransparentItems(); },
function () { return Scene.getEngineNumDrawnTransparentItems(); }, function () { return Render.getEngineNumDrawnTransparentItems(); },
function(value) { Scene.setEngineMaxDrawnTransparentItems(value); }, function(value) { Render.setEngineMaxDrawnTransparentItems(value); },
function () { return Scene.getEngineMaxDrawnTransparentItems(); } function () { return Render.getEngineMaxDrawnTransparentItems(); }
); );
var overlaysCounter = new CounterWidget(panel, "Overlays", var overlaysCounter = new CounterWidget(panel, "Overlays",
function () { return Scene.getEngineNumFeedOverlay3DItems(); }, function () { return Render.getEngineNumFeedOverlay3DItems(); },
function () { return Scene.getEngineNumDrawnOverlay3DItems(); }, function () { return Render.getEngineNumDrawnOverlay3DItems(); },
function(value) { Scene.setEngineMaxDrawnOverlay3DItems(value); }, function(value) { Render.setEngineMaxDrawnOverlay3DItems(value); },
function () { return Scene.getEngineMaxDrawnOverlay3DItems(); } function () { return Render.getEngineMaxDrawnOverlay3DItems(); }
); );
var resizing = false; var resizing = false;
var previousMode = Settings.getValue(SETTINGS_KEY, -1); var previousMode = Settings.getValue(SETTINGS_KEY, -1);
Menu.addActionGroup(MENU, ACTIONS, ACTIONS[previousMode + 1]); Menu.addActionGroup(MENU, ACTIONS, ACTIONS[previousMode + 1]);
Scene.setEngineDeferredDebugMode(previousMode); Render.setEngineDeferredDebugMode(previousMode);
Scene.setEngineDeferredDebugSize({ x: 0.0, y: -1.0, z: 1.0, w: 1.0 }); // Reset to default size Render.setEngineDeferredDebugSize({ x: 0.0, y: -1.0, z: 1.0, w: 1.0 }); // Reset to default size
function setEngineDeferredDebugSize(eventX) { function setEngineDeferredDebugSize(eventX) {
var scaledX = (2.0 * (eventX / Window.innerWidth) - 1.0).clamp(-1.0, 1.0); var scaledX = (2.0 * (eventX / Window.innerWidth) - 1.0).clamp(-1.0, 1.0);
Scene.setEngineDeferredDebugSize({ x: scaledX, y: -1.0, z: 1.0, w: 1.0 }); Render.setEngineDeferredDebugSize({ x: scaledX, y: -1.0, z: 1.0, w: 1.0 });
} }
function shouldStartResizing(eventX) { function shouldStartResizing(eventX) {
var x = Math.abs(eventX - Window.innerWidth * (1.0 + Scene.getEngineDeferredDebugSize().x) / 2.0); var x = Math.abs(eventX - Window.innerWidth * (1.0 + Render.getEngineDeferredDebugSize().x) / 2.0);
var mode = Scene.getEngineDeferredDebugMode(); var mode = Render.getEngineDeferredDebugMode();
return mode !== -1 && x < 20; return mode !== -1 && x < 20;
} }
function menuItemEvent(menuItem) { function menuItemEvent(menuItem) {
var index = ACTIONS.indexOf(menuItem); var index = ACTIONS.indexOf(menuItem);
if (index >= 0) { if (index >= 0) {
Scene.setEngineDeferredDebugMode(index - 1); Render.setEngineDeferredDebugMode(index - 1);
} }
} }
@ -98,24 +98,24 @@ var showDisplayStatusFlag = 1;
var showNetworkStatusFlag = 2; var showNetworkStatusFlag = 2;
panel.newCheckbox("Display status", panel.newCheckbox("Display status",
function(value) { Scene.setEngineDisplayItemStatus(value ? function(value) { Render.setEngineDisplayItemStatus(value ?
Scene.doEngineDisplayItemStatus() | showDisplayStatusFlag : Render.doEngineDisplayItemStatus() | showDisplayStatusFlag :
Scene.doEngineDisplayItemStatus() & ~showDisplayStatusFlag); }, Render.doEngineDisplayItemStatus() & ~showDisplayStatusFlag); },
function() { return (Scene.doEngineDisplayItemStatus() & showDisplayStatusFlag) > 0; }, function() { return (Render.doEngineDisplayItemStatus() & showDisplayStatusFlag) > 0; },
function(value) { return (value & showDisplayStatusFlag) > 0; } function(value) { return (value & showDisplayStatusFlag) > 0; }
); );
panel.newCheckbox("Network/Physics status", panel.newCheckbox("Network/Physics status",
function(value) { Scene.setEngineDisplayItemStatus(value ? function(value) { Render.setEngineDisplayItemStatus(value ?
Scene.doEngineDisplayItemStatus() | showNetworkStatusFlag : Render.doEngineDisplayItemStatus() | showNetworkStatusFlag :
Scene.doEngineDisplayItemStatus() & ~showNetworkStatusFlag); }, Render.doEngineDisplayItemStatus() & ~showNetworkStatusFlag); },
function() { return (Scene.doEngineDisplayItemStatus() & showNetworkStatusFlag) > 0; }, function() { return (Render.doEngineDisplayItemStatus() & showNetworkStatusFlag) > 0; },
function(value) { return (value & showNetworkStatusFlag) > 0; } function(value) { return (value & showNetworkStatusFlag) > 0; }
); );
panel.newSlider("Tone Mapping Exposure", -10, 10, panel.newSlider("Tone Mapping Exposure", -10, 10,
function (value) { Scene.setEngineToneMappingExposure(value); }, function (value) { Render.setEngineToneMappingExposure(value); },
function() { return Scene.getEngineToneMappingExposure(); }, function() { return Render.getEngineToneMappingExposure(); },
function (value) { return (value); }); function (value) { return (value); });
var tickTackPeriod = 500; var tickTackPeriod = 500;
@ -160,9 +160,9 @@ Menu.menuItemEvent.connect(menuItemEvent);
function scriptEnding() { function scriptEnding() {
panel.destroy(); panel.destroy();
Menu.removeActionGroup(MENU); Menu.removeActionGroup(MENU);
Settings.setValue(SETTINGS_KEY, Scene.getEngineDeferredDebugMode()); Settings.setValue(SETTINGS_KEY, Render.getEngineDeferredDebugMode());
Scene.setEngineDeferredDebugMode(-1); Render.setEngineDeferredDebugMode(-1);
Scene.setEngineDeferredDebugSize({ x: 0.0, y: -1.0, z: 1.0, w: 1.0 }); // Reset to default size Render.setEngineDeferredDebugSize({ x: 0.0, y: -1.0, z: 1.0, w: 1.0 }); // Reset to default size
} }
Script.scriptEnding.connect(scriptEnding); Script.scriptEnding.connect(scriptEnding);

2
libraries/render/src/render/Engine.h
View file

@ -75,7 +75,7 @@ public:
class Tone { class Tone {
public: public:
int toneCurve = 3; int toneCurve = 1; // Means just Gamma 2.2 correction
float exposure = 0.0; float exposure = 0.0;
}; };