- [WIP] Reestructuració: Fase 2 a meitant, pero serà questió de commitar, no tingam un disgust

lagueirtofile

@@ -1,26 +1,26 @@
 [linux]
-cppflags = -D LUA_USE_LINUX -Wall -Os -ffunction-sections -fdata-sections -std=c++20
+cppflags = -D LUA_USE_LINUX -Wall -Os -ffunction-sections -fdata-sections -std=c++20 -Isource
 libs = -Wl,--gc-sections -lSDL3 -lGL
 executable = mini
 sourcepath = source+
 buildpath = build
 
 [linux_debug] default
-cppflags = -D LUA_USE_LINUX -D DEBUG -g -Wall -std=c++20
+cppflags = -D LUA_USE_LINUX -D DEBUG -g -Wall -std=c++20 -Isource
 libs = -lSDL3 -lGL
 executable = mini_debug
 sourcepath = source+
 buildpath = build
 
 [windows]
-cppflags = -Wall -Os -ffunction-sections -fdata-sections -std=c++20
+cppflags = -Wall -Os -ffunction-sections -fdata-sections -std=c++20 -Isource
 libs = icon.res -Wl,--gc-sections -lmingw32 -lSDL3 -lopengl32 -static-libstdc++ -static-libgcc -lpthread -mwindows
 executable = mini.exe
 sourcepath = source+
 buildpath = build
 
 [windows_debug]
-cppflags = -D DEBUG -g -Wall -std=c++20
+cppflags = -D DEBUG -g -Wall -std=c++20 -Isource
 libs = -lmingw32 -lSDL3 -lopengl32
 executable = mini_debug.exe
 sourcepath = source+

source/jail_audio.cpp

