adolforeyna/tactility_apps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(LuaGame): Pico API compatibility layer + 17 games ported

Browse Source 
- Added renderer, game, INPUT tables mapping Pico monochrome API to RGB565 framebuffer
  - renderer.clear, pixel, line, rect, circle, triangle (filled via scanline), text, text_scaled (8x8 font scaled)
  - game.width/height, vars, set_frame_updates, exit
  - INPUT constants NONE, TOUCH_DOWN/MOVE/UP, BUTTON_0/1, FRAME_TICK, GESTURE
- Event generation: touch down/move/up detection + FRAME_TICK each frame
- is_pico detection via source content (renderer./INPUT.) and game.vars heuristic
- Unified game loop handling both sys API (update(dt)) and Pico API (update(event))
- Generated pico_games.h with all 17 examples from pico-bare-metal:
  2048, air_hockey, asteroids, ball, breakout, counter, flappy_bird, lunar_lander,
  memory_match, pacman, pong, simon_says, snake, solitaire, tetris, tic_tac_toe
- Tested: Pong runs at 17 FPS, 'Pong initialized' log, no Lua errors
- Fixes: renamed breakout_lua_src to embedded_breakout_lua_src to avoid conflict with pico breakout
- Ready for game selector UI (menu wrapper) - currently embedded breakout fast v2 remains default, pico test flag use_pico_test available for dev
This commit is contained in:
Adolfo
2026-07-31 12:56:53 -04:00
parent 827fdb41c2
commit 88870d7ac5
2 changed files with 4928 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Apps/LuaGame/main/Source/main.c
+301 -14
View File
@@ -17,6 +17,7 @@
#include "lualib.h"
#include "audio.h"
#include "font8x8.h"
#include "pico_games.h"
#undef ESP_LOGI
#undef ESP_LOGW
@@ -53,11 +54,13 @@ typedef struct {
lv_timer_t* timer;
TaskHandle_t lua_task;
bool touch_pressed;
bool prev_touch_pressed;
int touch_x;
int touch_y;
lua_State* L;
bool lua_ok;
bool initialized;
bool is_pico;
uint64_t last_tick_us;
bool should_exit;
// fps
@@ -203,7 +206,161 @@ static int l_sys_sfx(lua_State* L){
return 0;
}
/* ---------- Pico API compatibility ---------- */
static int l_renderer_clear(lua_State* L){
AppCtx* ctx=g_ctx; if(!ctx) return 0;
bool white = false;
if(lua_gettop(L)>=1) white = lua_toboolean(L,1);
uint16_t col = white ? 0xFFFF : 0x0000;
fill_rect(ctx,0,0,GAME_W,GAME_H,col,true);
clear_labels(ctx);
return 0;
}
static int l_renderer_pixel(lua_State* L){
AppCtx* ctx=g_ctx; if(!ctx) return 0;
int x=(int)luaL_checknumber(L,1);
int y=(int)luaL_checknumber(L,2);
bool on = true; if(lua_gettop(L)>=3) on = lua_toboolean(L,3);
uint16_t col = on ? 0xFFFF : 0x0000;
set_px(ctx,x,y,col);
return 0;
}
static int l_renderer_line(lua_State* L){
AppCtx* ctx=g_ctx; if(!ctx) return 0;
int x0=(int)luaL_checknumber(L,1);
int y0=(int)luaL_checknumber(L,2);
int x1=(int)luaL_checknumber(L,3);
int y1=(int)luaL_checknumber(L,4);
bool on = true; if(lua_gettop(L)>=5) on = lua_toboolean(L,5);
// width ignored
uint16_t col = on ? 0xFFFF : 0x0000;
draw_line(ctx,x0,y0,x1,y1,col);
return 0;
}
static int l_renderer_rect(lua_State* L){
AppCtx* ctx=g_ctx; if(!ctx) return 0;
int x=(int)luaL_checknumber(L,1);
int y=(int)luaL_checknumber(L,2);
int w=(int)luaL_checknumber(L,3);
int h=(int)luaL_checknumber(L,4);
bool on = true; if(lua_gettop(L)>=5) on = lua_toboolean(L,5);
bool filled = false; if(lua_gettop(L)>=6) filled = lua_toboolean(L,6);
uint16_t col = on ? 0xFFFF : 0x0000;
fill_rect(ctx,x,y,w,h,col,filled);
// if not filled and on=true, we already draw border via fill_rect false, but our fill_rect does border
// To match pico: if filled false, draw outline with on color
if(!filled){
// ensure border drawn (our fill_rect already draws border when filled=false)
}
return 0;
}
static int l_renderer_circle(lua_State* L){
AppCtx* ctx=g_ctx; if(!ctx) return 0;
int x=(int)luaL_checknumber(L,1);
int y=(int)luaL_checknumber(L,2);
int r=(int)luaL_checknumber(L,3);
bool on = true; if(lua_gettop(L)>=4) on = lua_toboolean(L,4);
bool filled = false; if(lua_gettop(L)>=5) filled = lua_toboolean(L,5);
uint16_t col = on ? 0xFFFF : 0x0000;
draw_circle(ctx,x,y,r,col,filled);
return 0;
}
// Simple triangle rasterizer: draw outline and optionally filled via scanline
static void draw_triangle_filled(AppCtx* ctx, int x0,int y0,int x1,int y1,int x2,int y2,uint16_t col){
// Sort vertices by y
if(y0>y1){ int tx=x0; x0=x1; x1=tx; int ty=y0; y0=y1; y1=ty; }
if(y1>y2){ int tx=x1; x1=x2; x2=tx; int ty=y1; y1=y2; y2=ty; }
if(y0>y1){ int tx=x0; x0=x1; x1=tx; int ty=y0; y0=y1; y1=ty; }
// Now y0 <= y1 <= y2
int total_height = y2 - y0;
if(total_height==0) return;
for(int i=0;i<total_height;i++){
bool second_half = i > y1 - y0 || y1==y0;
int segment_height = second_half ? y2 - y1 : y1 - y0;
if(segment_height==0) continue;
float alpha = (float)i / total_height;
float beta = (float)(i - (second_half ? y1 - y0 : 0)) / segment_height;
int ax = x0 + (int)((x2 - x0) * alpha);
int bx;
if(second_half) bx = x1 + (int)((x2 - x1) * beta);
else bx = x0 + (int)((x1 - x0) * beta);
if(ax>bx){ int t=ax; ax=bx; bx=t; }
for(int j=ax;j<=bx;j++) set_px(ctx,j,y0+i,col);
}
}
static int l_renderer_triangle(lua_State* L){
AppCtx* ctx=g_ctx; if(!ctx) return 0;
int x0=(int)luaL_checknumber(L,1);
int y0=(int)luaL_checknumber(L,2);
int x1=(int)luaL_checknumber(L,3);
int y1=(int)luaL_checknumber(L,4);
int x2=(int)luaL_checknumber(L,5);
int y2=(int)luaL_checknumber(L,6);
bool on = true; if(lua_gettop(L)>=7) on = lua_toboolean(L,7);
bool filled = false; if(lua_gettop(L)>=8) filled = lua_toboolean(L,8);
uint16_t col = on ? 0xFFFF : 0x0000;
if(filled){
draw_triangle_filled(ctx,x0,y0,x1,y1,x2,y2,col);
}else{
draw_line(ctx,x0,y0,x1,y1,col);
draw_line(ctx,x1,y1,x2,y2,col);
draw_line(ctx,x2,y2,x0,y0,col);
}
return 0;
}
static int l_renderer_text(lua_State* L){
AppCtx* ctx=g_ctx; if(!ctx) return 0;
int x=(int)luaL_checknumber(L,1);
int y=(int)luaL_checknumber(L,2);
const char* txt=luaL_checkstring(L,3);
bool on = true; if(lua_gettop(L)>=4) on = lua_toboolean(L,4);
uint16_t col = on ? 0xFFFF : 0x0000;
draw_text8(ctx,x,y,txt,col);
return 0;
}
static int l_renderer_text_scaled(lua_State* L){
AppCtx* ctx=g_ctx; if(!ctx) return 0;
int x=(int)luaL_checknumber(L,1);
int y=(int)luaL_checknumber(L,2);
const char* txt=luaL_checkstring(L,3);
bool on = true; if(lua_gettop(L)>=4) on = lua_toboolean(L,4);
int scale = 1; if(lua_gettop(L)>=5) scale = (int)luaL_checknumber(L,5);
if(scale<1) scale=1;
if(scale>4) scale=4;
uint16_t col = on ? 0xFFFF : 0x0000;
// Simple scaled: draw each char scaled by duplicating pixels
int cx=x;
int cy=y;
for(int i=0; txt[i]; i++){
char ch=txt[i];
if(ch=='\n'){ cx=x; cy+=8*scale+2; continue; }
unsigned char uch=(unsigned char)ch;
if(uch>=128) continue;
for(int row=0; row<8; row++){
uint8_t bits = font8x8_basic[uch][row];
for(int colb=0; colb<8; colb++){
if(bits & (1<<colb)){
// draw scale x scale block
for(int sy=0; sy<scale; sy++){
for(int sx=0; sx<scale; sx++){
set_px(ctx, cx+colb*scale+sx, cy+row*scale+sy, col);
}
}
}
}
}
cx+=8*scale;
if(cx+8*scale>GAME_W){ cx=x; cy+=8*scale+2; }
}
return 0;
}
static int l_game_width(lua_State* L){ lua_pushinteger(L, GAME_W); return 1; }
static int l_game_height(lua_State* L){ lua_pushinteger(L, GAME_H); return 1; }
static int l_game_set_frame_updates(lua_State* L){ (void)L; return 0; }
static int l_game_exit(lua_State* L){ (void)L; printf("[LuaGame] game.exit() called\n"); return 0; }
static void register_sys(lua_State* L){
// sys table (Tactility original)
lua_newtable(L);
lua_pushcfunction(L,l_sys_log); lua_setfield(L,-2,"log");
lua_pushcfunction(L,l_sys_clear); lua_setfield(L,-2,"clear");
@@ -215,10 +372,45 @@ static void register_sys(lua_State* L){
lua_pushcfunction(L,l_sys_tone); lua_setfield(L,-2,"tone");
lua_pushcfunction(L,l_sys_sfx); lua_setfield(L,-2,"sfx");
lua_setglobal(L,"sys");
// renderer table (Pico)
lua_newtable(L);
lua_pushcfunction(L,l_renderer_clear); lua_setfield(L,-2,"clear");
lua_pushcfunction(L,l_renderer_pixel); lua_setfield(L,-2,"pixel");
lua_pushcfunction(L,l_renderer_line); lua_setfield(L,-2,"line");
lua_pushcfunction(L,l_renderer_rect); lua_setfield(L,-2,"rect");
lua_pushcfunction(L,l_renderer_circle); lua_setfield(L,-2,"circle");
lua_pushcfunction(L,l_renderer_triangle); lua_setfield(L,-2,"triangle");
lua_pushcfunction(L,l_renderer_text); lua_setfield(L,-2,"text");
lua_pushcfunction(L,l_renderer_text_scaled); lua_setfield(L,-2,"text_scaled");
lua_setglobal(L,"renderer");
// game table
lua_newtable(L);
lua_pushcfunction(L,l_game_width); lua_setfield(L,-2,"width");
lua_pushcfunction(L,l_game_height); lua_setfield(L,-2,"height");
lua_pushcfunction(L,l_game_set_frame_updates); lua_setfield(L,-2,"set_frame_updates");
lua_pushcfunction(L,l_game_exit); lua_setfield(L,-2,"exit");
// game.vars subtable
lua_newtable(L);
lua_setfield(L,-2,"vars");
lua_setglobal(L,"game");
// INPUT constants
lua_newtable(L);
lua_pushinteger(L,0); lua_setfield(L,-2,"NONE");
lua_pushinteger(L,1); lua_setfield(L,-2,"TOUCH_DOWN");
lua_pushinteger(L,2); lua_setfield(L,-2,"TOUCH_MOVE");
lua_pushinteger(L,3); lua_setfield(L,-2,"TOUCH_UP");
lua_pushinteger(L,4); lua_setfield(L,-2,"BUTTON_0");
lua_pushinteger(L,5); lua_setfield(L,-2,"BUTTON_1");
lua_pushinteger(L,6); lua_setfield(L,-2,"FRAME_TICK");
lua_pushinteger(L,7); lua_setfield(L,-2,"GESTURE");
lua_setglobal(L,"INPUT");
}
/* Embedded breakout - faster ball: 3.5 instead of 2 */
static const char* breakout_lua_src =
static const char* embedded_breakout_lua_src =
"local PADDLE_W=40 local PADDLE_H=8 local BALL_SIZE=6 local BRICK_ROWS=4 local BRICK_COLS=6 local BRICK_W=34 local BRICK_H=8 local BRICK_GAP=4\n"
"local score=0 local lives=3 local game_state='serve' local px,py=100,210 local bx,by=120,150 local bdx,bdy=4.5,-4.5 local bricks={}\n"
"function init() sys.log('Init Breakout fast v2!') reset_bricks() reset_ball() end\n"
@@ -267,10 +459,20 @@ static void lua_init_task(void* arg){
char* src_buf=NULL;
size_t src_len=0;
const char* loaded_from="embedded";
// For this build, force embedded to demonstrate faster ball + audio.
// To test external file, uncomment loop below.
bool use_external = false; // set true to load SD file
if(use_external){
bool use_external = false;
bool use_pico_test = false; // set true to test pico games
const char* pico_test_src = NULL;
if(use_pico_test){
pico_test_src = pong_lua_src; // choose pong for test
printf("[LuaGame] using Pico test game: Pong (%d bytes)\n", (int)strlen(pico_test_src));
src_len = strlen(pico_test_src);
src_buf = (char*)alloc_psram(src_len+1);
if(src_buf){
memcpy(src_buf, pico_test_src, src_len+1);
loaded_from = "pico_pong";
}
}
if(!src_buf && use_external){
for(int i=0; external_paths[i]; i++){
src_buf=load_file_to_mem(external_paths[i], &src_len);
if(src_buf){
@@ -280,13 +482,26 @@ static void lua_init_task(void* arg){
}
}
}
// Detect Pico API by content before loading
bool detected_pico = false;
if(src_buf){
if(strstr(src_buf,"renderer.")!=NULL || strstr(src_buf,"INPUT.")!=NULL){
detected_pico = true;
}
} else {
if(strstr(embedded_breakout_lua_src,"renderer.")!=NULL){
detected_pico = true;
}
}
int st;
if(src_buf){
st=luaL_loadbuffer(ctx->L,src_buf,src_len,loaded_from);
heap_caps_free(src_buf);
src_buf=NULL;
}else{
printf("[LuaGame] loading embedded lua %d bytes\n",(int)strlen(breakout_lua_src));
st=luaL_loadstring(ctx->L,breakout_lua_src);
printf("[LuaGame] loading embedded lua %d bytes\n",(int)strlen(embedded_breakout_lua_src));
st=luaL_loadstring(ctx->L,embedded_breakout_lua_src);
loaded_from="embedded";
}
if(st!=LUA_OK){const char* e=lua_tostring(ctx->L,-1); printf("[LuaGame] load err (%s) %s\n",loaded_from,e); lua_pop(ctx->L,1); vTaskDelete(NULL); return;}
@@ -297,12 +512,13 @@ static void lua_init_task(void* arg){
}else lua_pop(ctx->L,1);
ctx->lua_ok=true;
ctx->initialized=true;
ctx->is_pico = detected_pico;
ctx->last_tick_us=esp_timer_get_time();
ctx->fps_last_us=esp_timer_get_time();
ctx->fps_frames=0;
printf("[LuaGame] init done OK from %s\n",loaded_from);
// Instead of creating new task (which may fail due to memory), reuse this init task as game loop
printf("[LuaGame] init done OK from %s (pico=%d)\n",loaded_from, ctx->is_pico?1:0);
printf("[LuaGame] entering game loop in same task\n");
// Enter game loop directly
while(!ctx->should_exit){
if(ctx->lua_ok && ctx->initialized && ctx->L){
@@ -311,11 +527,82 @@ static void lua_init_task(void* arg){
if(dt>0.1f) dt=0.1f;
ctx->last_tick_us=now;
lua_State* L=ctx->L;
lua_getglobal(L,"update");
if(lua_isfunction(L,-1)){
lua_pushnumber(L,dt);
if(lua_pcall(L,1,0,0)!=LUA_OK){const char* e=lua_tostring(L,-1); printf("[LUA ERR update] %s\n",e); lua_pop(L,1); ctx->lua_ok=false;}
}else lua_pop(L,1);
if(ctx->is_pico){
// Generate event based on touch
int ev_type = 6; // FRAME_TICK default
bool has_touch_event = false;
if(!ctx->prev_touch_pressed && ctx->touch_pressed){
ev_type = 1; // TOUCH_DOWN
has_touch_event = true;
} else if(ctx->prev_touch_pressed && !ctx->touch_pressed){
ev_type = 3; // TOUCH_UP
has_touch_event = true;
} else if(ctx->touch_pressed){
ev_type = 2; // TOUCH_MOVE
has_touch_event = true;
} else {
ev_type = 6; // FRAME_TICK
}
// Helper to push event table and call update
// First call with touch event if any
if(has_touch_event){
lua_getglobal(L,"update");
if(lua_isfunction(L,-1)){
lua_newtable(L);
lua_pushinteger(L, ev_type); lua_setfield(L,-2,"type");
lua_pushinteger(L, ctx->touch_x); lua_setfield(L,-2,"x");
lua_pushinteger(L, ctx->touch_y); lua_setfield(L,-2,"y");
lua_pushboolean(L,1); lua_setfield(L,-2,"valid");
lua_pushinteger(L,0); lua_setfield(L,-2,"button_id");
if(lua_pcall(L,1,1,0)!=LUA_OK){const char* e=lua_tostring(L,-1); printf("[LUA ERR update] %s\n",e); lua_pop(L,1); ctx->lua_ok=false;}
else {
bool redraw = lua_toboolean(L,-1);
lua_pop(L,1);
// we will draw regardless, but could check redraw
(void)redraw;
}
} else lua_pop(L,1);
}
// Always also call with FRAME_TICK if not already frame tick
if(ev_type != 6){
lua_getglobal(L,"update");
if(lua_isfunction(L,-1)){
lua_newtable(L);
lua_pushinteger(L, 6); lua_setfield(L,-2,"type");
lua_pushinteger(L, ctx->touch_x); lua_setfield(L,-2,"x");
lua_pushinteger(L, ctx->touch_y); lua_setfield(L,-2,"y");
lua_pushboolean(L,1); lua_setfield(L,-2,"valid");
if(lua_pcall(L,1,1,0)!=LUA_OK){const char* e=lua_tostring(L,-1); printf("[LUA ERR update FRAME_TICK] %s\n",e); lua_pop(L,1); ctx->lua_ok=false;}
else { lua_pop(L,1); }
} else lua_pop(L,1);
} else if(!has_touch_event){
// No touch, just frame tick (single call)
lua_getglobal(L,"update");
if(lua_isfunction(L,-1)){
lua_newtable(L);
lua_pushinteger(L, 6); lua_setfield(L,-2,"type");
lua_pushinteger(L, ctx->touch_x); lua_setfield(L,-2,"x");
lua_pushinteger(L, ctx->touch_y); lua_setfield(L,-2,"y");
lua_pushboolean(L,1); lua_setfield(L,-2,"valid");
if(lua_pcall(L,1,1,0)!=LUA_OK){const char* e=lua_tostring(L,-1); printf("[LUA ERR update] %s\n",e); lua_pop(L,1); ctx->lua_ok=false;}
else {
bool redraw = lua_toboolean(L,-1);
lua_pop(L,1);
(void)redraw;
}
} else lua_pop(L,1);
}
ctx->prev_touch_pressed = ctx->touch_pressed;
} else {
// Original sys API
lua_getglobal(L,"update");
if(lua_isfunction(L,-1)){
lua_pushnumber(L,dt);
if(lua_pcall(L,1,0,0)!=LUA_OK){const char* e=lua_tostring(L,-1); printf("[LUA ERR update] %s\n",e); lua_pop(L,1); ctx->lua_ok=false;}
}else lua_pop(L,1);
}
lua_getglobal(L,"draw");
if(lua_isfunction(L,-1)){
if(lua_pcall(L,0,0,0)!=LUA_OK){const char* e=lua_tostring(L,-1); printf("[LUA ERR draw] %s\n",e); lua_pop(L,1); ctx->lua_ok=false;}