diff --git a/1v13D.g1a b/1v13D.g1a index 71e3b78..fc585d4 100644 Binary files a/1v13D.g1a and b/1v13D.g1a differ diff --git a/build-fx/map b/build-fx/map index 1329d3e..6db74d5 100644 --- a/build-fx/map +++ b/build-fx/map @@ -293,7 +293,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 - 0x0000000000004e84 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000004e7c _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x890 *(.pretext.entry) @@ -559,56 +559,56 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.gint.drivers.6) 0x0000000000304ec0 _edrv = . -.rodata 0x0000000000304ec0 0x85c +.rodata 0x0000000000304ec0 0x854 *(.rodata .rodata.*) - .rodata 0x0000000000304ec0 0x18 build-fx/src/FxEngine/texture.o + .rodata 0x0000000000304ec0 0x10 build-fx/src/FxEngine/texture.o 0x0000000000304ec0 _FE_textures - .rodata 0x0000000000304ed8 0x18 build-fx/src/FxEngine/coord.o - 0x0000000000304ed8 _pi_sur2 - 0x0000000000304ee0 _pi2 - 0x0000000000304ee8 _pi + .rodata 0x0000000000304ed0 0x18 build-fx/src/FxEngine/coord.o + 0x0000000000304ed0 _pi_sur2 + 0x0000000000304ed8 _pi2 + 0x0000000000304ee0 _pi .rodata.str1.4 - 0x0000000000304ef0 0x9 build-fx/src/FxEngine/FxEngine.o - *fill* 0x0000000000304ef9 0x3 + 0x0000000000304ee8 0x9 build-fx/src/FxEngine/FxEngine.o + *fill* 0x0000000000304ef1 0x3 .rodata.str1.4 - 0x0000000000304efc 0x12 build-fx/src/FxEngine/zbuffer.o - *fill* 0x0000000000304f0e 0x2 - .rodata 0x0000000000304f10 0x60 build-fx/src/main.o + 0x0000000000304ef4 0x12 build-fx/src/FxEngine/zbuffer.o + *fill* 0x0000000000304f06 0x2 + .rodata 0x0000000000304f08 0x60 build-fx/src/main.o .rodata.str1.4 - 0x0000000000304f70 0x3 build-fx/src/controls.o - *fill* 0x0000000000304f73 0x1 - .rodata 0x0000000000304f74 0x24 build-fx/assets/img/fps.png.o - 0x0000000000304f74 _img_fps - 0x0000000000304f98 _img_fps_end - .rodata 0x0000000000304f98 0x204 build-fx/assets/fonts/FxEngine.png.o - 0x0000000000304f98 _font_FxEngine - 0x000000000030519c _font_FxEngine_end + 0x0000000000304f68 0x3 build-fx/src/controls.o + *fill* 0x0000000000304f6b 0x1 + .rodata 0x0000000000304f6c 0x24 build-fx/assets/img/fps.png.o + 0x0000000000304f6c _img_fps + 0x0000000000304f90 _img_fps_end + .rodata 0x0000000000304f90 0x204 build-fx/assets/fonts/FxEngine.png.o + 0x0000000000304f90 _font_FxEngine + 0x0000000000305194 _font_FxEngine_end .rodata.str1.4 - 0x000000000030519c 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x0000000000305194 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) .rodata.str1.4 - 0x00000000003051a0 0x6 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - *fill* 0x00000000003051a6 0x2 + 0x0000000000305198 0x6 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + *fill* 0x000000000030519e 0x2 .rodata.str1.4 - 0x00000000003051a8 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .rodata 0x00000000003051ac 0x18 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x00000000003051a0 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .rodata 0x00000000003051a4 0x18 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x00000000003051c4 0x31 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - *fill* 0x00000000003051f5 0x3 + 0x00000000003051bc 0x31 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + *fill* 0x00000000003051ed 0x3 .rodata.str1.4 - 0x00000000003051f8 0x8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x00000000003051f0 0x8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) 0x6 (size before relaxing) - .rodata 0x0000000000305200 0x408 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) - 0x0000000000305200 _gint_font5x7 - 0x0000000000305608 _gint_font5x7_end - .rodata 0x0000000000305608 0x14 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) - 0x0000000000305608 ___thenan_df - .rodata 0x000000000030561c 0x100 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) - 0x000000000030561c ___clz_tab + .rodata 0x00000000003051f8 0x408 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) + 0x00000000003051f8 _gint_font5x7 + 0x0000000000305600 _gint_font5x7_end + .rodata 0x0000000000305600 0x14 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) + 0x0000000000305600 ___thenan_df + .rodata 0x0000000000305614 0x100 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x0000000000305614 ___clz_tab -.rela.dyn 0x000000000030571c 0x0 - .rela.text 0x000000000030571c 0x0 build-fx/src/FxEngine/coord.o +.rela.dyn 0x0000000000305714 0x0 + .rela.text 0x0000000000305714 0x0 build-fx/src/FxEngine/coord.o .rela.pretext.entry - 0x000000000030571c 0x0 build-fx/src/FxEngine/coord.o + 0x0000000000305714 0x0 build-fx/src/FxEngine/coord.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x5b0 @@ -683,8 +683,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 0x000000000030571c - 0x000000000030571c _ldata = LOADADDR (.data) +.data 0x00000000081005b0 0x110 load address 0x0000000000305714 + 0x0000000000305714 _ldata = LOADADDR (.data) 0x00000000081005b0 _rdata = . *(.data .data.*) .data 0x00000000081005b0 0x0 build-fx/src/FxEngine/libprof.o @@ -749,15 +749,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 0x000000000030582c +.data.4 0x00000000081006c0 0x0 load address 0x0000000000305824 *(.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 0x000000000030582c - 0x000000000030582c _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x130 load address 0x0000000000305824 + 0x0000000000305824 _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) @@ -775,7 +775,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 0x000000000030595c +.gint.bss 0x000000008800f530 0x210 load address 0x0000000000305954 *(.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 91d6c5e..1dffff6 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 b9891e1..ecba3e4 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/texture.o b/build-fx/src/FxEngine/texture.o index f74260a..cb32317 100644 Binary files a/build-fx/src/FxEngine/texture.o and b/build-fx/src/FxEngine/texture.o differ diff --git a/src/FxEngine/texture.c b/src/FxEngine/texture.c index bdfde29..42618c3 100644 --- a/src/FxEngine/texture.c +++ b/src/FxEngine/texture.c @@ -1,10 +1,7 @@ #include "texture.h" -static unsigned char const blanc[8]={0,0,0,0,0,0,0,0}; -static unsigned char const noir[8]={255,255,255,255,255,255,255,255}; - // textures address -unsigned char const * const FE_textures[2][8]= +unsigned char const FE_textures[2][8]= { {0,0,0,0,0,0,0,0}, // full white {255,255,255,255,255,255,255,255}, // full black @@ -12,4 +9,4 @@ unsigned char const * const FE_textures[2][8]= bool FE_get_pixel(int num,int x, int y) -{return (1<<(7-x)FE_textures[num][y]);} \ No newline at end of file +{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 1a65fab..791b59d 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 * const FE_textures[2]; +extern unsigned char const FE_textures[2][8]; bool FE_get_pixel(int texture_num, int x, int y); #endif \ No newline at end of file