From 3317217ed84b0a592400ff476ab070a46968c938 Mon Sep 17 00:00:00 2001 From: Fire-Head Date: Wed, 12 Jun 2019 20:05:06 +0300 Subject: [PATCH 1/2] CameraCreate/CameraDestroy/CameraSize done --- src/RwHelper.cpp | 232 +++++++++++++++++++++++++++++++++++++++++++++++ src/RwHelper.h | 9 ++ src/main.cpp | 5 +- 3 files changed, 243 insertions(+), 3 deletions(-) diff --git a/src/RwHelper.cpp b/src/RwHelper.cpp index 2634cfd6..5c007621 100644 --- a/src/RwHelper.cpp +++ b/src/RwHelper.cpp @@ -1,6 +1,8 @@ #define WITHD3D #include "common.h" +#include "patcher.h" #include "TimeCycle.h" +#include "skeleton.h" void DefinedState(void) @@ -43,3 +45,233 @@ GetFirstObject(RwFrame *frame) RwFrameForAllObjects(frame, GetFirstObjectCallback, &obj); return obj; } + +void +CameraSize(RwCamera * camera, RwRect * rect, + RwReal viewWindow, RwReal aspectRatio) +{ + if (camera) + { + RwVideoMode videoMode; + RwRect r; + RwRect origSize; + RwV2d vw; + + RwEngineGetVideoModeInfo(&videoMode, + RwEngineGetCurrentVideoMode()); + + origSize.w = RwRasterGetWidth(RwCameraGetRaster(camera)); + origSize.h = RwRasterGetHeight(RwCameraGetRaster(camera)); + + if (!rect) + { + if (videoMode.flags & rwVIDEOMODEEXCLUSIVE) + { + /* For full screen applications, resizing the camera just doesn't + * make sense, use the video mode size. + */ + + r.x = r.y = 0; + r.w = videoMode.width; + r.h = videoMode.height; + rect = &r; + } + else + { + /* + rect not specified - reuse current values + */ + r.w = RwRasterGetWidth(RwCameraGetRaster(camera)); + r.h = RwRasterGetHeight(RwCameraGetRaster(camera)); + r.x = r.y = 0; + rect = &r; + } + } + + if (( origSize.w != rect->w ) && ( origSize.h != rect->h )) + { + RwRaster *raster; + RwRaster *zRaster; + + /* + * Destroy rasters... + */ + + raster = RwCameraGetRaster(camera); + if( raster ) + { + RwRasterDestroy(raster); + } + + zRaster = RwCameraGetZRaster(camera); + if( zRaster ) + { + RwRasterDestroy(zRaster); + } + + /* + * Create new rasters... + */ + + raster = RwRasterCreate(rect->w, rect->h, 0, rwRASTERTYPECAMERA); + zRaster = RwRasterCreate(rect->w, rect->h, 0, rwRASTERTYPEZBUFFER); + + if( raster && zRaster ) + { + RwCameraSetRaster(camera, raster); + RwCameraSetZRaster(camera, zRaster); + } + else + { + if( raster ) + { + RwRasterDestroy(raster); + } + + if( zRaster ) + { + RwRasterDestroy(zRaster); + } + + rect->x = origSize.x; + rect->y = origSize.y; + rect->w = origSize.w; + rect->h = origSize.h; + + /* + * Use default values... + */ + raster = + RwRasterCreate(rect->w, rect->h, 0, rwRASTERTYPECAMERA); + + zRaster = + RwRasterCreate(rect->w, rect->h, 0, rwRASTERTYPEZBUFFER); + + RwCameraSetRaster(camera, raster); + RwCameraSetZRaster(camera, zRaster); + } + } + + /* Figure out the view window */ + if (videoMode.flags & rwVIDEOMODEEXCLUSIVE) + { + /* derive ratio from aspect ratio */ + vw.x = viewWindow; + vw.y = viewWindow / aspectRatio; + } + else + { + /* derive from pixel ratios */ + if (rect->w > rect->h) + { + vw.x = viewWindow; + vw.y = (rect->h * viewWindow) / rect->w; + } + else + { + vw.x = (rect->w * viewWindow) / rect->h; + vw.y = viewWindow; + } + } + + RwCameraSetViewWindow(camera, &vw); + + RsGlobal.width = rect->w; + RsGlobal.height = rect->h; + } + + return; +} + +void +CameraDestroy(RwCamera *camera) +{ + RwRaster *raster, *tmpRaster; + RwFrame *frame; + + if (camera) + { + frame = RwCameraGetFrame(camera); + if (frame) + { + RwFrameDestroy(frame); + } + + raster = RwCameraGetRaster(camera); + if (raster) + { + tmpRaster = RwRasterGetParent(raster); + + RwRasterDestroy(raster); + + if ((tmpRaster != NULL) && (tmpRaster != raster)) + { + RwRasterDestroy(tmpRaster); + } + } + + raster = RwCameraGetZRaster(camera); + if (raster) + { + tmpRaster = RwRasterGetParent(raster); + + RwRasterDestroy(raster); + + if ((tmpRaster != NULL) && (tmpRaster != raster)) + { + RwRasterDestroy(tmpRaster); + } + } + + RwCameraDestroy(camera); + } + + return; +} + +RwCamera * +CameraCreate(RwInt32 width, RwInt32 height, RwBool zBuffer) +{ + RwCamera *camera; + + camera = RwCameraCreate(); + + if (camera) + { + RwCameraSetFrame(camera, RwFrameCreate()); + RwCameraSetRaster(camera, + RwRasterCreate(0, 0, 0, rwRASTERTYPECAMERA)); + + if (zBuffer) + { + RwCameraSetZRaster(camera, + RwRasterCreate(0, 0, 0, + rwRASTERTYPEZBUFFER)); + } + + /* now check that everything is valid */ + if (RwCameraGetFrame(camera) && + RwCameraGetRaster(camera) && + RwRasterGetParent(RwCameraGetRaster(camera)) && + (!zBuffer || (RwCameraGetZRaster(camera) && + RwRasterGetParent(RwCameraGetZRaster + (camera))))) + { + /* everything OK */ + return (camera); + } + } + + /* if we're here then an error must have occurred so clean up */ + + CameraDestroy(camera); + return (NULL); +} + +STARTPATCHES + InjectHook(0x526450, GetFirstObjectCallback, PATCH_JUMP); + InjectHook(0x526460, GetFirstObject, PATCH_JUMP); + InjectHook(0x527170, CameraSize, PATCH_JUMP); + InjectHook(0x527340, CameraDestroy, PATCH_JUMP); + InjectHook(0x5273B0, CameraCreate, PATCH_JUMP); +ENDPATCHES \ No newline at end of file diff --git a/src/RwHelper.h b/src/RwHelper.h index 49292449..6112f72d 100644 --- a/src/RwHelper.h +++ b/src/RwHelper.h @@ -2,3 +2,12 @@ void DefinedState(void); RwObject *GetFirstObject(RwFrame *frame); + +extern void CameraSize(RwCamera *camera, + RwRect *rect, + RwReal viewWindow, + RwReal aspectRatio); +extern void CameraDestroy(RwCamera *camera); +extern RwCamera *CameraCreate(RwInt32 width, + RwInt32 height, + RwBool zBuffer); \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index e56d6938..ad40c3b0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -53,8 +53,6 @@ #define DEFAULT_ASPECTRATIO (4.0f/3.0f) #endif -WRAPPER void CameraSize(RwCamera *camera, void *rect, float viewWindow, float aspectRatio) { EAXJMP(0x527170); } - //WRAPPER RwBool RpAnimBlendPluginAttach() { EAXJMP(0x4052D0); } WRAPPER RwBool NodeNamePluginAttach() { EAXJMP(0x527100); } @@ -680,7 +678,8 @@ AppEventHandler(RsEvent event, void *param) case rsCAMERASIZE: { - CameraSize(Scene.camera, param, DEFAULT_VIEWWINDOW, DEFAULT_ASPECTRATIO); + CameraSize(Scene.camera, (RwRect *)param, + DEFAULT_VIEWWINDOW, DEFAULT_ASPECTRATIO); return rsEVENTPROCESSED; } From 292fd5ad2494fd8cbd500ad0b82bb51620e9fe5c Mon Sep 17 00:00:00 2001 From: Fire-Head Date: Wed, 12 Jun 2019 20:08:04 +0300 Subject: [PATCH 2/2] CameraCreate cosmetic fix --- src/RwHelper.cpp | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/RwHelper.cpp b/src/RwHelper.cpp index 5c007621..cb0c1a4e 100644 --- a/src/RwHelper.cpp +++ b/src/RwHelper.cpp @@ -117,39 +117,39 @@ CameraSize(RwCamera * camera, RwRect * rect, zRaster = RwRasterCreate(rect->w, rect->h, 0, rwRASTERTYPEZBUFFER); if( raster && zRaster ) - { - RwCameraSetRaster(camera, raster); - RwCameraSetZRaster(camera, zRaster); - } - else - { - if( raster ) - { - RwRasterDestroy(raster); - } + { + RwCameraSetRaster(camera, raster); + RwCameraSetZRaster(camera, zRaster); + } + else + { + if( raster ) + { + RwRasterDestroy(raster); + } - if( zRaster ) - { - RwRasterDestroy(zRaster); - } + if( zRaster ) + { + RwRasterDestroy(zRaster); + } - rect->x = origSize.x; - rect->y = origSize.y; + rect->x = origSize.x; + rect->y = origSize.y; rect->w = origSize.w; - rect->h = origSize.h; + rect->h = origSize.h; - /* - * Use default values... - */ - raster = - RwRasterCreate(rect->w, rect->h, 0, rwRASTERTYPECAMERA); + /* + * Use default values... + */ + raster = + RwRasterCreate(rect->w, rect->h, 0, rwRASTERTYPECAMERA); - zRaster = - RwRasterCreate(rect->w, rect->h, 0, rwRASTERTYPEZBUFFER); + zRaster = + RwRasterCreate(rect->w, rect->h, 0, rwRASTERTYPEZBUFFER); - RwCameraSetRaster(camera, raster); - RwCameraSetZRaster(camera, zRaster); - } + RwCameraSetRaster(camera, raster); + RwCameraSetZRaster(camera, zRaster); + } } /* Figure out the view window */ @@ -269,7 +269,7 @@ CameraCreate(RwInt32 width, RwInt32 height, RwBool zBuffer) } STARTPATCHES - InjectHook(0x526450, GetFirstObjectCallback, PATCH_JUMP); + //InjectHook(0x526450, GetFirstObjectCallback, PATCH_JUMP); InjectHook(0x526460, GetFirstObject, PATCH_JUMP); InjectHook(0x527170, CameraSize, PATCH_JUMP); InjectHook(0x527340, CameraDestroy, PATCH_JUMP);