Björn Ritzl преди 3 години
родител
ревизия
089ace947d
променени са 72 файла, в които са добавени 675 реда и са изтрити 76 реда
  1. 0 66
      assets/cat.atlas
  2. 0 0
      assets/cat.json
  3. 0 3
      assets/cat.spinescene
  4. BIN
      assets/cat_images/back_arm01.png
  5. BIN
      assets/cat_images/back_arm02.png
  6. BIN
      assets/cat_images/back_foot.png
  7. BIN
      assets/cat_images/back_leg01.png
  8. BIN
      assets/cat_images/back_leg02.png
  9. BIN
      assets/cat_images/back_paw.png
  10. BIN
      assets/cat_images/body.png
  11. BIN
      assets/cat_images/eyelids.png
  12. BIN
      assets/cat_images/front_arm01.png
  13. BIN
      assets/cat_images/front_arm02.png
  14. BIN
      assets/cat_images/front_foot.png
  15. BIN
      assets/cat_images/front_leg01.png
  16. BIN
      assets/cat_images/front_leg02.png
  17. BIN
      assets/cat_images/front_paw.png
  18. BIN
      assets/cat_images/hat.png
  19. BIN
      assets/cat_images/head.png
  20. BIN
      assets/cat_images/left_ear.png
  21. BIN
      assets/cat_images/lower_body.png
  22. BIN
      assets/cat_images/mouth_open.png
  23. BIN
      assets/cat_images/right_ear.png
  24. 0 0
      assets/cat_images/run.json
  25. BIN
      assets/cat_images/tail.png
  26. BIN
      assets/spineboy/images/crosshair.png
  27. BIN
      assets/spineboy/images/eye-indifferent.png
  28. BIN
      assets/spineboy/images/eye-surprised.png
  29. BIN
      assets/spineboy/images/front-bracer.png
  30. BIN
      assets/spineboy/images/front-fist-closed.png
  31. BIN
      assets/spineboy/images/front-fist-open.png
  32. BIN
      assets/spineboy/images/front-foot.png
  33. BIN
      assets/spineboy/images/front-shin.png
  34. BIN
      assets/spineboy/images/front-thigh.png
  35. BIN
      assets/spineboy/images/front-upper-arm.png
  36. BIN
      assets/spineboy/images/goggles.png
  37. BIN
      assets/spineboy/images/gun.png
  38. BIN
      assets/spineboy/images/head.png
  39. BIN
      assets/spineboy/images/hoverboard-board.png
  40. BIN
      assets/spineboy/images/hoverboard-thruster.png
  41. BIN
      assets/spineboy/images/hoverglow-small.png
  42. BIN
      assets/spineboy/images/mouth-grind.png
  43. BIN
      assets/spineboy/images/mouth-oooo.png
  44. BIN
      assets/spineboy/images/mouth-smile.png
  45. BIN
      assets/spineboy/images/muzzle-glow.png
  46. BIN
      assets/spineboy/images/muzzle-ring.png
  47. BIN
      assets/spineboy/images/muzzle01.png
  48. BIN
      assets/spineboy/images/muzzle02.png
  49. BIN
      assets/spineboy/images/muzzle03.png
  50. BIN
      assets/spineboy/images/muzzle04.png
  51. BIN
      assets/spineboy/images/muzzle05.png
  52. BIN
      assets/spineboy/images/neck.png
  53. BIN
      assets/spineboy/images/portal-bg.png
  54. BIN
      assets/spineboy/images/portal-flare1.png
  55. BIN
      assets/spineboy/images/portal-flare2.png
  56. BIN
      assets/spineboy/images/portal-flare3.png
  57. BIN
      assets/spineboy/images/portal-shade.png
  58. BIN
      assets/spineboy/images/portal-streaks1.png
  59. BIN
      assets/spineboy/images/portal-streaks2.png
  60. BIN
      assets/spineboy/images/rear-bracer.png
  61. BIN
      assets/spineboy/images/rear-foot.png
  62. BIN
      assets/spineboy/images/rear-shin.png
  63. BIN
      assets/spineboy/images/rear-thigh.png
  64. BIN
      assets/spineboy/images/rear-upper-arm.png
  65. BIN
      assets/spineboy/images/torso.png
  66. 124 0
      assets/spineboy/spineboy.atlas
  67. 541 0
      assets/spineboy/spineboy.spinejson
  68. 3 0
      assets/spineboy/spineboy.spinescene
  69. 4 4
      examples/animation/spine/spine.collection
  70. BIN
      examples/animation/spine/spine.png
  71. 2 2
      examples/animation/spine/spine.script
  72. 1 1
      game.project

