mirror of
https://github.com/Ed94/pikuma_ps1.git
synced 2026-06-01 18:41:13 -07:00
Update convention yet again
Doing stuff inspired by Timothy Lottes's fixing c vod
This commit is contained in:
@@ -5,25 +5,25 @@
|
||||
# include "duffle/gp.h"
|
||||
#endif
|
||||
|
||||
typedef def_struct(DrawEnv_Packed) { U32 tag; U32 code[15]; };
|
||||
typedef def_struct(DrawEnv_Packed) { U4 tag; U4 code[15]; };
|
||||
typedef def_struct(DrawEnv) {
|
||||
Rect_S16 clip_area;
|
||||
A2_S16 drawing_offset;
|
||||
Rect_S16 texture_window;
|
||||
S16 texture_page;
|
||||
BYTE flag_dither;
|
||||
BYTE flag_draw_on_display;
|
||||
BYTE enable_auto_clear;
|
||||
RGB8 initial_bg_color;
|
||||
Rect_S2 clip_area;
|
||||
A2_S2 drawing_offset;
|
||||
Rect_S2 texture_window;
|
||||
S2 texture_page;
|
||||
B1 flag_dither;
|
||||
B1 flag_draw_on_display;
|
||||
B1 enable_auto_clear;
|
||||
RGB8 initial_bg_color;
|
||||
DrawEnv_Packed dr_env; // reserved
|
||||
};
|
||||
typedef def_struct(DisplayEnv) {
|
||||
Rect_S16 display_area;
|
||||
Rect_S16 screen;
|
||||
BYTE vinterlace;
|
||||
BYTE color24;
|
||||
BYTE pad0;
|
||||
BYTE pad1;
|
||||
Rect_S2 display_area;
|
||||
Rect_S2 screen;
|
||||
B1 vinterlace;
|
||||
B1 color24;
|
||||
B1 pad0;
|
||||
B1 pad1;
|
||||
};
|
||||
typedef def_farray(DrawEnv, 2);
|
||||
typedef def_farray(DisplayEnv, 2);
|
||||
@@ -38,51 +38,49 @@ typedef def_struct(DoubleBuffer) {
|
||||
#define ScreenRes_CenterX (ScreenRes_X >> 1)
|
||||
#define ScreenRes_CenterY (ScreenRes_Y >> 1)
|
||||
|
||||
|
||||
DisplayEnv* displayenv_init(DisplayEnv* env, S32 x, S32 y, S32 w, S32 h) __asm__("SetDefDispEnv");
|
||||
DrawEnv* drawenv_init (DrawEnv* env, S32 x, S32 y, S32 w, S32 h) __asm__("SetDefDrawEnv");
|
||||
DisplayEnv* displayenv_init(DisplayEnv* env, S4 x, S4 y, S4 w, S4 h) __asm__("SetDefDispEnv");
|
||||
DrawEnv* drawenv_init (DrawEnv* env, S4 x, S4 y, S4 w, S4 h) __asm__("SetDefDrawEnv");
|
||||
|
||||
DisplayEnv* displayenv_put(DisplayEnv* env) __asm__("PutDispEnv");
|
||||
DrawEnv* drawenv_put (DrawEnv* env) __asm__("PutDrawEnv");
|
||||
|
||||
U32 geom_init(void) __asm__("InitGeom");
|
||||
void geom_set_offset(U32 x, U32 y) __asm__("SetGeomOffset");
|
||||
void geom_set_screen(U32 h) __asm__("SetGeomScreen");
|
||||
U4 geom_init(void) __asm__("InitGeom");
|
||||
void geom_set_offset(U4 x, U4 y) __asm__("SetGeomOffset");
|
||||
void geom_set_screen(U4 h) __asm__("SetGeomScreen");
|
||||
|
||||
U32* orderingtbl_clear_reverse(U32* ot, SSIZE len) __asm__("ClearOTagR");
|
||||
U4* orderingtbl_clear_reverse(U4* ot, U4 len) __asm__("ClearOTagR");
|
||||
|
||||
U32 reset_graph(U32 mode) __asm__("ResetGraph");
|
||||
void set_display_enabled(U32 mask) __asm__("SetDispMask");
|
||||
U4 reset_graph(U4 mode) __asm__("ResetGraph");
|
||||
void set_display_enabled(U4 mask) __asm__("SetDispMask");
|
||||
|
||||
U32 draw_sync(U32 mode) __asm__("DrawSync");
|
||||
U32 vsync(U32 mode) __asm("VSync");
|
||||
U4 draw_sync(U4 mode) __asm__("DrawSync");
|
||||
U4 vsync(U4 mode) __asm__("VSync");
|
||||
|
||||
void draw_orderingtbl(U32* buf) __asm__("DrawOTag");
|
||||
void draw_orderingtbl(U4* buf) __asm__("DrawOTag");
|
||||
|
||||
typedef def_struct(PolyTag) {
|
||||
U32 addr: 24;
|
||||
U32 len: 8;
|
||||
U4 addr: 24;
|
||||
U4 len: 8;
|
||||
RGB8 color;
|
||||
BYTE code;
|
||||
B1 code;
|
||||
};
|
||||
|
||||
/*
|
||||
* Primitive Handling Macros
|
||||
*/
|
||||
#define set_len( p, _len) (((PolyTag*)(p))->len = (BYTE)(_len))
|
||||
#define set_addr(p, _addr) (((PolyTag*)(p))->addr = (U32 )(_addr))
|
||||
#define set_code(p, _code) (((PolyTag*)(p))->code = (BYTE)(_code))
|
||||
|
||||
#define get_len(p) (BYTE)(((PolyTag*)(p))->len)
|
||||
#define get_code(p) (BYTE)(((PolyTag*)(p))->code)
|
||||
#define get_addr(p) (U32 )(((PolyTag*)(p))->addr)
|
||||
#define set_len( p, _len) (((PolyTag*)(p))->len = (B1)(_len))
|
||||
#define set_addr(p, _addr) (((PolyTag*)(p))->addr = (U4)(_addr))
|
||||
#define set_code(p, _code) (((PolyTag*)(p))->code = (B1)(_code))
|
||||
|
||||
#define get_len(p) (B1)(((PolyTag*)(p))->len)
|
||||
#define get_code(p) (B1)(((PolyTag*)(p))->code)
|
||||
#define get_addr(p) (U4)(((PolyTag*)(p))->addr)
|
||||
|
||||
#define orderingtbl_add_primitive(ot, p) set_addr(p, get_addr(ot)), set_addr(ot, p)
|
||||
#define orderingtbl_add_primitives(ot, p0, p1) set_addr(p1, get_addr(ot)), set_addr(ot, p0)
|
||||
|
||||
/* Primitive Lentgh Code */
|
||||
/*-------------------------------------------------------------------- */
|
||||
/* */
|
||||
/* Primitive Length Code */
|
||||
#define set_tri_flat(p) set_len(p, 4), set_code(p, 0x20)
|
||||
// #define setPolyFT3(p) set_len(p, 7), set_code(p, 0x24)
|
||||
// #define setPolyG3(p) set_len(p, 6), set_code(p, 0x30)
|
||||
@@ -106,3 +104,16 @@ typedef def_struct(PolyTag) {
|
||||
// #define setLineG3(p) set_len(p, 7), set_code(p, 0x58),(p)->pad = 0x55555555, (p)->p2 = 0
|
||||
// #define setLineF4(p) set_len(p, 6), set_code(p, 0x4c),(p)->pad = 0x55555555
|
||||
// #define setLineG4(p) set_len(p, 9), set_code(p, 0x5c),(p)->pad = 0x55555555, (p)->p2 = 0, (p)->p3 = 0
|
||||
|
||||
/*
|
||||
Linear Algebra
|
||||
*/
|
||||
|
||||
M3_S2* m3s2_rotation (V3_S2* vec, M3_S2* mat) __asm__("RotMatrix");
|
||||
M3_S2* m3s2_translation(M3_S2* mat, V3_S4* vec) __asm__("TransMatrix");
|
||||
M3_S2* m3s2_scale (M3_S2* mat, V3_S4* vec) __asm__("ScaleMatrix");
|
||||
|
||||
S4 v3s2_rtp(V3_S2* vec, A2_S2 xy, A2_S2* pp, S4* flag) __asm__("RotTransPers"); // Rotation, Translate, Perspective
|
||||
|
||||
void gte_matrix_set_rotation (M3_S2* mat) __asm__("SetRotMatrix");
|
||||
void gte_matrix_set_translation(M3_S2* mat) __asm__("SetTransMatrix");
|
||||
|
||||
Reference in New Issue
Block a user