Browse Source

Cleanup of dynamic example

Björn Ritzl 7 months ago
parent
commit
788f1887e3
82 changed files with 92 additions and 181 deletions
  1. 77 0
      factory/dynamic/.editor_settings
  2. BIN
      factory/dynamic/assets/images/bar_round_large_grey.png
  3. BIN
      factory/dynamic/assets/images/bar_round_large_red.png
  4. BIN
      factory/dynamic/assets/images/bee/Bee01.png
  5. BIN
      factory/dynamic/assets/images/bee/Bee02.png
  6. BIN
      factory/dynamic/assets/images/bee/Bee03.png
  7. BIN
      factory/dynamic/assets/images/bee/Bee04.png
  8. BIN
      factory/dynamic/assets/images/bee/Bee05.png
  9. BIN
      factory/dynamic/assets/images/bee/Bee06.png
  10. BIN
      factory/dynamic/assets/images/bee/Bee07.png
  11. BIN
      factory/dynamic/assets/images/bee/Bee08.png
  12. BIN
      factory/dynamic/assets/images/bee/Bee09.png
  13. BIN
      factory/dynamic/assets/images/bee/Bee10.png
  14. BIN
      factory/dynamic/assets/images/bee/Bee11.png
  15. BIN
      factory/dynamic/assets/images/bee/Bee12.png
  16. BIN
      factory/dynamic/assets/images/bee/Bee13.png
  17. BIN
      factory/dynamic/assets/images/bee/Bee14.png
  18. BIN
      factory/dynamic/assets/images/bee/Bee15.png
  19. BIN
      factory/dynamic/assets/images/bee/Bee16.png
  20. BIN
      factory/dynamic/assets/images/bee/Bee17.png
  21. BIN
      factory/dynamic/assets/images/bee/Bee18.png
  22. BIN
      factory/dynamic/assets/images/bee/Bee19.png
  23. BIN
      factory/dynamic/assets/images/bee/Bee20.png
  24. BIN
      factory/dynamic/assets/images/bee/Bee21.png
  25. BIN
      factory/dynamic/assets/images/bee/Bee22.png
  26. BIN
      factory/dynamic/assets/images/bee/Bee23.png
  27. BIN
      factory/dynamic/assets/images/bee/Bee24.png
  28. BIN
      factory/dynamic/assets/images/bee/Bee_shot01.png
  29. BIN
      factory/dynamic/assets/images/bee/Bee_shot02.png
  30. BIN
      factory/dynamic/assets/images/bee/Bee_shot03.png
  31. BIN
      factory/dynamic/assets/images/bee/Bee_shot04.png
  32. BIN
      factory/dynamic/assets/images/bee/Bee_shot05.png
  33. BIN
      factory/dynamic/assets/images/bee/Bee_shot06.png
  34. BIN
      factory/dynamic/assets/images/bee/Bee_shot07.png
  35. BIN
      factory/dynamic/assets/images/bee/Bee_shot08.png
  36. BIN
      factory/dynamic/assets/images/bee/Bee_shot09.png
  37. BIN
      factory/dynamic/assets/images/bee/Bee_shot10.png
  38. BIN
      factory/dynamic/assets/images/bee/Sting01.png
  39. BIN
      factory/dynamic/assets/images/bee/Sting02.png
  40. BIN
      factory/dynamic/assets/images/bee/Sting03.png
  41. BIN
      factory/dynamic/assets/images/bee/Sting04.png
  42. BIN
      factory/dynamic/assets/images/bee/Sting05.png
  43. BIN
      factory/dynamic/assets/images/bee/Sting06.png
  44. BIN
      factory/dynamic/assets/images/bee/Sting07.png
  45. BIN
      factory/dynamic/assets/images/bee/Sting08.png
  46. BIN
      factory/dynamic/assets/images/bee/Sting09.png
  47. BIN
      factory/dynamic/assets/images/bunny1_ready.png
  48. BIN
      factory/dynamic/assets/images/bunny2_ready.png
  49. BIN
      factory/dynamic/assets/images/carrot.png
  50. BIN
      factory/dynamic/assets/images/close.png
  51. BIN
      factory/dynamic/assets/images/coin/dcoin_1.png
  52. BIN
      factory/dynamic/assets/images/coin/dcoin_2.png
  53. BIN
      factory/dynamic/assets/images/coin/dcoin_3.png
  54. BIN
      factory/dynamic/assets/images/coin/dcoin_4.png
  55. BIN
      factory/dynamic/assets/images/coin/dcoin_5.png
  56. BIN
      factory/dynamic/assets/images/crosshair010.png
  57. BIN
      factory/dynamic/assets/images/elementMetal001.png
  58. BIN
      factory/dynamic/assets/images/elementStone019.png
  59. BIN
      factory/dynamic/assets/images/elementStone023.png
  60. BIN
      factory/dynamic/assets/images/enemyBlack1.png
  61. BIN
      factory/dynamic/assets/images/enemyFloating_1.png
  62. BIN
      factory/dynamic/assets/images/green_button03.png
  63. BIN
      factory/dynamic/assets/images/grid.png
  64. BIN
      factory/dynamic/assets/images/header.png
  65. BIN
      factory/dynamic/assets/images/hitman1_machine.png
  66. BIN
      factory/dynamic/assets/images/logo-color.png
  67. BIN
      factory/dynamic/assets/images/pattern_circle.png
  68. BIN
      factory/dynamic/assets/images/plank_slice.png
  69. BIN
      factory/dynamic/assets/images/rainbow.png
  70. BIN
      factory/dynamic/assets/images/red_button12.png
  71. BIN
      factory/dynamic/assets/images/shipBeige_manned.png
  72. BIN
      factory/dynamic/assets/images/shipBlue_manned.png
  73. BIN
      factory/dynamic/assets/images/shipGreen_manned.png
  74. BIN
      factory/dynamic/assets/images/shipPink_manned.png
  75. BIN
      factory/dynamic/assets/images/smoke.png
  76. BIN
      factory/dynamic/assets/images/spinner.png
  77. BIN
      factory/dynamic/assets/images/tilesheet_complete.png
  78. 0 80
      factory/dynamic/assets/sprites.atlas
  79. BIN
      factory/dynamic/bullets_collection.png
  80. BIN
      factory/dynamic/dynamic_collection.png
  81. 8 0
      factory/dynamic/example.md
  82. 7 101
      factory/dynamic/example/dynamic.collection