@@ -1,507 +0,0 @@
-#ifndef JA_USESDLMIXER
-#include "jail_audio.h"
-#include "stb_vorbis.h"
-#include <SDL3/SDL.h>
-#include <stdio.h>
-#include "log.h"
-
-#define JA_MAX_SIMULTANEOUS_CHANNELS 5
-
-struct JA_Sound_t
-{
-    SDL_AudioSpec       spec        { SDL_AUDIO_S16, 2, 48000 };
-    Uint32              length      { 0 };
-    Uint8               *buffer     { NULL };
-};
-
-struct JA_Channel_t
-{
-    JA_Sound_t          *sound      { nullptr };
-    int                 pos         { 0 };
-    int                 times       { 0 };
-    SDL_AudioStream     *stream     { nullptr };
-    JA_Channel_state    state       { JA_CHANNEL_FREE };
-};
-
-struct JA_Music_t
-{
-    SDL_AudioSpec       spec        { SDL_AUDIO_S16, 2, 48000 };
-    Uint32              length      { 0 };
-    Uint8               *buffer     { nullptr };
-
-    int                 pos         { 0 };
-    int                 times       { 0 };
-    SDL_AudioStream     *stream     { nullptr };
-    JA_Music_state      state       { JA_MUSIC_INVALID };
-};
-
-JA_Music_t          *current_music  { nullptr };
-JA_Channel_t        channels[JA_MAX_SIMULTANEOUS_CHANNELS];
-
-SDL_AudioSpec       JA_audioSpec    { SDL_AUDIO_S16, 2, 48000 };
-float               JA_musicVolume  { 1.0f };
-float               JA_soundVolume  { 0.5f };
-bool                JA_musicEnabled { true };
-bool                JA_soundEnabled { true };
-SDL_AudioDeviceID   sdlAudioDevice  { 0 };
-SDL_TimerID         JA_timerID      { 0 };
-
-bool fading = false;
-int fade_start_time;
-int fade_duration;
-int fade_initial_volume;
-
-/*
-void audioCallback(void * userdata, uint8_t * stream, int len) {
-    SDL_memset(stream, 0, len);
-    if (current_music != NULL && current_music->state == JA_MUSIC_PLAYING) {
-        const int size = SDL_min(len, current_music->samples*2-current_music->pos);
-        SDL_MixAudioFormat(stream, (Uint8*)(current_music->output+current_music->pos), AUDIO_S16, size, JA_musicVolume);
-        current_music->pos += size/2;
-        if (size < len) {
-            if (current_music->times != 0) {
-                SDL_MixAudioFormat(stream+size, (Uint8*)current_music->output, AUDIO_S16, len-size, JA_musicVolume);
-                current_music->pos = (len-size)/2;
-                if (current_music->times > 0) current_music->times--;
-            } else {
-                current_music->pos = 0;
-                current_music->state = JA_MUSIC_STOPPED;
-            }
-        }
-    }
-    // Mixar els channels mi amol
-    for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
-        if (channels[i].state == JA_CHANNEL_PLAYING) {
-            const int size = SDL_min(len, channels[i].sound->length - channels[i].pos);
-            SDL_MixAudioFormat(stream, channels[i].sound->buffer + channels[i].pos, AUDIO_S16, size, JA_soundVolume);
-            channels[i].pos += size;
-            if (size < len) {
-                if (channels[i].times != 0) {
-                    SDL_MixAudioFormat(stream + size, channels[i].sound->buffer, AUDIO_S16, len-size, JA_soundVolume);
-                    channels[i].pos = len-size;
-                    if (channels[i].times > 0) channels[i].times--;
-                } else {
-                    JA_StopChannel(i);
-                }
-            }
-        }
-    }
-}
-*/
-
-Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval)
-{
-    if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING)
-    {
-        if (fading) {
-            int time = SDL_GetTicks();
-            if (time > (fade_start_time+fade_duration)) {
-                fading = false;
-                JA_StopMusic();
-                return 30;
-            } else {
-                const int time_passed = time - fade_start_time;
-                const float percent = (float)time_passed / (float)fade_duration;
-                SDL_SetAudioStreamGain(current_music->stream, 1.0 - percent);
-            }
-        }
-
-        if (current_music->times != 0)
-        {
-            if (SDL_GetAudioStreamAvailable(current_music->stream) < int(current_music->length/2)) {
-                SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length);
-            }
-            if (current_music->times>0) current_music->times--;
-        }
-        else
-        {
-            if (SDL_GetAudioStreamAvailable(current_music->stream) == 0) JA_StopMusic();
-        }
-    }
-
-    if (JA_soundEnabled)
-    {
-        for (int i=0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i)
-            if (channels[i].state == JA_CHANNEL_PLAYING)
-            {
-                if (channels[i].times != 0)
-                {
-                    if (SDL_GetAudioStreamAvailable(channels[i].stream) < int(channels[i].sound->length/2))
-                        SDL_PutAudioStreamData(channels[i].stream, channels[i].sound->buffer, channels[i].sound->length);
-                    if (channels[i].times>0) channels[i].times--;
-                }
-            }
-            else
-            {
-                if (SDL_GetAudioStreamAvailable(channels[i].stream) == 0) JA_StopChannel(i);
-            }
-
-    }
-
-    return 30;
-}
-
-void JA_Init(const int freq, const SDL_AudioFormat format, const int channels)
-{
-    #ifdef DEBUG
-    SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG);
-    #endif
-    
-    JA_audioSpec = {format, channels, freq };
-    if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice);
-    sdlAudioDevice = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &JA_audioSpec);
-    if (!sdlAudioDevice) {
-        log_msg(LOG_FAIL, "Failed to initialize SDL audio: %s\n", SDL_GetError());
-    } else {
-        log_msg(LOG_OK, "Audio subsytem initialized\n");
-    }
-    //SDL_PauseAudioDevice(sdlAudioDevice);
-    JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr);
-}
-
-void JA_Quit()
-{
-    if (JA_timerID) SDL_RemoveTimer(JA_timerID);
-
-    if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice);
-    sdlAudioDevice = 0;
-}
-
-JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length)
-{
-    JA_Music_t *music = new JA_Music_t();
-
-    int chan, samplerate;
-    short *output;
-    music->length = stb_vorbis_decode_memory(buffer, length, &chan, &samplerate, &output) * chan * 2;
-
-    music->spec.channels = chan;
-    music->spec.freq = samplerate;
-    music->spec.format = SDL_AUDIO_S16;
-    music->buffer = (Uint8*)SDL_malloc(music->length);
-    SDL_memcpy(music->buffer, output, music->length);
-    free(output);
-    music->pos = 0;
-    music->state = JA_MUSIC_STOPPED;
-
-    return music;
-}
-
-JA_Music_t *JA_LoadMusic(const char* filename)
-{
-    // [RZC 28/08/22] Carreguem primer el arxiu en memòria i després el descomprimim. Es algo més rapid.
-    FILE *f = fopen(filename, "rb");
-    fseek(f, 0, SEEK_END);
-    long fsize = ftell(f);
-    fseek(f, 0, SEEK_SET);
-    Uint8 *buffer = (Uint8*)malloc(fsize + 1);
-    if (fread(buffer, fsize, 1, f)!=1) return NULL;
-    fclose(f);
-
-    JA_Music_t *music = JA_LoadMusic(buffer, fsize);
-
-    free(buffer);
-
-    return music;
-}
-
-void JA_PlayMusic(JA_Music_t *music, const int loop)
-{
-    if (!JA_musicEnabled) return;
-
-    JA_StopMusic();
-
-    current_music = music;
-    current_music->pos = 0;
-    current_music->state = JA_MUSIC_PLAYING;
-    current_music->times = loop;
-
-    current_music->stream = SDL_CreateAudioStream(&current_music->spec, &JA_audioSpec);
-    if (!SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length)) log_msg(LOG_FAIL, "SDL_PutAudioStreamData failed!\n");
-    SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume);
-    if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) log_msg(LOG_FAIL, "SDL_BindAudioStream failed!\n");
-    //SDL_ResumeAudioStreamDevice(current_music->stream);
-}
-
-void JA_PauseMusic()
-{
-    if (!JA_musicEnabled) return;
-    if (!current_music || current_music->state == JA_MUSIC_INVALID) return;
-
-    current_music->state = JA_MUSIC_PAUSED;
-    //SDL_PauseAudioStreamDevice(current_music->stream);
-    SDL_UnbindAudioStream(current_music->stream);
-}
-
-void JA_ResumeMusic()
-{
-    if (!JA_musicEnabled) return;
-    if (!current_music || current_music->state == JA_MUSIC_INVALID) return;
-
-    current_music->state = JA_MUSIC_PLAYING;
-    //SDL_ResumeAudioStreamDevice(current_music->stream);
-    SDL_BindAudioStream(sdlAudioDevice, current_music->stream);
-}
-
-void JA_StopMusic()
-{
-    if (!JA_musicEnabled) return;
-    if (!current_music || current_music->state == JA_MUSIC_INVALID) return;
-
-    current_music->pos = 0;
-    current_music->state = JA_MUSIC_STOPPED;
-    //SDL_PauseAudioStreamDevice(current_music->stream);
-    SDL_DestroyAudioStream(current_music->stream);
-    current_music->stream = nullptr;
-}
-
-void JA_FadeOutMusic(const int milliseconds)
-{
-    if (!JA_musicEnabled) return;
-    if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return;
-
-    fading = true;
-    fade_start_time = SDL_GetTicks();
-    fade_duration = milliseconds;
-    fade_initial_volume = JA_musicVolume;
-}
-
-JA_Music_state JA_GetMusicState()
-{
-    if (!JA_musicEnabled) return JA_MUSIC_DISABLED;
-    if (!current_music) return JA_MUSIC_INVALID;
-
-    return current_music->state;
-}
-
-void JA_DeleteMusic(JA_Music_t *music)
-{
-    if (current_music == music) current_music = nullptr;
-    SDL_free(music->buffer);
-    if (music->stream) SDL_DestroyAudioStream(music->stream);
-    delete music;
-}
-
-float JA_SetMusicVolume(float volume)
-{
-    JA_musicVolume = SDL_clamp( volume, 0.0f, 1.0f );
-    if (current_music) SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume);
-    return JA_musicVolume;
-}
-
-void JA_SetMusicPosition(float value)
-{
-    if (!current_music) return;
-    current_music->pos = value * current_music->spec.freq;
-}
-
-float JA_GetMusicPosition()
-{
-    if (!current_music) return 0;
-    return float(current_music->pos)/float(current_music->spec.freq);
-}
-
-void JA_EnableMusic(const bool value)
-{
-    if ( !value && current_music && (current_music->state==JA_MUSIC_PLAYING) ) JA_StopMusic();
-
-    JA_musicEnabled = value;
-}
-
-const bool JA_IsMusicEnabled()
-{
-    return JA_musicEnabled;
-}
-
-
-
-
-JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length)
-{
-    JA_Sound_t *sound = new JA_Sound_t();
-    sound->buffer = buffer;
-    sound->length = length;
-    return sound;
-}
-
-JA_Sound_t *JA_LoadSound(uint8_t* buffer, uint32_t size)
-{
-    JA_Sound_t *sound = new JA_Sound_t();
-    SDL_LoadWAV_IO(SDL_IOFromMem(buffer, size),1, &sound->spec, &sound->buffer, &sound->length);
-
-    return sound;
-}
-
-JA_Sound_t *JA_LoadSound(const char* filename)
-{
-    JA_Sound_t *sound = new JA_Sound_t();
-    SDL_LoadWAV(filename, &sound->spec, &sound->buffer, &sound->length);
-
-    return sound;
-}
-
-int JA_PlaySound(JA_Sound_t *sound, const int loop)
-{
-    if (!JA_soundEnabled) return -1;
-
-    int channel = 0;
-    while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE) { channel++; }
-    if (channel == JA_MAX_SIMULTANEOUS_CHANNELS) channel = 0;
-    JA_StopChannel(channel);
-
-    channels[channel].sound = sound;
-    channels[channel].times = loop;
-    channels[channel].pos = 0;
-    channels[channel].state = JA_CHANNEL_PLAYING;
-    channels[channel].stream = SDL_CreateAudioStream(&channels[channel].sound->spec, &JA_audioSpec);
-    SDL_PutAudioStreamData(channels[channel].stream, channels[channel].sound->buffer, channels[channel].sound->length);
-    SDL_SetAudioStreamGain(channels[channel].stream, JA_soundVolume);
-    SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream);
-
-    return channel;
-}
-
-int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop)
-{
-    if (!JA_soundEnabled) return -1;
-
-    if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1;
-    JA_StopChannel(channel);
-
-    channels[channel].sound = sound;
-    channels[channel].times = loop;
-    channels[channel].pos = 0;
-    channels[channel].state = JA_CHANNEL_PLAYING;
-    channels[channel].stream = SDL_CreateAudioStream(&channels[channel].sound->spec, &JA_audioSpec);
-    SDL_PutAudioStreamData(channels[channel].stream, channels[channel].sound->buffer, channels[channel].sound->length);
-    SDL_SetAudioStreamGain(channels[channel].stream, JA_soundVolume);
-    SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream);
-
-    return channel;
-}
-
-void JA_DeleteSound(JA_Sound_t *sound)
-{
-    for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
-        if (channels[i].sound == sound) JA_StopChannel(i);
-    }
-    SDL_free(sound->buffer);
-    delete sound;
-}
-
-void JA_PauseChannel(const int channel)
-{
-    if (!JA_soundEnabled) return;
-
-    if (channel == -1)
-    {
-        for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
-            if (channels[i].state == JA_CHANNEL_PLAYING)
-            {
-                channels[i].state = JA_CHANNEL_PAUSED;
-                //SDL_PauseAudioStreamDevice(channels[i].stream);
-                SDL_UnbindAudioStream(channels[i].stream);
-            }
-    }
-    else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS)
-    {
-        if (channels[channel].state == JA_CHANNEL_PLAYING)
-        {
-            channels[channel].state = JA_CHANNEL_PAUSED;
-            //SDL_PauseAudioStreamDevice(channels[channel].stream);
-            SDL_UnbindAudioStream(channels[channel].stream);
-        }
-    }
-}
-
-void JA_ResumeChannel(const int channel)
-{
-    if (!JA_soundEnabled) return;
-
-    if (channel == -1)
-    {
-        for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
-            if (channels[i].state == JA_CHANNEL_PAUSED)
-            {
-                channels[i].state = JA_CHANNEL_PLAYING;
-                //SDL_ResumeAudioStreamDevice(channels[i].stream);
-                SDL_BindAudioStream(sdlAudioDevice, channels[i].stream);
-            }
-    }
-    else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS)
-    {
-        if (channels[channel].state == JA_CHANNEL_PAUSED)
-        {
-            channels[channel].state = JA_CHANNEL_PLAYING;
-            //SDL_ResumeAudioStreamDevice(channels[channel].stream);
-            SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream);
-        }
-    }
-}
-
-void JA_StopChannel(const int channel)
-{
-    if (!JA_soundEnabled) return;
-
-    if (channel == -1)
-    {
-        for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
-            if (channels[i].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[i].stream);
-            channels[i].stream = nullptr;
-            channels[i].state = JA_CHANNEL_FREE;
-            channels[i].pos = 0;
-            channels[i].sound = NULL;
-        }
-    }
-    else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS)
-    {
-        if (channels[channel].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[channel].stream);
-        channels[channel].stream = nullptr;
-        channels[channel].state = JA_CHANNEL_FREE;
-        channels[channel].pos = 0;
-        channels[channel].sound = NULL;
-    }
-}
-
-JA_Channel_state JA_GetChannelState(const int channel)
-{
-    if (!JA_soundEnabled) return JA_SOUND_DISABLED;
-
-    if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return JA_CHANNEL_INVALID;
-
-    return channels[channel].state;
-}
-
-float JA_SetSoundVolume(float volume)
-{
-    JA_soundVolume = SDL_clamp( volume, 0.0f, 1.0f );
-
-    for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
-        if ( (channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED) )
-            SDL_SetAudioStreamGain(channels[i].stream, JA_soundVolume);
-
-    return JA_soundVolume;
-}
-
-void JA_EnableSound(const bool value)
-{
-    for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
-    {
-        if (channels[i].state == JA_CHANNEL_PLAYING) JA_StopChannel(i);
-    }
-    JA_soundEnabled = value;
-}
-
-const bool JA_IsSoundEnabled()
-{
-    return JA_soundEnabled;
-}
-
-float JA_SetVolume(float volume)
-{
-    JA_SetSoundVolume(JA_SetMusicVolume(volume) / 2.0f);
-
-    return JA_musicVolume;
-}
-
-#endif

