init

Author: selimanac

example/components/collections/container.collection

@@ -9,16 +9,6 @@ instances {
       value: "40.0"
       type: PROPERTY_TYPE_NUMBER
     }
-    properties {
-      id: "angle_x"
-      value: "-30.0"
-      type: PROPERTY_TYPE_NUMBER
-    }
-    properties {
-      id: "angle_y"
-      value: "45.0"
-      type: PROPERTY_TYPE_NUMBER
-    }
   }
 }
 instances {

example/components/gameobjects/camera.go

@@ -16,26 +16,6 @@ components {
     value: "0.0"
     type: PROPERTY_TYPE_NUMBER
   }
-  properties {
-    id: "angle_x"
-    value: "0.0"
-    type: PROPERTY_TYPE_NUMBER
-  }
-  properties {
-    id: "angle_y"
-    value: "0.0"
-    type: PROPERTY_TYPE_NUMBER
-  }
-  properties {
-    id: "angle_min"
-    value: "0.0"
-    type: PROPERTY_TYPE_NUMBER
-  }
-  properties {
-    id: "angle_max"
-    value: "0.0"
-    type: PROPERTY_TYPE_NUMBER
-  }
 }
 embedded_components {
   id: "camera"

example/scripts/lib/camera.lua

@@ -1,13 +1,11 @@
-local camera         = {}
+local camera     = {}
 
-local DISPLAY_WIDTH  = sys.get_config_int("display.width")
-local DISPLAY_HEIGHT = sys.get_config_int("display.height")
-local camera_url     = msg.url(".")
-local VECTOR_UP      = vmath.vector3(0, 1, 0)
-local PIVOT          = vmath.vector3(0, 1, 0)
+local camera_url = msg.url(".")
+local VECTOR_UP  = vmath.vector3(0, 1, 0)
+local PIVOT      = vmath.vector3(0, 1, 0)
 
-local nv             = vmath.vector4(0, 0, -1, 1)
-local fv             = vmath.vector4(0, 0, 1, 1)
+local nv         = vmath.vector4(0, 0, -1, 1)
+local fv         = vmath.vector4(0, 0, 1, 1)
 
 function camera.init()
 	msg.post("@render:", "use_camera_projection")
@@ -29,41 +27,7 @@ function camera.screen_to_viewport(x, y, delta)
 end
 
 -- from rendercam
-function camera.screen_to_world_2d(x, y, delta, worldz, raw)
-	--	x, y = camera.screen_to_viewport(x, y, delta)
-
-
-	local projection = go.get(camera_url, "projection")
-	local view = go.get(camera_url, "view")
-	local window_width, window_height = window.get_size()
-
-	local m = not delta and vmath.inv(projection * view) or vmath.inv(projection)
-
-	-- Remap coordinates to range -1 to 1
-	x1 = (x - window_width * 0.5) / window_width * 2
-	y1 = (y - window_height * 0.5) / window_height * 2
-
-	if delta then
-		x1 = x1 + 1; y1 = y1 + 1
-	end
-
-	nv.x, nv.y = x1, y1
-	fv.x, fv.y = x1, y1
-	local np = m * nv
-	local fp = m * fv
-	np = np * (1 / np.w)
-	fp = fp * (1 / fp.w)
-
-	local t = (worldz - 0.1) / (100 - 0.1) -- normalize desired Z to 0-1 from abs_nearZ to abs_farZ
-	local worldpos = vmath.lerp(t, np, fp)
-
-	if raw then
-		return worldpos.x, worldpos.y, worldpos.z
-	else
-		return vmath.vector3(worldpos.x, worldpos.y, worldpos.z)
-	end -- convert vector4 to vector3
-end
-
+-- https://github.com/rgrams/rendercam
 function camera.screen_to_world_ray(x, y, raw)
 	local projection = go.get(camera_url, "projection")
 

example/scripts/manifold.script

@@ -33,9 +33,9 @@ function update(self, dt)
 			for i = 1, query_result_count do
 				pprint(query_result[i])
 				-- Offset the position if a collision occurs."
-				local offset_x = query_result[i].normal_x * query_result[i].depth
-				local offset_y = query_result[i].normal_y * query_result[i].depth
-				local offset_z = query_result[i].normal_z * query_result[i].depth
+				local offset_x = query_result[i].normal.x * query_result[i].depth
+				local offset_y = query_result[i].normal.y * query_result[i].depth
+				local offset_z = query_result[i].normal.z * query_result[i].depth
 
 				manager.world_position = manager.world_position + vmath.vector3(offset_x, offset_y, offset_z)
 			end

example/scripts/test.gui_script

@@ -3,7 +3,7 @@ function init(self)
 end
 
 function on_input(self, action_id, action)
-	if gui.pick_node(gui.get_node("next_btn"), action.x, action.y) and action.pressed then
+	if gui.pick_node(gui.get_node("next_btn"), action.x, action.y) and action.pressed and action_id == hash("touch") then
 		msg.post("load:/proxies#load", "next", {})
 	end
 end