+ 77 - 0
factory/dynamic/.editor_settings

@@ -0,0 +1,77 @@
+{
+  :bundle {
+    :android {
+      :architecture {
+        :arm64-android true
+        :armv7-android false
+      }
+      :format "apk"
+      :install false
+      :keystore "/Users/bjornritzl/projects/certificates-defold/android/defold.keystore"
+      :keystore-pass "/Users/bjornritzl/projects/certificates-defold/android/defold.keystore.pass.txt"
+      :launch false
+    }
+    :build-report true
+    :contentless false
+    :debug-symbols true
+    :html5 {
+      :architecture {
+        :js-web false
+        :wasm-web true
+      }
+    }
+    :ios {
+      :architecture {
+        :arm64-ios true
+        :x86_64-ios false
+      }
+      :code-signing-identity "Apple Development: Bjoern Ritzl (5HXMA7P46L)"
+      :install false
+      :launch false
+      :provisioning-profile "/Users/bjornritzl/projects/certificates-defold/apple/BR_Foobar.mobileprovision"
+      :sign true
+    }
+    :liveupdate false
+    :macos {
+      :architecture {
+        :arm64-macos true
+        :x86_64-macos true
+      }
+    }
+    :texture-compression "enabled"
+    :variant "release"
+    :windows {
+      :platform "x86_64-win32"
+    }
+  }
+  :code {
+    :find {
+      :case-sensitive true
+      :term "self.jump_timer"
+    }
+  }
+  :open-assets {
+    :term "game.p"
+  }
+  :search-in-files {
+    :exts "*.script, *.lua"
+    :include-libraries false
+    :term "ads_wrapper"
+  }
+  :workflow {
+    :recent-files [
+      [
+        "/example/dynamic.collection"
+        :scene
+      ]
+      [
+        "/example/bullets.collection"
+        :scene
+      ]
+      [
+        "/assets/sprites.atlas"
+        :scene
+      ]
+    ]
+  }
+}