source/jail_audio.h

@@ -1,42 +0,0 @@
-#pragma once
-#include <SDL3/SDL.h>
-
-enum JA_Channel_state { JA_CHANNEL_INVALID, JA_CHANNEL_FREE, JA_CHANNEL_PLAYING, JA_CHANNEL_PAUSED, JA_SOUND_DISABLED };
-enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED, JA_MUSIC_DISABLED };
-
-struct JA_Sound_t;
-struct JA_Music_t;
-
-void JA_Init(const int freq, const SDL_AudioFormat format, const int channels);
-void JA_Quit();
-
-JA_Music_t *JA_LoadMusic(const char* filename);
-JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length);
-void JA_PlayMusic(JA_Music_t *music, const int loop = -1);
-void JA_PauseMusic();
-void JA_ResumeMusic();
-void JA_StopMusic();
-void JA_FadeOutMusic(const int milliseconds);
-JA_Music_state JA_GetMusicState();
-void JA_DeleteMusic(JA_Music_t *music);
-float JA_SetMusicVolume(float volume);
-void JA_SetMusicPosition(float value);
-float JA_GetMusicPosition();
-void JA_EnableMusic(const bool value);
-const bool JA_IsMusicEnabled();
-
-JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length);
-JA_Sound_t *JA_LoadSound(Uint8* buffer, Uint32 length);
-JA_Sound_t *JA_LoadSound(const char* filename);
-int JA_PlaySound(JA_Sound_t *sound, const int loop = 0);
-int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop = 0);
-void JA_PauseChannel(const int channel);
-void JA_ResumeChannel(const int channel);
-void JA_StopChannel(const int channel);
-JA_Channel_state JA_GetChannelState(const int channel);
-void JA_DeleteSound(JA_Sound_t *sound);
-float JA_SetSoundVolume(float volume);
-void JA_EnableSound(const bool value);
-const bool JA_IsSoundEnabled();
-
-float JA_SetVolume(float volume);

source/jfile.cpp

