From 362b2c6c46662bb927c6656635ec72cad84e045b Mon Sep 17 00:00:00 2001
From: Artsiom Trubchyk <aglitchman@gmail.com>
Date: Wed, 26 Jun 2024 01:32:10 +0300
Subject: [PATCH 1/2] Upgrade to Defold 1.9.0

---
 game.project              | 2 +-
 scene3d/src/extension.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/game.project b/game.project
index 48c15f3..e872185 100644
--- a/game.project
+++ b/game.project
@@ -22,7 +22,7 @@ title = scene3d_examples
 version = dev
 developer = Indiesoft LLC
 dependencies#0 = https://github.com/britzl/ludobits/archive/7.1.0.zip
-dependencies#1 = https://github.com/britzl/defold-screenshot/archive/1.8.2.zip
+dependencies#1 = https://github.com/britzl/defold-screenshot/archive/1.11.0.zip
 dependencies#2 = https://github.com/britzl/defold-clipboard/archive/1.3.0.zip
 dependencies#3 = https://github.com/indiesoftby/defold-pointer-lock/archive/1.0.0.zip
 dependencies#4 = https://github.com/subsoap/defos/archive/refs/tags/v2.7.1.zip
diff --git a/scene3d/src/extension.cpp b/scene3d/src/extension.cpp
index 06d5869..e0d172a 100644
--- a/scene3d/src/extension.cpp
+++ b/scene3d/src/extension.cpp
@@ -660,8 +660,8 @@ static dmExtension::Result OnPostRender(dmExtension::Params* params)
 
 static dmExtension::Result AppInitializeExt(dmExtension::AppParams* params)
 {
-    dmExtension::RegisterCallback(dmExtension::CALLBACK_PRE_RENDER, OnPreRender);
-    dmExtension::RegisterCallback(dmExtension::CALLBACK_POST_RENDER, OnPostRender);
+    dmExtension::RegisterCallback(dmExtension::CALLBACK_PRE_RENDER, (FExtensionCallback)OnPreRender);
+    dmExtension::RegisterCallback(dmExtension::CALLBACK_POST_RENDER, (FExtensionCallback)OnPostRender);
 
     return dmExtension::RESULT_OK;
 }

From 9a2aaf4ffcbeb10178646f15c23c6ff3675a3d34 Mon Sep 17 00:00:00 2001
From: Artsiom Trubchyk <aglitchman@gmail.com>
Date: Wed, 26 Jun 2024 01:45:50 +0300
Subject: [PATCH 2/2] Fix blocksbuster example

---
 examples/scenes/blocksbuster/blocksbuster.collection | 6 ++++--
 examples/scenes/blocksbuster/buster.go               | 9 +++++----
 game.project                                         | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/examples/scenes/blocksbuster/blocksbuster.collection b/examples/scenes/blocksbuster/blocksbuster.collection
index d733598..3ba4278 100644
--- a/examples/scenes/blocksbuster/blocksbuster.collection
+++ b/examples/scenes/blocksbuster/blocksbuster.collection
@@ -97,7 +97,7 @@ instances {
   prototype: "/examples/scenes/blocksbuster/buster.go"
   position {
     x: 0.0
-    y: 0.05
+    y: 0.0
     z: 3.5
   }
   rotation {
@@ -108,7 +108,7 @@ instances {
   }
   scale3 {
     x: 2.0
-    y: 0.1
+    y: 2.0
     z: 2.0
   }
 }
@@ -249,6 +249,8 @@ embedded_instances {
   "    z: 0.0\n"
   "    w: 1.0\n"
   "  }\n"
+  "  property_decls {\n"
+  "  }\n"
   "}\n"
   ""
   position {
diff --git a/examples/scenes/blocksbuster/buster.go b/examples/scenes/blocksbuster/buster.go
index 78cd70e..7e92095 100644
--- a/examples/scenes/blocksbuster/buster.go
+++ b/examples/scenes/blocksbuster/buster.go
@@ -25,7 +25,7 @@ embedded_components {
   ""
   position {
     x: 0.0
-    y: 0.0
+    y: -0.45
     z: 0.0
   }
   rotation {
@@ -61,8 +61,9 @@ embedded_components {
   "    }\n"
   "    index: 0\n"
   "    count: 2\n"
+  "    id: \"\"\n"
   "  }\n"
-  "  data: 1.0\n"
+  "  data: 0.5\n"
   "  data: 10.0\n"
   "}\n"
   "linear_damping: 0.0\n"
@@ -94,7 +95,7 @@ embedded_components {
   ""
   position {
     x: 0.0
-    y: -0.9
+    y: -0.495
     z: 0.0
   }
   rotation {
@@ -142,7 +143,7 @@ embedded_components {
   ""
   position {
     x: 0.0
-    y: 0.0
+    y: 0.011303
     z: 0.0
   }
   rotation {
diff --git a/game.project b/game.project
index e872185..985fffc 100644
--- a/game.project
+++ b/game.project
@@ -40,7 +40,7 @@ type = 3D
 max_collisions = 10000
 max_contacts = 10000
 ray_cast_limit_3d = 1000
-trigger_overlap_capacity = 100
+trigger_overlap_capacity = 1000
 world_count = 5
 use_fixed_timestep = 1
 max_collision_object_count = 2000