AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 10:05:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

N64: Change movement keys to c buttons, change mipmaps grahics option to filtering option

Browse Source
This commit is contained in:
UnknownShadow200 2024-01-20 22:23:16 +11:00
parent 12c952a02a
commit 3dd9b32f22
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Graphics_N64.c
View File

@ -139,8 +139,8 @@ static GfxResourceID Gfx_AllocTexture(struct Bitmap* bmp, cc_uint8 flags, cc_boo
glGenTextures(1, &tex->textureID); glGenTextures(1, &tex->textureID);
glBindTexture(GL_TEXTURE_2D, tex->textureID); glBindTexture(GL_TEXTURE_2D, tex->textureID);
// NOTE: Enabling these fixes textures, but seems to break on cen64 // NOTE: Enabling these fixes textures, but seems to break on cen64
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, mipmaps ? GL_LINEAR : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mipmaps ? GL_LINEAR : GL_NEAREST);
tex->surface = surface_alloc(bit16 ? FMT_RGBA16 : FMT_RGBA32, bmp->width, bmp->height); tex->surface = surface_alloc(bit16 ? FMT_RGBA16 : FMT_RGBA32, bmp->width, bmp->height);
surface_t* fb = &tex->surface; surface_t* fb = &tex->surface;

5
src/Menus.c
View File

@ -2941,8 +2941,13 @@ static void GraphicsOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) {
GraphicsOptionsScreen_GetNames, GraphicsOptionsScreen_SetNames }, GraphicsOptionsScreen_GetNames, GraphicsOptionsScreen_SetNames },
{ 1, 0, "Shadows", MenuOptionsScreen_Enum, { 1, 0, "Shadows", MenuOptionsScreen_Enum,
GraphicsOptionsScreen_GetShadows, GraphicsOptionsScreen_SetShadows }, GraphicsOptionsScreen_GetShadows, GraphicsOptionsScreen_SetShadows },
#ifdef CC_BUILD_N64
{ 1, 50, "Filtering", MenuOptionsScreen_Bool,
GraphicsOptionsScreen_GetMipmaps, GraphicsOptionsScreen_SetMipmaps }
#else
{ 1, 50, "Mipmaps", MenuOptionsScreen_Bool, { 1, 50, "Mipmaps", MenuOptionsScreen_Bool,
GraphicsOptionsScreen_GetMipmaps, GraphicsOptionsScreen_SetMipmaps } GraphicsOptionsScreen_GetMipmaps, GraphicsOptionsScreen_SetMipmaps }
#endif
}; };
s->numCore = 8; s->numCore = 8;

4
src/Window_3DS.c
View File

@ -40,8 +40,8 @@ void Window_Init(void) {
DisplayInfo.Width = height; // deliberately swapped DisplayInfo.Width = height; // deliberately swapped
DisplayInfo.Height = width; // deliberately swapped DisplayInfo.Height = width; // deliberately swapped
DisplayInfo.Depth = 4; // 32 bit DisplayInfo.Depth = 4; // 32 bit
DisplayInfo.ScaleX = 0.5; DisplayInfo.ScaleX = 0.5f;
DisplayInfo.ScaleY = 0.5; DisplayInfo.ScaleY = 0.5f;
Window_Main.Width = height; // deliberately swapped Window_Main.Width = height; // deliberately swapped
Window_Main.Height = width; // deliberately swapped Window_Main.Height = width; // deliberately swapped

4
src/Window_N64.c
View File

@ -40,6 +40,10 @@ void Window_Init(void) {
// change defaults to make more sense for N64 // change defaults to make more sense for N64
cc_uint8* binds = (cc_uint8*)KeyBind_GamepadDefaults; cc_uint8* binds = (cc_uint8*)KeyBind_GamepadDefaults;
binds[KEYBIND_INVENTORY] = CCPAD_Z; binds[KEYBIND_INVENTORY] = CCPAD_Z;
binds[KEYBIND_FORWARD] = CCPAD_CUP;
binds[KEYBIND_BACK] = CCPAD_CDOWN;
binds[KEYBIND_LEFT] = CCPAD_CLEFT;
binds[KEYBIND_RIGHT] = CCPAD_CRIGHT;
} }
void Window_Free(void) { } void Window_Free(void) { }