fixed version

[pmachines.git] / game / app.py

diff --git a/game/app.py b/game/app.py
index 5015b8c3ffb47e30f82f28257b80f165fbeec5e0..057a6808f94f0bf9edc929c87d255c2c78cd87c4 100755 (executable)
--- a/game/app.py
+++ b/game/app.py
@@ -65,7 +65,7 @@ class PmachinesApp:
     def __init__(self):
         info('platform: %s' % platform)
         info('exists main.py: %s' % exists('main.py'))
-        args = self._parse_args()
+        self._args = args = self._parse_args()
         self._configure(args)
         self.base = ShowBase()
         self._pipeline = None
@@ -75,7 +75,7 @@ class PmachinesApp:
         self._prepare_window(args)
         if args.update:
             return
-        if args.functional_test and int(args.functional_test) == 1:
+        if args.functional_test:
             self._options['settings']['volume'] = 0
         self._music = MusicMgr(self._options['settings']['volume'])
         self.lang_mgr = LangMgr(self._options['settings']['language'],
@@ -98,13 +98,13 @@ class PmachinesApp:
         else:
             self._fsm.demand('Menu')
         if args.functional_test or args.functional_ref:
-            FunctionalTest(args.functional_test, args.functional_ref)
+            FunctionalTest(args.functional_ref)
 
     def on_menu_enter(self):
         self._menu_bg = Background()
         self._menu = Menu(
             self._fsm, self.lang_mgr, self._options, self._music,
-            self._pipeline, self.scenes)
+            self._pipeline, self.scenes, self._args.functional_test or self._args.functional_ref)
 
     def on_home(self):
         self._fsm.demand('Menu')
@@ -134,7 +134,7 @@ class PmachinesApp:
         load_prc_file_data('', 'framebuffer-srgb true')
         load_prc_file_data('', 'sync-video true')
         if args.functional_test or args.functional_ref:
-            load_prc_file_data('', 'win-size 1280 720')
+            load_prc_file_data('', 'win-size 1360 768')
             # otherwise it is not centered in exwm
         # load_prc_file_data('', 'threading-model Cull/Draw')
         # it freezes when you go to the next scene
@@ -148,7 +148,7 @@ class PmachinesApp:
         parser.add_argument('--version', action='store_true')
         parser.add_argument('--optfile')
         parser.add_argument('--screenshot')
-        parser.add_argument('--functional-test')
+        parser.add_argument('--functional-test', action='store_true')
         parser.add_argument('--functional-ref', action='store_true')
         cmd_line = [arg for arg in iter(argv[1:]) if not arg.startswith('-psn_')]
         args = parser.parse_args(cmd_line)
@@ -198,12 +198,14 @@ class PmachinesApp:
         if res:
             res = LVector2i(*[int(_res) for _res in res.split('x')])
         else:
-            d_i = base.pipe.get_display_information()
-            def _res(idx):
-                return d_i.get_display_mode_width(idx), \
-                    d_i.get_display_mode_height(idx)
-            resolutions = [
-                _res(idx) for idx in range(d_i.get_total_display_modes())]
+            resolutions = []
+            if not self.version:
+                d_i = base.pipe.get_display_information()
+                def _res(idx):
+                    return d_i.get_display_mode_width(idx), \
+                        d_i.get_display_mode_height(idx)
+                resolutions = [
+                    _res(idx) for idx in range(d_i.get_total_display_modes())]
             res = sorted(resolutions)[-1]
         fullscreen = self._options['settings']['fullscreen']
         props = WindowProperties()
@@ -245,7 +247,6 @@ class PmachinesApp:
                 return task.cont
             taskMgr.add(update_coords, 'update_coords')
 
-
     def _set_physics(self):
         if self._options['development']['physics_debug']:
             debug_node = BulletDebugNode('Debug')