@@ -1,384 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdint.h>
-#include "jfile.h"
-#include <sys/stat.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <filesystem>
-#include <string>
-
-#include <algorithm>
-#include <dirent.h>     // Para opendir/readdir en SOURCE_FOLDER
-
-#ifndef _WIN32
-#include <pwd.h>
-#endif
-
-#define DEFAULT_FILENAME    "data.jf2"
-#define DEFAULT_FOLDER      "data/"
-#define CONFIG_FILENAME      "config.txt"
-
-struct file_t
-{
-    std::string      path;
-    uint32_t    size;
-    uint32_t    offset;
-};
-
-std::vector<file_t> toc;
-
-/* El std::map me fa coses rares, vaig a usar un good old std::vector amb una estructura key,value propia i au, que sempre funciona */
-struct keyvalue_t {
-	std::string key, value;
-};
-
-char *resource_filename = NULL;
-char *resource_folder = NULL;
-int file_source = SOURCE_FILE;
-char scratch[255];
-static std::string config_folder;
-std::vector<keyvalue_t> config;
-
-void file_setresourcefilename(const char *str) {
-    if (resource_filename != NULL) free(resource_filename);
-    resource_filename = (char*)malloc(strlen(str)+1);
-    strcpy(resource_filename, str);
-}
-
-void file_setresourcefolder(const char *str) {
-    if (resource_folder != NULL) free(resource_folder);
-    resource_folder = (char*)malloc(strlen(str)+1);
-    strcpy(resource_folder, str);
-}
-
-void file_setsource(const int src) {
-    file_source = src%2; // mod 2 so it always is a valid value, 0 (file) or 1 (folder)
-	if (src==SOURCE_FOLDER && resource_folder==NULL) file_setresourcefolder(DEFAULT_FOLDER);
-}
-
-bool file_getdictionary() {
-    if (resource_filename == NULL) file_setresourcefilename(DEFAULT_FILENAME);
-
-	std::ifstream fi (resource_filename, std::ios::binary);
-    if (!fi.is_open()) return false;
-    char header[4];
-    fi.read(header, 4);
-    uint32_t num_files, toc_offset;
-    fi.read((char*)&num_files, 4);
-    fi.read((char*)&toc_offset, 4);
-    fi.seekg(toc_offset);
-
-    for (uint32_t i=0; i<num_files; ++i) 
-    {
-        uint32_t file_offset, file_size;
-        fi.read( (char*)&file_offset, 4 );
-        fi.read( (char*)&file_size, 4 );
-        uint8_t path_size;
-        fi.read( (char*)&path_size, 1 );
-        char *file_name = (char*)malloc(path_size+1);
-        fi.read( file_name, path_size );
-        file_name[path_size] = 0;
-        std::string filename = file_name;
-		free(file_name);
-        toc.push_back({filename, file_size, file_offset});
-    }
-    fi.close();
-	return true;
-}
-
-char *file_getfilenamewithfolder(const char* filename) {
-	strcpy(scratch, resource_folder);
-	strcat(scratch, filename);
-	return scratch;
-}
-
-FILE *file_getfilepointer(const char *resourcename, int& filesize, const bool binary) {
-
-    if (file_source==SOURCE_FILE and toc.size()==0) {
-        if (not file_getdictionary()) file_setsource(SOURCE_FOLDER);
-    }
-
-    FILE *f;
-
-    if (file_source==SOURCE_FILE) {
-	    bool found = false;
-	    uint32_t count = 0;
-	    while( !found && count < toc.size() ) {
-		    found = ( std::string(resourcename) == toc[count].path );
-		    if( !found ) count++;
-	    }
-
-	    if( !found ) {
-		    perror("El recurs no s'ha trobat en l'arxiu de recursos");
-		    exit(1);
-	    }
-
-	    filesize = toc[count].size;
-
-        f = fopen(resource_filename, binary?"rb":"r");
-	    if (not f) {
-		    perror("No s'ha pogut obrir l'arxiu de recursos");
-		    exit(1);
-	    }
-        fseek(f, toc[count].offset, SEEK_SET);
-	} else {
-		f = fopen(file_getfilenamewithfolder(resourcename), binary?"rb":"r");
-		fseek(f, 0, SEEK_END);
-		filesize = ftell(f);
-        fseek(f, 0, SEEK_SET);
-	}
-	return f;
-}
-
-char *file_getfilebuffer(const char *resourcename, int& filesize, const bool zero_terminate) {
-	FILE *f = file_getfilepointer(resourcename, filesize, true);
-	char* buffer = (char*)malloc(zero_terminate?filesize:filesize+1);
-	fread(buffer, filesize, 1, f);
-	if (zero_terminate) buffer[filesize]=0;
-	fclose(f);
-	return buffer;
-}
-
-FILE *file_getfilepointerex(const char *filename, int& filesize, const bool binary) {
-
-    FILE *f;
-	f = fopen(filename, binary?"rb":"r");
-	fseek(f, 0, SEEK_END);
-	filesize = ftell(f);
-	fseek(f, 0, SEEK_SET);
-	return f;
-}
-
-char *file_getfilebufferex(const char *filename, int& filesize, const bool zero_terminate) {
-	FILE *f = file_getfilepointerex(filename, filesize, true);
-	char* buffer = (char*)malloc(zero_terminate?filesize:filesize+1);
-	fread(buffer, filesize, 1, f);
-	if (zero_terminate) buffer[filesize]=0;
-	fclose(f);
-	return buffer;
-}
-
-// Crea la carpeta del sistema donde guardar datos
-void file_setconfigfolder(const char *foldername)
-{
-#ifdef _WIN32
-	config_folder = std::string(getenv("APPDATA")) + "/" + foldername;
-#elif __APPLE__
-	struct passwd *pw = getpwuid(getuid());
-	const char *homedir = pw->pw_dir;
-	config_folder = std::string(homedir) + "/Library/Application Support/" + foldername;
-#elif __linux__
-	struct passwd *pw = getpwuid(getuid());
-	const char *homedir = pw->pw_dir;
-	config_folder = std::string(homedir) + "/." + foldername;
-	config_folder = std::string(homedir) + "/.config/jailgames/" + foldername;
-
-	{
-		// Intenta crear ".config", per si no existeix
-		std::string config_base_folder = std::string(homedir) + "/.config";
-		int ret = mkdir(config_base_folder.c_str(), S_IRWXU);
-		if (ret == -1 && errno != EEXIST)
-		{
-			printf("ERROR CREATING CONFIG BASE FOLDER.");
-			exit(EXIT_FAILURE);
-		}
-	}
-	{
-		// Intenta crear ".config/jailgames", per si no existeix
-		std::string config_base_folder = std::string(homedir) + "/.config/jailgames";
-		int ret = mkdir(config_base_folder.c_str(), S_IRWXU);
-		if (ret == -1 && errno != EEXIST)
-		{
-			printf("ERROR CREATING CONFIG BASE FOLDER.");
-			exit(EXIT_FAILURE);
-		}
-	}
-
-#endif
-
-	struct stat st = {0};
-	if (stat(config_folder.c_str(), &st) == -1)
-	{
-#ifdef _WIN32
-		int ret = mkdir(config_folder.c_str());
-#else
-		int ret = mkdir(config_folder.c_str(), S_IRWXU);
-#endif
-
-		if (ret == -1)
-		{
-			printf("ERROR CREATING CONFIG FOLDER.");
-			exit(EXIT_FAILURE);
-		}
-	}
-}
-
-const char *file_getconfigfolder() {
-	static std::string folder = config_folder + "/";
-	return folder.c_str();
-}
-
-void file_loadconfigvalues() {
-	config.clear();
-	std::string config_file = config_folder + "/config.txt";
-	FILE *f = fopen(config_file.c_str(), "r");
-    if (!f) return;
-
-    char line[1024];
-    while (fgets(line, sizeof(line), f)) {
-		char *value = strchr(line, '=');
-        if (value) {
-			*value='\0'; value++;
-            value[strlen(value)-1] = '\0';
-			config.push_back({line, value});
-        }
-    }
-    fclose(f);
-}
-
-void file_saveconfigvalues() {
-	std::string config_file = config_folder + "/config.txt";
-	FILE *f = fopen(config_file.c_str(), "w");
-	if (f) {
-		for (auto pair : config) {
-			fprintf(f, "%s=%s\n", pair.key.c_str(), pair.value.c_str());
-		}
-		fclose(f);
-	}
-}
-
-const char* file_getconfigvalue(const char *key) {
-	if (config.empty()) file_loadconfigvalues();
-	for (auto pair : config) {
-		if (pair.key == std::string(key)) {
-			strcpy(scratch, pair.value.c_str());
-			return scratch;
-		}
-	}
-	return NULL;
-}
-
-void file_setconfigvalue(const char* key, const char* value) {
-	if (config.empty()) file_loadconfigvalues();
-	for (auto &pair : config) {
-		if (pair.key == std::string(key)) {
-			pair.value = value;
-			file_saveconfigvalues();
-			return;
-		}
-	}
-	config.push_back({key, value});
-	file_saveconfigvalues();
-	return;
-}
-
-bool file_createFolder(const char* name) {
-	char tmp[256];
-	strcpy(tmp, "./");
-	strcat(tmp, name);
-#ifdef _WIN32
-	return mkdir(tmp)==0;
-#else
-	return mkdir(tmp, 0755)==0;
-#endif
-}
-
-static bool has_extension(const std::string &name, const char *ext)
-{
-    if (!ext) return true; // sin filtro
-
-    std::string e = ext;
-    std::string suffix = "." + e;
-
-    if (name.size() < suffix.size())
-        return false;
-
-    return (name.compare(name.size() - suffix.size(), suffix.size(), suffix) == 0);
-}
-
-std::vector<std::string> file_listdir(const char *folder, const char *extension)
-{
-    std::vector<std::string> result;
-    std::string base(folder);
-
-    // Normalizar: quitar "/" final si existe
-    if (!base.empty() && base.back() == '/')
-        base.pop_back();
-
-    // -------------------------------
-    // 1. MODO: ARCHIVOS SUELTOS
-    // -------------------------------
-    if (file_source == SOURCE_FOLDER)
-    {
-        std::string fullpath = std::string(resource_folder) + base;
-
-        DIR *dir = opendir(fullpath.c_str());
-        if (!dir)
-            return result;
-
-        struct dirent *entry;
-        while ((entry = readdir(dir)) != nullptr)
-        {
-            std::string name = entry->d_name;
-
-            // Ignorar "." y ".."
-            if (name == "." || name == "..")
-                continue;
-
-            // Ignorar subdirectorios
-            std::string full = fullpath + "/" + name;
-            DIR *test = opendir(full.c_str());
-            if (test)
-            {
-                closedir(test);
-                continue; // es un directorio
-            }
-
-            // Filtrar por extensión
-            if (!has_extension(name, extension))
-                continue;
-
-            result.push_back(name);
-        }
-
-        closedir(dir);
-        return result;
-    }
-
-    // -------------------------------
-    // 2. MODO: ARCHIVO CONTENEDOR
-    // -------------------------------
-    if (file_source == SOURCE_FILE)
-    {
-        std::string prefix = base + "/";
-
-        for (auto &f : toc)
-        {
-            const std::string &path = f.path;
-
-            // Debe empezar por "folder/"
-            if (path.compare(0, prefix.size(), prefix) != 0)
-                continue;
-
-            // Extraer la parte después de "folder/"
-            std::string rest = path.substr(prefix.size());
-
-            // Ignorar subdirectorios
-            if (rest.find('/') != std::string::npos)
-                continue;
-
-            // Filtrar por extensión
-            if (!has_extension(rest, extension))
-                continue;
-
-            result.push_back(rest);
-        }
-
-        return result;
-    }
-
-    return result;
-}

