Added palette table selection for the Sega Genesis

Author: ComputerNerd

callback_gui.cpp

@@ -26,6 +26,8 @@
 #include "undo.h"
 #include "class_global.h"
 #include "palette.h"
+#include "runlua.h"
+#include "luaconfig.h"
 static const char* GPLv3="This program is free software: you can redistribute it and/or modify\n"
 	"it under the terms of the GNU General Public License as published by\n"
 	"the Free Software Foundation, either version 3 of the License, or\n"
@@ -123,17 +125,21 @@ static void palCopyConvert(unsigned cols){
 }
 void set_game_system(Fl_Widget*,void* selection){
 	gameSystemEnum sel=(gameSystemEnum)(intptr_t)selection;
+	const gameSystemEnum gold=currentProject->gameSystem;
 	if(unlikely(sel==currentProject->gameSystem)){
 		fl_alert("You are already in that mode");
 		return;
 	}
 	pushProject();
+	lua_getglobal(Lconf,"switchSystemBefore");
+	lua_pushinteger(Lconf,gold);
+	lua_pushinteger(Lconf,sel);
+	runLuaFunc(Lconf,2,0);
 	if(sel==NES){
 		updateNesTab(0,false);
 		updateNesTab(0,true);
 	}
 	unsigned msprt=window->metaspritesel->value();
-	gameSystemEnum gold=currentProject->gameSystem;
 	uint32_t sold=currentProject->subSystem;
 	unsigned bd=currentProject->getBitdepthSys();
 	unsigned bdold=bd;
@@ -425,6 +431,10 @@ void set_game_system(Fl_Widget*,void* selection){
 			}
 		}
 	}
+	lua_getglobal(Lconf,"switchSystemAfter");
+	lua_pushinteger(Lconf,gold);
+	lua_pushinteger(Lconf,sel);
+	runLuaFunc(Lconf,2,0);
 	window->redraw();
 }
 void trueColTileToggle(Fl_Widget*,void*){

config.lua

@@ -26,4 +26,5 @@ dofile "callbacks.lua"
 dofile "gui.lua"
 dofile "level.lua"
 dofile "project.lua"
+dofile "system.lua"
 --print('Code will execute here after the window is created but before the GUI controls are added')

gui.lua

@@ -14,8 +14,23 @@
 	along with Retro Graphics Toolkit. If not, see <http://www.gnu.org/licenses/>.
 	Copyright Sega16 (or whatever you wish to call me) (2012-2015)
 --]]
+function setPalTabCB(unused)
+	project.setPalTab(palTabSel:value())
+	palette.toRgbAll()
+	rgt.damage()
+end
 function tabConfig(tab)
-	if tab==rgt.levelTab then
+	if tab==rgt.paletteTab then
+		palTabSel=Fl_Choice.new(336, 464, 128, 24,"Palette table selection")
+		palTabSel:align(FL.ALIGN_TOP)
+		palTabSel:callback('setPalTabCB')
+		palTabSel:add("HardwareMan's measured values")
+		palTabSel:add('round(255*v\\/7)')
+		palTabSel:add('Steps of 36')
+		palTabSel:add('Steps of 32')
+		palTabSel:labelsize(12)
+		palTabSel:value(0)
+	elseif tab==rgt.levelTab then
 		initLevelEditor()
 	end
 end

palette.cpp

@@ -62,8 +62,12 @@ void sortBy(unsigned type,bool perRow){
 }
 const uint8_t palTabGameGear[]={0,17,34,51,68,85,102,119,136,153,170,187,204,221,236,255};
 const uint8_t palTabMasterSystem[]={0,85,170,255};//From http://segaretro.org/Palette