BIN
factory/dynamic/assets/images/bar_round_large_grey.png


BIN
factory/dynamic/assets/images/bar_round_large_red.png


BIN
factory/dynamic/assets/images/bee/Bee01.png


BIN
factory/dynamic/assets/images/bee/Bee02.png


BIN
factory/dynamic/assets/images/bee/Bee03.png


BIN
factory/dynamic/assets/images/bee/Bee04.png


BIN
factory/dynamic/assets/images/bee/Bee05.png


BIN
factory/dynamic/assets/images/bee/Bee06.png


BIN
factory/dynamic/assets/images/bee/Bee07.png


BIN
factory/dynamic/assets/images/bee/Bee08.png


BIN
factory/dynamic/assets/images/bee/Bee09.png


BIN
factory/dynamic/assets/images/bee/Bee10.png


BIN
factory/dynamic/assets/images/bee/Bee11.png


BIN
factory/dynamic/assets/images/bee/Bee12.png


BIN
factory/dynamic/assets/images/bee/Bee13.png


BIN
factory/dynamic/assets/images/bee/Bee14.png


BIN
factory/dynamic/assets/images/bee/Bee15.png


BIN
factory/dynamic/assets/images/bee/Bee16.png


BIN
factory/dynamic/assets/images/bee/Bee17.png


BIN
factory/dynamic/assets/images/bee/Bee18.png


BIN
factory/dynamic/assets/images/bee/Bee19.png


BIN
factory/dynamic/assets/images/bee/Bee20.png


BIN
factory/dynamic/assets/images/bee/Bee21.png


BIN
factory/dynamic/assets/images/bee/Bee22.png


BIN
factory/dynamic/assets/images/bee/Bee23.png


BIN
factory/dynamic/assets/images/bee/Bee24.png


BIN
factory/dynamic/assets/images/bee/Bee_shot01.png


BIN
factory/dynamic/assets/images/bee/Bee_shot02.png


BIN
factory/dynamic/assets/images/bee/Bee_shot03.png


BIN
factory/dynamic/assets/images/bee/Bee_shot04.png


BIN
factory/dynamic/assets/images/bee/Bee_shot05.png


BIN
factory/dynamic/assets/images/bee/Bee_shot06.png


BIN
factory/dynamic/assets/images/bee/Bee_shot07.png


BIN
factory/dynamic/assets/images/bee/Bee_shot08.png


BIN
factory/dynamic/assets/images/bee/Bee_shot09.png


BIN
factory/dynamic/assets/images/bee/Bee_shot10.png


BIN
factory/dynamic/assets/images/bee/Sting01.png


BIN
factory/dynamic/assets/images/bee/Sting02.png


BIN
factory/dynamic/assets/images/bee/Sting03.png


BIN
factory/dynamic/assets/images/bee/Sting04.png


BIN
factory/dynamic/assets/images/bee/Sting05.png


BIN
factory/dynamic/assets/images/bee/Sting06.png


BIN
factory/dynamic/assets/images/bee/Sting07.png


BIN
factory/dynamic/assets/images/bee/Sting08.png


BIN
factory/dynamic/assets/images/bee/Sting09.png


BIN
factory/dynamic/assets/images/bunny1_ready.png


BIN
factory/dynamic/assets/images/bunny2_ready.png


BIN
factory/dynamic/assets/images/carrot.png


BIN
factory/dynamic/assets/images/close.png