source/jfile.h

@@ -1,26 +0,0 @@
-#pragma once
-#include <stdio.h>
-#include <vector>
-#include <string>
-
-#define SOURCE_FILE         0
-#define SOURCE_FOLDER       1
-
-void file_setconfigfolder(const char *foldername);
-const char *file_getconfigfolder();
-
-void file_setresourcefilename(const char *str);
-void file_setresourcefolder(const char *str);
-void file_setsource(const int src);
-
-FILE *file_getfilepointer(const char *resourcename, int& filesize, const bool binary=false);
-char *file_getfilebuffer(const char *resourcename, int& filesize, const bool zero_terminate=false);
-
-FILE *file_getfilepointerex(const char *filename, int& filesize, const bool binary=false);
-char *file_getfilebufferex(const char *filename, int& filesize, const bool zero_terminate=false);
-
-const char* file_getconfigvalue(const char *key);
-void file_setconfigvalue(const char* key, const char* value);
-
-bool file_createFolder(const char* name);
-std::vector<std::string> file_listdir(const char *folder, const char *extension=NULL);

source/jshader.cpp

@@ -1,256 +0,0 @@
-#include "jshader.h"
-
-#include <iostream>
-
-#ifdef __APPLE__
-#include "CoreFoundation/CoreFoundation.h"
-#include <OpenGL/OpenGL.h>
-
-#if ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
-#include <OpenGL/gl3.h>
-#else
-#include <OpenGL/gl.h>
-#endif //!ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
-#else
-#include <SDL3/SDL_opengl.h>
-#include <SDL3/SDL_opengl_glext.h>
-#endif
-
-namespace mini
-{
-    namespace shader
-    {
-        SDL_Window *win = nullptr;
-        SDL_Renderer *renderer = nullptr;
-        GLuint programId = 0;
-        SDL_Texture* backBuffer = nullptr;
-        SDL_Point win_size = {640, 480};
-        SDL_FPoint tex_size = {320, 240};
-        bool can_use_opengl = false;
-        bool using_opengl = false;
-        GLuint texture_number;
-        GLuint nose;
-
-        #ifndef __APPLE__
-
-        // I'm avoiding the use of GLEW or some extensions handler, but that 
-        // doesn't mean you should...
-        PFNGLCREATESHADERPROC glCreateShader;
-        PFNGLSHADERSOURCEPROC glShaderSource;
-        PFNGLCOMPILESHADERPROC glCompileShader;
-        PFNGLGETSHADERIVPROC glGetShaderiv;
-        PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
-        PFNGLDELETESHADERPROC glDeleteShader;
-        PFNGLATTACHSHADERPROC glAttachShader;
-        PFNGLCREATEPROGRAMPROC glCreateProgram;
-        PFNGLDELETEPROGRAMPROC glDeleteProgram;
-        PFNGLLINKPROGRAMPROC glLinkProgram;
-        PFNGLVALIDATEPROGRAMPROC glValidateProgram;
-        PFNGLGETPROGRAMIVPROC glGetProgramiv;
-        PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
-        PFNGLUSEPROGRAMPROC glUseProgram;
-        PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
-        PFNGLACTIVETEXTUREPROC glActiveTexture;
-
-
-        bool initGLExtensions() {
-            glCreateShader = (PFNGLCREATESHADERPROC)SDL_GL_GetProcAddress("glCreateShader");
-            glShaderSource = (PFNGLSHADERSOURCEPROC)SDL_GL_GetProcAddress("glShaderSource");
-            glCompileShader = (PFNGLCOMPILESHADERPROC)SDL_GL_GetProcAddress("glCompileShader");
-            glGetShaderiv = (PFNGLGETSHADERIVPROC)SDL_GL_GetProcAddress("glGetShaderiv");
-            glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)SDL_GL_GetProcAddress("glGetShaderInfoLog");
-            glDeleteShader = (PFNGLDELETESHADERPROC)SDL_GL_GetProcAddress("glDeleteShader");
-            glAttachShader = (PFNGLATTACHSHADERPROC)SDL_GL_GetProcAddress("glAttachShader");
-            glCreateProgram = (PFNGLCREATEPROGRAMPROC)SDL_GL_GetProcAddress("glCreateProgram");
-            glDeleteProgram = (PFNGLDELETEPROGRAMPROC)SDL_GL_GetProcAddress("glDeleteProgram");
-            glLinkProgram = (PFNGLLINKPROGRAMPROC)SDL_GL_GetProcAddress("glLinkProgram");
-            glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)SDL_GL_GetProcAddress("glValidateProgram");
-            glGetProgramiv = (PFNGLGETPROGRAMIVPROC)SDL_GL_GetProcAddress("glGetProgramiv");
-            glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)SDL_GL_GetProcAddress("glGetProgramInfoLog");
-            glUseProgram = (PFNGLUSEPROGRAMPROC)SDL_GL_GetProcAddress("glUseProgram");
-            glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)SDL_GL_GetProcAddress("glGetUniformLocation");
-            glActiveTexture = (PFNGLACTIVETEXTUREPROC)SDL_GL_GetProcAddress("glActiveTexture");
-
-            return glCreateShader && glShaderSource && glCompileShader && glGetShaderiv && 
-                glGetShaderInfoLog && glDeleteShader && glAttachShader && glCreateProgram &&
-                glDeleteProgram && glLinkProgram && glValidateProgram && glGetProgramiv &&
-                glGetProgramInfoLog && glUseProgram && glGetUniformLocation;
-        }
-
-        #endif
-
-        GLuint compileShader(const char* source, GLuint shaderType) {
-            // Create ID for shader
-            GLuint result = glCreateShader(shaderType);
-            // Add define depending on shader type
-            const char *sources[2] = { shaderType==GL_VERTEX_SHADER?"#define VERTEX\n":"#define FRAGMENT\n", source };
-            // Define shader text
-            glShaderSource(result, 2, sources, NULL);
-            // Compile shader
-            glCompileShader(result);
-
-            //Check vertex shader for errors
-            GLint shaderCompiled = GL_FALSE;
-            glGetShaderiv( result, GL_COMPILE_STATUS, &shaderCompiled );
-            if (shaderCompiled != GL_TRUE)
-            {
-                std::cout << "Error en la compilación: " << result << "!" << std::endl;
-                GLint logLength;
-                glGetShaderiv(result, GL_INFO_LOG_LENGTH, &logLength);
-                if (logLength > 0)
-                {
-                    GLchar *log = (GLchar*)malloc(logLength);
-                    glGetShaderInfoLog(result, logLength, &logLength, log);
-                    std::cout << "Shader compile log:" << log << std::endl;
-                    //std::cout << source << std::endl;
-                    free(log);
-                }
-                glDeleteShader(result);
-                result = 0;
-            }
-            return result;
-        }
-
-        GLuint compileProgram(const char* vertexShaderSource, const char* fragmentShaderSource)
-        {
-            GLuint programId = 0;
-            GLuint vtxShaderId, fragShaderId;
-
-            if (programId != 0) glDeleteProgram(programId);
-            programId = glCreateProgram();
-            
-
-            vtxShaderId = compileShader(vertexShaderSource, GL_VERTEX_SHADER);
-            fragShaderId = compileShader(fragmentShaderSource?fragmentShaderSource:vertexShaderSource, GL_FRAGMENT_SHADER);
-
-            if(vtxShaderId && fragShaderId)
-            {
-                // Associate shader with program
-                glAttachShader(programId, vtxShaderId);
-                glAttachShader(programId, fragShaderId);
-                glLinkProgram(programId);
-                glValidateProgram(programId);
-
-                // Check the status of the compile/link
-                GLint logLen;
-                glGetProgramiv(programId, GL_INFO_LOG_LENGTH, &logLen);
-                if (logLen > 0)
-                {
-                    char* log = (char*) malloc(logLen * sizeof(char));
-                    // Show any errors as appropriate
-                    glGetProgramInfoLog(programId, logLen, &logLen, log);
-                    std::cout << "Prog Info Log: " << std::endl << log << std::endl;
-                    free(log);
-                }
-            }
-            if (vtxShaderId) glDeleteShader(vtxShaderId);
-            if (fragShaderId) glDeleteShader(fragShaderId);
-            return programId;
-        }
-
-        const bool init(SDL_Window* win, SDL_Texture* backBuffer, const char* vertexShader, const char* fragmentShader)
-        {
-            shader::win = win;
-            shader::renderer = SDL_GetRenderer(win);
-            shader::backBuffer = backBuffer;
-            SDL_GetWindowSize(win, &win_size.x, &win_size.y);
-            SDL_GetTextureSize(backBuffer, &tex_size.x, &tex_size.y);
-            //printf("tex size: %fx%f\n", tex_size.x, tex_size.y);
-            SDL_PropertiesID props = SDL_GetTextureProperties(backBuffer);
-            texture_number = SDL_GetNumberProperty(props, SDL_PROP_TEXTURE_OPENGL_TEXTURE_NUMBER, -1);
-            //printf("texture number: %i\n", texture_number);
-            int access = SDL_GetNumberProperty(props, SDL_PROP_TEXTURE_ACCESS_NUMBER, -1);
-            nose = SDL_GetNumberProperty(props, SDL_PROP_TEXTURE_OPENGL_TEXTURE_TARGET_NUMBER, -1);
-            //printf("texture target number: %i\n", nose);
-
-            if (access != SDL_TEXTUREACCESS_TARGET)
-            {
-                std::cout << "ERROR FATAL: La textura per al render ha de tindre SDL_TEXTUREACCESS_TARGET definit." << std::endl;
-                exit(1);
-            }
-
-            const char * renderer_name = SDL_GetRendererName(renderer);
-            //printf("rendererInfo.name: %s\n", renderer_name);
-
-            if(!strncmp(renderer_name, "opengl", 6)) {
-    #ifndef __APPLE__
-                static bool gl_extensions_initialized = false;
-                if (!gl_extensions_initialized) {
-                    if (!initGLExtensions()) {
-                        std::cout << "WARNING: No s'han pogut inicialitzar les extensions d'OpenGL!" << std::endl;
-                        can_use_opengl = false;
-                        return false;
-                    }
-                    gl_extensions_initialized = true;
-                }
-    #endif
-                // Compilar el shader y dejarlo listo para usar.
-                if (!vertexShader) {
-                    can_use_opengl = false;
-                    return false;
-                }
-                programId = compileProgram(vertexShader, fragmentShader);
-            } else {
-                std::cout << "WARNING: El driver del renderer no es OpenGL." << std::endl;
-                can_use_opengl = false;
-                return false;
-            }
-            can_use_opengl = true;
-            return true;
-        }
-
-        unsigned char pixels[512*240*4];
-
-        void enable() { if (can_use_opengl) using_opengl = true; }
-        void disable() { using_opengl = false; }
-
-        void render()
-        {
-            SDL_FlushRenderer(renderer);
-            SDL_SetRenderTarget(renderer, NULL);
-            SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
-            SDL_RenderClear(renderer);
-            SDL_FlushRenderer(renderer);
-
-            if (using_opengl)
-            {
-                GLint oldProgramId;
-                if (programId != 0)
-                {
-                    glGetIntegerv(GL_CURRENT_PROGRAM, &oldProgramId);
-                    glUseProgram(programId);
-                }
-
-                glEnable(GL_TEXTURE_2D);
-                glActiveTexture(GL_TEXTURE0);
-                glBindTexture(GL_TEXTURE_2D, 1);
-                //glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, pixels);
-                //if (glGetError()) { printf("GLGETERROR!\n"); exit(1);}
-                //GLint param;
-                //glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &param);
-                //printf("tex width: %i\n", param);
-                glViewport(0, 0, win_size.x, win_size.y);
-                
-                glBegin(GL_TRIANGLE_STRIP);
-                    glTexCoord2f(0.0f, 0.0f);
-                    glVertex2f(-1.0f, -1.0f);
-                    glTexCoord2f(tex_size.x, 0.0f);
-                    glVertex2f(1.0f, -1.0f);
-                    glTexCoord2f(0.0f, tex_size.y);
-                    glVertex2f(-1.0f, 1.0f);
-                    glTexCoord2f(tex_size.x, tex_size.y);
-                    glVertex2f(1.0f, 1.0f);
-                glEnd();
-
-                SDL_GL_SwapWindow(win);
-
-                if (programId != 0) glUseProgram(oldProgramId);
-
-            } else {
-                SDL_RenderTexture(renderer, backBuffer, NULL, NULL);
-                SDL_RenderPresent(renderer);
-            }
-            if (glGetError()) { printf("GLERROR!\n"); exit(1); }
-        }
-    }
-}

