From 9a20d4713f91624caddc0731b26f3d1b11d75c51 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 24 Dec 2020 15:18:03 +0100 Subject: [PATCH] showbase: Remove unused C++ runtestFullscreenSizes interface If there is a need for this, we can implement it properly in GraphicsWindow (open an issue or comment in #1014 if you are affected by this, please) See #1014 --- direct/src/showbase/showBase.cxx | 38 -------------------------------- direct/src/showbase/showBase.h | 5 ----- 2 files changed, 43 deletions(-) diff --git a/direct/src/showbase/showBase.cxx b/direct/src/showbase/showBase.cxx index 7f90d4c93c..c4aa38b7d5 100644 --- a/direct/src/showbase/showBase.cxx +++ b/direct/src/showbase/showBase.cxx @@ -91,44 +91,6 @@ init_app_for_gui() { */ } -// klunky interface since we cant pass array from python->C++ to use -// verify_window_sizes directly -static int num_fullscreen_testsizes = 0; -#define MAX_FULLSCREEN_TESTS 10 -static int fullscreen_testsizes[MAX_FULLSCREEN_TESTS * 2]; - -void -add_fullscreen_testsize(int xsize, int ysize) { - if ((xsize == 0) && (ysize == 0)) { - num_fullscreen_testsizes = 0; - return; - } - - // silently fail if maxtests exceeded - if (num_fullscreen_testsizes < MAX_FULLSCREEN_TESTS) { - fullscreen_testsizes[num_fullscreen_testsizes * 2] = xsize; - fullscreen_testsizes[num_fullscreen_testsizes * 2 + 1] = ysize; - num_fullscreen_testsizes++; - } -} - -void -runtest_fullscreen_sizes(GraphicsWindow *win) { - win->verify_window_sizes(num_fullscreen_testsizes, fullscreen_testsizes); -} - -bool -query_fullscreen_testresult(int xsize, int ysize) { - // stupid linear search that works ok as long as total tests are small - int i; - for (i=0; i < num_fullscreen_testsizes; i++) { - if((fullscreen_testsizes[i * 2] == xsize) && - (fullscreen_testsizes[i * 2 + 1] == ysize)) - return true; - } - return false; -} - void store_accessibility_shortcut_keys() { #ifdef _WIN32 diff --git a/direct/src/showbase/showBase.h b/direct/src/showbase/showBase.h index b6b90eedd0..a578c5159c 100644 --- a/direct/src/showbase/showBase.h +++ b/direct/src/showbase/showBase.h @@ -40,11 +40,6 @@ EXPCL_DIRECT_SHOWBASE void throw_new_frame(); EXPCL_DIRECT_SHOWBASE void init_app_for_gui(); -// klunky interface since we cant pass array from python->C++ -EXPCL_DIRECT_SHOWBASE void add_fullscreen_testsize(int xsize, int ysize); -EXPCL_DIRECT_SHOWBASE void runtest_fullscreen_sizes(GraphicsWindow *win); -EXPCL_DIRECT_SHOWBASE bool query_fullscreen_testresult(int xsize, int ysize); - // to handle windows stickykeys EXPCL_DIRECT_SHOWBASE void store_accessibility_shortcut_keys(); EXPCL_DIRECT_SHOWBASE void allow_accessibility_shortcut_keys(bool allowKeys);