Format code, update the mandelbrot and shift hue examples, fix the Lua API so the shift hue example works.

Author: ComputerNerd

luaChunk.cpp

@@ -27,10 +27,10 @@ static int lua_chunk_draw(lua_State*L) {
 	size_t chunk = idxPtr[1];
 
 	projects[projectIDX]->Chunk->drawChunk(chunk,
-						luaL_optinteger(L, 2, 0), luaL_optinteger(L, 3, 0), // X offset, Y offset.
-	                                        luaL_optinteger(L, 4, 1), // Zoom
-	                                        luaL_optinteger(L, 5, 0), luaL_optinteger(L, 6, 0) // Scroll X, scroll Y
-	                                        );
+	                                       luaL_optinteger(L, 2, 0), luaL_optinteger(L, 3, 0), // X offset, Y offset.
+	                                       luaL_optinteger(L, 4, 1), // Zoom
+	                                       luaL_optinteger(L, 5, 0), luaL_optinteger(L, 6, 0) // Scroll X, scroll Y
+	                                      );
 	return 0;
 }
 
@@ -62,6 +62,7 @@ static int chunk__get_(lua_State *L) {
 
 static int chunk___tostring(lua_State * L) {
 	const size_t *idxPtr = (const size_t*)lua_touserdata(L, 1);
+
 	if (idxPtr) {
 		lua_pushfstring(L, "Chunk: %d from project: %d", idxPtr[0], idxPtr[1]);
 		return 1;

luaChunks.cpp

@@ -24,7 +24,7 @@
 static int chunk__set_(lua_State *L) {
 	const char *key = luaL_checkstring(L, 2);
 	getProjectIDX
-	
+
 	class ChunkClass *chunk = projects[projectIDX]->Chunk;
 
 	const char*k = luaL_checkstring(L, 2);

luaExamples/mandelbrotToTilemap.lua

@@ -45,17 +45,17 @@ if p:have(project.mapMask) then
 	local maxit = tonumber(fl.input("Maximum iterations","16000"))
 	if maxit ~= nil then
 		local tilemap = p.tilemaps.current
-		p.tiles:resize(tilemap.w * tilemap.h)
+		p.tiles:setAmt(tilemap.width * tilemap.height)
 
-		for j = 0, tilemap.h -1 do
+		for j = 0, tilemap.height -1 do
 			local row = tilemap[j + 1]
-			for i = 0, tilemap.w - 1 do
-				row[i + 1].tile = j * tilemap.w + i
+			for i = 0, tilemap.width - 1 do
+				row[i + 1].tile = j * tilemap.width + i
 			end
 		end
 
-		local width = tilemap.w * p.tiles.w
-		local height = tilemap.hAll * p.tiles.h
+		local width = tilemap.width * p.tiles.width
+		local height = tilemap.hAll * p.tiles.height
 
 		-- [-2,1],[-1,1]
 		local sx, sy = 3/width, 2/height

luaExamples/shifthue.lua

@@ -35,25 +35,31 @@ function hsl_to_rgb(h, s, L)
 	return _h2rgb(m1, m2, h+1./3.), _h2rgb(m1, m2, h), _h2rgb(m1, m2, h-1./3.)
 end
 function idxHelper(idx)
-	local r,g,b=palette.getRGB(idx)
+	local ent = projects.current.palette[idx]
+
+	local r = ent.r
+	local g = ent.g
+	local b = ent.b
+
 	local h,s,l=rgt.rgbToHsl(r/255.,g/255.,b/255.)
 	r,g,b=hsl_to_rgb((h+shift)%1.,s,l)
 	return r*255.//1,g*255.//1,b*255.//1
 end
 function draw()
+	local p = projects.current
 	win:baseDraw()
 	if shift~=nil then
-		for row=0,palette.rowCnt-1 do
-			for idx=0,palette.perRow-1 do
-				local r,g,b=idxHelper(row*palette.perRow+idx)
+		for row=0,p.palette.rowCnt-1 do
+			for idx=0,p.palette.perRow-1 do
+				local r,g,b=idxHelper(row*p.palette.perRow+idx + 1)
 				fl.rectf((idx+1)*16,(row+1)*16,16,16,r,g,b)
 			end
 		end
-		if palette.haveAlt~=0 then
-			for row=0,palette.rowCntAlt-1 do
-				for idx=0,palette.perRowAlt-1 do
-					local r,g,b=idxHelper(row*palette.perRowAlt+idx+palette.cnt)
-					fl.rectf((idx+1)*16+(palette.perRow+1)*16,(row+1)*16,16,16,r,g,b)
+		if p.palette.haveAlt~=0 then
+			for row=0,p.palette.rowCntAlt-1 do
+				for idx=0,p.palette.perRowAlt-1 do
+					local r,g,b=idxHelper(row*p.palette.perRowAlt+idx+p.palette.cnt + 1)
+					fl.rectf((idx+1)*16+(p.palette.perRow+1)*16,(row+1)*16,16,16,r,g,b)
 				end
 			end
 		end
@@ -71,6 +77,7 @@ function btnCB(val)
 end
 local p = projects.current
 if p:have(project.palMask) then
+	local p = projects.current
 	win=Fl_Window.new(320,200,'Shift hue by')
 	win:set_modal()
 	win:setDrawFunction("draw")
@@ -88,9 +95,9 @@ if p:have(project.palMask) then
 	end
 	if ok~=0 then
 		undo.pushPaletteAll()
-		for ent=0,palette.cnt+palette.cntAlt-1,1 do
-			local r,g,b=idxHelper(ent)
-			palette.setRGB(ent,r,g,b)
+		for ent=0,p.palette.cntTotal - 1, 1 do
+			local r,g,b=idxHelper(ent + 1)
+			p.palette[ent + 1]:setRGB(r,g,b)
 		end
 		palette.fixSliders()
 		rgt.damage()

luaPalette.cpp

@@ -59,6 +59,12 @@ static int palette__get_(lua_State *L) {
 		} else if (!strcmp("cnt", k)) {
 			lua_pushinteger(L, projects[idx]->pal->colorCnt);
 			return 1;
+		} else if (!strcmp("cntAlt", k)) {
+			lua_pushinteger(L, projects[idx]->pal->colorCntalt);
+			return 1;
+		} else if (!strcmp("cntTotal", k)) {
+			lua_pushinteger(L, projects[idx]->pal->colorCntalt + projects[idx]->pal->colorCnt);
+			return 1;
 		} else if (!strcmp("perRow", k)) {
 			lua_pushinteger(L, projects[idx]->pal->perRow);
 			return 1;

luaPaletteEntry.cpp

@@ -22,8 +22,7 @@
 #include "gui.h"
 
 static int palette__set_(lua_State *L) {
-	const size_t *idxPtr = (const size_t*)lua_touserdata(L, 1);
-	size_t projectIDX = *idxPtr;
+	getProjectIDX
 	size_t entryIDX = idxPtr[1];
 
 	const char *key = luaL_checkstring(L, 2);
@@ -59,8 +58,7 @@ static int palette__set_(lua_State *L) {
 }
 
 static int lua_palette_convertFromRGB(lua_State*L) {
-	const size_t *idxPtr = (const size_t*)lua_touserdata(L, 1);
-	size_t projectIDX = *idxPtr;
+	getProjectIDX
 	size_t entryIDX = idxPtr[1];
 	size_t ent3 = entryIDX * 3;
 
@@ -70,8 +68,7 @@ static int lua_palette_convertFromRGB(lua_State*L) {
 }
 
 static int lua_palette_setRGB(lua_State*L) {
-	const size_t *idxPtr = (const size_t*)lua_touserdata(L, 1);
-	size_t projectIDX = *idxPtr;
+	getProjectIDX
 	size_t entryIDX = idxPtr[1];
 
 	projects[projectIDX]->pal->rgbToEntry(luaL_checkinteger(L, 2), luaL_checkinteger(L, 3), luaL_checkinteger(L, 4), entryIDX);
@@ -81,8 +78,7 @@ static int lua_palette_setRGB(lua_State*L) {
 
 static int paletteEntry__get_(lua_State *L) {
 	int type = lua_type(L, 2);
-	const size_t *idxPtr = (const size_t*)lua_touserdata(L, 1);
-	size_t projectIDX = *idxPtr;
+	getProjectIDX
 	size_t entryIDX = idxPtr[1];
 
 	if (type == LUA_TSTRING) {

luaTilemap.cpp

@@ -259,6 +259,7 @@ static int tilemap__set_(lua_State *L) {
 
 	if (!strcmp("useBlocks", k))
 		tm->isBlock = lua_toboolean(L, 3);
+
 	return 0;
 }
 

luaTilemapEntry.cpp

@@ -26,12 +26,12 @@ static int lua_tilemap_setFull(lua_State*L) {
 	const size_t columnIDX = idxPtr[2];
 	const size_t entryIDX = idxPtr[3];
 	projects[projectIDX]->tms->maps[tilemapIDX].set_tile_full(entryIDX, // x
-			columnIDX, // y
-			luaL_optinteger(L, 2, 0), // tile
-			luaL_optboolean(L, 3, false), // palette_row
-			luaL_optboolean(L, 4, false), // hflip
-			luaL_optboolean(L, 5, false), // vflip
-			luaL_optboolean(L, 6, false)); // priority
+	        columnIDX, // y
+	        luaL_optinteger(L, 2, 0), // tile
+	        luaL_optboolean(L, 3, false), // palette_row
+	        luaL_optboolean(L, 4, false), // hflip
+	        luaL_optboolean(L, 5, false), // vflip
+	        luaL_optboolean(L, 6, false)); // priority
 	return 0;
 }