source/jshader.h

@@ -1,51 +0,0 @@
-#pragma once
-
-#include <SDL3/SDL.h>
-
-// TIPS:
-// =======================================================================
-// Abans de crear el renderer, cridar a la següent funció:
-//
-//   SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl");
-//
-// Aixó li diu que volem un renderer que use especificament opengl. A més,
-// al crear el renderer li tenim que dir que el volem que use acceeració
-// per hardware, i que soporte render a textura. Per exemple:
-//
-//   SDL_Renderer *ren = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED |
-//                                                   SDL_RENDERER_TARGETTEXTURE);
-//
-// Per altra part, al crear la textura tenim que definir que puga ser target
-// de renderitzat (SDL_TEXTUREACCESS_TARGET), per exemple:
-//
-// 	 SDL_Texture *tex = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888,
-//		                                  SDL_TEXTUREACCESS_TARGET, 320, 240);
-//
-// Els shaders li'ls passem com una cadena, som nosaltres els que s'encarreguem
-// de carregarlos de disc, amb fopen, ifstream, jfile o el que vullgues.
-// Si els tens en un std::string, passa-li-la com "cadena.c_str()".
-// 
-// Poden ser els dos el mateix arxiu, com fa libRetro, jo desde dins ja fique
-// els defines necessaris. Si es el mateix arxiu, pots no ficar el quart paràmetre.
-//
-// Els shaders de libRetro no funcionen directament, hi ha que fer algunes modificacions.
-//
-// El pintat final de la teua escena l'has de fer com si "backBuffer" fora la pantalla.
-//
-// Ah! una cosa mes: al compilar, en Linux afegir "-lGL", en Windows afegir "-lopengl32".
-// En Mac ni idea
-
-namespace mini
-{
-    namespace shader
-    {
-        const bool init(SDL_Window* win, SDL_Texture* backBuffer,
-                        const char* vertexShader, const char* fragmentShader=nullptr);
-
-                        
-        //void enable();
-        //void disable();
-
-        void render();
-    }
-}

