diff --git a/1v13D.dlw b/1v13D.dlw index ea8f33a..8acc55b 100644 --- a/1v13D.dlw +++ b/1v13D.dlw @@ -2,7 +2,7 @@ [_1] Type=5 -Order=1 +Order=0 Top=15 Left=2235 Height=4740 @@ -13,7 +13,7 @@ OptionA=0 [_2] Type=1 -Order=0 +Order=1 Top=15 Left=7800 Height=4725 diff --git a/1v13D.g1a b/1v13D.g1a index 1c14c83..fa14d4b 100644 Binary files a/1v13D.g1a and b/1v13D.g1a differ diff --git a/build-fx/map b/build-fx/map index fd62cfa..247bfd0 100644 --- a/build-fx/map +++ b/build-fx/map @@ -295,7 +295,7 @@ LOAD build-fx/assets/fonts/FxEngine.png.o LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x0000000000005154 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x000000000000525c _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x890 *(.pretext.entry) @@ -334,286 +334,286 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300a90 _etors = . -.text 0x0000000000300a90 0x4530 +.text 0x0000000000300a90 0x4630 *(.text .text.*) .text 0x0000000000300a90 0x154 build-fx/src/FxEngine/libprof.o 0x0000000000300a90 _prof_time 0x0000000000300ad4 _prof_quit 0x0000000000300b08 _prof_init - .text 0x0000000000300be4 0x24 build-fx/src/FxEngine/texture.o + .text 0x0000000000300be4 0x48 build-fx/src/FxEngine/texture.o 0x0000000000300be4 _FE_get_pixel - .text 0x0000000000300c08 0x554 build-fx/src/FxEngine/coord.o - 0x0000000000300c08 _FE_modulo_2pi - 0x0000000000300cb8 _FE_cos - 0x0000000000300df8 _FE_sin - 0x0000000000300e20 _FE_calc - 0x0000000000300fb4 _FE_set_matrice - .text 0x000000000030115c 0x394 build-fx/src/FxEngine/FxEngine.o - 0x000000000030115c _FE_new_frame - 0x0000000000301434 _FE_get_fps_history - 0x0000000000301490 _FE_get_fps_current - 0x00000000003014b0 _FE_get_fps_min - 0x00000000003014d0 _FE_get_fps_max - .text 0x00000000003014f0 0x26c build-fx/src/FxEngine/face.o - 0x0000000000301580 _FE_draw_face - .text 0x000000000030175c 0xc0 build-fx/src/FxEngine/zbuffer.o - 0x000000000030175c _FE_zbuffer_clear - 0x00000000003017c8 _FE_zbuffer_set_dist - .text 0x000000000030181c 0x0 build-fx/src/main.o - .text.startup 0x000000000030181c 0xa4 build-fx/src/main.o - 0x000000000030181c _main - .text 0x00000000003018c0 0x74 build-fx/src/controls.o - 0x00000000003018c0 _init_controls - 0x00000000003018d0 _reload_fps_displaying - 0x00000000003018f4 _display_fps - .text 0x0000000000301934 0x150 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x0000000000301a78 _clock_freq - .text 0x0000000000301a84 0x2c8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x0000000000301c28 _pollevent - 0x0000000000301d14 _waitevent - .text 0x0000000000301d4c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .text 0x0000000000301d4c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .text 0x0000000000301d4c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .text 0x0000000000301d4c 0x1f4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - 0x0000000000301d4c _tlb_addr - 0x0000000000301d60 _tlb_data - 0x0000000000301d74 _tlb_mapped_memory - 0x0000000000301e48 _utlb_addr - 0x0000000000301e58 _utlb_data - 0x0000000000301e68 _utlb_mapped_memory - .text 0x0000000000301f40 0x56c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x0000000000302260 _timer_setup - 0x00000000003022f0 _timer_delay - 0x0000000000302350 _timer_start - 0x0000000000302384 _timer_reload - 0x00000000003023a4 _timer_pause - 0x00000000003023d8 _timer_stop - 0x0000000000302434 _timer_timeout - 0x0000000000302440 _timer_address - 0x000000000030247c _timer_clear - .text 0x00000000003024ac 0x9c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x00000000003024ac _dsize - .text 0x0000000000302548 0x50 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dpixel.c.o) - 0x0000000000302548 _dpixel - .text 0x0000000000302598 0x54 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - 0x0000000000302598 _dimage - 0x00000000003025cc _dsubimage - .text 0x00000000003025ec 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - 0x00000000003025ec _dupdate - 0x0000000000302604 _dupdate_noint - .text 0x0000000000302610 0x4c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - 0x0000000000302610 _dclear - .text 0x000000000030265c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .text 0x000000000030265c 0xc00 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - 0x0000000000302f84 _kprint_opt - 0x00000000003030bc _kprint - 0x0000000000303194 _kvsprint - 0x00000000003031dc _sprintf - 0x0000000000303204 _vsprintf - 0x0000000000303224 _snprintf - 0x0000000000303244 _vsnprintf - .text 0x000000000030325c 0xdc /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - 0x000000000030325c _memcpy - 0x0000000000303316 __memmove - 0x000000000030331a __memcmp - 0x000000000030331e _memset - .text 0x0000000000303338 0x1d8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x00000000003033d0 _t6k11_display - 0x00000000003034a4 _t6k11_contrast - 0x00000000003034d0 _t6k11_backlight - .text 0x0000000000303510 0x1c8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - 0x0000000000303510 _getkey_opt - 0x0000000000303690 _getkey - 0x000000000030369c _getkey_repeat - .text 0x00000000003036d8 0x124 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - 0x00000000003036e4 _iokbd_row - 0x00000000003037cc _iokbd_scan - .text 0x00000000003037fc 0x170 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - 0x00000000003038b0 _gint_install - 0x0000000000303954 _gint_unload - .text 0x000000000030396c 0x2c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - 0x000000000030396c _gint_setvbr - .text 0x0000000000303998 0x78 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - 0x0000000000303998 _gint_intlevel - 0x00000000003039ec _gint_inthandler - .text 0x0000000000303a10 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .text 0x0000000000303a10 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) - .text 0x0000000000303a10 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .text 0x0000000000303a10 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .text 0x0000000000303a10 0x3b0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - 0x0000000000303a10 _bopti_grid - 0x0000000000303b66 _bopti_render - 0x0000000000303c6c _bopti_render_clip - 0x0000000000303d74 _bopti_render_noclip - .text 0x0000000000303dc0 0x9c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - 0x0000000000303dc0 _masks - .text 0x0000000000303e5c 0x60 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - 0x0000000000303e5c _bopti_asm_mono - 0x0000000000303e82 _bopti_asm_mono_alpha - 0x0000000000303eb4 _bopti_asm_gray - 0x0000000000303eb8 _bopti_asm_gray_alpha - .text 0x0000000000303ebc 0x78 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - 0x0000000000303ebc ___movstr - 0x0000000000303ebc ___movmem - 0x0000000000303ef0 ___movmemSI64 - 0x0000000000303ef0 ___movstrSI64 - 0x0000000000303ef4 ___movstrSI60 - 0x0000000000303ef4 ___movmemSI60 - 0x0000000000303ef8 ___movmemSI56 - 0x0000000000303ef8 ___movstrSI56 - 0x0000000000303efc ___movstrSI52 - 0x0000000000303efc ___movmemSI52 - 0x0000000000303f00 ___movstrSI48 - 0x0000000000303f00 ___movmemSI48 - 0x0000000000303f04 ___movstrSI44 - 0x0000000000303f04 ___movmemSI44 - 0x0000000000303f08 ___movstrSI40 - 0x0000000000303f08 ___movmemSI40 - 0x0000000000303f0c ___movstrSI36 - 0x0000000000303f0c ___movmemSI36 - 0x0000000000303f10 ___movmemSI32 - 0x0000000000303f10 ___movstrSI32 - 0x0000000000303f14 ___movmemSI28 - 0x0000000000303f14 ___movstrSI28 - 0x0000000000303f18 ___movstrSI24 - 0x0000000000303f18 ___movmemSI24 - 0x0000000000303f1c ___movmemSI20 - 0x0000000000303f1c ___movstrSI20 - 0x0000000000303f20 ___movstrSI16 - 0x0000000000303f20 ___movmemSI16 - 0x0000000000303f24 ___movmemSI12 - 0x0000000000303f24 ___movstrSI12 - 0x0000000000303f28 ___movmemSI8 - 0x0000000000303f28 ___movstrSI8 - 0x0000000000303f2c ___movmemSI4 - 0x0000000000303f2c ___movstrSI4 - .text 0x0000000000303f34 0xa0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_sdivsi3.o) - 0x0000000000303f34 ___sdivsi3 - .text 0x0000000000303fd4 0x6c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - 0x0000000000303ff6 ___udivsi3 - .text 0x0000000000304040 0x1f0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - 0x0000000000304040 ___udivdi3 - .text 0x0000000000304230 0x348 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_addsub_df.o) - 0x00000000003044d4 ___adddf3 - 0x0000000000304524 ___subdf3 - .text 0x0000000000304578 0x208 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_mul_df.o) - 0x0000000000304578 ___muldf3 - .text 0x0000000000304780 0x130 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_div_df.o) - 0x0000000000304780 ___divdf3 - .text 0x00000000003048b0 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_gt_df.o) - 0x00000000003048b0 ___gtdf2 - .text 0x0000000000304908 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_ge_df.o) - 0x0000000000304908 ___gedf2 - .text 0x0000000000304960 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_lt_df.o) - 0x0000000000304960 ___ltdf2 - .text 0x00000000003049b8 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_le_df.o) - 0x00000000003049b8 ___ledf2 - .text 0x0000000000304a10 0x98 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_si_to_df.o) - 0x0000000000304a10 ___floatsidf - .text 0x0000000000304aa8 0x8c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_df_to_si.o) - 0x0000000000304aa8 ___fixdfsi - .text 0x0000000000304b34 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) - *fill* 0x0000000000304b34 0x4 - .text 0x0000000000304b38 0x60 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000304b38 ___udiv_qrnnd_16 - .text 0x0000000000304b98 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) - .text 0x0000000000304b98 0x54 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clzsi2.o) - 0x0000000000304b98 ___clzsi2 - .text 0x0000000000304bec 0x240 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_pack_df.o) - 0x0000000000304bec ___pack_d - .text 0x0000000000304e2c 0xcc /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_unpack_df.o) - 0x0000000000304e2c ___unpack_d - .text 0x0000000000304ef8 0xc8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_fpcmp_parts_df.o) - 0x0000000000304ef8 ___fpcmp_parts_d + .text 0x0000000000300c2c 0x554 build-fx/src/FxEngine/coord.o + 0x0000000000300c2c _FE_modulo_2pi + 0x0000000000300cdc _FE_cos + 0x0000000000300e1c _FE_sin + 0x0000000000300e44 _FE_calc + 0x0000000000300fd8 _FE_set_matrice + .text 0x0000000000301180 0x394 build-fx/src/FxEngine/FxEngine.o + 0x0000000000301180 _FE_new_frame + 0x0000000000301458 _FE_get_fps_history + 0x00000000003014b4 _FE_get_fps_current + 0x00000000003014d4 _FE_get_fps_min + 0x00000000003014f4 _FE_get_fps_max + .text 0x0000000000301514 0x348 build-fx/src/FxEngine/face.o + 0x00000000003015a4 _FE_draw_face + .text 0x000000000030185c 0xc0 build-fx/src/FxEngine/zbuffer.o + 0x000000000030185c _FE_zbuffer_clear + 0x00000000003018c8 _FE_zbuffer_set_dist + .text 0x000000000030191c 0x0 build-fx/src/main.o + .text.startup 0x000000000030191c 0xa4 build-fx/src/main.o + 0x000000000030191c _main + .text 0x00000000003019c0 0x74 build-fx/src/controls.o + 0x00000000003019c0 _init_controls + 0x00000000003019d0 _reload_fps_displaying + 0x00000000003019f4 _display_fps + .text 0x0000000000301a34 0x150 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x0000000000301b78 _clock_freq + .text 0x0000000000301b84 0x2c8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x0000000000301d28 _pollevent + 0x0000000000301e14 _waitevent + .text 0x0000000000301e4c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .text 0x0000000000301e4c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .text 0x0000000000301e4c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .text 0x0000000000301e4c 0x1f4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + 0x0000000000301e4c _tlb_addr + 0x0000000000301e60 _tlb_data + 0x0000000000301e74 _tlb_mapped_memory + 0x0000000000301f48 _utlb_addr + 0x0000000000301f58 _utlb_data + 0x0000000000301f68 _utlb_mapped_memory + .text 0x0000000000302040 0x56c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000302360 _timer_setup + 0x00000000003023f0 _timer_delay + 0x0000000000302450 _timer_start + 0x0000000000302484 _timer_reload + 0x00000000003024a4 _timer_pause + 0x00000000003024d8 _timer_stop + 0x0000000000302534 _timer_timeout + 0x0000000000302540 _timer_address + 0x000000000030257c _timer_clear + .text 0x00000000003025ac 0x9c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x00000000003025ac _dsize + .text 0x0000000000302648 0x50 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dpixel.c.o) + 0x0000000000302648 _dpixel + .text 0x0000000000302698 0x54 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + 0x0000000000302698 _dimage + 0x00000000003026cc _dsubimage + .text 0x00000000003026ec 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + 0x00000000003026ec _dupdate + 0x0000000000302704 _dupdate_noint + .text 0x0000000000302710 0x4c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + 0x0000000000302710 _dclear + .text 0x000000000030275c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .text 0x000000000030275c 0xc00 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + 0x0000000000303084 _kprint_opt + 0x00000000003031bc _kprint + 0x0000000000303294 _kvsprint + 0x00000000003032dc _sprintf + 0x0000000000303304 _vsprintf + 0x0000000000303324 _snprintf + 0x0000000000303344 _vsnprintf + .text 0x000000000030335c 0xdc /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + 0x000000000030335c _memcpy + 0x0000000000303416 __memmove + 0x000000000030341a __memcmp + 0x000000000030341e _memset + .text 0x0000000000303438 0x1d8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x00000000003034d0 _t6k11_display + 0x00000000003035a4 _t6k11_contrast + 0x00000000003035d0 _t6k11_backlight + .text 0x0000000000303610 0x1c8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + 0x0000000000303610 _getkey_opt + 0x0000000000303790 _getkey + 0x000000000030379c _getkey_repeat + .text 0x00000000003037d8 0x124 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + 0x00000000003037e4 _iokbd_row + 0x00000000003038cc _iokbd_scan + .text 0x00000000003038fc 0x170 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + 0x00000000003039b0 _gint_install + 0x0000000000303a54 _gint_unload + .text 0x0000000000303a6c 0x2c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + 0x0000000000303a6c _gint_setvbr + .text 0x0000000000303a98 0x78 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + 0x0000000000303a98 _gint_intlevel + 0x0000000000303aec _gint_inthandler + .text 0x0000000000303b10 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .text 0x0000000000303b10 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) + .text 0x0000000000303b10 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .text 0x0000000000303b10 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .text 0x0000000000303b10 0x3b0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + 0x0000000000303b10 _bopti_grid + 0x0000000000303c66 _bopti_render + 0x0000000000303d6c _bopti_render_clip + 0x0000000000303e74 _bopti_render_noclip + .text 0x0000000000303ec0 0x9c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + 0x0000000000303ec0 _masks + .text 0x0000000000303f5c 0x60 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + 0x0000000000303f5c _bopti_asm_mono + 0x0000000000303f82 _bopti_asm_mono_alpha + 0x0000000000303fb4 _bopti_asm_gray + 0x0000000000303fb8 _bopti_asm_gray_alpha + .text 0x0000000000303fbc 0x78 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + 0x0000000000303fbc ___movstr + 0x0000000000303fbc ___movmem + 0x0000000000303ff0 ___movmemSI64 + 0x0000000000303ff0 ___movstrSI64 + 0x0000000000303ff4 ___movstrSI60 + 0x0000000000303ff4 ___movmemSI60 + 0x0000000000303ff8 ___movmemSI56 + 0x0000000000303ff8 ___movstrSI56 + 0x0000000000303ffc ___movstrSI52 + 0x0000000000303ffc ___movmemSI52 + 0x0000000000304000 ___movstrSI48 + 0x0000000000304000 ___movmemSI48 + 0x0000000000304004 ___movstrSI44 + 0x0000000000304004 ___movmemSI44 + 0x0000000000304008 ___movstrSI40 + 0x0000000000304008 ___movmemSI40 + 0x000000000030400c ___movstrSI36 + 0x000000000030400c ___movmemSI36 + 0x0000000000304010 ___movmemSI32 + 0x0000000000304010 ___movstrSI32 + 0x0000000000304014 ___movmemSI28 + 0x0000000000304014 ___movstrSI28 + 0x0000000000304018 ___movstrSI24 + 0x0000000000304018 ___movmemSI24 + 0x000000000030401c ___movmemSI20 + 0x000000000030401c ___movstrSI20 + 0x0000000000304020 ___movstrSI16 + 0x0000000000304020 ___movmemSI16 + 0x0000000000304024 ___movmemSI12 + 0x0000000000304024 ___movstrSI12 + 0x0000000000304028 ___movmemSI8 + 0x0000000000304028 ___movstrSI8 + 0x000000000030402c ___movmemSI4 + 0x000000000030402c ___movstrSI4 + .text 0x0000000000304034 0xa0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_sdivsi3.o) + 0x0000000000304034 ___sdivsi3 + .text 0x00000000003040d4 0x6c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + 0x00000000003040f6 ___udivsi3 + .text 0x0000000000304140 0x1f0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + 0x0000000000304140 ___udivdi3 + .text 0x0000000000304330 0x348 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_addsub_df.o) + 0x00000000003045d4 ___adddf3 + 0x0000000000304624 ___subdf3 + .text 0x0000000000304678 0x208 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_mul_df.o) + 0x0000000000304678 ___muldf3 + .text 0x0000000000304880 0x130 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_div_df.o) + 0x0000000000304880 ___divdf3 + .text 0x00000000003049b0 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_gt_df.o) + 0x00000000003049b0 ___gtdf2 + .text 0x0000000000304a08 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_ge_df.o) + 0x0000000000304a08 ___gedf2 + .text 0x0000000000304a60 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_lt_df.o) + 0x0000000000304a60 ___ltdf2 + .text 0x0000000000304ab8 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_le_df.o) + 0x0000000000304ab8 ___ledf2 + .text 0x0000000000304b10 0x98 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_si_to_df.o) + 0x0000000000304b10 ___floatsidf + .text 0x0000000000304ba8 0x8c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_df_to_si.o) + 0x0000000000304ba8 ___fixdfsi + .text 0x0000000000304c34 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) + *fill* 0x0000000000304c34 0x4 + .text 0x0000000000304c38 0x60 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000304c38 ___udiv_qrnnd_16 + .text 0x0000000000304c98 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .text 0x0000000000304c98 0x54 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clzsi2.o) + 0x0000000000304c98 ___clzsi2 + .text 0x0000000000304cec 0x240 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_pack_df.o) + 0x0000000000304cec ___pack_d + .text 0x0000000000304f2c 0xcc /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_unpack_df.o) + 0x0000000000304f2c ___unpack_d + .text 0x0000000000304ff8 0xc8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_fpcmp_parts_df.o) + 0x0000000000304ff8 ___fpcmp_parts_d *(C P) -.gint.blocks 0x0000000000304fc0 0x140 +.gint.blocks 0x00000000003050c0 0x140 *(.gint.blocks) - .gint.blocks 0x0000000000304fc0 0x40 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - 0x0000000000304fc0 _inth_entry_7305 - 0x0000000000304fe0 _inth_entry_7705 - .gint.blocks 0x0000000000305000 0x20 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) - 0x0000000000305000 _exch_entry_7705 - 0x0000000000305000 _exch_entry_7305 - .gint.blocks 0x0000000000305020 0xe0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - 0x0000000000305020 _inth_tmu - 0x00000000003050a0 _inth_etmu2 - 0x00000000003050c0 _inth_etmu_help - 0x00000000003050e0 _inth_etmux + .gint.blocks 0x00000000003050c0 0x40 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + 0x00000000003050c0 _inth_entry_7305 + 0x00000000003050e0 _inth_entry_7705 + .gint.blocks 0x0000000000305100 0x20 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) + 0x0000000000305100 _exch_entry_7705 + 0x0000000000305100 _exch_entry_7305 + .gint.blocks 0x0000000000305120 0xe0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + 0x0000000000305120 _inth_tmu + 0x00000000003051a0 _inth_etmu2 + 0x00000000003051c0 _inth_etmu_help + 0x00000000003051e0 _inth_etmux -.gint.drivers 0x0000000000305100 0x90 - 0x0000000000305100 _bdrv = . +.gint.drivers 0x0000000000305200 0x90 + 0x0000000000305200 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x0000000000305100 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x0000000000305100 _drv_cpg + 0x0000000000305200 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x0000000000305200 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000305124 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x0000000000305124 _drv_tmu + 0x0000000000305224 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000305224 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000305148 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x0000000000305148 _drv_keysc + 0x0000000000305248 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x0000000000305248 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x000000000030516c 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x000000000030516c _drv_t6k11 + 0x000000000030526c 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x000000000030526c _drv_t6k11 *(.gint.drivers.6) - 0x0000000000305190 _edrv = . + 0x0000000000305290 _edrv = . -.rodata 0x0000000000305190 0x854 +.rodata 0x0000000000305290 0x85c *(.rodata .rodata.*) - .rodata 0x0000000000305190 0x10 build-fx/src/FxEngine/texture.o - 0x0000000000305190 _FE_textures - .rodata 0x00000000003051a0 0x18 build-fx/src/FxEngine/coord.o - 0x00000000003051a0 _pi_sur2 - 0x00000000003051a8 _pi2 - 0x00000000003051b0 _pi + .rodata 0x0000000000305290 0x18 build-fx/src/FxEngine/texture.o + 0x0000000000305290 _FE_textures + .rodata 0x00000000003052a8 0x18 build-fx/src/FxEngine/coord.o + 0x00000000003052a8 _pi_sur2 + 0x00000000003052b0 _pi2 + 0x00000000003052b8 _pi .rodata.str1.4 - 0x00000000003051b8 0x9 build-fx/src/FxEngine/FxEngine.o - *fill* 0x00000000003051c1 0x3 + 0x00000000003052c0 0x9 build-fx/src/FxEngine/FxEngine.o + *fill* 0x00000000003052c9 0x3 .rodata.str1.4 - 0x00000000003051c4 0x12 build-fx/src/FxEngine/zbuffer.o - *fill* 0x00000000003051d6 0x2 - .rodata 0x00000000003051d8 0x60 build-fx/src/main.o + 0x00000000003052cc 0x12 build-fx/src/FxEngine/zbuffer.o + *fill* 0x00000000003052de 0x2 + .rodata 0x00000000003052e0 0x60 build-fx/src/main.o .rodata.str1.4 - 0x0000000000305238 0x3 build-fx/src/controls.o - *fill* 0x000000000030523b 0x1 - .rodata 0x000000000030523c 0x24 build-fx/assets/img/fps.png.o - 0x000000000030523c _img_fps - 0x0000000000305260 _img_fps_end - .rodata 0x0000000000305260 0x204 build-fx/assets/fonts/FxEngine.png.o - 0x0000000000305260 _font_FxEngine - 0x0000000000305464 _font_FxEngine_end + 0x0000000000305340 0x3 build-fx/src/controls.o + *fill* 0x0000000000305343 0x1 + .rodata 0x0000000000305344 0x24 build-fx/assets/img/fps.png.o + 0x0000000000305344 _img_fps + 0x0000000000305368 _img_fps_end + .rodata 0x0000000000305368 0x204 build-fx/assets/fonts/FxEngine.png.o + 0x0000000000305368 _font_FxEngine + 0x000000000030556c _font_FxEngine_end .rodata.str1.4 - 0x0000000000305464 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x000000000030556c 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) .rodata.str1.4 - 0x0000000000305468 0x6 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - *fill* 0x000000000030546e 0x2 + 0x0000000000305570 0x6 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + *fill* 0x0000000000305576 0x2 .rodata.str1.4 - 0x0000000000305470 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .rodata 0x0000000000305474 0x18 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x0000000000305578 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .rodata 0x000000000030557c 0x18 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x000000000030548c 0x31 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - *fill* 0x00000000003054bd 0x3 + 0x0000000000305594 0x31 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + *fill* 0x00000000003055c5 0x3 .rodata.str1.4 - 0x00000000003054c0 0x8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x00000000003055c8 0x8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) 0x6 (size before relaxing) - .rodata 0x00000000003054c8 0x408 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) - 0x00000000003054c8 _gint_font5x7 - 0x00000000003058d0 _gint_font5x7_end - .rodata 0x00000000003058d0 0x14 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) - 0x00000000003058d0 ___thenan_df - .rodata 0x00000000003058e4 0x100 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) - 0x00000000003058e4 ___clz_tab + .rodata 0x00000000003055d0 0x408 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) + 0x00000000003055d0 _gint_font5x7 + 0x00000000003059d8 _gint_font5x7_end + .rodata 0x00000000003059d8 0x14 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) + 0x00000000003059d8 ___thenan_df + .rodata 0x00000000003059ec 0x100 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x00000000003059ec ___clz_tab -.rela.dyn 0x00000000003059e4 0x0 - .rela.text 0x00000000003059e4 0x0 build-fx/src/FxEngine/coord.o +.rela.dyn 0x0000000000305aec 0x0 + .rela.text 0x0000000000305aec 0x0 build-fx/src/FxEngine/coord.o .rela.pretext.entry - 0x00000000003059e4 0x0 build-fx/src/FxEngine/coord.o + 0x0000000000305aec 0x0 build-fx/src/FxEngine/coord.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x5b0 @@ -689,8 +689,8 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *fill* 0x00000000081005ac 0x4 0x00000000000005b0 _sbss = SIZEOF (.bss) -.data 0x00000000081005b0 0x110 load address 0x00000000003059e4 - 0x00000000003059e4 _ldata = LOADADDR (.data) +.data 0x00000000081005b0 0x110 load address 0x0000000000305aec + 0x0000000000305aec _ldata = LOADADDR (.data) 0x00000000081005b0 _rdata = . *(.data .data.*) .data 0x00000000081005b0 0x0 build-fx/src/FxEngine/libprof.o @@ -756,15 +756,15 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(D) 0x00000000081006c0 . = ALIGN (0x10) -.data.4 0x00000000081006c0 0x0 load address 0x0000000000305af4 +.data.4 0x00000000081006c0 0x0 load address 0x0000000000305bfc *(.data.4) 0x00000000081006c0 . = ALIGN (0x10) 0x0000000000000110 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x130 load address 0x0000000000305af4 - 0x0000000000305af4 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x130 load address 0x0000000000305bfc + 0x0000000000305bfc _lgdata = LOADADDR (.gint.data) 0x000000008800f400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008800f400 0x18 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) @@ -782,7 +782,7 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x000000008800f530 . = ALIGN (0x10) 0x0000000000000130 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f530 0x210 load address 0x0000000000305c24 +.gint.bss 0x000000008800f530 0x210 load address 0x0000000000305d2c *(.gint.bss .gint.bss.*) .gint.bss 0x000000008800f530 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) .gint.bss 0x000000008800f554 0x100 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) diff --git a/build-fx/src/FxEngine/1v13D.bin b/build-fx/src/FxEngine/1v13D.bin index c2a96f5..a4b2f09 100755 Binary files a/build-fx/src/FxEngine/1v13D.bin and b/build-fx/src/FxEngine/1v13D.bin differ diff --git a/build-fx/src/FxEngine/1v13D.elf b/build-fx/src/FxEngine/1v13D.elf index 772e753..23baf5a 100755 Binary files a/build-fx/src/FxEngine/1v13D.elf and b/build-fx/src/FxEngine/1v13D.elf differ diff --git a/build-fx/src/FxEngine/face.o b/build-fx/src/FxEngine/face.o index 375902f..cb05407 100644 Binary files a/build-fx/src/FxEngine/face.o and b/build-fx/src/FxEngine/face.o differ diff --git a/build-fx/src/FxEngine/texture.o b/build-fx/src/FxEngine/texture.o index cb32317..f2fd6a4 100644 Binary files a/build-fx/src/FxEngine/texture.o and b/build-fx/src/FxEngine/texture.o differ diff --git a/build-fx/src/main.o b/build-fx/src/main.o index c883402..5155ff8 100644 Binary files a/build-fx/src/main.o and b/build-fx/src/main.o differ diff --git a/src/FxEngine/face.c b/src/FxEngine/face.c index a37ca9c..d36dc4c 100644 --- a/src/FxEngine/face.c +++ b/src/FxEngine/face.c @@ -93,12 +93,12 @@ void FE_draw_face(FE_face const * face) const int ymin=max(min(face->s1->translated.y,min(face->s2->translated.y,face->s3->translated.y)),0); const int ymax=min(max(face->s1->translated.y,max(face->s2->translated.y,face->s3->translated.y)),63); - //const int xAB=face->s2->translated.x-face->s1->translated.x, yAB=face->s2->translated.y-face->s1->translated.y; - //const int xAC=face->s3->translated.x-face->s1->translated.x, yAC=face->s3->translated.y-face->s1->translated.y; - //const int diviseur_commun=(xAB*yAC-yAB*xAC)*2500; //(multiplier par 10000) + const int xAB=face->s2->translated.x-face->s1->translated.x, yAB=face->s2->translated.y-face->s1->translated.y; + const int xAC=face->s3->translated.x-face->s1->translated.x, yAC=face->s3->translated.y-face->s1->translated.y; + const int diviseur_commun=(xAB*yAC-yAB*xAC)*1250; //(multiplier par 10000) - //const int fact_1=(10000*yAC)/diviseur_commun, fact_2=(10000*xAC)/diviseur_commun; - //const int fact_3=(10000*xAB)/diviseur_commun, fact_4=(10000*yAB)/diviseur_commun; + const int fact_1=(10000*yAC)/diviseur_commun, fact_2=(10000*xAC)/diviseur_commun; + const int fact_3=(10000*xAB)/diviseur_commun, fact_4=(10000*yAB)/diviseur_commun; for (int ty=ymin; ty<=ymax; ty++) @@ -114,10 +114,13 @@ void FE_draw_face(FE_face const * face) const int txmin=max(min(tx1,tx2),0), txmax=min(max(tx1,tx2),127); for (int tx=txmin; tx<=txmax; tx++) { - //int vx,vy,vz; - if (FE_zbuffer_set_dist(tx,ty,1)) - dpixel(tx,ty,C_BLACK); - + int vx,vy,vz; + int xcalc=tx-face->s1->translated.x, ycalc=ty-face->s1->translated.y; + vx=(xcalc*fact_1-ycalc*fact_2)/1250; + vy=(ycalc*fact_3-xcalc*fact_4)/1250; + vz=face->s1->translated.z + (vx*cotes[0].dz + vy*cotes[1].dz)/8; + if (FE_zbuffer_set_dist(tx,ty,vz)) + dpixel(tx,ty,3*FE_get_pixel(face->texturenum,vx,vy)); } } diff --git a/src/FxEngine/texture.c b/src/FxEngine/texture.c index 42618c3..e97e9be 100644 --- a/src/FxEngine/texture.c +++ b/src/FxEngine/texture.c @@ -1,12 +1,13 @@ #include "texture.h" // textures address -unsigned char const FE_textures[2][8]= +unsigned char const FE_textures[3][8]= { {0,0,0,0,0,0,0,0}, // full white {255,255,255,255,255,255,255,255}, // full black + {255,193,161,145,137,133,131,255} // borders and diagonal }; bool FE_get_pixel(int num,int x, int y) -{return ((1<<(7-x)) & (FE_textures[num][y]));} \ No newline at end of file +{x%=8;y%=8;return ((1<<(7-x)) & (FE_textures[num][y]));} \ No newline at end of file diff --git a/src/FxEngine/texture.h b/src/FxEngine/texture.h index 791b59d..151b79b 100644 --- a/src/FxEngine/texture.h +++ b/src/FxEngine/texture.h @@ -9,7 +9,7 @@ // textures : 8x8 // du bon vieux bitmap monochrome, la routine quoi ^^ -extern unsigned char const FE_textures[2][8]; +extern unsigned char const FE_textures[][8]; bool FE_get_pixel(int texture_num, int x, int y); #endif \ No newline at end of file diff --git a/src/main.c b/src/main.c index d0f6e07..f0dd84d 100644 --- a/src/main.c +++ b/src/main.c @@ -13,7 +13,7 @@ int main(void) init_controls(); dclear(C_WHITE); FE_point point[4]={{10,0,0,0,0,0},{10,10,0,0,0,0},{10,0,10,0,0,0},{10,10,10,0,0,0}}; - FE_face face={&point[0],&point[1],&point[2],0,0}; + FE_face face={&point[0],&point[1],&point[2],1,2}; while (1) { FE_new_frame();