dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no message

This commit is contained in:
BADIM-PC\Vadim 2018-02-13 13:28:05 +03:00
parent 237f575352
commit 96f956790a
2 changed files with 30 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main.c
View File

@ -75,29 +75,41 @@ static void initSound()
} }
} }
static u8* _getSpritePtr(tic_tile* tiles, s32 x, s32 y)
{
enum { SheetCols = (TIC_SPRITESHEET_SIZE / TIC_SPRITESIZE) };
return tiles[x / TIC_SPRITESIZE + y / TIC_SPRITESIZE * SheetCols].data;
}
static u8 _getSpritePixel(tic_tile* tiles, s32 x, s32 y)
{
// TODO: check spritesheet rect
return tic_tool_peek4(_getSpritePtr(tiles, x, y), (x % TIC_SPRITESIZE) + (y % TIC_SPRITESIZE) * TIC_SPRITESIZE);
}
static void setWindowIcon() static void setWindowIcon()
{ {
// enum{ Size = 64, TileSize = 16, ColorKey = 14, Cols = TileSize / TIC_SPRITESIZE, Scale = Size/TileSize}; enum{ Size = 64, TileSize = 16, ColorKey = 14, Cols = TileSize / TIC_SPRITESIZE, Scale = Size/TileSize};
// platform.studio->tic->api.clear(platform.studio->tic, 0); platform.studio->tic->api.clear(platform.studio->tic, 0);
// u32* pixels = SDL_malloc(Size * Size * sizeof(u32)); u32* pixels = SDL_malloc(Size * Size * sizeof(u32));
// const u32* pal = tic_palette_blit(&platform.studio->tic->config.palette); const u32* pal = tic_palette_blit(&platform.studio->tic->config.palette);
// for(s32 j = 0, index = 0; j < Size; j++) for(s32 j = 0, index = 0; j < Size; j++)
// for(s32 i = 0; i < Size; i++, index++) for(s32 i = 0; i < Size; i++, index++)
// { {
// u8 color = getSpritePixel(platform.studio->tic->config.bank0.tiles.data, i/Scale, j/Scale); u8 color = _getSpritePixel(platform.studio->tic->config.bank0.tiles.data, i/Scale, j/Scale);
// pixels[index] = color == ColorKey ? 0 : pal[color]; pixels[index] = color == ColorKey ? 0 : pal[color];
// } }
// SDL_Surface* surface = SDL_CreateRGBSurfaceFrom(pixels, Size, Size, SDL_Surface* surface = SDL_CreateRGBSurfaceFrom(pixels, Size, Size,
// sizeof(s32) * BITS_IN_BYTE, Size * sizeof(s32), sizeof(s32) * BITS_IN_BYTE, Size * sizeof(s32),
// 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000); 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
// SDL_SetWindowIcon(platform.window, surface); SDL_SetWindowIcon(platform.window, surface);
// SDL_FreeSurface(surface); SDL_FreeSurface(surface);
// SDL_free(pixels); SDL_free(pixels);
} }
static void updateGamepadParts() static void updateGamepadParts()
@ -965,6 +977,8 @@ s32 main(s32 argc, char **argv)
#endif #endif
); );
platform.studio = studioInit(argc, argv, platform.audio.spec.freq, getAppFolder(), &sysHandlers);
// set the window icon before renderer is created (issues on Linux) // set the window icon before renderer is created (issues on Linux)
setWindowIcon(); setWindowIcon();
@ -981,8 +995,6 @@ s32 main(s32 argc, char **argv)
platform.texture = SDL_CreateTexture(platform.renderer, STUDIO_PIXEL_FORMAT, SDL_TEXTUREACCESS_STREAMING, TEXTURE_SIZE, TEXTURE_SIZE); platform.texture = SDL_CreateTexture(platform.renderer, STUDIO_PIXEL_FORMAT, SDL_TEXTUREACCESS_STREAMING, TEXTURE_SIZE, TEXTURE_SIZE);
platform.studio = studioInit(argc, argv, platform.audio.spec.freq, getAppFolder(), &sysHandlers);
initTouchGamepad(); initTouchGamepad();
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)

58
src/studio.c
View File

@ -2541,31 +2541,6 @@ void studioConfigChanged()
updateSystemFont(); updateSystemFont();
} }
// static void setWindowIcon()
// {
// enum{ Size = 64, TileSize = 16, ColorKey = 14, Cols = TileSize / TIC_SPRITESIZE, Scale = Size/TileSize};
// studioImpl.studio.tic->api.clear(studioImpl.studio.tic, 0);
// u32* pixels = malloc(Size * Size * sizeof(u32));
// const u32* pal = tic_palette_blit(&studioImpl.studio.tic->config.palette);
// for(s32 j = 0, index = 0; j < Size; j++)
// for(s32 i = 0; i < Size; i++, index++)
// {
// u8 color = getSpritePixel(studioImpl.studio.tic->config.bank0.tiles.data, i/Scale, j/Scale);
// pixels[index] = color == ColorKey ? 0 : pal[color];
// }
// SDL_Surface* surface = SDL_CreateRGBSurfaceFrom(pixels, Size, Size,
// sizeof(s32) * BITS_IN_BYTE, Size * sizeof(s32),
// 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
// SDL_SetWindowIcon(studioImpl.window, surface);
// freeSurface(surface);
// free(pixels);
// }
u32 unzip(u8** dest, const u8* source, size_t size) u32 unzip(u8** dest, const u8* source, size_t size)
{ {
// TODO: remove this size // TODO: remove this size
@ -2612,22 +2587,6 @@ static void onFSInitialized(FileSystem* fs)
{ {
studioImpl.fs = fs; studioImpl.fs = fs;
// SDL_SetHint(SDL_HINT_WINRT_HANDLE_BACK_BUTTON, "1");
// SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
// SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK);
// studioImpl.window = SDL_CreateWindow( TIC_TITLE, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
// (TIC80_FULLWIDTH) * STUDIO_UI_SCALE,
// (TIC80_FULLHEIGHT) * STUDIO_UI_SCALE,
// SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE
// #if defined(__CHIP__)
// | SDL_WINDOW_FULLSCREEN_DESKTOP
// #endif
// );
// initSound();
studioImpl.tic80local = (tic80_local*)tic80_create(studioImpl.samplerate); studioImpl.tic80local = (tic80_local*)tic80_create(studioImpl.samplerate);
studioImpl.studio.tic = studioImpl.tic80local->memory; studioImpl.studio.tic = studioImpl.tic80local->memory;
@ -2673,23 +2632,6 @@ static void onFSInitialized(FileSystem* fs)
{ {
goFullscreen(); goFullscreen();
} }
// // set the window icon before renderer is created (issues on Linux)
// setWindowIcon();
// studioImpl.renderer = SDL_CreateRenderer(studioImpl.window, -1,
// #if defined(__CHIP__)
// SDL_RENDERER_SOFTWARE
// #elif defined(__EMSCRIPTEN__)
// SDL_RENDERER_ACCELERATED
// #else
// SDL_RENDERER_ACCELERATED | (getConfig()->useVsync ? SDL_RENDERER_PRESENTVSYNC : 0)
// #endif
// );
// studioImpl.texture = SDL_CreateTexture(studioImpl.renderer, STUDIO_PIXEL_FORMAT, SDL_TEXTUREACCESS_STREAMING, TEXTURE_SIZE, TEXTURE_SIZE);
// initTouchGamepad();
} }
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)