Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start unification of QuakeGX #33

Merged
merged 26 commits into from
Dec 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1b0d5ac
Start unification of QuakeGX
tyleryoung88 Sep 10, 2024
84922d5
silence warning
tyleryoung88 Sep 10, 2024
8974ed4
Unify draw header
tyleryoung88 Sep 11, 2024
a93bd16
Add mathlib and pr_cmds to unified list
tyleryoung88 Sep 12, 2024
ecbafc7
add view and wad to unified files
tyleryoung88 Sep 14, 2024
28ad20a
Fix rumble not being multiplayer safe on Wii
tyleryoung88 Sep 14, 2024
4f6b56c
host.c unified
tyleryoung88 Sep 14, 2024
234699d
various merge cleanups
tyleryoung88 Sep 14, 2024
a1b646e
Remove unnecessary ifdefs
tyleryoung88 Sep 15, 2024
65c19fd
properly document ifdef
tyleryoung88 Sep 15, 2024
8ac13fe
console.c unified
tyleryoung88 Sep 15, 2024
d41af48
update paths and folder structure for wii
tyleryoung88 Sep 15, 2024
3e35e41
protection against some crashes on wii
tyleryoung88 Sep 15, 2024
fb9766b
Change scale to accept floats
tyleryoung88 Sep 15, 2024
7ce51c8
merge cl_hud.c
tyleryoung88 Oct 7, 2024
5276a11
Cleaup cl_hud merger and fix an input bug
tyleryoung88 Oct 7, 2024
d9bf7bc
Upload GX specific files
tyleryoung88 Oct 7, 2024
e7179c1
Remove duplicate file
tyleryoung88 Oct 7, 2024
d947315
Merge recent Vril commits
tyleryoung88 Dec 16, 2024
b7e01e5
Upload Makefile.wii and fix ctr/psp compile errors
tyleryoung88 Dec 16, 2024
dc0b5f8
Update Makefile to use the same build folder as other systems
tyleryoung88 Dec 16, 2024
729f28c
Removed references to SetDlightColor and fixed ifdefs
tyleryoung88 Dec 21, 2024
b6e8042
Clean up host.c and quakedef.h
tyleryoung88 Dec 22, 2024
dab6ab8
Clean up sv_main.c
tyleryoung88 Dec 22, 2024
08d9e09
Cleanup and document view.c
tyleryoung88 Dec 22, 2024
585f9c2
Cleanup wad.c
tyleryoung88 Dec 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Unify draw header
tyleryoung88 committed Sep 11, 2024
commit 8974ed4f8a5228f7b94c05ec1ccbf274c0195ea5
9 changes: 7 additions & 2 deletions source/draw.h
Original file line number Diff line number Diff line change
@@ -40,7 +40,10 @@ void Draw_ConsoleBackground (int lines);
void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha);
void Draw_Fill (int x, int y, int w, int h, int c);
void Draw_LoadingFill(void);
#endif // __PSP__
#elif __WII__
void Draw_TileClear (int x, int y, int w, int h);
tyleryoung88 marked this conversation as resolved.
Show resolved Hide resolved
void Draw_Fill (int x, int y, int w, int h, float r, float g, float b, float a);
tyleryoung88 marked this conversation as resolved.
Show resolved Hide resolved
#endif
void Draw_FillByColor (int x, int y, int w, int h, int r, int g, int b, int a);
void Draw_FadeScreen (void);
void Draw_String (int x, int y, char *str);
@@ -61,4 +64,6 @@ extern int font_kerningamount[96];
qpic_t *Draw_CachePic (char *path);
#ifdef __PSP__
qpic_t *Draw_CacheImg (char *path);
#endif // __PSP__
#elif __WII__
qpic_t *Draw_LMP (char *path);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to keep LMP and CachePic logic separate on this platform. Whenever these functions are consolidated it creates a small lag when drawing Textboxes. This is because there are 5 file open/closes for 10 total textures loaded in coupled with slow IO speeds

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand. We shouldn't be using lmp anywhere.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lmp is used to draw the console keyboard background.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. We should depreciate this in favor of drawing it in engine.

#endif