Browse Source

draw interiors time gap: in config

Bastien Sevajol 7 years ago
parent
commit
38d72521c5
2 changed files with 11 additions and 3 deletions
  1. 3 0
      config.yaml
  2. 8 3
      opencombat/gui/base.py

+ 3 - 0
config.yaml View File

12
         walk_ref_time: 3
12
         walk_ref_time: 3
13
         run_ref_time: 1
13
         run_ref_time: 1
14
         crawl_ref_time: 10
14
         crawl_ref_time: 10
15
+    building:
16
+      draw_interior_gap: 2
17
+
15
 global:
18
 global:
16
     include_path:
19
     include_path:
17
       maps:
20
       maps:

+ 8 - 3
opencombat/gui/base.py View File

60
 class BackgroundLayer(cocos.layer.Layer):
60
 class BackgroundLayer(cocos.layer.Layer):
61
     def __init__(
61
     def __init__(
62
         self,
62
         self,
63
+        config: Config,
63
         layer_manager: LayerManager,
64
         layer_manager: LayerManager,
64
         background_sprite: cocos.sprite.Sprite,
65
         background_sprite: cocos.sprite.Sprite,
65
     ) -> None:
66
     ) -> None:
66
         super().__init__()
67
         super().__init__()
68
+        self.config = config
67
         self.layer_manager = layer_manager
69
         self.layer_manager = layer_manager
68
         self.background_sprite = background_sprite
70
         self.background_sprite = background_sprite
69
         self.last_interior_draw_timestamp = 0
71
         self.last_interior_draw_timestamp = 0
72
+        self.draw_interiors_gap = self.config.resolve(
73
+            'game.building.draw_interior_gap',
74
+            2,
75
+        )
70
         self.interior_manager = InteriorManager(TileMap(
76
         self.interior_manager = InteriorManager(TileMap(
71
             layer_manager.middleware.get_map_file_path(),
77
             layer_manager.middleware.get_map_file_path(),
72
         ))
78
         ))
77
 
83
 
78
     def draw_interiors(self):
84
     def draw_interiors(self):
79
         now = time.time()
85
         now = time.time()
80
-        # FIXME: config
81
-        if now - self.last_interior_draw_timestamp > 2:
86
+        if now - self.last_interior_draw_timestamp > self.draw_interiors_gap:
82
             self.last_interior_draw_timestamp = now
87
             self.last_interior_draw_timestamp = now
83
             subject_grid_positions = [
88
             subject_grid_positions = [
84
                 a.subject.position for a
89
                 a.subject.position for a
127
         super().init()
132
         super().init()
128
         self.interior_sprite = self.middleware.get_interior_sprite()
133
         self.interior_sprite = self.middleware.get_interior_sprite()
129
         background_sprite = self.middleware.get_background_sprite()
134
         background_sprite = self.middleware.get_background_sprite()
130
-        self.background_layer = BackgroundLayer(self, background_sprite)
135
+        self.background_layer = BackgroundLayer(self.config, self, background_sprite)
131
         self.background_layer.add(background_sprite)
136
         self.background_layer.add(background_sprite)
132
         self.ground_layer = self.middleware.get_ground_layer()
137
         self.ground_layer = self.middleware.get_ground_layer()
133
         self.top_layer = self.middleware.get_top_layer()
138
         self.top_layer = self.middleware.get_top_layer()