Przeglądaj źródła

clear code (remove specific code)

Bastien Sevajol 6 lat temu
rodzic
commit
8fb6fda453

+ 0 - 6
synergine2_cocos2d/animation.py Wyświetl plik

4
 import pyglet
4
 import pyglet
5
 import cocos
5
 import cocos
6
 
6
 
7
-if False:
8
-    from synergine2_cocos2d.actor import Actor
9
-
10
-ANIMATION_WALK = 'WALK'
11
-ANIMATION_CRAWL = 'CRAWL'
12
-
13
 
7
 
14
 class AnimatedInterface(object):
8
 class AnimatedInterface(object):
15
     def get_images_for_animation(self, animation_name: str) -> typing.List[pyglet.image.TextureRegion]:
9
     def get_images_for_animation(self, animation_name: str) -> typing.List[pyglet.image.TextureRegion]:

+ 3 - 3
synergine2_cocos2d/gui.py Wyświetl plik

477
 
477
 
478
     def on_mouse_press(self, x, y, buttons, modifiers):
478
     def on_mouse_press(self, x, y, buttons, modifiers):
479
         rx, ry = self.layer_manager.scrolling_manager.screen_to_world(x, y)
479
         rx, ry = self.layer_manager.scrolling_manager.screen_to_world(x, y)
480
-        self.logger.info(
480
+        self.logger.debug(
481
             'GUI click: x: {}, y: {}, rx: {}, ry: {} ({}|{})'.format(x, y, rx, ry, buttons, modifiers)
481
             'GUI click: x: {}, y: {}, rx: {}, ry: {} ({}|{})'.format(x, y, rx, ry, buttons, modifiers)
482
         )
482
         )
483
 
483
 
732
         self.terminal = terminal
732
         self.terminal = terminal
733
         self.cycle_duration = self.config.resolve('core.cycle_duration')
733
         self.cycle_duration = self.config.resolve('core.cycle_duration')
734
 
734
 
735
-        cocos.director.\
736
-            director.init(
735
+        cocos.director.director.init(
737
             width=640,
736
             width=640,
738
             height=480,
737
             height=480,
739
             vsync=True,
738
             vsync=True,
752
             gui=self,
751
             gui=self,
753
         )
752
         )
754
         self.layer_manager.init()
753
         self.layer_manager.init()
754
+        self.layer_manager.connect_layers()
755
         self.layer_manager.center()
755
         self.layer_manager.center()
756
 
756
 
757
         # Enable blending
757
         # Enable blending

+ 1 - 1
synergine2_cocos2d/interaction.py Wyświetl plik

20
         terminal: Terminal,
20
         terminal: Terminal,
21
     ) -> None:
21
     ) -> None:
22
         self.config = config
22
         self.config = config
23
-        self.logger = get_logger(InteractionManager, config)
23
+        self.logger = get_logger('InteractionManager', config)
24
         self.terminal = terminal
24
         self.terminal = terminal
25
         self.interactions = []
25
         self.interactions = []
26
 
26
 

+ 4 - 19
synergine2_cocos2d/layer.py Wyświetl plik

6
 import cocos
6
 import cocos
7
 
7
 
8
 from synergine2.config import Config
8
 from synergine2.config import Config
9
-from synergine2.log import SynergineLogger, get_logger
9
+from synergine2.log import get_logger
10
 from synergine2_cocos2d.middleware import MapMiddleware
10
 from synergine2_cocos2d.middleware import MapMiddleware
11
 
11
 
12
 if False:
12
 if False:
79
         self.main_scene = None  # type: cocos.scene.Scene
79
         self.main_scene = None  # type: cocos.scene.Scene
80
         self.main_layer = None  # type: cocos.layer.Layer
80
         self.main_layer = None  # type: cocos.layer.Layer
81
         self.edit_layer = None  # TODO type
81
         self.edit_layer = None  # TODO type
82
-
83
-        self.background_sprite = None  # type: cocos.sprite.Sprite
84
-        self.ground_layer = None  # type: cocos.tiles.RectMapLayer
85
         self.subject_layer = None  # type: SubjectLayer
82
         self.subject_layer = None  # type: SubjectLayer
86
-        self.top_layer = None  # type: cocos.tiles.RectMapLayer
87
 
83
 
88
         from synergine2_cocos2d.gui import EditLayer
84
         from synergine2_cocos2d.gui import EditLayer
89
         self.edit_layer_class = self.edit_layer_class or EditLayer
85
         self.edit_layer_class = self.edit_layer_class or EditLayer
109
         self.main_layer = MainLayer(
105
         self.main_layer = MainLayer(
110
             self,
106
             self,
111
             self.grid_manager,
107
             self.grid_manager,
108
+            # TODO: Hardcoded values
112
             **{
109
             **{
113
                 'width': 1200,  # Note: world size
110
                 'width': 1200,  # Note: world size
114
                 'height': 1000,  # Note: world size
111
                 'height': 1000,  # Note: world size
143
         self.main_scene.add(self.scrolling_manager)
140
         self.main_scene.add(self.scrolling_manager)
144
         self.scrolling_manager.add(self.main_layer, z=0)
141
         self.scrolling_manager.add(self.main_layer, z=0)
145
         self.main_scene.add(self.edit_layer)
142
         self.main_scene.add(self.edit_layer)
146
-
147
-        self.interior_sprite = self.middleware.get_interior_sprite()
148
-        self.background_sprite = self.middleware.get_background_sprite()
149
-        self.ground_layer = self.middleware.get_ground_layer()
150
         self.subject_layer = SubjectLayer()
143
         self.subject_layer = SubjectLayer()
151
-        self.top_layer = self.middleware.get_top_layer()
152
 
144
 
153
-        self.main_layer.add(self.interior_sprite)
154
-        self.main_layer.add(self.background_sprite)
155
-        self.main_layer.add(self.ground_layer)
145
+    def connect_layers(self) -> None:
156
         self.main_layer.add(self.subject_layer)
146
         self.main_layer.add(self.subject_layer)
157
-        self.main_layer.add(self.top_layer)
158
 
147
 
159
-    def center(self):
160
-        self.interior_sprite.position = 0 + (self.interior_sprite.width/2), 0 + (self.interior_sprite.height/2)
161
-        self.background_sprite.position = 0 + (self.background_sprite.width/2), 0 + (self.background_sprite.height/2)
162
-        self.ground_layer.set_view(0, 0, self.ground_layer.px_width, self.ground_layer.px_height)
148
+    def center(self) -> None:
163
         self.subject_layer.position = 0, 0
149
         self.subject_layer.position = 0, 0
164
-        self.top_layer.set_view(0, 0, self.top_layer.px_width, self.top_layer.px_height)
165
 
150
 
166
     def add_subject(self, subject: 'Actor') -> None:
151
     def add_subject(self, subject: 'Actor') -> None:
167
         self.subject_layer.add_subject(subject)
152
         self.subject_layer.add_subject(subject)