BIN
factory/dynamic/assets/images/coin/dcoin_1.png


BIN
factory/dynamic/assets/images/coin/dcoin_2.png


BIN
factory/dynamic/assets/images/coin/dcoin_3.png


BIN
factory/dynamic/assets/images/coin/dcoin_4.png


BIN
factory/dynamic/assets/images/coin/dcoin_5.png


BIN
factory/dynamic/assets/images/crosshair010.png


BIN
factory/dynamic/assets/images/elementMetal001.png


BIN
factory/dynamic/assets/images/elementStone019.png


BIN
factory/dynamic/assets/images/elementStone023.png


BIN
factory/dynamic/assets/images/enemyBlack1.png


BIN
factory/dynamic/assets/images/enemyFloating_1.png


BIN
factory/dynamic/assets/images/green_button03.png


BIN
factory/dynamic/assets/images/grid.png


BIN
factory/dynamic/assets/images/header.png


BIN
factory/dynamic/assets/images/hitman1_machine.png


BIN
factory/dynamic/assets/images/logo-color.png


BIN
factory/dynamic/assets/images/pattern_circle.png


BIN
factory/dynamic/assets/images/plank_slice.png


BIN
factory/dynamic/assets/images/rainbow.png


BIN
factory/dynamic/assets/images/red_button12.png


BIN
factory/dynamic/assets/images/shipBeige_manned.png


BIN
factory/dynamic/assets/images/shipBlue_manned.png


BIN
factory/dynamic/assets/images/shipGreen_manned.png


BIN
factory/dynamic/assets/images/shipPink_manned.png


BIN
factory/dynamic/assets/images/smoke.png


BIN
factory/dynamic/assets/images/spinner.png


BIN
factory/dynamic/assets/images/tilesheet_complete.png


+ 0 - 80
factory/dynamic/assets/sprites.atlas

@@ -1,93 +1,13 @@
-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

BIN
factory/dynamic/bullets_collection.png


BIN
factory/dynamic/dynamic_collection.png


+ 8 - 0
factory/dynamic/example.md

@@ -13,3 +13,11 @@ ship
   - A *Factory* component to spawn bullet game objects. This component has the *Dynamic Protoype* option checked.
   - A *Collection Proxy* component referencing a collection containing all bullet types
   - A *Script* component to handle spawning of bullets.
+
+All bullets are added in the bullets.collection:
+
+![](bullets_collection.png)
+
+The bullets.collection is referenced from the dynamic.collection as a collection proxy:
+
+![](bullets_collection.png)

+ 7 - 101
factory/dynamic/example/dynamic.collection