+ 0 - 66
assets/cat.atlas

@@ -1,66 +0,0 @@
-images {
-  image: "/assets/cat_images/back_arm01.png"
-}
-images {
-  image: "/assets/cat_images/back_arm02.png"
-}
-images {
-  image: "/assets/cat_images/back_foot.png"
-}
-images {
-  image: "/assets/cat_images/back_leg01.png"
-}
-images {
-  image: "/assets/cat_images/back_leg02.png"
-}
-images {
-  image: "/assets/cat_images/back_paw.png"
-}
-images {
-  image: "/assets/cat_images/body.png"
-}
-images {
-  image: "/assets/cat_images/eyelids.png"
-}
-images {
-  image: "/assets/cat_images/front_arm01.png"
-}
-images {
-  image: "/assets/cat_images/front_arm02.png"
-}
-images {
-  image: "/assets/cat_images/front_foot.png"
-}
-images {
-  image: "/assets/cat_images/front_leg01.png"
-}
-images {
-  image: "/assets/cat_images/front_leg02.png"
-}
-images {
-  image: "/assets/cat_images/front_paw.png"
-}
-images {
-  image: "/assets/cat_images/hat.png"
-}
-images {
-  image: "/assets/cat_images/head.png"
-}
-images {
-  image: "/assets/cat_images/left_ear.png"
-}
-images {
-  image: "/assets/cat_images/lower_body.png"
-}
-images {
-  image: "/assets/cat_images/mouth_open.png"
-}
-images {
-  image: "/assets/cat_images/right_ear.png"
-}
-images {
-  image: "/assets/cat_images/tail.png"
-}
-margin: 0
-extrude_borders: 2
-inner_padding: 0

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
assets/cat.json


+ 0 - 3
assets/cat.spinescene

@@ -1,3 +0,0 @@
-spine_json: "/assets/cat.json"
-atlas: "/assets/cat.atlas"
-sample_rate: 30.0

BIN
assets/cat_images/back_arm01.png


BIN
assets/cat_images/back_arm02.png


BIN
assets/cat_images/back_foot.png


BIN
assets/cat_images/back_leg01.png


BIN
assets/cat_images/back_leg02.png


BIN
assets/cat_images/back_paw.png


BIN
assets/cat_images/body.png


BIN
assets/cat_images/eyelids.png


BIN
assets/cat_images/front_arm01.png


BIN
assets/cat_images/front_arm02.png


BIN
assets/cat_images/front_foot.png


BIN
assets/cat_images/front_leg01.png


BIN
assets/cat_images/front_leg02.png


BIN
assets/cat_images/front_paw.png


BIN
assets/cat_images/hat.png


BIN
assets/cat_images/head.png


BIN
assets/cat_images/left_ear.png


BIN
assets/cat_images/lower_body.png


BIN
assets/cat_images/mouth_open.png


BIN
assets/cat_images/right_ear.png


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
assets/cat_images/run.json


BIN
assets/cat_images/tail.png


BIN
assets/spineboy/images/crosshair.png


BIN
assets/spineboy/images/eye-indifferent.png


BIN
assets/spineboy/images/eye-surprised.png


BIN
assets/spineboy/images/front-bracer.png


BIN
assets/spineboy/images/front-fist-closed.png


BIN
assets/spineboy/images/front-fist-open.png


BIN
assets/spineboy/images/front-foot.png


BIN
assets/spineboy/images/front-shin.png


