Oolite Bulletins

Code: Select all

13:31:13.851 [oxp-standards.error]: OXP ../AddOns/adcks Navy Destroyer V1.0.oxp has no manifest.plist
13:31:20.983 [oxp-standards.deprecated]: Old style sub-entity declarations are deprecated in stealth_base
13:31:35.271 [oxp-standards.deprecated]: The conditions key is deprecated for equipment Hyper-Cargo System Illicit Hack
13:31:35.277 [oxp-standards.deprecated]: Script ../AddOns/LinkG7 v0.1.oxp/Scripts/linkG7_autoJumper.js does not "use strict";

Code: Select all

diff --git a/src/Core/OOSkyDrawable.m b/src/Core/OOSkyDrawable.m
index ea3b0c0a..03f66a6a 100644
--- a/src/Core/OOSkyDrawable.m
+++ b/src/Core/OOSkyDrawable.m
@@ -553,6 +553,7 @@ static OOColor *DebugColor(Vector orientation)
 	GLfloat					r, g, b;
 	size_t					posSize, tcSize, colSize;
 	unsigned				count = 0;
+	BOOL					skyColorGammaCorrect = [[NSUserDefaults standardUserDefaults] boolForKey:@"skycolor-gamma-correct"];
 	
 	self = [super init];
 	if (self == nil)  OK = NO;
@@ -605,9 +606,18 @@ static OOColor *DebugColor(Vector orientation)
 					*pos++ = array[i].corners[j].z;
 					
 					// Colour is the same for each vertex
-					*col++ = r;
-					*col++ = g;
-					*col++ = b;
+					if (!skyColorGammaCorrect)
+					{
+						*col++ = r;
+						*col++ = g;
+						*col++ = b;
+					}
+					else
+					{
+						*col++ = pow(r, 1.0/2.2);
+						*col++ = pow(g, 1.0/2.2);
+						*col++ = pow(b, 1.0/2.2);
+					}
 					*col++ = 1.0f;	// Alpha is unused but needs to be there
 				}
 				 

Code: Select all

diff --git a/src/Core/OOSkyDrawable.m b/src/Core/OOSkyDrawable.m
index 03f66a6a..b17dd668 100644
--- a/src/Core/OOSkyDrawable.m
+++ b/src/Core/OOSkyDrawable.m
@@ -35,12 +35,19 @@ SOFTWARE.
 #import "Universe.h"
 #import "OOMacroOpenGL.h"
 #import "NSObjectOOExtensions.h"
+#import "OOCollectionExtractors.h"
 
 
 #define SKY_ELEMENT_SCALE_FACTOR		(BILLBOARD_DEPTH / 500.0f)
 #define NEBULA_SHUFFLE_FACTOR			0.005f
 #define DEBUG_COLORS					0	// If set, rgb = xyz (offset to range from 0.1 to 1.0).
 
+#define SKYCOLOR_TONEMAP(skyColorComponent) \
+do { \
+	x = max(0.0, skyColorComponent - 0.004); \
+	*col++ = (x * (6.2 * x + 0.5)) / (x * (6.2 * x + 1.7) + 0.06); \
+} while (0)
+
 
 /*	Min and max coords are 0 and 1 normally, but the default
 	sky-render-inset-coords can be used to modify them slightly as an attempted
@@ -550,10 +557,10 @@ static OOColor *DebugColor(Vector orientation)
 	GLfloat					*pos;
 	GLfloat					*tc;
 	GLfloat					*col;
-	GLfloat					r, g, b;
+	GLfloat					r, g, b, x;
 	size_t					posSize, tcSize, colSize;
 	unsigned				count = 0;
-	BOOL					skyColorGammaCorrect = [[NSUserDefaults standardUserDefaults] boolForKey:@"skycolor-gamma-correct"];
+	int					skyColorGammaCorrect = [[NSUserDefaults standardUserDefaults] oo_integerForKey:@"skycolor-gamma-correct" defaultValue:0];
 	
 	self = [super init];
 	if (self == nil)  OK = NO;
@@ -606,18 +613,24 @@ static OOColor *DebugColor(Vector orientation)
 					*pos++ = array[i].corners[j].z;
 					
 					// Colour is the same for each vertex
-					if (!skyColorGammaCorrect)
+					if (skyColorGammaCorrect == 0)	// no gamma correction
 					{
 						*col++ = r;
 						*col++ = g;
 						*col++ = b;
 					}
-					else
+					else if (skyColorGammaCorrect == 1)	// gamma correction only
 					{
 						*col++ = pow(r, 1.0/2.2);
 						*col++ = pow(g, 1.0/2.2);
 						*col++ = pow(b, 1.0/2.2);
 					}
+					else							// gamma correctioin + filmic tonemapping
+					{
+						SKYCOLOR_TONEMAP(r);
+						SKYCOLOR_TONEMAP(g);
+						SKYCOLOR_TONEMAP(b);
+					}
 					*col++ = 1.0f;	// Alpha is unused but needs to be there
 				}
 				

Code: Select all

"debug-settings-override" = { };

Code: Select all

#define NULTIPLIER_EXPOSURE			1.0  // Misspelling of NULTIPLIER ?? Should it be MULTIPLIER ??