Oolite Bulletins

Code: Select all

Index: src/Core/Materials/OOPlanetTextureGenerator.h
===================================================================
--- src/Core/Materials/OOPlanetTextureGenerator.h	(revision 4856)
+++ src/Core/Materials/OOPlanetTextureGenerator.h	(working copy)
@@ -28,7 +28,7 @@
 #import "OOTextureGenerator.h"
 #import "OOMaths.h"
 
-#define PERLIN_3D			0
+#define PERLIN_3D			1
 
 @class OOPlanetNormalMapGenerator, OOPlanetAtmosphereGenerator;
 
@@ -65,6 +65,7 @@
 	// Noise generation stuff.
 	float							*fbmBuffer;
 	float							*qBuffer;
+	float							*qxeBuffer;
 	
 #if PERLIN_3D
 	uint16_t						*permutations;
Index: src/Core/Materials/OOPlanetTextureGenerator.m
===================================================================
--- src/Core/Materials/OOPlanetTextureGenerator.m	(revision 4856)
+++ src/Core/Materials/OOPlanetTextureGenerator.m	(working copy)
@@ -407,8 +407,16 @@
 	
 	_info.paleSeaColor = Blend(0.35f, _info.polarSeaColor, Blend(0.7f, _info.seaColor, _info.landColor));
 	float normalScale = 1 << _planetScale;
-	if (!generateNormalMap)  normalScale *= 3.0f;
-	
+	float normalExponent = 1.0f;
+	if (!generateNormalMap) 
+	{
+		normalScale *= 3.0f;
+	}
+	else
+	{
+		normalScale *= 5.0f;
+		normalExponent = 2.0f;
+	}
 	// Deep sea colour: sea darker past the continental shelf.
 	_info.deepSeaColor = Blend(0.85f, _info.seaColor, (FloatRGB){ 0, 0, 0 });
 	
@@ -425,6 +433,8 @@
 	// first pass, calculate q.
 	_info.qBuffer = malloc(_width * _height * sizeof (float));
 	FAIL_IF_NULL(_info.qBuffer);
+	_info.qxeBuffer = malloc(_width * _height * sizeof (float));
+	FAIL_IF_NULL(_info.qxeBuffer);
 	
 	for (y = (int)_height - 1, fy = (float)y; y >=0; y--, fy--)
 	{
@@ -434,6 +444,7 @@
 		for (x = (int)_width - 1; x >=0; x--)
 		{
 			_info.qBuffer[y * _width + x] = QFactor(_info.fbmBuffer, x, y, _width, poleValue, seaBias, nearPole);
+			_info.qxeBuffer[y * _width + x] = pow( _info.qBuffer[y * _width + x ] , normalExponent );
 		}
 	}
 	
@@ -450,10 +461,10 @@
 		for (x = (int)_width - 1; x >= 0; x--)
 		{
 			q = _info.qBuffer[y * _width + x];	// no need to use GetQ, x and y are always within bounds.
-			yN = GetQ(_info.qBuffer, x, y - 1, _width, _height, widthMask, heightMask);	// recalculates x & y if they go out of bounds.
-			yS = GetQ(_info.qBuffer, x, y + 1, _width, _height, widthMask, heightMask);
-			yW = GetQ(_info.qBuffer, x - 1, y, _width, _height, widthMask, heightMask);
-			yE = GetQ(_info.qBuffer, x + 1, y, _width, _height, widthMask, heightMask);
+			yN = GetQ(_info.qxeBuffer, x, y - 1, _width, _height, widthMask, heightMask);	// recalculates x & y if they go out of bounds.
+			yS = GetQ(_info.qxeBuffer, x, y + 1, _width, _height, widthMask, heightMask);
+			yW = GetQ(_info.qxeBuffer, x - 1, y, _width, _height, widthMask, heightMask);
+			yE = GetQ(_info.qxeBuffer, x + 1, y, _width, _height, widthMask, heightMask);
 			
 			color = PlanetMix(&_info, q, nearPole);