Archive/engine-psx
0
0
Fork 0
mirror of https://github.com/luksamuk/engine-psx.git synced 2025-04-28 13:28:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Basically code cleanup

Browse source
This commit is contained in:
Lucas S. Vieira 2024-11-07 11:52:15 -03:00
parent 13e0617103
commit 12d90c0d87
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/level.c
View file

@ -1,6 +1,7 @@
#include "level.h" #include "level.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <assert.h>
#include "util.h" #include "util.h"
#include "render.h" #include "render.h"
#include "memalloc.h" #include "memalloc.h"
@ -240,6 +241,7 @@ _render_8(
u0 = (u0_idx << 3), u0 = (u0_idx << 3),
v0 = (v0_idx << 3); v0 = (v0_idx << 3);
assert(_numsprites < MAX_TILES);
SPRT_8 *sprt = &_sprites[_current_spritebuf ^ 1][_numsprites++]; SPRT_8 *sprt = &_sprites[_current_spritebuf ^ 1][_numsprites++];
setXY0(sprt, vx, vy); setXY0(sprt, vx, vy);
setUV0(sprt, u0, v0); setUV0(sprt, u0, v0);
@ -519,6 +521,8 @@ render_lvl(
// TODO: Add front layer rendered at OTZ_LAYER_LEVEL_FG_FRONT // TODO: Add front layer rendered at OTZ_LAYER_LEVEL_FG_FRONT
// TODO: Fix level mapping tool to consider only mapping layers // TODO: Fix level mapping tool to consider only mapping layers
/* if(lvl->num_layers > 1) */
/* _render_layer(lvl, map128, map16, cx, cy, OTZ_LAYER_LEVEL_FG_FRONT, 1); */
// Texture TPAGE info for level foreground (back tiles) // Texture TPAGE info for level foreground (back tiles)
DR_TPAGE *tpage = get_next_prim(); DR_TPAGE *tpage = get_next_prim();
@ -527,10 +531,10 @@ render_lvl(
sort_prim(tpage, OTZ_LAYER_LEVEL_FG_BACK); sort_prim(tpage, OTZ_LAYER_LEVEL_FG_BACK);
// Texture TPAGE info for level foreground (front tiles) // Texture TPAGE info for level foreground (front tiles)
tpage = get_next_prim(); /* tpage = get_next_prim(); */
increment_prim(sizeof(DR_TPAGE)); /* increment_prim(sizeof(DR_TPAGE)); */
setDrawTPage(tpage, 0, 1, getTPage(lvl->clutmode & 0x3, 1, lvl->prectx, lvl->precty)); /* setDrawTPage(tpage, 0, 1, getTPage(lvl->clutmode & 0x3, 1, lvl->prectx, lvl->precty)); */
sort_prim(tpage, OTZ_LAYER_LEVEL_FG_FRONT); /* sort_prim(tpage, OTZ_LAYER_LEVEL_FG_FRONT); */
// Render objects on nearest window // Render objects on nearest window
_render_obj_window(lvl, tbl, cx, cy); _render_obj_window(lvl, tbl, cx, cy);

2
src/screen_level.c
View file

@ -547,6 +547,8 @@ level_load_level(screen_level_data *data)
return; return;
} }
printf("Number of level layers: %d\n", leveldata.num_layers);
sound_play_xa(filename0, 0, music_channel, bgm_loop_sectors[level]); sound_play_xa(filename0, 0, music_channel, bgm_loop_sectors[level]);
} }

1
tools/cooklvl.py
View file

@ -52,6 +52,7 @@ def main():
j = load_json(jsonfile) j = load_json(jsonfile)
with open(outfile, "wb") as f: with open(outfile, "wb") as f:
print(f"Number of level layers: {j.get('num_layers')}")
f.write(c_ubyte(j.get("num_layers"))) f.write(c_ubyte(j.get("num_layers")))
f.write(c_ubyte(0)) # _unused f.write(c_ubyte(0)) # _unused
layer_data = j.get("layer_data") layer_data = j.get("layer_data")

7
tools/tiled_exporter/lvlexporter.py
View file

@ -40,13 +40,6 @@ class PSXPreLevel(Plugin):
tile = tileLayer.cellAt(x, y).tile() tile = tileLayer.cellAt(x, y).tile()
layer["tiles"].append(tile.id() if tile else 0) layer["tiles"].append(tile.id() if tile else 0)
filedata["layer_data"].append(layer) filedata["layer_data"].append(layer)
# elif isObjectGroupAt(tileMap, i):
# # Unfortunately, the available options for MapObject are
# # VERY LIMITED, so we'll have to figure things out by directly
# # parsing a .tmx file for objects, with an external tool :/
# # For more info on MapObject, see:
# # https://github.com/mapeditor/tiled/blob/06e94bdea0790dceb9c9eb104af9982ce6a0e04e/src/plugins/python/tiledbinding.py#L257
# pass
with open(fileName, "w") as f: with open(fileName, "w") as f:
print(json.dumps(filedata), file=f) print(json.dumps(filedata), file=f)
return True return True