From 5a24dc445bccd509d8db9308c0476173df3fe37c Mon Sep 17 00:00:00 2001 From: n00b Date: Thu, 5 Dec 2024 22:19:50 -0500 Subject: [PATCH] Fixed GetPixel() in GLES2 driver --- rcbasic_build/main.cpp | 2 +- rcbasic_build/rcbasic.dbgs | 71 +++++++++++++------------- rcbasic_build/rcbasic_build.depend | 2 +- rcbasic_runtime/rc_gfx.h | 4 ++ rcbasic_runtime/rc_os_defines.h | 2 +- rcbasic_runtime/rcbasic_runtime.depend | 4 +- 6 files changed, 45 insertions(+), 40 deletions(-) diff --git a/rcbasic_build/main.cpp b/rcbasic_build/main.cpp index 8c38228..b15061d 100755 --- a/rcbasic_build/main.cpp +++ b/rcbasic_build/main.cpp @@ -921,7 +921,7 @@ int main(int argc, char * argv[]) //DEBUG START //rc_filename = "/home/n00b/projects/bu/constraint_demo/main.bas"; //rc_filename = "/home/n00b/projects/bu/rcbasic_v400A6_linux/rcbasic_v400_linux/examples/tile_demo/main.bas"; - //rc_filename = "/home/n00b/projects/rcbasic_alpha3/test_project/main.bas"; + rc_filename = "/home/n00b/projects/rcbasic_alpha3/test_project/main.bas"; //DEBUG END //enable_presets = true; diff --git a/rcbasic_build/rcbasic.dbgs b/rcbasic_build/rcbasic.dbgs index 6d4fec6..b258b24 100644 --- a/rcbasic_build/rcbasic.dbgs +++ b/rcbasic_build/rcbasic.dbgs @@ -31,38 +31,39 @@ S main fnt$ 3 N main hud_font 41 AS main hud_txt$ 4 N main t_img 42 -N main.#FOR:0 i 43 -N main mesh1 44 -N main actor1 45 -N main actor1_texture 46 -N main c 47 -N main mat 48 -N main a_mat 49 -N main level 50 -N main actor2 51 -N main ax 52 -N main ay 53 -N main az 54 -N main init 55 -N main i 56 -N main vx 57 -N main vy 58 -N main vz 59 -N main mass 60 -N main anim 61 -N main num_loops 62 -N main off_x 63 -N main off_y 64 -N main test_mode 65 -N main.#WHILE:0.#SELECT:0->CASE:0.#IF:7 crx 66 -N main.#WHILE:0.#SELECT:0->CASE:0.#IF:7 cry 67 -N main.#WHILE:0.#SELECT:0->CASE:0.#IF:7 crz 68 -N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:7->CONDITION:0 crx 69 -N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:7->CONDITION:0 cry 70 -N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:7->CONDITION:0 crz 71 -N main.#WHILE:0.#SELECT:0->CASE:0.#IF:9 crx 72 -N main.#WHILE:0.#SELECT:0->CASE:0.#IF:9 cry 73 -N main.#WHILE:0.#SELECT:0->CASE:0.#IF:9 crz 74 -N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:9->CONDITION:0 crx 75 -N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:9->CONDITION:0 cry 76 -N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:9->CONDITION:0 crz 77 +N main t_img2 43 +N main.#FOR:0 i 44 +N main mesh1 45 +N main actor1 46 +N main actor1_texture 47 +N main c 48 +N main mat 49 +N main a_mat 50 +N main level 51 +N main actor2 52 +N main ax 53 +N main ay 54 +N main az 55 +N main init 56 +N main i 57 +N main vx 58 +N main vy 59 +N main vz 60 +N main mass 61 +N main anim 62 +N main num_loops 63 +N main off_x 64 +N main off_y 65 +N main test_mode 66 +N main.#WHILE:0.#SELECT:0->CASE:0.#IF:7 crx 67 +N main.#WHILE:0.#SELECT:0->CASE:0.#IF:7 cry 68 +N main.#WHILE:0.#SELECT:0->CASE:0.#IF:7 crz 69 +N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:7->CONDITION:0 crx 70 +N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:7->CONDITION:0 cry 71 +N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:7->CONDITION:0 crz 72 +N main.#WHILE:0.#SELECT:0->CASE:0.#IF:9 crx 73 +N main.#WHILE:0.#SELECT:0->CASE:0.#IF:9 cry 74 +N main.#WHILE:0.#SELECT:0->CASE:0.#IF:9 crz 75 +N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:9->CONDITION:0 crx 76 +N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:9->CONDITION:0 cry 77 +N main.#WHILE:0.#SELECT:0->CASE:0.#ELSE:9->CONDITION:0 crz 78 diff --git a/rcbasic_build/rcbasic_build.depend b/rcbasic_build/rcbasic_build.depend index 459d5c0..36c45c2 100755 --- a/rcbasic_build/rcbasic_build.depend +++ b/rcbasic_build/rcbasic_build.depend @@ -1,5 +1,5 @@ # depslib dependency file v1.0 -1733272260 source:/home/n00b/Projects/RCBASIC4/rcbasic_build/main.cpp +1733454209 source:/home/n00b/Projects/RCBASIC4/rcbasic_build/main.cpp diff --git a/rcbasic_runtime/rc_gfx.h b/rcbasic_runtime/rc_gfx.h index b66943e..8104630 100644 --- a/rcbasic_runtime/rc_gfx.h +++ b/rcbasic_runtime/rc_gfx.h @@ -1409,6 +1409,10 @@ Uint32 rc_getPixel(int x, int y) if(y < 0 || y >= rc_window_size.Height) y = 0; + #ifdef RC_DRIVER_GLES2 + y = rc_canvas[rc_active_canvas].texture->getSize().Height - (y+1); + #endif // RC_DRIVER_GLES2 + irr::video::ITexture* texture = rc_canvas[rc_active_canvas].texture; diff --git a/rcbasic_runtime/rc_os_defines.h b/rcbasic_runtime/rc_os_defines.h index 50e40c0..4444858 100755 --- a/rcbasic_runtime/rc_os_defines.h +++ b/rcbasic_runtime/rc_os_defines.h @@ -2,7 +2,7 @@ #define RC_OS_DEFINES_H_INCLUDED //USED FOR TESTING ONLY -//#define RC_TESTING +#define RC_TESTING //I am checking Android first since I think it also defines __linux__ diff --git a/rcbasic_runtime/rcbasic_runtime.depend b/rcbasic_runtime/rcbasic_runtime.depend index 8536c30..805aa8d 100755 --- a/rcbasic_runtime/rcbasic_runtime.depend +++ b/rcbasic_runtime/rcbasic_runtime.depend @@ -32,7 +32,7 @@ "rc_func130_cases.h" -1733451673 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_os_defines.h +1733454924 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_os_defines.h 1733270962 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_defines.h @@ -1247,7 +1247,7 @@ 1727545973 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/RealisticWater.h -1733452182 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_gfx.h +1733454956 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_gfx.h "SDL.h"