From 24de9f92e8513cfe0f6eedc6b69b3ff5bc282ffe Mon Sep 17 00:00:00 2001 From: aap Date: Thu, 21 Jan 2021 10:21:42 +0100 Subject: enable screenshots for librw; update librw --- src/skel/glfw/glfw.cpp | 4 ++++ src/skel/win/win.cpp | 4 ++++ vendor/librw | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index f039819c..9b2a768e 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -216,6 +216,10 @@ psGrabScreen(RwCamera *pCamera) RwImageSetFromRaster(pImage, pRaster); return pImage; } +#else + rw::Image *image = RwCameraGetRaster(pCamera)->toImage(); + if(image) + return image; #endif return nil; } diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index 1fd959f2..a5f721c8 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -257,6 +257,10 @@ psGrabScreen(RwCamera *pCamera) RwImageSetFromRaster(pImage, pRaster); return pImage; } +#else + rw::Image *image = RwCameraGetRaster(pCamera)->toImage(); + if(image) + return image; #endif return nil; } diff --git a/vendor/librw b/vendor/librw index 61b288a9..9260bddc 160000 --- a/vendor/librw +++ b/vendor/librw @@ -1 +1 @@ -Subproject commit 61b288a9fe72ae4073c0ac5fd2a5815ed510c8c8 +Subproject commit 9260bddc66f70eb51adf0749fa835fed1562c178 -- cgit v1.2.3 From f0097ff7333dd270126cc7dea0ed4c54141f86a9 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Thu, 21 Jan 2021 16:09:58 +0300 Subject: fix --- src/modelinfo/ModelIndices.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h index 182a0cea..836c4092 100644 --- a/src/modelinfo/ModelIndices.h +++ b/src/modelinfo/ModelIndices.h @@ -35,7 +35,7 @@ X("veg_treea1", MI_TREE3) \ X("veg_treeb1", MI_TREE6) \ X("veg_treea3", MI_TREE8) \ - X("doc_crane_cab", MODELID_CRANE_1) \ + X("doc_crane_cab0", MODELID_CRANE_1) \ X("doc_crane_cab01", MODELID_CRANE_2) \ X("doc_crane_cab02", MODELID_CRANE_3) \ X("doc_crane_cab03", MODELID_CRANE_4) \ -- cgit v1.2.3