@@ -5,129 +5,59 @@ embedded_instances {
   data: "components {\n"
   "  id: \"dynamic\"\n"
   "  component: \"/example/dynamic.script\"\n"
-  "  position {\n"
-  "    x: 0.0\n"
-  "    y: 0.0\n"
-  "    z: 0.0\n"
-  "  }\n"
-  "  rotation {\n"
-  "    x: 0.0\n"
-  "    y: 0.0\n"
-  "    z: 0.0\n"
-  "    w: 1.0\n"
-  "  }\n"
-  "  property_decls {\n"
-  "  }\n"
   "}\n"
   "embedded_components {\n"
   "  id: \"bulletfactory\"\n"
   "  type: \"factory\"\n"
   "  data: \"prototype: \\\"/example/flame.go\\\"\\n"
-  "load_dynamically: false\\n"
   "dynamic_prototype: true\\n"
   "\"\n"
-  "  position {\n"
-  "    x: 0.0\n"
-  "    y: 0.0\n"
-  "    z: 0.0\n"
-  "  }\n"
-  "  rotation {\n"
-  "    x: 0.0\n"
-  "    y: 0.0\n"
-  "    z: 0.0\n"
-  "    w: 1.0\n"
-  "  }\n"
   "}\n"
   "embedded_components {\n"
   "  id: \"bullets\"\n"
   "  type: \"collectionproxy\"\n"
   "  data: \"collection: \\\"/example/bullets.collection\\\"\\n"
-  "exclude: false\\n"
   "\"\n"
-  "  position {\n"
-  "    x: 0.0\n"
-  "    y: 0.0\n"
-  "    z: 0.0\n"
-  "  }\n"
-  "  rotation {\n"
-  "    x: 0.0\n"
-  "    y: 0.0\n"
-  "    z: 0.0\n"
-  "    w: 1.0\n"
-  "  }\n"
   "}\n"
   "embedded_components {\n"
   "  id: \"sprite\"\n"
   "  type: \"sprite\"\n"
-  "  data: \"tile_set: \\\"/assets/sprites.atlas\\\"\\n"
-  "default_animation: \\\"playerShip1_red\\\"\\n"
+  "  data: \"default_animation: \\\"playerShip1_red\\\"\\n"
   "material: \\\"/builtins/materials/sprite.material\\\"\\n"
-  "blend_mode: BLEND_MODE_ALPHA\\n"
+  "textures {\\n"
+  "  sampler: \\\"texture_sampler\\\"\\n"
+  "  texture: \\\"/assets/sprites.atlas\\\"\\n"
+  "}\\n"
   "\"\n"
   "  position {\n"
-  "    x: 0.0\n"
-  "    y: 0.0\n"
   "    z: 1.0\n"
   "  }\n"
-  "  rotation {\n"
-  "    x: 0.0\n"
-  "    y: 0.0\n"
-  "    z: 0.0\n"
-  "    w: 1.0\n"
-  "  }\n"
   "}\n"
   ""
   position {
     x: 360.0
     y: 116.0
-    z: 0.0
-  }
-  rotation {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  scale3 {
-    x: 1.0
-    y: 1.0
-    z: 1.0
   }
 }
 embedded_instances {
-  id: "go1"
+  id: "go"
   data: "embedded_components {\n"
-  "  id: \"label1\"\n"
+  "  id: \"instructions\"\n"
   "  type: \"label\"\n"
   "  data: \"size {\\n"
   "  x: 128.0\\n"
   "  y: 32.0\\n"
-  "  z: 0.0\\n"
-  "  w: 0.0\\n"
   "}\\n"
   "color {\\n"
   "  x: 0.0\\n"
   "  y: 0.5647059\\n"
   "  z: 0.99215686\\n"
-  "  w: 1.0\\n"
   "}\\n"
   "outline {\\n"
   "  x: 1.0\\n"
   "  y: 1.0\\n"
   "  z: 1.0\\n"
-  "  w: 1.0\\n"
   "}\\n"
-  "shadow {\\n"
-  "  x: 0.0\\n"
-  "  y: 0.0\\n"
-  "  z: 0.0\\n"
-  "  w: 1.0\\n"
-  "}\\n"
-  "leading: 1.0\\n"
-  "tracking: 0.0\\n"
-  "pivot: PIVOT_CENTER\\n"
-  "blend_mode: BLEND_MODE_ALPHA\\n"
-  "line_break: false\\n"
   "text: \\\"Click/spacebar to change bullet\\\"\\n"
   "font: \\\"/assets/text48.font\\\"\\n"
   "material: \\\"/builtins/fonts/label.material\\\"\\n"
@@ -135,35 +65,11 @@ embedded_instances {
   "  position {\n"
   "    x: 360.0\n"
   "    y: 20.0\n"
-  "    z: 0.0\n"
-  "  }\n"
-  "  rotation {\n"
-  "    x: 0.0\n"
-  "    y: 0.0\n"
-  "    z: 0.0\n"
-  "    w: 1.0\n"
   "  }\n"
   "  scale {\n"
   "    x: 0.5\n"
   "    y: 0.5\n"
-  "    z: 1.0\n"
   "  }\n"
   "}\n"
   ""
-  position {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-  }
-  rotation {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  scale3 {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-  }
 }