skyblue water color, in Math.h, common for game and editor

Author: cryham

src/caveexpress/client/CaveExpressClientMap.cpp

@@ -27,10 +27,6 @@
 
 namespace caveexpress {
 
-static const Color waterLineColor = { 0.99f, 0.99f, 1.0f, 1.0f };
-static const Color color = { (float)WATERCOLOR[0] / 255.0f, (float)WATERCOLOR[1] / 255.0f, (float)WATERCOLOR[2] / 255.0f, WATER_ALPHA
-		/ 255.0f };
-
 CaveExpressClientMap::CaveExpressClientMap (int x, int y, int width, int height, IFrontend *frontend,
 		ServiceProvider& serviceProvider, int referenceTileWidth) :
 		ClientMap(x, y, width, height, frontend, serviceProvider, referenceTileWidth), _waterHeight(0.0), _target(nullptr)
@@ -58,7 +54,7 @@ void CaveExpressClientMap::renderWater (int x, int y) const
 	const SDL_Rect& rect = getWaterRect(x, y);
 	Log::trace(LOG_GAMEIMPL, "rect:(%i,%i,%i,%i), x:%i, y:%i, water:(w:%i, h:%i, surf:%i, grnd:%i, wh:%f, scale:%i)",
 									_x, _y, _width, _height, x, y, rect.w, rect.h, rect.y, rect.y + rect.h, _waterHeight, _scale);
-	_frontend->renderWaterPlane(rect.x, rect.y, rect.w, rect.h, color, waterLineColor);
+	_frontend->renderWaterPlane(rect.x, rect.y, rect.w, rect.h, waterColor, waterLineColor);
 	if (Config.isDebug()) {
 		const int waterGround = rect.y + rect.h;
 		_frontend->renderLine(rect.x, rect.y, rect.x + rect.w, rect.y, colorRed);

src/caveexpress/client/ui/nodes/UINodeBackgroundScene.cpp

@@ -1,4 +1,5 @@
 #include "UINodeBackgroundScene.h"
+#include "common/Math.h"
 #include "ui/UI.h"
 #include "client/ClientMap.h"
 #include "caveexpress/shared/CaveExpressMapFailedReasons.h"
@@ -86,9 +87,7 @@ int UINodeBackgroundScene::renderGround (int x, int y) const
 
 void UINodeBackgroundScene::renderWater (int x, int y) const
 {
-	static const Color color = { WATERCOLOR[0] / 255.0f, WATERCOLOR[1] / 255.0f, WATERCOLOR[2] / 255.0f, WATER_ALPHA
-			/ 255.0f };
-	_frontend->renderFilledRect(x, y, _frontend->getWidth() - x, _frontend->getHeight() - y, color);
+	_frontend->renderFilledRect(x, y, _frontend->getWidth() - x, _frontend->getHeight() - y, waterColor);
 }
 
 void UINodeBackgroundScene::renderFailedOnGround (int x, int y, const MapFailedReason& reason, float offsetY) const

src/caveexpress/client/ui/nodes/UINodeMapEditor.cpp

@@ -102,9 +102,7 @@ void UINodeMapEditor::renderWater (int x, int y) const
 	const int waterPixelHeight = _waterHeight * tileHeight;
 	const int waterPixelWidth = getScreenMapGridWidth() * tileWidth;
 
-	Color waterColor = { 0.7f, 0.7f, 1.0f, 0.8f };
-	renderLine(x, waterPixelSurface, x + waterPixelWidth, waterPixelSurface, waterColor);
-	waterColor[3] = 0.4;
+	renderLine(x, waterPixelSurface, x + waterPixelWidth, waterPixelSurface, waterLineColor);
 	renderFilledRect(x, waterPixelSurface + 1, waterPixelWidth, waterPixelHeight, waterColor);
 }
 

src/modules/client/ClientMap.h

@@ -17,11 +17,6 @@
 #include <vector>
 #include <unordered_map>
 
-namespace {
-const uint8_t WATER_ALPHA = 120;
-const uint8_t WATERCOLOR[] = { 178, 178, 255, WATER_ALPHA };
-}
-
 class ClientMap: public IMap, public IClientCallback, public IEventObserver, public IParticleEnvironment {
 public:
 	typedef std::unordered_map<uint16_t, ClientEntityPtr> ClientEntityMap;

src/modules/common/Math.h

@@ -96,6 +96,21 @@ static const Color highlightColor = { 1.0f, 1.0f, 1.0f, 0.5f };
 static const Color colorYellow = { 1.0f, 1.0f, 0.0f, 1.0f };
 static const Color colorCyan = { 0.2313f, 0.7372f, 0.8274f, 1.0f };
 
+//  water color
+// const uint8_t WATER_ALPHA = 80, WATERCOLOR[] = { 26, 45, 71, WATER_ALPHA };  // dark blue
+// const uint8_t WATER_ALPHA = 120, WATERCOLOR[] = { 56, 85, 121, WATER_ALPHA };  // dark cyan
+// const uint8_t WATER_ALPHA = 130, WATERCOLOR[] = { 56, 95, 151, WATER_ALPHA };  // cyan
+static const uint8_t WATER_ALPHA = 150, WATERCOLOR[] = { 58, 118, 181, WATER_ALPHA };  // skyblue
+
+static const Color waterLineColor = 
+	{ (float)WATERCOLOR[0] / 255.0f * 1.2f,
+	  (float)WATERCOLOR[1] / 255.0f * 1.2f,
+	  (float)WATERCOLOR[2] / 255.0f * 1.2f, 1.f };
+static const Color waterColor =
+	{ (float)WATERCOLOR[0] / 255.0f,
+	  (float)WATERCOLOR[1] / 255.0f,
+	  (float)WATERCOLOR[2] / 255.0f, WATER_ALPHA / 255.0f };
+
 inline void FadeIn (float& value, float frac)
 {
 	value *= frac;