Przeglądaj źródła

Input bindings use `all` where possible and fixing some examples (#77)

* "animation" examples input refactoring

* "basics" examples input refactoring

* Refactor input bindings

* Update confetti example to keep only required content

* Update fireworks example

* Update mouse_and_touch input bindings

* Clean up unlit example

* Clean up screen space example

* Clean up debug/profiler example
Artsiom Trubchyk 4 miesięcy temu
rodzic
commit
49bcd60ad9
100 zmienionych plików z 36 dodań i 1361 usunięć
  1. 1 1
      animation/basic_tween/game.project
  2. 0 44
      animation/basic_tween/input/game.input_binding
  3. 1 1
      animation/chained_tween/game.project
  4. 0 44
      animation/chained_tween/input/game.input_binding
  5. 1 1
      animation/cursor/game.project
  6. 0 44
      animation/cursor/input/game.input_binding
  7. 2 2
      animation/easing/example/controller.script
  8. 1 1
      animation/easing/game.project
  9. 0 44
      animation/easing/input/game.input_binding
  10. 1 1
      animation/euler_rotation/game.project
  11. 0 44
      animation/euler_rotation/input/game.input_binding
  12. 1 1
      animation/flipbook/game.project
  13. 0 44
      animation/flipbook/input/game.input_binding
  14. 1 1
      animation/spine/game.project
  15. 0 44
      animation/spine/input/game.input_binding
  16. 1 1
      animation/spinner/game.project
  17. 0 44
      animation/spinner/input/game.input_binding
  18. 1 1
      basics/message_passing/game.project
  19. 0 44
      basics/message_passing/input/game.input_binding
  20. 1 1
      basics/parent_child/game.project
  21. 0 44
      basics/parent_child/input/game.input_binding
  22. 1 1
      basics/z_order/game.project
  23. 0 44
      basics/z_order/input/game.input_binding
  24. 1 1
      collection/proxy/game.project
  25. 0 44
      collection/proxy/input/game.input_binding
  26. 1 1
      collection/splash/game.project
  27. 0 44
      collection/splash/input/game.input_binding
  28. 3 3
      collection/timestep/example/game.script
  29. 1 1
      collection/timestep/game.project
  30. 0 44
      collection/timestep/input/game.input_binding
  31. 1 1
      debug/physics/game.project
  32. 0 44
      debug/physics/input/game.input_binding
  33. BIN
      debug/profile/assets/images/bar_round_large_grey.png
  34. BIN
      debug/profile/assets/images/bar_round_large_red.png
  35. BIN
      debug/profile/assets/images/bunny1_ready.png
  36. BIN
      debug/profile/assets/images/bunny2_ready.png
  37. BIN
      debug/profile/assets/images/carrot.png
  38. BIN
      debug/profile/assets/images/close.png
  39. BIN
      debug/profile/assets/images/coin/dcoin_1.png
  40. BIN
      debug/profile/assets/images/coin/dcoin_2.png
  41. BIN
      debug/profile/assets/images/coin/dcoin_3.png
  42. BIN
      debug/profile/assets/images/coin/dcoin_4.png
  43. BIN
      debug/profile/assets/images/coin/dcoin_5.png
  44. BIN
      debug/profile/assets/images/crosshair010.png
  45. BIN
      debug/profile/assets/images/elementMetal001.png
  46. BIN
      debug/profile/assets/images/elementStone019.png
  47. BIN
      debug/profile/assets/images/elementStone023.png
  48. BIN
      debug/profile/assets/images/enemyBlack1.png
  49. BIN
      debug/profile/assets/images/enemyFloating_1.png
  50. BIN
      debug/profile/assets/images/flame.png
  51. BIN
      debug/profile/assets/images/green_button03.png
  52. BIN
      debug/profile/assets/images/grid.png
  53. BIN
      debug/profile/assets/images/header.png
  54. BIN
      debug/profile/assets/images/hitman1_machine.png
  55. BIN
      debug/profile/assets/images/laserYellow_burst.png
  56. BIN
      debug/profile/assets/images/lighting_blue.png
  57. BIN
      debug/profile/assets/images/logo-color.png
  58. BIN
      debug/profile/assets/images/particle_brown.png
  59. BIN
      debug/profile/assets/images/pattern_circle.png
  60. BIN
      debug/profile/assets/images/plank_slice.png
  61. BIN
      debug/profile/assets/images/playerShip1_red.png
  62. BIN
      debug/profile/assets/images/rainbow.png
  63. BIN
      debug/profile/assets/images/red_button12.png
  64. BIN
      debug/profile/assets/images/shipBeige_manned.png
  65. BIN
      debug/profile/assets/images/shipBlue_manned.png
  66. BIN
      debug/profile/assets/images/shipGreen_manned.png
  67. BIN
      debug/profile/assets/images/shipPink_manned.png
  68. BIN
      debug/profile/assets/images/smoke.png
  69. BIN
      debug/profile/assets/images/spinner.png
  70. BIN
      debug/profile/assets/images/tilesheet_complete.png
  71. 0 93
      debug/profile/assets/sprites.atlas
  72. 1 1
      debug/profile/game.project
  73. 0 44
      debug/profile/input/game.input_binding
  74. 1 1
      factory/basic/game.project
  75. 0 44
      factory/basic/input/game.input_binding
  76. 1 1
      factory/bullets/example/player.script
  77. 1 1
      factory/bullets/game.project
  78. 0 44
      factory/bullets/input/game.input_binding
  79. 1 1
      factory/dynamic/example/dynamic.script
  80. 1 1
      factory/dynamic/game.project
  81. 0 44
      factory/dynamic/input/game.input_binding
  82. 1 1
      file/sys_save_load/game.project
  83. 0 44
      file/sys_save_load/input/game.input_binding
  84. 1 1
      gui/button/game.project
  85. 0 44
      gui/button/input/game.input_binding
  86. 1 1
      gui/color/game.project
  87. 0 44
      gui/color/input/game.input_binding
  88. 1 1
      gui/drag/game.project
  89. 0 44
      gui/drag/input/game.input_binding
  90. 1 1
      gui/get_set_font/game.project
  91. 0 44
      gui/get_set_font/input/game.input_binding
  92. 1 1
      gui/get_set_material/game.project
  93. 0 44
      gui/get_set_material/input/game.input_binding
  94. 1 1
      gui/get_set_texture/game.project
  95. 0 44
      gui/get_set_texture/input/game.input_binding
  96. 1 1
      gui/healthbar/game.project
  97. 0 44
      gui/healthbar/input/game.input_binding
  98. 1 1
      gui/layouts/game.project
  99. 0 44
      gui/layouts/input/game.input_binding
  100. 1 1
      gui/load_texture/game.project

+ 1 - 1
animation/basic_tween/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/basic_tween.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
animation/basic_tween/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
animation/chained_tween/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/chained_tween.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
animation/chained_tween/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
animation/cursor/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/cursor.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
animation/cursor/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 2 - 2
animation/easing/example/controller.script

@@ -52,9 +52,9 @@ function on_message(self, message_id, message, sender)
 end
 
 function on_input(self, action_id, action)
-	if action_id == hash("left") and action.pressed then
+	if action_id == hash("key_left") and action.pressed then
 		change_easing_demo(self, PREVIOUS)
-	elseif action_id == hash("right") and action.pressed then
+	elseif action_id == hash("key_right") and action.pressed then
 		change_easing_demo(self, NEXT)
 	end
 end

+ 1 - 1
animation/easing/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/easing.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
animation/easing/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
animation/euler_rotation/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/euler_rotation.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
animation/euler_rotation/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
animation/flipbook/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/flipbook.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
animation/flipbook/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
animation/spine/game.project

@@ -7,7 +7,7 @@ dependencies#0 = https://github.com/defold/extension-spine/archive/refs/tags/3.6
 main_collection = /example/spine.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
animation/spine/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
animation/spinner/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/spinner.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
animation/spinner/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
basics/message_passing/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/message_passing.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
basics/message_passing/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
basics/parent_child/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/parent_child.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
basics/parent_child/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
basics/z_order/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/z_order.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
basics/z_order/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
collection/proxy/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/proxy.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
collection/proxy/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
collection/splash/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/splash.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
collection/splash/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 3 - 3
collection/timestep/example/game.script

@@ -10,11 +10,11 @@ function init(self)
 end
 
 function on_input(self, action_id, action)
-	if action_id == hash("left") then
+	if action_id == hash("key_left") then
 		msg.post("timestep:/controller", "change_speed", { amount = -0.01 })
-	elseif action_id == hash("right") then
+	elseif action_id == hash("key_right") then
 		msg.post("timestep:/controller", "change_speed", { amount = 0.01 })
-	elseif action_id == hash("action") and action.pressed then
+	elseif action_id == hash("key_space") and action.pressed then
 		-- flip self.to between 0 and 3 each time
 		self.to = 3 - (self.to or 0)
 		msg.post("timestep:/controller", "animate_speed", { to = self.to })

+ 1 - 1
collection/timestep/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/timestep.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
collection/timestep/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
debug/physics/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/physics.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
debug/physics/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

BIN
debug/profile/assets/images/bar_round_large_grey.png


BIN
debug/profile/assets/images/bar_round_large_red.png


BIN
debug/profile/assets/images/bunny1_ready.png


BIN
debug/profile/assets/images/bunny2_ready.png


BIN
debug/profile/assets/images/carrot.png


BIN
debug/profile/assets/images/close.png


BIN
debug/profile/assets/images/coin/dcoin_1.png


BIN
debug/profile/assets/images/coin/dcoin_2.png


BIN
debug/profile/assets/images/coin/dcoin_3.png


BIN
debug/profile/assets/images/coin/dcoin_4.png


BIN
debug/profile/assets/images/coin/dcoin_5.png


BIN
debug/profile/assets/images/crosshair010.png


BIN
debug/profile/assets/images/elementMetal001.png


BIN
debug/profile/assets/images/elementStone019.png


BIN
debug/profile/assets/images/elementStone023.png


BIN
debug/profile/assets/images/enemyBlack1.png


BIN
debug/profile/assets/images/enemyFloating_1.png


BIN
debug/profile/assets/images/flame.png


BIN
debug/profile/assets/images/green_button03.png


BIN
debug/profile/assets/images/grid.png


BIN
debug/profile/assets/images/header.png


BIN
debug/profile/assets/images/hitman1_machine.png


BIN
debug/profile/assets/images/laserYellow_burst.png


BIN
debug/profile/assets/images/lighting_blue.png


BIN
debug/profile/assets/images/logo-color.png


BIN
debug/profile/assets/images/particle_brown.png


BIN
debug/profile/assets/images/pattern_circle.png


BIN
debug/profile/assets/images/plank_slice.png


BIN
debug/profile/assets/images/playerShip1_red.png


BIN
debug/profile/assets/images/rainbow.png


BIN
debug/profile/assets/images/red_button12.png


BIN
debug/profile/assets/images/shipBeige_manned.png


BIN
debug/profile/assets/images/shipBlue_manned.png


BIN
debug/profile/assets/images/shipGreen_manned.png


BIN
debug/profile/assets/images/shipPink_manned.png


BIN
debug/profile/assets/images/smoke.png


BIN
debug/profile/assets/images/spinner.png


BIN
debug/profile/assets/images/tilesheet_complete.png


+ 0 - 93
debug/profile/assets/sprites.atlas

@@ -1,93 +0,0 @@
-images {
-  image: "/assets/images/spinner.png"
-}
-images {
-  image: "/assets/images/elementStone019.png"
-}
-images {
-  image: "/assets/images/elementStone023.png"
-}
-images {
-  image: "/assets/images/bunny1_ready.png"
-}
-images {
-  image: "/assets/images/bunny2_ready.png"
-}
-images {
-  image: "/assets/images/carrot.png"
-}
-images {
-  image: "/assets/images/red_button12.png"
-}
-images {
-  image: "/assets/images/flame.png"
-}
-images {
-  image: "/assets/images/smoke.png"
-}
-images {
-  image: "/assets/images/rainbow.png"
-}
-images {
-  image: "/assets/images/enemyFloating_1.png"
-}
-images {
-  image: "/assets/images/logo-color.png"
-}
-images {
-  image: "/assets/images/shipGreen_manned.png"
-}
-images {
-  image: "/assets/images/elementMetal001.png"
-}
-images {
-  image: "/assets/images/plank_slice.png"
-}
-images {
-  image: "/assets/images/hitman1_machine.png"
-}
-images {
-  image: "/assets/images/green_button03.png"
-}
-images {
-  image: "/assets/images/playerShip1_red.png"
-}
-images {
-  image: "/assets/images/enemyBlack1.png"
-}
-images {
-  image: "/assets/images/lighting_blue.png"
-}
-images {
-  image: "/assets/images/particle_brown.png"
-}
-images {
-  image: "/assets/images/crosshair010.png"
-}
-images {
-  image: "/assets/images/bar_round_large_grey.png"
-}
-images {
-  image: "/assets/images/bar_round_large_red.png"
-}
-animations {
-  id: "coin"
-  images {
-    image: "/assets/images/coin/dcoin_1.png"
-  }
-  images {
-    image: "/assets/images/coin/dcoin_2.png"
-  }
-  images {
-    image: "/assets/images/coin/dcoin_3.png"
-  }
-  images {
-    image: "/assets/images/coin/dcoin_4.png"
-  }
-  images {
-    image: "/assets/images/coin/dcoin_5.png"
-  }
-  playback: PLAYBACK_LOOP_FORWARD
-  fps: 8
-}
-extrude_borders: 2

+ 1 - 1
debug/profile/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/profile.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
debug/profile/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
factory/basic/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/basicfactory.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
factory/basic/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
factory/bullets/example/player.script

@@ -5,7 +5,7 @@ end
 
 function on_input(self, action_id, action)
 	-- mouse or spacebar
-	if (action_id == hash("touch") or action_id == hash("action")) and action.pressed then
+	if (action_id == hash("touch") or action_id == hash("key_space")) and action.pressed then
 		-- position bullet somewhat offset from the player position
 		local pos = go.get_position()
 		pos.y = pos.y + 50

+ 1 - 1
factory/bullets/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/bullets.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
factory/bullets/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
factory/dynamic/example/dynamic.script

@@ -24,7 +24,7 @@ end
 
 function on_input(self, action_id, action)
 	-- mouse or spacebar
-	if (action_id == hash("touch") or action_id == hash("action")) and action.pressed then
+	if (action_id == hash("touch") or action_id == hash("key_space")) and action.pressed then
 		-- next bullet prototype, wrap around to the first
 		self.bullet_index = self.bullet_index + 1
 		if self.bullet_index > #self.bullets then

+ 1 - 1
factory/dynamic/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/dynamic.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
factory/dynamic/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
file/sys_save_load/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/sys_save_load.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
file/sys_save_load/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
gui/button/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/button.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
gui/button/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
gui/color/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/color.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
gui/color/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
gui/drag/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/drag.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
gui/drag/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
gui/get_set_font/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/get_set_font.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
gui/get_set_font/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
gui/get_set_material/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/get_set_material.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
gui/get_set_material/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
gui/get_set_texture/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/get_set_texture.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
gui/get_set_texture/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
gui/healthbar/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/healthbar.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
gui/healthbar/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
gui/layouts/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/layouts.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

+ 0 - 44
gui/layouts/input/game.input_binding

@@ -1,44 +0,0 @@
-key_trigger {
-  input: KEY_UP
-  action: "up"
-}
-key_trigger {
-  input: KEY_DOWN
-  action: "down"
-}
-key_trigger {
-  input: KEY_LEFT
-  action: "left"
-}
-key_trigger {
-  input: KEY_RIGHT
-  action: "right"
-}
-key_trigger {
-  input: KEY_BACKSPACE
-  action: "backspace"
-}
-key_trigger {
-  input: KEY_SPACE
-  action: "action"
-}
-mouse_trigger {
-  input: MOUSE_BUTTON_LEFT
-  action: "touch"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_UP
-  action: "wheel_up"
-}
-mouse_trigger {
-  input: MOUSE_WHEEL_DOWN
-  action: "wheel_down"
-}
-touch_trigger {
-  input: TOUCH_MULTI
-  action: "multitouch"
-}
-text_trigger {
-  input: TEXT
-  action: "type"
-}

+ 1 - 1
gui/load_texture/game.project

@@ -6,7 +6,7 @@ version = 0.1
 main_collection = /example/load_texture.collectionc
 
 [input]
-game_binding = /input/game.input_bindingc
+game_binding = /builtins/input/all.input_bindingc
 repeat_interval = 0.05
 
 [display]

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików