- [FIX] Fallaba al carregar fonts amb format de final de linea de Windows

- [NEW] draw.surfrot

.gitignore

@@ -4,4 +4,6 @@ mini_debug.exe
 mini_debug
 .vscode/*
 info.plist
-build/*
+build/*
+*.zip
+*.tar.gz

Makefile

@@ -11,13 +11,13 @@ windows_debug:
 	g++ $(source) -D DEBUG -g -Wall -Os -lmingw32 -lSDL3 -lopengl32 -o "$(executable)_debug.exe"
 
 macos:
-	clang++ $(source) -Wall -Os -std=c++11 -ffunction-sections -fdata-sections -lSDL3 -o "$(executable)"
+	clang++ $(source) -Wall -Os -std=c++17 -Wno-deprecated -ffunction-sections -fdata-sections -lSDL3 -framework OpenGL -o "$(executable)"
 
 macos_debug:
-	clang++ $(source) -D DEBUG -g -Wall -Os -std=c++11 -ffunction-sections -fdata-sections -lSDL3 -o "$(executable)_debug"
+	clang++ $(source) -D DEBUG -g -Wall -Os -std=c++17 -Wno-deprecated -ffunction-sections -fdata-sections -lSDL3 -framework OpenGL -o "$(executable)_debug"
 
 macos_bundle:
-	clang++ $(source) -D MACOS_BUNDLE -Wall -Os -std=c++11 -framework SDL3 -F /Library/Frameworks -ffunction-sections -fdata-sections -o mini_bundle -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12
+	clang++ $(source) -D MACOS_BUNDLE -Wall -Os -std=c++17 -Wno-deprecated -framework SDL3 -framework OpenGL -F /Library/Frameworks -ffunction-sections -fdata-sections -o mini_bundle -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12
 
 linux:
 	g++ $(source) -D LUA_USE_LINUX -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -lSDL3 -lGL -o "$(executable)"

data/main.lua

@@ -1,6 +1,7 @@
 --require "ia.other"
 
 x=0
+rot=0
 
 function mini.init()
     s = surf.load("gfx/logo.gif")
@@ -21,7 +22,7 @@ end
 
 function mini.update()
     surf.cls(0)
-    draw.surf(0, 0, 160, 144, 0, 0)
+    draw.surfrot(0, 0, 160, 144, 120, 78, rot)
 
     draw.text("PRESS START", 60, 110, 28)
     if key.press(key.ESCAPE) then sys.quit() end
@@ -48,4 +49,5 @@ function mini.update()
     font.spacing(0)
     draw.text("0146",100,50,28)
     font.current(font.DEFAULT)
+    rot=rot+1
 end

do_release.bat

@@ -20,7 +20,7 @@ REM Crear ZIP release con mini.exe + DLLs
 tar -a -c -f mini_%PARAM%_windows_release.zip mini.exe bin\*.dll || exit /b 1
 
 REM Crear ZIP debug solo con mini_debug.exe
-tar -a -c -f mini_%PARAM%_windows_debug.zip mini_debug.exe || exit /b 1
+tar -a -c -f mini_%PARAM%_windows_debug.zip mini_debug.exe bin\*.dll || exit /b 1
 
 echo Paquetes generados:
 echo   mini_%PARAM%_windows_release.zip

do_release.sh

@@ -1,36 +1,41 @@
 #!/bin/bash
 set -e
 
-if [ -z "$1" ]; then
-    echo "Uso: $0 <PARAMETRO>"
-    exit 1
-fi
+#if [ -z "$1" ]; then
+#    echo "Uso: $0 <PARAMETRO>"
+#    exit 1
+#fi
 
-PARAM=$1
+# Leer versión desde version.h
+VERSION=$(grep '#define MINI_VERSION' version.h | sed 's/.*"\(.*\)".*/\1/')
+echo "Versión detectada: $VERSION"
+
+#PARAM=$1
 
 # Datos Windows
 WIN_USER="raimon"
 WIN_HOST="192.168.1.51"
-WIN_PATH_SSH="/cygdrive/c/Users/raimon/dev/mini"
+WIN_PATH_SSH="C:\Users\raimon\dev\mini"
+WIN_PATH_SCP="C:/Users/Raimon/dev/mini"
 
 echo "=== Compilando Linux ==="
 make linux
 make linux_debug
 
 echo "=== Empaquetando Linux ==="
-tar -czf mini_${PARAM}_linux_release.tar.gz mini
-tar -czf mini_${PARAM}_linux_debug.tar.gz mini_debug
+tar -czf mini_v${VERSION}_linux_release.tar.gz mini
+tar -czf mini_v${VERSION}_linux_debug.tar.gz mini_debug
 
 echo "=== Ejecutando build remoto Windows ==="
-ssh ${WIN_USER}@${WIN_HOST} "cd '${WIN_PATH_SSH}' && build_windows.bat ${PARAM}"
+ssh ${WIN_USER}@${WIN_HOST} "cd ${WIN_PATH_SSH} && do_release.bat v${VERSION}"
 
 echo "=== Copiando ZIPs desde Windows ==="
-scp ${WIN_USER}@${WIN_HOST}:"${WIN_PATH_SSH}/mini_${PARAM}_windows_release.zip" .
-scp ${WIN_USER}@${WIN_HOST}:"${WIN_PATH_SSH}/mini_${PARAM}_windows_debug.zip" .
+scp ${WIN_USER}@${WIN_HOST}:"${WIN_PATH_SCP}/mini_v${VERSION}_windows_release.zip" .
+scp ${WIN_USER}@${WIN_HOST}:"${WIN_PATH_SCP}/mini_v${VERSION}_windows_debug.zip" .
 
 echo "=== Build completado correctamente ==="
 echo "Generados:"
-echo "  mini_${PARAM}_linux_release.tar.gz"
-echo "  mini_${PARAM}_linux_debug.tar.gz"
-echo "  mini_${PARAM}_windows_release.zip"
-echo "  mini_${PARAM}_windows_debug.zip"
+echo "  mini_v${VERSION}_linux_release.tar.gz"
+echo "  mini_v${VERSION}_linux_debug.tar.gz"
+echo "  mini_v${VERSION}_windows_release.zip"
+echo "  mini_v${VERSION}_windows_debug.zip"

lua.cpp

@@ -577,7 +577,11 @@ extern "C" {
         int dx = luaL_checknumber(L, 5);
         int dy = luaL_checknumber(L, 6);
         float a = luaL_checknumber(L, 7);
-        blit_r(sx, sy, sw, sh, dx, dy, a);
+        int dw = luaL_optnumber(L, 8, 0);
+        int dh = luaL_optnumber(L, 9, 0);
+        bool flip_x = lua_toboolean(L, 10);
+        bool flip_y = lua_toboolean(L, 11);
+        blit_r(sx, sy, sw, sh, dx, dy, dw, dh, flip_x, flip_y, a);
         return 0;
     }
 

mini.cpp

@@ -435,6 +435,7 @@ uint8_t loadfont_from_buffer(const char* buffer, uint8_t index, const char* name
         memcpy(line, ptr, len);
         line[len] = '\0';
         ptr += (ptr[len] == '\n') ? len + 1 : len; // Advance pointer
+        if (len > 0 && line[len - 1] == '\r') line[len - 1] = '\0';
 
         if (strncmp(line, "bitmap=", 7) != 0) return false; // Parse first line
 
@@ -453,6 +454,7 @@ uint8_t loadfont_from_buffer(const char* buffer, uint8_t index, const char* name
         memcpy(line, ptr, len);
         line[len] = '\0';
         ptr += (ptr[len] == '\n') ? len + 1 : len; // Advance pointer
+        if (len > 0 && line[len - 1] == '\r') line[len - 1] = '\0';
 
         // Remove comments
         char* hash = strchr(line, '#');
@@ -1351,6 +1353,7 @@ void blit(int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, bool f
     }
 }
 
+/*
 void blit_r(int sx, int sy, int sw, int sh, int x, int y, float a)
 {
     const int x0 = sw>>1;
@@ -1373,6 +1376,142 @@ void blit_r(int sx, int sy, int sw, int sh, int x, int y, float a)
         }
     }
 }
+*/
+
+void blit_r(int sx, int sy, int sw, int sh,
+            int dx, int dy, int dw, int dh,
+            bool flip_x, bool flip_y,
+            float angle_deg)
+{
+    if (dw == 0) dw = sw;
+    if (dh == 0) dh = sh;
+
+    // Centro del destino (rectángulo sin rotar)
+    float dcx = dx + dw * 0.5f;
+    float dcy = dy + dh * 0.5f;
+
+    // Centro del subrectángulo origen
+    float scx = sx + sw * 0.5f;
+    float scy = sy + sh * 0.5f;
+
+    // Escalado destino -> origen
+    float inv_scale_x = float(sw) / float(dw);
+    float inv_scale_y = float(sh) / float(dh);
+
+    // Flips integrados en la escala
+    if (flip_x) inv_scale_x = -inv_scale_x;
+    if (flip_y) inv_scale_y = -inv_scale_y;
+
+    // Ángulo en radianes
+    float a  = angle_deg * 3.14159265f / 180.0f;
+    float ca = SDL_cosf(a);
+    float sa = SDL_sinf(a);
+
+    // --- 1. Bounding box rotado del rectángulo destino ---
+
+    float hx = dw * 0.5f;
+    float hy = dh * 0.5f;
+
+    float vx[4] = { -hx,  hx, -hx,  hx };
+    float vy[4] = { -hy, -hy,  hy,  hy };
+
+    float min_x =  1e9f, max_x = -1e9f;
+    float min_y =  1e9f, max_y = -1e9f;
+
+    for (int i = 0; i < 4; ++i) {
+        float rr_x = vx[i] * ca - vy[i] * sa;
+        float rr_y = vx[i] * sa + vy[i] * ca;
+
+        float dxp = dcx + rr_x;
+        float dyp = dcy + rr_y;
+
+        if (dxp < min_x) min_x = dxp;
+        if (dxp > max_x) max_x = dxp;
+        if (dyp < min_y) min_y = dyp;
+        if (dyp > max_y) max_y = dyp;
+    }
+
+    int bb_x0 = (int)SDL_floorf(min_x);
+    int bb_x1 = (int)SDL_ceilf (max_x);
+    int bb_y0 = (int)SDL_floorf(min_y);
+    int bb_y1 = (int)SDL_ceilf (max_y);
+
+    // --- 2. Rotación inversa + escalado + clipping estricto ---
+
+    for (int y = bb_y0; y <= bb_y1; ++y) {
+        for (int x = bb_x0; x <= bb_x1; ++x) {
+
+            // Coordenadas relativas al centro destino
+            float rx = x - dcx;
+            float ry = y - dcy;
+
+            // Rotación inversa
+            float ux =  rx * ca + ry * sa;
+            float uy = -rx * sa + ry * ca;
+
+            // Escalado destino -> origen (con flips)
+            float sxp = scx + ux * inv_scale_x;
+            float syp = scy + uy * inv_scale_y;
+
+            // Clipping estricto al subrectángulo origen
+            if (sxp < sx || sxp >= sx + sw ||
+                syp < sy || syp >= sy + sh)
+                continue; // no pintamos nada
+
+            uint8_t color = sget((int)sxp, (int)syp);
+            pset(x, y, color);
+        }
+    }
+}
+
+/*void blit_r(int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, bool flip_x, bool flip_y, float angle_deg)
+{
+    if (dw == 0) dw = sw;
+    if (dh == 0) dh = sh;
+
+    // Escalado origen→destino
+    float sdx = float(sw) / float(dw);
+    float sdy = float(sh) / float(dh);
+
+    // Centro del destino
+    float dcx = dx + dw * 0.5f;
+    float dcy = dy + dh * 0.5f;
+
+    // Centro del origen
+    float scx = sx + sw * 0.5f;
+    float scy = sy + sh * 0.5f;
+
+    // Flips: invertir escala
+    if (flip_x) sdx = -sdx;
+    if (flip_y) sdy = -sdy;
+
+    // Ángulo en radianes
+    float a = angle_deg * 3.14159265f / 180.0f;
+    float ca = SDL_cosf(a);
+    float sa = SDL_sinf(a);
+
+    // Bucle principal
+    for (int y = dy; y < dy + dh; ++y) {
+        for (int x = dx; x < dx + dw; ++x) {
+
+            // Coordenadas destino relativas al centro
+            float rx = x - dcx;
+            float ry = y - dcy;
+
+            // Rotación inversa (para muestreo)
+            float orx =  rx * ca + ry * sa;
+            float ory = -rx * sa + ry * ca;
+
+            // Convertir a coordenadas de la fuente
+            float sxp = scx + orx * sdx;
+            float syp = scy + ory * sdy;
+
+            // Muestreo nearest neighbor
+            uint8_t color = sget(int(sxp), int(syp));
+            pset(x, y, color);
+        }
+    }
+}*/
 
 void tline(int x0, int y0, int x1, int y1, float mx, float my, float mdx, float mdy) {
     int		x, y;

mini.h

@@ -217,7 +217,8 @@ void sset(int x, int y, uint8_t color);
 
 void spr(uint8_t n, int x, int y, float w = 1.0f, float h = 1.0f, bool flip_x = false, bool flip_y = false);
 void blit(int sx, int sy, int sw, int sh, int dx, int dy, int dw=0, int dh=0, bool flip_x = false, bool flip_y = false, bool invert = false);
-void blit_r(int sx, int sy, int sw, int sh, int x, int y, float a);
+//void blit_r(int sx, int sy, int sw, int sh, int x, int y, float a);
+void blit_r(int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, bool flip_x, bool flip_y, float angle_deg);
 
 void tline(int x0, int y0, int x1, int y1, float mx, float my, float mdx=0.125f, float mdy=0.0f);
 void thline(int x0, int y, int x1, float mx, float my, float mdx=0.125f, float mdy=0.0f);

publish_gitea.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+set -e
+
+#if [ -z "$1" ]; then
+#    echo "Uso: $0 <PARAMETRO>"
+#    exit 1
+#fi
+
+GITEA_TOKEN="eb44d9c0142f5038c61c5afd17f5a41177bfaedc"
+
+if [ -z "$GITEA_TOKEN" ]; then
+    echo "ERROR: Debes exportar GITEA_TOKEN"
+    exit 1
+fi
+
+# Leer versión desde version.h
+VERSION=$(grep '#define MINI_VERSION' version.h | sed 's/.*"\(.*\)".*/\1/')
+echo "Versión detectada: $VERSION"
+
+#PARAM=$1
+API="https://gitea.sustancia.synology.me/api/v1"
+REPO="JailDoctor/mini"
+
+echo "=== Creando release ${VERSION} en Gitea ==="
+
+RELEASE_ID=$(curl -s -X POST "${API}/repos/${REPO}/releases" \
+  -H "Authorization: token ${GITEA_TOKEN}" \
+  -H "Content-Type: application/json" \
+  -d "{
+        \"tag_name\": \"${VERSION}\",
+        \"name\": \"Release ${VERSION}\",
+        \"draft\": false,
+        \"prerelease\": false
+      }" | jq -r '.id')
+
+if [ "$RELEASE_ID" = "null" ]; then
+    echo "ERROR: No se pudo crear el release"
+    exit 1
+fi
+
+echo "Release creado con ID: $RELEASE_ID"
+
+echo "=== Subiendo artefactos ==="
+
+for f in mini_v${VERSION}_linux_release.tar.gz \
+         mini_v${VERSION}_linux_debug.tar.gz \
+         mini_v${VERSION}_windows_release.zip \
+         mini_v${VERSION}_windows_debug.zip
+do
+    echo "Subiendo $f..."
+    curl -s -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -F "attachment=@${f}" \
+        "${API}/repos/${REPO}/releases/${RELEASE_ID}/assets" > /dev/null
+done
+
+echo "=== Publicación completada ==="

version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define MINI_VERSION "1.4.7"
+#define MINI_VERSION "1.4.9"

vscode/library.lua

@@ -320,9 +320,15 @@ function draw.surf(sx, sy, sw, sh, dx, dy, dw, dh, flip_x, flip_y, invert) end
 ---@param x number
 ---@param y number
 ---@param a number
+---@optional dw number
+---@optional dh number
+---@optional boolean flip_x
+---@optional boolean flip_y
+---@optional boolean invert
 ---Blit the region starting at (sx,sy) and size (sw, sh) from the source surface
----to the position (dx, dy) of the target surface, rotating it by a degrees
-function draw.surfrot(sx, sy, sw, sh, x, y, a) end
+---to the position (dx, dy) of the target surface, rotating it by a degrees,
+---(and optionally of size (dw, dh)) optionally flipping it horizontally or vertically
+function draw.surfrot(sx, sy, sw, sh, x, y, a, dw, dh, flip_x, flip_y) end
 
 ---@param text string
 ---@param x number