Browse Source

refact rocks configuration

Bastien Sevajol 9 years ago
parent
commit
1f610488a2
2 changed files with 19 additions and 37 deletions
  1. 11 36
      intelligine/synergy/RocksConfiguration.py
  2. 8 1
      intelligine/synergy/object/Rock.py

+ 11 - 36
intelligine/synergy/RocksConfiguration.py View File

@@ -1,8 +1,5 @@
1 1
 from synergine.synergy.collection.Configuration import Configuration
2 2
 from intelligine.synergy.object.Rock import Rock
3
-from synergine.metas import metas
4
-from intelligine.cst import IMPENETRABLE
5
-from synergine.synergy.Simulation import Simulation
6 3
 
7 4
 
8 5
 class RocksConfiguration(Configuration):
@@ -10,46 +7,24 @@ class RocksConfiguration(Configuration):
10 7
     def get_start_objects(self, collection):
11 8
 
12 9
       rocks = []
10
+      rocks_positions = []
13 11
 
14 12
       for i in range(100):
15
-          rock = Rock()
16
-          metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
17
-          rock.set_position((0, 0+i, 0))
18
-          rocks.append(rock)
19
-
20
-      for i in range(100):
21
-          rock = Rock()
22
-          metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
23
-          rock.set_position((0, 0+i, 50))
24
-          rocks.append(rock)
25
-
26
-      for i in range(50):
27
-          rock = Rock()
28
-          rock.set_position((0, 0, 0+i))
29
-          metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
30
-          rocks.append(rock)
13
+          rocks_positions.append((0, 0+i, 0))
14
+          rocks_positions.append((0, 0+i, 50))
31 15
 
32 16
       for i in range(50):
17
+          rocks_positions.append((0, 0, 0+i))
33 18
           if i is not 25:
34
-            rock = Rock()
35
-            rock.set_position((0, 50, 0+i))
36
-            metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
37
-            rocks.append(rock)
19
+              rocks_positions.append((0, 50, 0+i))
20
+          rocks_positions.append((0, 100, 0+i))
38 21
 
39
-      for i in range(50):
22
+      rocks_positions.append((0, 50, 50))
23
+      rocks_positions.append((0, 100, 50))
24
+
25
+      for rock_position in rocks_positions:
40 26
           rock = Rock()
41
-          rock.set_position((0, 100, 0+i))
42
-          metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
27
+          rock.set_position(rock_position)
43 28
           rocks.append(rock)
44 29
 
45
-      rock = Rock()
46
-      rock.set_position((0, 50, 50))
47
-      metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
48
-      rocks.append(rock)
49
-
50
-      rock = Rock()
51
-      rock.set_position((0, 100, 50))
52
-      metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
53
-      rocks.append(rock)
54
-
55 30
       return rocks

+ 8 - 1
intelligine/synergy/object/Rock.py View File

@@ -1,4 +1,11 @@
1 1
 from xyzworld.SynergyObject import SynergyObject as XyzSynergyObject
2
+from synergine.metas import metas
3
+from intelligine.cst import IMPENETRABLE
4
+from synergine.synergy.Simulation import Simulation
5
+
2 6
 
3 7
 class Rock(XyzSynergyObject):
4
-  pass
8
+
9
+    def __init__(self):
10
+        super().__init__()
11
+        metas.list.add(Simulation.STATE, self.get_id(), IMPENETRABLE)