-const uint8_t palTab[]=   {0,49,87,119,146,174,206,255,0,27,49,71,87,103,119,130,130,146,157,174,190,206,228,255};//from http://gendev.spritesmind.net/forum/viewtopic.php?t=1389
-const uint8_t palTabEmu[]={0,36,72,108,144,180,216,252,0,18,36,54,72, 90,108,126,126,144,162,180,198,216,234,252};
+const uint8_t*palTab=palTabGenReal;
+const uint8_t*palTabPtr[]={palTabGenReal,palTabGen255div7,palTabGen36,palTabGen32};
+const uint8_t palTabGenReal[]=   {0,49,87,119,146,174,206,255,0,27,49,71,87,103,119,130,130,146,157,174,190,206,228,255};//from http://gendev.spritesmind.net/forum/viewtopic.php?t=1389
+const uint8_t palTabGen255div7[]={0,36,73,109,146,182,219,255,0,18,36,55,73,91 ,109,128,128,146,164,182,200,219,237,255};
+const uint8_t palTabGen36[]=     {0,36,72,108,144,180,216,252,0,18,36,54,72,90 ,108,126,126,144,162,180,198,216,234,252};
+const uint8_t palTabGen32[]=     {0,32,64, 96,128,160,192,224,0,16,32,48,64,80 ,96 ,112,112,128,144,160,176,192,208,224};
 void set_palette_type_force(unsigned type){
 	palTypeGen=type;
 	//now reconvert all the colors

palette.h

@@ -17,7 +17,12 @@
 #pragma once
 extern const uint8_t palTabGameGear[];
 extern const uint8_t palTabMasterSystem[];
-extern const uint8_t palTab[];
+extern const uint8_t*palTabPtr[];
+extern const uint8_t*palTab;
+extern const uint8_t palTabGenReal[];
+extern const uint8_t palTabGen255div7[];
+extern const uint8_t palTabGen36[];
+extern const uint8_t palTabGen32[];
 extern unsigned palTypeGen;
 void sortBy(unsigned type,bool perRow);
 void set_palette_type(void);

project.h

@@ -29,6 +29,7 @@
 #include "classtilemaps.h"
 #include "classlevel.h"
 #include "metasprites.h"
+#include "palette.h"
 #define currentProjectVersionNUM 8
 extern uint32_t curProjectID;
 enum luaLocEnum{PALETTE_C,TILEMAP_C,CHUNK_C,SPRITE_C,LEVEL_C,GLOBAL_C/*Not allowed for luaControl*/,CUSTOM_TAB_0/*And so on*/};
@@ -79,6 +80,16 @@ struct Project{/*!<Holds all data needed for a project based system for example
 	int getBitdepthSys(void)const{
 		return getBitdepthSysraw()+1;
 	}
+	int getPalTab(void)const{
+		palTab=palTabPtr[(subSystem>>3)&7];
+		return (subSystem>>3)&7;
+	}
+	void setPalTab(unsigned val){
+		val&=7;
+		subSystem&=~(7<<3);
+		subSystem|=val<<3;
+		palTab=palTabPtr[val];
+	}
 	unsigned szPerExtPalRow(void);
 	unsigned extAttrTilesPerByte(void);
 	bool isFixedPalette(void);

project.lua

@@ -16,6 +16,10 @@
 --]]
 function switchProject()
 	rgt.syncProject()
+	palTabSel:value(project.getPalTab())--Fixes internal pointer
+	if project.have(project.palMask)~=false then
+		palette.toRgbAll()
+	end
 	if project.have(project.levelMask)~=false then
 		layerSel:clear()
 		for i=1,#level.names do

runlua.cpp

@@ -667,6 +667,10 @@ static int lua_palette_sortByHSL(lua_State*L){
 	sortBy(luaL_optinteger(L,1,0),luaL_optinteger(L,2,0));
 	return 0;
 }
+static int lua_palette_paletteToRgb(lua_State*L){
+	currentProject->pal->paletteToRgb();
+	return 0;
+}
 static const luaL_Reg lua_paletteAPI[]={
 	{"getRGB",lua_palette_getRGB},
 	{"setRGB",lua_palette_setRGB},
@@ -676,6 +680,7 @@ static const luaL_Reg lua_paletteAPI[]={
 	{"maxInRow",lua_palette_maxInRow},
 	{"getType",lua_palette_getType},
 	{"sortByHSL",lua_palette_sortByHSL},
+	{"toRgbAll",lua_palette_paletteToRgb},
 	{0,0}
 };
 static unsigned inRangeTile(unsigned tile){
@@ -1194,6 +1199,14 @@ static int lua_project_update(lua_State*L){
 	updateProjectTablesLua(L);
 	return 0;
 }
+static int lua_project_getPalTab(lua_State*L){
+	lua_pushinteger(L,currentProject->getPalTab());
+	return 1;
+}
+static int lua_project_setPalTab(lua_State*L){
+	currentProject->setPalTab(luaL_optinteger(L,1,0));
+	return 0;
+}
 static const luaL_Reg lua_projectAPI[]={/*!This is the project table. The global project contains the following functions*/
 	{"have",lua_project_rgt_have},
 	{"haveOR",lua_project_rgt_haveOR},
@@ -1202,6 +1215,8 @@ static const luaL_Reg lua_projectAPI[]={/*!This is the project table. The global
 	{"update",lua_project_update},
 	{"getSettings",lua_project_getSettings},
 	{"setSettings",lua_project_setSettings},
+	{"getPalTab",lua_project_getPalTab},
+	{"setPalTab",lua_project_setPalTab},
 	{0,0}
 };
 #define arLen(ar) (sizeof(ar)/sizeof(ar[0]))
@@ -1354,6 +1369,8 @@ void updateProjectTablesLua(lua_State*L){
 	mkKeyunsigned(L,"gameSystem",currentProject->gameSystem);
 	mkKeyunsigned(L,"segaGenesis",segaGenesis);
 	mkKeyunsigned(L,"NES",NES);
+	mkKeyunsigned(L,"gameGear",gameGear);
+	mkKeyunsigned(L,"masterSystem",masterSystem);
 	mkKeyunsigned(L,"count",projects_count);
 	mkKeyunsigned(L,"curProjectID",curProjectID);
 	lua_setglobal(L, "project");

system.h

@@ -26,6 +26,7 @@ enum TMS9918SubSys{MODE_0,MODE_1,MODE_2,MODE_3};
  * These are not compatible when switching systems
  * For the Sega Genesis, Master System and Game Gear bits 1-0 contain bit depth 0 means 1 bit
  * For the Sega Genesis bit 2 sets if shadow highlight is enabled and bit 3 sets if highlight should be displayed instead of shadow
+ * For the Sega Genesis bit 5-3 contain which palette table is used.
  * For the NES bit 1 contains bit depth 1 if 2 bit 0 if 1 bit
  * For the TMS9918 bits 1-0 contain the subsystem
  * For palette framebuffer bits 2-0 contain bit depth add 1 to get actual just like the others

system.lua

@@ -0,0 +1,28 @@
+--[[ 
+	This file is part of Retro Graphics Toolkit
+
+	Retro Graphics Toolkit is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or any later version.
+
+	Retro Graphics Toolkit is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Retro Graphics Toolkit. If not, see <http://www.gnu.org/licenses/>.
+	Copyright Sega16 (or whatever you wish to call me) (2012-2015)
+--]]
+
+function switchSystemBefore(old,new)
+	if new==project.segaGenesis then
+		palTabSel:show()
+	else
+		palTabSel:hide()
+	end
+end
+
+function switchSystemAfter(old,new)
+
+end