← Back to branch summary

~sjdv1982/hivesystem/trunk

« back to all changes in this revision

Viewing changes to manual/movingpanda/pandalib.py

  • Committer: Sjoerd de Vries
  • Date: 2014-06-09 10:19:38 UTC
  • mfrom: (182.1.43 hive-view)
  • Revision ID: sjdv1982@gmail.com-20140609101938-7ji5g0buo09r0se6
merged with hive-view branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
manual/movingpanda/pandalib.py
67
67
               dragonfly.scene.bind,
68
68
               dragonfly.time.bind,
69
69
               dragonfly.bind.bind):    
70
 
  bind_entity = "local"  
 
70
  bind_entity = "relative"  
71
71
  bind_keyboard = "indirect"
72
72
 
73
73
 
127
127
  connect(v_marker, hide_marker)
128
128
  show_marker = dragonfly.scene.unbound.show()
129
129
  connect(v_marker, show_marker)
130
 
  parent_marker = dragonfly.scene.unbound.parent(local=False,parent_local=True)
 
130
  parent_marker = dragonfly.scene.unbound.parent()
131
131
  connect(v_marker, parent_marker.entityname)
132
132
  connect(startsensor, hide_marker)
133
133
      
140
140
  t_panda_id_gen = dragonfly.std.transistor("id")()
141
141
  connect(panda_id_gen, t_panda_id_gen)
142
142
  connect(t_panda_id_gen, panda_id)
143
 
  random_matrix = dragonfly.std.generator("matrix", random_matrix_generator)()
144
 
  w_spawn = dragonfly.std.weaver(("id","matrix"))()
 
143
  random_matrix = dragonfly.std.generator(("object","matrix"), random_matrix_generator)()
 
144
  w_spawn = dragonfly.std.weaver(("id",("object","matrix")))()
145
145
  connect(panda_id, w_spawn.inp1)
146
146
  connect(random_matrix, w_spawn.inp2)
147
147
  
202
202
  key_k = dragonfly.io.keyboardsensor_trigger("K")
203
203
  connect(key_k, testkill)  
204
204
    
205
 
  do_spawn = dragonfly.std.transistor(("id","matrix"))()
 
205
  do_spawn = dragonfly.std.transistor(("id",("object","matrix")))()
206
206
  connect(w_spawn, do_spawn)
207
207
  connect(do_spawn, pandaspawn.spawn_matrix)
208
208
  trig_spawn = dragonfly.std.pushconnector("trigger")()