Add vorticity view. Lua bindings for vorticity.

Author: savask

src/graphics/Graphics.cpp

@@ -435,6 +435,12 @@ void Graphics::draw_icon(int x, int y, Icon icon, unsigned char alpha, bool inve
 			BlendChar({ x + 1, y + 1 }, 0xE055, 0x37FF37_rgb .WithAlpha(alpha));
 		}
 		break;
+	case IconVort:
+		if(invert)
+			BlendChar({ x + 1, y + 1 }, 0xE054, 0xA64D79_rgb .WithAlpha(alpha));
+		else
+			BlendChar({ x + 1, y + 1 }, 0xE054, 0xC27BA0_rgb .WithAlpha(alpha));
+		break;
 	default:
 		if(invert)
 			BlendChar({ x, y }, 't', 0x000000_rgb .WithAlpha(alpha));

src/graphics/Icons.h

@@ -38,5 +38,6 @@ enum Icon
 	IconPersistant,
 	IconHeat,
 	IconLife,
-	IconGradient
+	IconGradient,
+	IconVort
 };

src/graphics/Renderer.cpp

@@ -988,6 +988,14 @@ void Renderer::draw_air()
 					c = RGB(r, g, b);
 				}
 			}
+			else if (displayMode & DISPLAY_AIRW)
+			{
+				auto w = 4*Air::vorticity(*sim, y, x);
+				if (w > 0.0f)
+					c = RGB(clamp_flt(w, 0.0f, 8.0f), 0, 0); //positive vorticity is red
+				else
+					c = RGB(0, 0, clamp_flt(-w, 0.0f, 8.0f)); //negative vorticity is blue
+			}
 			if (findingElement)
 			{
 				c.Red   /= 10;

src/gui/render/RenderView.cpp

@@ -91,11 +91,12 @@ RenderView::RenderView():
 	addDisplayModeCheckbox(DISPLAY_AIRP, IconPressure  , ui::Point(135, 22), "Displays pressure, red is positive and blue is negative");
 	addDisplayModeCheckbox(DISPLAY_AIRV, IconVelocity  , ui::Point(167,  4), "Displays velocity and positive pressure: up/down adds blue, right/left adds red, still pressure adds green");
 	addDisplayModeCheckbox(DISPLAY_AIRH, IconHeat      , ui::Point(167, 22), "Displays the temperature of the air like heat display does");
-	line2 = 200;
-	addDisplayModeCheckbox(DISPLAY_WARP, IconWarp      , ui::Point(205, 22), "Gravity lensing, Newtonian Gravity bends light with this on");
-	addDisplayModeCheckbox(DISPLAY_EFFE, IconEffect    , ui::Point(205,  4), "Enables moving solids, stickmen guns, and premium(tm) graphics");
-	addDisplayModeCheckbox(DISPLAY_PERS, IconPersistant, ui::Point(237,  4), "Element paths persist on the screen for a while");
-	line3 = 270;
+	addDisplayModeCheckbox(DISPLAY_AIRW, IconVort      , ui::Point(199,  4), "Displays vorticity, red is clockwise and blue is anticlockwise");
+	line2 = 232;
+	addDisplayModeCheckbox(DISPLAY_WARP, IconWarp      , ui::Point(237, 22), "Gravity lensing, Newtonian Gravity bends light with this on");
+	addDisplayModeCheckbox(DISPLAY_EFFE, IconEffect    , ui::Point(237,  4), "Enables moving solids, stickmen guns, and premium(tm) graphics");
+	addDisplayModeCheckbox(DISPLAY_PERS, IconPersistant, ui::Point(269,  4), "Element paths persist on the screen for a while");
+	line3 = 302;
 
 	auto addColourModeCheckbox = [this](unsigned int mode, Icon icon, ui::Point offset, String tooltip) {
 		auto *colourModeCheckbox = new ModeCheckbox(ui::Point(0, YRES) + offset, ui::Point(30, 16), "", tooltip);
@@ -117,11 +118,11 @@ RenderView::RenderView():
 		} });
 		AddComponent(colourModeCheckbox);
 	};
-	addColourModeCheckbox(COLOUR_HEAT, IconHeat    , ui::Point(275,  4), "Displays temperatures of the elements, dark blue is coldest, pink is hottest");
-	addColourModeCheckbox(COLOUR_LIFE, IconLife    , ui::Point(275, 22), "Displays the life value of elements in greyscale gradients");
-	addColourModeCheckbox(COLOUR_GRAD, IconGradient, ui::Point(307, 22), "Changes colors of elements slightly to show heat diffusing through them");
-	addColourModeCheckbox(COLOUR_BASC, IconBasic   , ui::Point(307,  4), "No special effects at all for anything, overrides all other options and deco");
-	line4 = 340;
+	addColourModeCheckbox(COLOUR_HEAT, IconHeat    , ui::Point(307,  4), "Displays temperatures of the elements, dark blue is coldest, pink is hottest");
+	addColourModeCheckbox(COLOUR_LIFE, IconLife    , ui::Point(307, 22), "Displays the life value of elements in greyscale gradients");
+	addColourModeCheckbox(COLOUR_GRAD, IconGradient, ui::Point(339, 22), "Changes colors of elements slightly to show heat diffusing through them");
+	addColourModeCheckbox(COLOUR_BASC, IconBasic   , ui::Point(339,  4), "No special effects at all for anything, overrides all other options and deco");
+	line4 = 372;
 }
 
 uint32_t RenderView::CalculateRenderMode()