source/lua.cpp

@@ -1,170 +0,0 @@
-#include "lua.h"
-#include "lua/lua.hpp"
-#include "lua.wrappers.h"
-#include "lua.debug.h"
-#include "jfile.h"
-#include "log.h"
-#include <algorithm>
-#include <unistd.h>
-
-namespace mini
-{
-    namespace lua
-    {
-        lua_State *L;
-        bool is_playing = false;
-        bool init_exists = false;
-        bool update_exists = false;
-
-        bool running() {
-            debug::process_commands(L);
-            return is_playing;
-        }
-
-        int MiniLoader(lua_State *L) {
-            const char *name = luaL_checkstring(L, 1);
-
-            // 1. Convertir puntos en barras
-            std::string path(name);
-            std::string regpath(name);
-            std::replace(path.begin(), path.end(), '.', '/');
-
-            // 2. Detectar comodín "/*"
-            bool load_all = false;
-            if (path.size() >= 2 && path.substr(path.size()-2) == "/*") {
-                load_all = true;
-                path = path.substr(0, path.size()-2); // quitar "/*"
-                regpath = regpath.substr(0, regpath.size()-2); // quitar "/*"
-            }
-
-            if (load_all) {
-                std::vector<std::string> files = file_listdir(path.c_str(), "lua");
-
-                // Ejecutar todos los módulos
-                for (auto &f : files) {
-                    std::string fullpath = path + "/" + f;
-                    std::string registerpath = std::string(regpath + "." + f.substr(0,f.size()-4));
-
-                    int size;
-                    char* buffer = file_getfilebuffer(fullpath.c_str(), size);
-                    if (!buffer) continue;
-
-                    if (luaL_loadbuffer(L, buffer, size, registerpath.c_str()) == LUA_OK) {
-                        lua_pcall(L, 0, 0, 0); // ejecutar módulo, sin devolver nada
-                        lua_getglobal(L, "package");
-                        lua_getfield(L, -1, "loaded");
-                        lua_pushboolean(L, 1);
-                        lua_setfield(L, -2, registerpath.c_str());
-                        lua_pop(L, 2);
-                    } else {
-                        log_msg(LOG_LUALD, "Error cargando %s: %s\n", fullpath.c_str(), lua_tostring(L, -1));
-                        lua_pop(L, 1);
-                    }
-
-                    free(buffer);
-                }
-
-                // Devolver un loader vacío
-                lua_pushcfunction(L, [](lua_State* L) -> int {
-                    lua_pushboolean(L, 1); // require devuelve true
-                    return 1;
-                });
-
-                return 1;
-            }
-
-            // 3. Cargar un único archivo
-            std::string filename = path + ".lua";
-
-            int size;
-            char* buffer = file_getfilebuffer(filename.c_str(), size);
-            if (!buffer) {
-                lua_pushnil(L);
-                return 1;
-            }
-
-            if (luaL_loadbuffer(L, buffer, size, name)) {
-                log_msg(LOG_LUALD, "%s\n", lua_tostring(L, -1));
-                lua_pop(L, 1);
-                free(buffer);
-                lua_pushnil(L);
-                return 1;
-            }
-
-            free(buffer);
-            return 1;
-        }
-
-        void init(const char *main_lua_file) {
-            L = luaL_newstate();
-            luaL_openlibs(L);
-
-            push_functions(L);
-            lua_register(L, "mini_loader", MiniLoader);
-            luaL_dostring(L, "table.insert(package.searchers,2,mini_loader)\n");
-
-            int size;
-            char* buffer = file_getfilebuffer(main_lua_file, size);
-            if (luaL_loadbuffer(L, buffer, size, "main")) {
-                log_msg(LOG_LUALD, "%s\n", lua_tostring(L, -1));
-                lua_pop(L,1);
-                return;
-            }
-            free(buffer);
-            if (lua_pcall(L,0, LUA_MULTRET, 0)) {
-                //luaL_traceback(L, L, NULL, 1);
-                log_msg(LOG_LUART, "%s\n", lua_tostring(L, -1));
-                lua_pop(L,1);
-                return;
-            }
-
-            // Check if _init and _update exist
-            lua_getglobal(L, "mini");
-            lua_getfield(L, -1, "init");
-            if (lua_isfunction(L,-1)) init_exists = true;
-            lua_pop(L,1);
-            lua_pop(L,1);
-
-            lua_getglobal(L, "mini");
-            lua_getfield(L, -1, "update");
-            if (lua_isfunction(L,-1)) update_exists = true;
-            lua_pop(L,1);
-            lua_pop(L,1);
-
-            //std::thread(debugCommandThread).detach();
-            printf("stdin isatty: %d\n", isatty(0));
-            is_playing = true;
-        }
-
-        void quit() {
-            if (!is_playing) return;
-            is_playing = false;
-            lua_close(L);
-        }
-
-        void cleanup() {
-            debug::kill_thread();
-        }
-
-        namespace callbacks
-        {
-            void init() {
-                if (!init_exists) return;
-                debug::process_commands(L);
-                lua_getglobal(L, "mini");
-                lua_getfield(L, -1, "init");
-
-                is_playing = debug::call_and_handle_exceptions(L);
-            }
-
-            void update() {
-                if (!update_exists) return;
-                lua_getglobal(L, "mini");
-                lua_getfield(L, -1, "update");
-
-                is_playing = debug::call_and_handle_exceptions(L);
-            }
-
-        }
-    }
-}

source/lua.debug.h

@@ -1,17 +0,0 @@
-#pragma once
-struct lua_State;
-
-namespace mini
-{
-    namespace lua
-    {
-        namespace debug
-        {
-            bool call_and_handle_exceptions(lua_State* L);
-            void kill_thread();
-            void process_commands(lua_State* L);
-            void toggle(lua_State* L);
-        }
-
-    }
-}

source/lua.h

@@ -1,18 +0,0 @@
-#pragma once
-
-namespace mini
-{
-    namespace lua
-    {
-        bool running();
-        void init(const char* main_lua_file = "main.lua");
-        void quit();
-        void cleanup();
-
-        namespace callbacks
-        {
-            void init();
-            void update();
-        }
-    }
-}

source/lua.wrappers.h

@@ -1,11 +0,0 @@
-#pragma once
-
-struct lua_State;
-
-namespace mini
-{
-    namespace lua
-    {
-        void push_functions(lua_State *L);
-    }
-}

