Changed the way flow() updates and removed ray cast example

britzl · Apr 1, 2019 · 8c59d02 · 8c59d02
1 parent a066423
commit 8c59d02
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 4,915 deletions.
diff --git a/examples/examples.collection b/examples/examples.collection
@@ -126,24 +126,6 @@ embedded_instances {
   "  }\n"
   "}\n"
   "embedded_components {\n"
-  "  id: \"ray_castproxy\"\n"
-  "  type: \"collectionproxy\"\n"
-  "  data: \"collection: \\\"/examples/ray_cast/ray_cast.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: \"savefileproxy\"\n"
   "  type: \"collectionproxy\"\n"
   "  data: \"collection: \\\"/examples/savefile/savefile.collection\\\"\\n"

diff --git a/examples/examples.gui b/examples/examples.gui
@@ -1013,165 +1013,6 @@ nodes {
   text_leading: 1.0
   text_tracking: 0.0
 }
-nodes {
-  position {
-    x: 425.0
-    y: 309.0
-    z: 0.0
-    w: 1.0
-  }
-  rotation {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  scale {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  size {
-    x: 200.0
-    y: 100.0
-    z: 0.0
-    w: 1.0
-  }
-  color {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  type: TYPE_TEMPLATE
-  id: "ray_cast"
-  parent: "buttons"
-  layer: ""
-  inherit_alpha: true
-  alpha: 1.0
-  template: "/examples/assets/button.gui"
-  template_node_child: false
-}
-nodes {
-  position {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  rotation {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  scale {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  size {
-    x: 200.0
-    y: 49.0
-    z: 0.0
-    w: 1.0
-  }
-  color {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  type: TYPE_BOX
-  blend_mode: BLEND_MODE_ALPHA
-  texture: "examples/blue_button07"
-  id: "ray_cast/button"
-  xanchor: XANCHOR_NONE
-  yanchor: YANCHOR_NONE
-  pivot: PIVOT_CENTER
-  adjust_mode: ADJUST_MODE_FIT
-  parent: "ray_cast"
-  layer: "below"
-  inherit_alpha: true
-  slice9 {
-    x: 6.0
-    y: 6.0
-    z: 6.0
-    w: 9.0
-  }
-  clipping_mode: CLIPPING_MODE_NONE
-  clipping_visible: true
-  clipping_inverted: false
-  alpha: 1.0
-  template_node_child: true
-  size_mode: SIZE_MODE_MANUAL
-}
-nodes {
-  position {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  rotation {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  scale {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  size {
-    x: 188.0
-    y: 38.0
-    z: 0.0
-    w: 1.0
-  }
-  color {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  type: TYPE_TEXT
-  blend_mode: BLEND_MODE_ALPHA
-  text: "RAY CAST"
-  font: "kenpixel15"
-  id: "ray_cast/label"
-  xanchor: XANCHOR_NONE
-  yanchor: YANCHOR_NONE
-  pivot: PIVOT_CENTER
-  outline {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  shadow {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  adjust_mode: ADJUST_MODE_FIT
-  line_break: false
-  parent: "ray_cast/button"
-  layer: "text"
-  inherit_alpha: true
-  alpha: 1.0
-  outline_alpha: 1.0
-  shadow_alpha: 1.0
-  overridden_fields: 8
-  template_node_child: true
-  text_leading: 1.0
-  text_tracking: 0.0
-}
 nodes {
   position {
     x: 425.0
@@ -1492,8 +1333,8 @@ nodes {
 }
 nodes {
   position {
-    x: 651.0
-    y: 379.0
+    x: 425.0
+    y: 308.0
     z: 0.0
     w: 1.0
   }

diff --git a/examples/examples.gui_script b/examples/examples.gui_script
@@ -25,7 +25,7 @@ function init(self)
 
 	local examples = {
 		"bezier", "broadcast", "dynamic", "flow", "kinematic", "listener",
-		"ray_cast", "savefile", "savetable", "logger"
+		"savefile", "savetable", "logger"
 	}
 
 	for _,example in ipairs(examples) do

diff --git a/examples/flow/flow.gui_script b/examples/flow/flow.gui_script
@@ -16,15 +16,6 @@ function final(self)
 	flow.stop()
 end
 
-function update(self, dt)
-	flow.update(dt)
-end
-
 function on_message(self, message_id, message, sender)
 	flow.on_message(message_id, message, sender)
 end
-
-function on_reload(self)
-    -- Add input-handling code here
-    -- Remove this function if not needed
-end
diff --git a/examples/flow/flow.script b/examples/flow/flow.script
@@ -105,10 +105,6 @@ function final(self)
 	msg.post(".", "release_input_focus")
 end
 
-function update(self, dt)
-	flow.update(dt)
-end
-
 function on_message(self, message_id, message, sender)
 	flow.on_message(message_id, message, sender)
 end

diff --git a/examples/ray_cast/ray_cast.collection b/examples/ray_cast/ray_cast.collection
diff --git a/examples/ray_cast/ray_cast.script b/examples/ray_cast/ray_cast.script