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

PS3: Fix to compile again

Browse Source
This commit is contained in:
UnknownShadow200 2023-11-30 19:12:21 +11:00
parent 677edba22e
commit ce6a8d2516
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/ps3/Makefile
View File

@ -17,8 +17,8 @@ include $(PS3DEV)/ppu_rules
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
TARGET := ClassiCube-PS3 TARGET := ClassiCube-PS3
BUILD := build-ps3 BUILD := build-ps3
SOURCES := src SOURCES := src third_party/bearssl/src
INCLUDES := INCLUDES := third_party/bearssl/inc
SHADERS := misc/ps3 SHADERS := misc/ps3
TITLE := ClassiCube TITLE := ClassiCube

2
readme.md
View File

@ -82,7 +82,7 @@ And also runs on:
* PSP - unfinished, rendering issues (can [download from here](https://www.classicube.net/download/psp), **untested on real hardware**) * PSP - unfinished, rendering issues (can [download from here](https://www.classicube.net/download/psp), **untested on real hardware**)
* PS Vita - unfinished, rendering issues (can [download from here](https://www.classicube.net/download/vita), **untested on real hardware**) * PS Vita - unfinished, rendering issues (can [download from here](https://www.classicube.net/download/vita), **untested on real hardware**)
* Xbox - unfinished, major rendering issues (can [download from here](https://www.classicube.net/download/xbox), **untested on real hardware**) * Xbox - unfinished, major rendering issues (can [download from here](https://www.classicube.net/download/xbox), **untested on real hardware**)
* PS3 - unfinished, rendering issues (can [download from here](https://www.classicube.net/download/xbox), **untested on real hardware**) * PS3 - unfinished, rendering issues (can [download from here](https://www.classicube.net/download/ps3), **untested on real hardware**)
* Nintendo 64 - unfinished, major rendering issues * Nintendo 64 - unfinished, major rendering issues
# Compiling # Compiling

2
src/Graphics_PS3.c
View File

@ -531,7 +531,7 @@ void Gfx_UnlockVb(GfxResourceID vb) {
} }
static GfxResourceID Gfx_AllocDynamicVb(VertexFormat fmt, int maxVertices) static GfxResourceID Gfx_AllocDynamicVb(VertexFormat fmt, int maxVertices) {
return rsxMemalign(128, maxVertices * strideSizes[fmt]); return rsxMemalign(128, maxVertices * strideSizes[fmt]);
} }

15
src/Window_PS3.c
View File

@ -12,11 +12,15 @@
#include "ExtMath.h" #include "ExtMath.h"
#include "Logger.h" #include "Logger.h"
#include <io/pad.h> #include <io/pad.h>
#include <io/kb.h>
#include <sysutil/sysutil.h> #include <sysutil/sysutil.h>
#include <sysutil/video.h> #include <sysutil/video.h>
static cc_bool launcherMode; static cc_bool launcherMode;
static padInfo pad_info; static padInfo pad_info;
static padData pad_data; static padData pad_data;
static KbInfo kb_info;
static KbData kb_data;
struct _DisplayData DisplayInfo; struct _DisplayData DisplayInfo;
struct _WinData WindowInfo; struct _WinData WindowInfo;
@ -57,7 +61,8 @@ void Window_Init(void) {
DisplayInfo.ContentOffsetX = 10; DisplayInfo.ContentOffsetX = 10;
DisplayInfo.ContentOffsetY = 10; DisplayInfo.ContentOffsetY = 10;
ioPadInit(7); ioPadInit(MAX_PORT_NUM);
//ioKbInit(MAX_KB_PORT_NUM);
} }
void Window_Create2D(int width, int height) { void Window_Create2D(int width, int height) {
@ -133,13 +138,19 @@ static void ProcessPadInput(double delta, padData* pad) {
} }
void Window_ProcessEvents(double delta) { void Window_ProcessEvents(double delta) {
ioPadGetInfo(&pad_info);
Input.JoystickMovement = false; Input.JoystickMovement = false;
ioPadGetInfo(&pad_info);
if (pad_info.status[0]) { if (pad_info.status[0]) {
ioPadGetData(0, &pad_data); ioPadGetData(0, &pad_data);
ProcessPadInput(delta, &pad_data); ProcessPadInput(delta, &pad_data);
} }
//ioKbGetInfo(&kb_info);
//if (kb_info.status[0]) {
// int RES = ioKbRead(0, &kb_data);
// Platform_Log1("RES: %i", &RES);
//}
} }
void Cursor_SetPosition(int x, int y) { } // Makes no sense for PS Vita void Cursor_SetPosition(int x, int y) { } // Makes no sense for PS Vita