source/main.cpp

@@ -1,29 +0,0 @@
-#include "mini.h"
-
-uint16_t ants = 0xc936;
-float t = 0;
-
-using namespace mini;
-
-void exception_loop() {
-    //if (t==0) t= time();
-    if (sys::time()-t > 0.25) {
-        t = sys::time();
-        view::clip::reset();
-        view::origin::set(0,0);
-        surf::target::set(0);
-        pal::trans::set(255);
-        pal::color::set(0,0xffffff00);
-        pal::color::set(1,0xff000000);
-        const int w=win::res::getw();
-        const int h=win::res::geth();
-        mini::draw::mode::set(0);
-        mini::draw::rect(0,0,w,h,1);
-        mini::draw::rect(1,1,w-2,h-2,1);
-        mini::draw::mode::set(1);
-        draw::pattern::set(ants);
-        mini::draw::rect(0,0,w,h,0);
-        mini::draw::rect(1,1,w-2,h-2,0);
-        ants = (ants<<12) | (ants>>4);
-    }
-}

source/mini.h

@@ -1,252 +0,0 @@
-#pragma once
-#include <SDL3/SDL.h>
-#include "version.h"
-
-void exception_loop();
-
-void raisewindow();
-
-namespace mini
-{
-    namespace surf
-    {
-        uint8_t create(int w, int h);
-        uint8_t load(const char* filename, const bool external = false);
-        void save(uint8_t surface, const char* filename, uint8_t *pal, uint8_t colors=0);
-        void destroy(uint8_t surface);
-        int width(uint8_t surface);
-        int height(uint8_t surface);
-        void cls(uint8_t color=0);
-
-        namespace target {
-            void set(uint8_t surface);
-            uint8_t get();
-        }
-
-        namespace source {
-            void set(uint8_t surface);
-            uint8_t get();
-        }
-
-        namespace pixel {
-            void set(int x, int y, uint8_t color);
-            uint8_t get(int x, int y);
-        }
-    }
-
-    namespace map
-    {
-        namespace surf {
-            void set(uint8_t surface);
-            uint8_t get();
-        }
-        void draw(); //int celx, int cely, int sx, int sy, uint8_t celw, uint8_t celh, uint8_t layer=0);
-
-        namespace tile {
-            uint8_t get(int celx, int cely);
-            void set(int celx, int cely, uint8_t snum);
-        }
-
-        namespace cell {
-            uint8_t getw();
-            uint8_t geth();
-            void set(int w, int h);
-        }
-    }
-
-    namespace pal
-    {
-        uint32_t *load(const char* filename, uint16_t *palsize=NULL);
-        void set(uint32_t *pal);
-        namespace color {
-            void set(uint8_t index, uint32_t color);
-            uint32_t get(uint8_t index);
-        }
-        namespace trans {
-            void set(uint8_t index);
-            uint8_t get();
-        }
-        namespace subpal {
-            uint8_t set(uint8_t index, uint8_t color);
-            void reset();
-        }
-    }
-
-    namespace view
-    {
-        namespace clip {
-            void set(int x, int y, int w, int h);
-            void reset();
-        }
-
-        namespace origin {
-            void set(int x, int y);
-            int getx();
-            int gety();
-        }
-    }
-
-    namespace draw
-    {
-        void line(int x0, int y0, int x1, int y1, uint8_t color);
-        void hline(int x0, int y, int x1, uint8_t color);
-        void vline(int x, int y0, int y1, uint8_t color);
-
-        void rect(int x, int y, int w, int h, uint8_t color);
-        void rectf(int x, int y, int w, int h, uint8_t color);
-
-        void circ(int x, int y, uint8_t r, uint8_t color);
-        void circf(int x, int y, uint8_t r, uint8_t color);
-
-        void roundrect(int x, int y, int w, int h, uint8_t r, uint8_t color);
-        void roundrectf(int x, int y, int w, int h, uint8_t r, uint8_t color);
-        void oval(int x0, int y0, int x1, int y1, uint8_t color);
-        void ovalf(int x0, int y0, int x1, int y1, uint8_t color);
-
-        namespace pattern {
-            void set(uint16_t pat, bool transparent = false);
-        }
-
-        void surf(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 surfrot(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 text(const char *str, int x, int y, uint8_t color);
-
-        namespace mode
-        {
-            void set(uint8_t mode);
-        }
-    }
-
-    namespace shader
-    {
-        void init(const char* vshader, const char* fshader);
-        void enable();
-        void disable();
-    }
-
-    namespace audio
-    {
-        namespace music
-        {
-            void play(const char *filename, const int loop=-1);
-            void pause();
-            void resume();
-            void stop(const int t=1000);
-            namespace pos {
-                void set(float value);
-                float get();
-            }
-            namespace enable {
-                void set(const bool value);
-                const bool get();
-            }
-        }
-
-        namespace sound
-        {
-            int load(const char *filename);
-            void free(int soundfile);
-            int play(int soundfile, const int volume=-1);
-            void stop(int soundchannel);
-            namespace enable {
-                void set(const bool value);
-                const bool get();
-            }
-        }
-    }
-
-    namespace sys
-    {
-        float delta();
-        float time();
-        bool beat(int16_t i);
-
-        int getfps();
-
-        namespace update {
-            void set(const int value, const int t=0);
-            int get();
-        }
-
-        void exit();
-    }
-
-    namespace win
-    {
-        namespace zoom {
-            void set(const int value);
-            int get();
-        }
-
-        namespace fullscreen {
-            void set(const bool value);
-            bool get();
-        }
-
-        namespace cursor {
-            void set(const bool value);
-            bool get();
-        }
-
-        namespace res {
-            void set(const int w, const int h);
-            int getw();
-            int geth();
-        }
-    }
-
-    namespace config
-    {
-        namespace key {
-            void set(const char* key, const char* value);
-            const char *get(const char* key);
-        }
-
-        const char *folder();
-    }
-
-    namespace font
-    {
-        uint8_t load(const char *filename);
-
-        namespace current {
-            void set(uint8_t font);
-            uint8_t get();
-        }
-
-        namespace spacing {
-            void set(uint8_t spacing);
-            uint8_t get();
-        }
-    }
-
-    namespace mouse
-    {
-        int posx();
-        int posy();
-        int wheel();
-        bool down(uint8_t i);
-        bool press(uint8_t i);
-        bool dblclick();
-        void discard();
-        bool inside(int x, int y, int w, int h);
-    }
-
-    namespace key
-    {
-        bool down(uint8_t i);
-        bool press(uint8_t i);
-        int press();
-        bool any();
-        void text(const bool enable);
-        const char *utf8char();
-    }
-
-    namespace pad
-    {
-        bool down(int8_t i);
-        bool press(int8_t i);
-        int press();
-    }
-}

source/version.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#define MINI_VERSION "1.4.10"

vscode/library.lua

@@ -61,6 +61,16 @@ function surf.cls() end
 ---Erase the current target surface with 'color'
 function surf.cls(color) end
 
+---reset the clipping region of the current target surface to its entire surface
+function surf.clip() end
+
+---@param x number
+---@param y number
+---@param w number
+---@param h number
+---Set the clipping region of the current target surface
+function surf.clip(x, y, w, h) end
+
 ---@param x number
 ---@param y number
 ---@return number color
@@ -168,16 +178,6 @@ function pal.subpal(index1, index2, color) end
 ---@class view
 view = {}
 
----reset the current clipping region to the entire window
-function view.clip() end
-
----@param x number
----@param y number
----@param w number
----@param h number
----Set the current clipping region
-function view.clip(x, y, w, h) end
-
 ---@return number x, number y
 ---Get the current origin position
 function view.origin() end