summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-27 09:47:21 +0200
committeraap <aap@papnet.eu>2020-05-27 09:47:57 +0200
commit02741dc64faa907ded44265f17163505cf27eff9 (patch)
tree6e457468090a905093bb3a4c0e47f4245957de32
parentCVehicle loose ends (diff)
downloadre3-02741dc64faa907ded44265f17163505cf27eff9.tar
re3-02741dc64faa907ded44265f17163505cf27eff9.tar.gz
re3-02741dc64faa907ded44265f17163505cf27eff9.tar.bz2
re3-02741dc64faa907ded44265f17163505cf27eff9.tar.lz
re3-02741dc64faa907ded44265f17163505cf27eff9.tar.xz
re3-02741dc64faa907ded44265f17163505cf27eff9.tar.zst
re3-02741dc64faa907ded44265f17163505cf27eff9.zip
-rw-r--r--src/extras/debugmenu.cpp12
-rw-r--r--src/fakerw/fake.cpp2
2 files changed, 4 insertions, 10 deletions
diff --git a/src/extras/debugmenu.cpp b/src/extras/debugmenu.cpp
index f6b6eeb8..3a4c4175 100644
--- a/src/extras/debugmenu.cpp
+++ b/src/extras/debugmenu.cpp
@@ -1028,12 +1028,6 @@ DebugMenuProcess(void)
}
-#ifdef LIBRW
-#define CURRENTCAM (rw::engine->currentCamera)
-#else
-#define CURRENTCAM ((RwCamera*)RWSRCGLOBAL(curCamera))
-#endif
-
void
DebugMenuRender(void)
{
@@ -1048,7 +1042,7 @@ DebugMenuRender(void)
RwRenderStateSet(rwRENDERSTATEFOGENABLE, 0);
RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
- RwCamera *cam = CURRENTCAM;
+ RwCamera *cam = RwCameraGetCurrentCamera();
screenWidth = RwRasterGetWidth(RwCameraGetRaster(cam));
screenHeight = RwRasterGetHeight(RwCameraGetRaster(cam));
@@ -1080,7 +1074,7 @@ drawArrow(RwRect r, int direction, int style)
static RwImVertexIndex indices[] = { 0, 1, 2, 2, 1, 3 };
static RwIm2DVertex arrowVerts[4];
- RwCamera *cam = CURRENTCAM;
+ RwCamera *cam = RwCameraGetCurrentCamera();
float recipz = 1.0f/RwCameraGetNearClipPlane(cam);
int width = RwRasterGetWidth(arrow);
@@ -1183,7 +1177,7 @@ drawMouse(void)
static RwIm2DVertex vertices[4];
RwIm2DVertex *vert;
RwCamera *cam;
- cam = CURRENTCAM;
+ cam = RwCameraGetCurrentCamera();
float x = mouseX;
float y = mouseY;
float w = RwRasterGetWidth(cursor);
diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index 0c85728b..08d106f4 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -152,7 +152,7 @@ RwReal RwCameraGetNearClipPlane(const RwCamera *camera) { return camera->n
RwReal RwCameraGetFarClipPlane(const RwCamera *camera) { return camera->farPlane; }
RwCamera *RwCameraSetFogDistance(RwCamera *camera, RwReal fogDistance) { camera->fogPlane = fogDistance; return camera; }
RwReal RwCameraGetFogDistance(const RwCamera *camera) { return camera->fogPlane; }
-RwCamera *RwCameraGetCurrentCamera(void);
+RwCamera *RwCameraGetCurrentCamera(void) { return rw::engine->currentCamera; }
RwCameraProjection RwCameraGetProjection(const RwCamera *camera);
const RwV2d *RwCameraGetViewWindow(const RwCamera *camera) { return &camera->viewWindow; }
RwMatrix *RwCameraGetViewMatrix(RwCamera *camera) { return &camera->viewMatrix; }