BIN
assets/spineboy/images/front-thigh.png


BIN
assets/spineboy/images/front-upper-arm.png


BIN
assets/spineboy/images/goggles.png


BIN
assets/spineboy/images/gun.png


BIN
assets/spineboy/images/head.png


BIN
assets/spineboy/images/hoverboard-board.png


BIN
assets/spineboy/images/hoverboard-thruster.png


BIN
assets/spineboy/images/hoverglow-small.png


BIN
assets/spineboy/images/mouth-grind.png


BIN
assets/spineboy/images/mouth-oooo.png


BIN
assets/spineboy/images/mouth-smile.png


BIN
assets/spineboy/images/muzzle-glow.png


BIN
assets/spineboy/images/muzzle-ring.png


BIN
assets/spineboy/images/muzzle01.png


BIN
assets/spineboy/images/muzzle02.png


BIN
assets/spineboy/images/muzzle03.png


BIN
assets/spineboy/images/muzzle04.png


BIN
assets/spineboy/images/muzzle05.png


BIN
assets/spineboy/images/neck.png


BIN
assets/spineboy/images/portal-bg.png


BIN
assets/spineboy/images/portal-flare1.png


BIN
assets/spineboy/images/portal-flare2.png


BIN
assets/spineboy/images/portal-flare3.png


BIN
assets/spineboy/images/portal-shade.png


BIN
assets/spineboy/images/portal-streaks1.png


BIN
assets/spineboy/images/portal-streaks2.png


BIN
assets/spineboy/images/rear-bracer.png


BIN
assets/spineboy/images/rear-foot.png


BIN
assets/spineboy/images/rear-shin.png


BIN
assets/spineboy/images/rear-thigh.png


BIN
assets/spineboy/images/rear-upper-arm.png


BIN
assets/spineboy/images/torso.png


+ 124 - 0
assets/spineboy/spineboy.atlas

@@ -0,0 +1,124 @@
+
+images {
+  image: "/assets/spineboy/images/rear-thigh.png"
+}
+images {
+  image: "/assets/spineboy/images/hoverglow-small.png"
+}
+images {
+  image: "/assets/spineboy/images/rear-upper-arm.png"
+}
+images {
+  image: "/assets/spineboy/images/rear-bracer.png"
+}
+images {
+  image: "/assets/spineboy/images/portal-streaks1.png"
+}
+images {
+  image: "/assets/spineboy/images/front-fist-open.png"
+}
+images {
+  image: "/assets/spineboy/images/portal-flare2.png"
+}
+images {
+  image: "/assets/spineboy/images/portal-flare3.png"
+}
+images {
+  image: "/assets/spineboy/images/portal-streaks2.png"
+}
+images {
+  image: "/assets/spineboy/images/portal-flare1.png"
+}
+images {
+  image: "/assets/spineboy/images/muzzle-ring.png"
+}
+images {
+  image: "/assets/spineboy/images/front-thigh.png"
+}
+images {
+  image: "/assets/spineboy/images/eye-surprised.png"
+}
+images {
+  image: "/assets/spineboy/images/gun.png"
+}
+images {
+  image: "/assets/spineboy/images/portal-shade.png"
+}
+images {
+  image: "/assets/spineboy/images/crosshair.png"
+}
+images {
+  image: "/assets/spineboy/images/portal-bg.png"
+}
+images {
+  image: "/assets/spineboy/images/front-foot.png"
+}
+images {
+  image: "/assets/spineboy/images/front-upper-arm.png"
+}
+images {
+  image: "/assets/spineboy/images/mouth-oooo.png"
+}
+images {
+  image: "/assets/spineboy/images/rear-shin.png"
+}
+images {
+  image: "/assets/spineboy/images/head.png"
+}
+images {
+  image: "/assets/spineboy/images/front-bracer.png"
+}
+images {
+  image: "/assets/spineboy/images/eye-indifferent.png"
+}
+images {
+  image: "/assets/spineboy/images/hoverboard-board.png"
+}
+images {
+  image: "/assets/spineboy/images/torso.png"
+}
+images {
+  image: "/assets/spineboy/images/muzzle05.png"
+}
+images {
+  image: "/assets/spineboy/images/muzzle04.png"
+}
+images {
+  image: "/assets/spineboy/images/front-shin.png"
+}
+images {
+  image: "/assets/spineboy/images/neck.png"
+}
+images {
+  image: "/assets/spineboy/images/mouth-smile.png"
+}
+images {
+  image: "/assets/spineboy/images/muzzle-glow.png"
+}
+images {
+  image: "/assets/spineboy/images/goggles.png"
+}
+images {
+  image: "/assets/spineboy/images/muzzle03.png"
+}
+images {
+  image: "/assets/spineboy/images/muzzle02.png"
+}
+images {
+  image: "/assets/spineboy/images/mouth-grind.png"
+}
+images {
+  image: "/assets/spineboy/images/rear-foot.png"
+}
+images {
+  image: "/assets/spineboy/images/hoverboard-thruster.png"
+}
+images {
+  image: "/assets/spineboy/images/front-fist-closed.png"
+}
+images {
+  image: "/assets/spineboy/images/muzzle01.png"
+}
+margin: 0
+extrude_borders: 2
+inner_padding: 0

