editor: scene properties

[pmachines.git] / pmachines / app.py

diff --git a/pmachines/app.py b/pmachines/app.py
index deac280af5d8ffdc96be8a84aa2f8ac7e256aad1..de6d67fca3ba64240266308cb758740e38bd509f 100755 (executable)
--- a/pmachines/app.py
+++ b/pmachines/app.py
@@ -109,12 +109,12 @@ class Pmachines:
             scene.destroy()
             exit()
         elif self._options['development']['auto_start']:
-            mod_name = 'pmachines.scenes.scene_' + self._options['development']['auto_start']
-            for member in import_module(mod_name).__dict__.values():
-                if isclass(member) and issubclass(member, Scene) and \
-                        member != Scene:
-                    cls = member
-            self._fsm.demand('Scene', cls)
+            # mod_name = 'pmachines.scenes.scene_' + self._options['development']['auto_start']
+            # for member in import_module(mod_name).__dict__.values():
+            #     if isclass(member) and issubclass(member, Scene) and \
+            #             member != Scene:
+            #         cls = member
+            self._fsm.demand('Scene', self._options['development']['auto_start'])
         else:
             Scene.scenes_done = self.__persistent.scenes_done
             self._fsm.demand('Menu')
@@ -146,7 +146,9 @@ class Pmachines:
             self._args.functional_test or self._args.functional_ref,
             self._options['development']['mouse_coords'],
             self.__persistent,
-            scene_name)
+            scene_name,
+            self._options['development']['editor'],
+            self._options['development']['auto_start_editor'])
 
     def on_scene_exit(self):
         self._unset_physics()
@@ -215,7 +217,9 @@ class Pmachines:
                 'show_buffers': 0,
                 'debug_items': 0,
                 'mouse_coords': 0,
-                'fps': 0}}
+                'fps': 0,
+                'editor': 0,
+                'auto_start_editor': 0}}
         opt_path = LibP3d.fixpath(data_path + '/' + optfile) if data_path else optfile
         opt_exists = exists(opt_path)
         self._options = DctFile(