src/lua/LuaRenderer.cpp

@@ -370,6 +370,7 @@ void LuaRenderer::Open(lua_State *L)
 	LCONST(DISPLAY_WARP);
 	LCONST(DISPLAY_PERS);
 	LCONST(DISPLAY_EFFE);
+	LCONST(DISPLAY_AIRW);
 #undef LCONST
 	lua_pushvalue(L, -1);
 	lua_setglobal(L, "renderer");

src/lua/LuaSimulation.cpp

@@ -1275,6 +1275,21 @@ static int ambientAirTemp(lua_State *L)
 	return 0;
 }
 
+static int vorticityCoeff(lua_State *L)
+{
+	auto *lsi = GetLSI();
+	int acount = lua_gettop(L);
+	if (acount == 0)
+	{
+		lua_pushnumber(L, lsi->sim->air->vorticityCoeff);
+		return 1;
+	}
+	lsi->AssertInterfaceEvent();
+	float vorticityCoeff = restrict_flt(luaL_optnumber(L, 1, 0.0f), 0.0f, 1.0f);
+	lsi->gameModel->SetVorticityCoeff(vorticityCoeff);
+	return 0;
+}
+
 static int elementCount(lua_State *L)
 {
 	int element = luaL_optint(L, 1, 0);
@@ -2013,6 +2028,7 @@ void LuaSimulation::Open(lua_State *L)
 		LFUNC(airMode),
 		LFUNC(waterEqualization),
 		LFUNC(ambientAirTemp),
+		LFUNC(vorticityCoeff),
 		LFUNC(elementCount),
 		LFUNC(canMove),
 		LFUNC(brush),

src/simulation/Air.cpp

@@ -27,10 +27,10 @@ void Air::make_kernel(void) //used for velocity
 }
 
 
-float Air::vorticity(int y, int x)
+float Air::vorticity(const RenderableSimulation & sm, int y, int x)
 {
-	auto &vx = sim.vx;
-	auto &vy = sim.vy;
+	auto &vx = sm.vx;
+	auto &vy = sm.vy;
 
 	if (x > 1 && x < XCELLS-2 && y > 1 && y < YCELLS-2)
 	{
@@ -391,10 +391,10 @@ void Air::update_air(void)
 				//Vorticity confinement
 				if (vorticityCoeff > 0.0f && x > 1 && x < XCELLS-2 && y > 1 && y < YCELLS-2)
 				{
-					auto dwx = (vorticity(y, x+1) - vorticity(y, x-1))*0.5f;
-					auto dwy = (vorticity(y+1, x) - vorticity(y-1, x))*0.5f;
+					auto dwx = (vorticity(sim, y, x+1) - vorticity(sim, y, x-1))*0.5f;
+					auto dwy = (vorticity(sim, y+1, x) - vorticity(sim, y-1, x))*0.5f;
 					auto norm = std::sqrt(dwx*dwx + dwy*dwy);
-					auto w = vorticity(y, x);
+					auto w = vorticity(sim, y, x);
 
 					dx += vorticityCoeff * dwx / (norm + 0.001f) * w;
 					dy += vorticityCoeff * dwy / (norm + 0.001f) * w;

src/simulation/Air.h

@@ -2,6 +2,7 @@
 #include "SimulationConfig.h"
 
 class Simulation;
+class RenderableSimulation;
 
 class Air
 {
@@ -18,7 +19,7 @@ class Air
 	unsigned char bmap_blockairh[YCELLS][XCELLS];
 	float kernel[9];
 	void make_kernel(void);
-	float vorticity(int y, int x);
+	static float vorticity(const RenderableSimulation & sm, int y, int x);
 	void update_airh(void);
 	void update_air(void);
 	void Clear();

src/simulation/ElementGraphics.h

@@ -49,7 +49,8 @@ constexpr auto DISPLAY_AIRC    = UINT32_C(0x00000001);
 constexpr auto DISPLAY_AIRP    = UINT32_C(0x00000002);
 constexpr auto DISPLAY_AIRV    = UINT32_C(0x00000004);
 constexpr auto DISPLAY_AIRH    = UINT32_C(0x00000008);
-constexpr auto DISPLAY_AIR     = UINT32_C(0x0000000F);
+constexpr auto DISPLAY_AIR     = UINT32_C(0x0000008F); // 'or' of all air modes
 constexpr auto DISPLAY_WARP    = UINT32_C(0x00000010);
 constexpr auto DISPLAY_PERS    = UINT32_C(0x00000020);
 constexpr auto DISPLAY_EFFE    = UINT32_C(0x00000040);
+constexpr auto DISPLAY_AIRW    = UINT32_C(0x00000080);