Файловите разлики са ограничени, защото са твърде много
+ 541 - 0
assets/spineboy/spineboy.spinejson


+ 3 - 0
assets/spineboy/spineboy.spinescene

@@ -0,0 +1,3 @@
+spine_json: "/assets/spineboy/spineboy.spinejson"
+atlas: "/assets/spineboy/spineboy.atlas"
+sample_rate: 30.0

+ 4 - 4
examples/animation/spine/spine.collection

@@ -1,7 +1,7 @@
 name: "default"
 scale_along_z: 0
 embedded_instances {
-  id: "cat"
+  id: "spineboy"
   data: "components {\n"
   "  id: \"script\"\n"
   "  component: \"/examples/animation/spine/spine.script\"\n"
@@ -20,7 +20,7 @@ embedded_instances {
   "embedded_components {\n"
   "  id: \"spinemodel\"\n"
   "  type: \"spinemodel\"\n"
-  "  data: \"spine_scene: \\\"/assets/cat.spinescene\\\"\\n"
+  "  data: \"spine_scene: \\\"/assets/spineboy/spineboy.spinescene\\\"\\n"
   "default_animation: \\\"idle\\\"\\n"
   "skin: \\\"\\\"\\n"
   "blend_mode: BLEND_MODE_ALPHA\\n"
@@ -81,8 +81,8 @@ embedded_instances {
   "material: \\\"/builtins/fonts/label.material\\\"\\n"
   "\"\n"
   "  position {\n"
-  "    x: -14.709\n"
-  "    y: 1410.971\n"
+  "    x: -174.709\n"
+  "    y: 820.971\n"
   "    z: 0.0\n"
   "  }\n"
   "  rotation {\n"

BIN
examples/animation/spine/spine.png


+ 2 - 2
examples/animation/spine/spine.script

@@ -5,8 +5,8 @@ end
 
 function on_input(self, action_id, action)
 	if action_id == hash("touch") and action.pressed then
-    	local properties = { blend_duration = 0.3 } -- <3>
-    	if self.state == "idle" then -- <4>
+		local properties = { blend_duration = 0.3 } -- <3>
+		if self.state == "idle" then -- <4>
 			spine.play_anim("#spinemodel", hash("run"), go.PLAYBACK_LOOP_FORWARD, properties)
 			label.set_text("#label", "Click to idle...")
 			self.state = "run"

+ 1 - 1
game.project

@@ -1,7 +1,7 @@
 [project]
 title = Defold-examples
 version = 0.1
-dependencies#0 = https://github.com/defold/extension-spine/archive/refs/tags/1.2.0.zip
+dependencies#0 = https://github.com/defold/extension-spine/archive/refs/tags/2.0.4.zip
 
 [bootstrap]
 main_collection = /examples/main.collectionc

Някои файлове не бяха показани, защото твърде много файлове са промени