Explorar o código

Update samples

Daniele Bartolini %!s(int64=9) %!d(string=hai) anos
pai
achega
4677033b2f

+ 1 - 1
samples/01-physics/lua/camera.lua

@@ -34,7 +34,7 @@ function FPSCamera:update(dx, dy)
 	if Keyboard.released(Keyboard.button_id("d")) then dkey = false end
 	if Keyboard.released(Keyboard.button_id("d")) then dkey = false end
 
 
 	local camera = self:camera()
 	local camera = self:camera()
-	local camera_transform = SceneGraph.transform_instances(self._sg, self._unit)
+	local camera_transform = SceneGraph.instances(self._sg, self._unit)
 	local camera_local_pose = SceneGraph.local_pose(self._sg, camera_transform)
 	local camera_local_pose = SceneGraph.local_pose(self._sg, camera_transform)
 	local camera_right_vector = Matrix4x4.x(camera_local_pose)
 	local camera_right_vector = Matrix4x4.x(camera_local_pose)
 	local camera_position = Matrix4x4.translation(camera_local_pose)
 	local camera_position = Matrix4x4.translation(camera_local_pose)

+ 3 - 3
samples/01-physics/lua/game.lua

@@ -21,7 +21,7 @@ function init()
 
 
 	-- Spawn camera
 	-- Spawn camera
 	camera_unit = World.spawn_unit(wd, "core/units/camera")
 	camera_unit = World.spawn_unit(wd, "core/units/camera")
-	local camera_tr = SceneGraph.transform_instances(sg, camera_unit)
+	local camera_tr = SceneGraph.instances(sg, camera_unit)
 	SceneGraph.set_local_position(sg, camera_tr, Vector3(0, 6.5, -30))
 	SceneGraph.set_local_position(sg, camera_tr, Vector3(0, 6.5, -30))
 
 
 	-- Load test level
 	-- Load test level
@@ -56,7 +56,7 @@ function update(dt)
 
 
 	-- Spawn a sphere when left mouse button is pressed
 	-- Spawn a sphere when left mouse button is pressed
 	if Mouse.pressed(Mouse.button_id("left")) then
 	if Mouse.pressed(Mouse.button_id("left")) then
-		local camera_transform = SceneGraph.transform_instances(sg, camera_unit)
+		local camera_transform = SceneGraph.instances(sg, camera_unit)
 		local pos = SceneGraph.local_position(sg, camera_transform)
 		local pos = SceneGraph.local_position(sg, camera_transform)
 		local dir = Matrix4x4.z(SceneGraph.local_pose(sg, camera_transform))
 		local dir = Matrix4x4.z(SceneGraph.local_pose(sg, camera_transform))
 		local u1 = World.spawn_unit(wd, "sphere", pos)
 		local u1 = World.spawn_unit(wd, "sphere", pos)
@@ -67,7 +67,7 @@ function update(dt)
 
 
 	-- Perform a raycast when middle mouse button is pressed
 	-- Perform a raycast when middle mouse button is pressed
 	if Mouse.pressed(Mouse.button_id("middle")) then
 	if Mouse.pressed(Mouse.button_id("middle")) then
-		local camera_transform = SceneGraph.transform_instances(sg, camera_unit)
+		local camera_transform = SceneGraph.instances(sg, camera_unit)
 		local pos = SceneGraph.local_position(sg, camera_transform)
 		local pos = SceneGraph.local_position(sg, camera_transform)
 		local dir = Matrix4x4.z(SceneGraph.local_pose(sg, camera_transform))
 		local dir = Matrix4x4.z(SceneGraph.local_pose(sg, camera_transform))
 		local hits = PhysicsWorld.raycast(pw, pos, dir, 100, "closest")
 		local hits = PhysicsWorld.raycast(pw, pos, dir, 100, "closest")

+ 3 - 3
samples/core/editors/level_editor/camera.lua

@@ -19,14 +19,14 @@ end
 
 
 function FPSCamera:position()
 function FPSCamera:position()
 	local sg = World.scene_graph(self._world)
 	local sg = World.scene_graph(self._world)
-	local camera_transform = SceneGraph.transform_instances(sg, self._unit)
+	local camera_transform = SceneGraph.instances(sg, self._unit)
 	local camera_position = SceneGraph.world_position(sg, camera_transform)
 	local camera_position = SceneGraph.world_position(sg, camera_transform)
 	return camera_position
 	return camera_position
 end
 end
 
 
 function FPSCamera:world_pose()
 function FPSCamera:world_pose()
 	local sg = World.scene_graph(self._world)
 	local sg = World.scene_graph(self._world)
-	local camera_transform = SceneGraph.transform_instances(sg, self._unit)
+	local camera_transform = SceneGraph.instances(sg, self._unit)
 	return SceneGraph.world_pose(sg, camera_transform)
 	return SceneGraph.world_pose(sg, camera_transform)
 end
 end
 
 
@@ -61,7 +61,7 @@ function FPSCamera:update(dx, dy, keyboard)
 	local sg = World.scene_graph(self._world)
 	local sg = World.scene_graph(self._world)
 
 
 	local camera = self:camera()
 	local camera = self:camera()
-	local camera_transform = SceneGraph.transform_instances(sg, self._unit)
+	local camera_transform = SceneGraph.instances(sg, self._unit)
 	local camera_local_pose = SceneGraph.local_pose(sg, camera_transform)
 	local camera_local_pose = SceneGraph.local_pose(sg, camera_transform)
 	local camera_right_vector = Matrix4x4.x(camera_local_pose)
 	local camera_right_vector = Matrix4x4.x(camera_local_pose)
 	local camera_position = Matrix4x4.translation(camera_local_pose)
 	local camera_position = Matrix4x4.translation(camera_local_pose)

+ 23 - 23
samples/core/editors/level_editor/level_editor.lua

@@ -257,32 +257,32 @@ function UnitBox:destroy()
 end
 end
 
 
 function UnitBox:local_position()
 function UnitBox:local_position()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.local_position(self._sg, tr) or Vector3.zero()
 	return tr and SceneGraph.local_position(self._sg, tr) or Vector3.zero()
 end
 end
 
 
 function UnitBox:local_rotation()
 function UnitBox:local_rotation()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.local_rotation(self._sg, tr) or Quaternion.identity()
 	return tr and SceneGraph.local_rotation(self._sg, tr) or Quaternion.identity()
 end
 end
 
 
 function UnitBox:local_scale()
 function UnitBox:local_scale()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.local_scale(self._sg, tr) or Vector3(1, 1, 1)
 	return tr and SceneGraph.local_scale(self._sg, tr) or Vector3(1, 1, 1)
 end
 end
 
 
 function UnitBox:local_pose()
 function UnitBox:local_pose()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.local_pose(self._sg, tr) or Matrix4x4.identity()
 	return tr and SceneGraph.local_pose(self._sg, tr) or Matrix4x4.identity()
 end
 end
 
 
 function UnitBox:world_position()
 function UnitBox:world_position()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.world_position(self._sg, tr) or Vector3.zero()
 	return tr and SceneGraph.world_position(self._sg, tr) or Vector3.zero()
 end
 end
 
 
 function UnitBox:world_rotation()
 function UnitBox:world_rotation()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.world_rotation(self._sg, tr) or Quaternion.identity()
 	return tr and SceneGraph.world_rotation(self._sg, tr) or Quaternion.identity()
 end
 end
 
 
@@ -291,27 +291,27 @@ function UnitBox:world_scale()
 end
 end
 
 
 function UnitBox:world_pose()
 function UnitBox:world_pose()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.world_pose(self._sg, tr) or Matrix4x4.identity()
 	return tr and SceneGraph.world_pose(self._sg, tr) or Matrix4x4.identity()
 end
 end
 
 
 function UnitBox:set_local_position(pos)
 function UnitBox:set_local_position(pos)
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	if tr then SceneGraph.set_local_position(self._sg, tr, pos) end
 	if tr then SceneGraph.set_local_position(self._sg, tr, pos) end
 end
 end
 
 
 function UnitBox:set_local_rotation(rot)
 function UnitBox:set_local_rotation(rot)
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	if tr then SceneGraph.set_local_rotation(self._sg, tr, rot) end
 	if tr then SceneGraph.set_local_rotation(self._sg, tr, rot) end
 end
 end
 
 
 function UnitBox:set_local_scale(scale)
 function UnitBox:set_local_scale(scale)
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	if tr then SceneGraph.set_local_scale(self._sg, tr, scale) end
 	if tr then SceneGraph.set_local_scale(self._sg, tr, scale) end
 end
 end
 
 
 function UnitBox:set_local_pose(pose)
 function UnitBox:set_local_pose(pose)
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	if tr then SceneGraph.set_local_pose(self._sg, tr, pose) end
 	if tr then SceneGraph.set_local_pose(self._sg, tr, pose) end
 end
 end
 
 
@@ -380,32 +380,32 @@ function SoundObject:name()
 end
 end
 
 
 function SoundObject:local_position()
 function SoundObject:local_position()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.local_position(self._sg, tr) or Vector3.zero()
 	return tr and SceneGraph.local_position(self._sg, tr) or Vector3.zero()
 end
 end
 
 
 function SoundObject:local_rotation()
 function SoundObject:local_rotation()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.local_rotation(self._sg, tr) or Quaternion.identity()
 	return tr and SceneGraph.local_rotation(self._sg, tr) or Quaternion.identity()
 end
 end
 
 
 function SoundObject:local_scale()
 function SoundObject:local_scale()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.local_scale(self._sg, tr) or Vector3(1, 1, 1)
 	return tr and SceneGraph.local_scale(self._sg, tr) or Vector3(1, 1, 1)
 end
 end
 
 
 function SoundObject:local_pose()
 function SoundObject:local_pose()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.local_pose(self._sg, tr) or Matrix4x4.identity()
 	return tr and SceneGraph.local_pose(self._sg, tr) or Matrix4x4.identity()
 end
 end
 
 
 function SoundObject:world_position()
 function SoundObject:world_position()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.world_position(self._sg, tr) or Vector3.zero()
 	return tr and SceneGraph.world_position(self._sg, tr) or Vector3.zero()
 end
 end
 
 
 function SoundObject:world_rotation()
 function SoundObject:world_rotation()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.world_rotation(self._sg, tr) or Quaternion.identity()
 	return tr and SceneGraph.world_rotation(self._sg, tr) or Quaternion.identity()
 end
 end
 
 
@@ -414,27 +414,27 @@ function SoundObject:world_scale()
 end
 end
 
 
 function SoundObject:world_pose()
 function SoundObject:world_pose()
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	return tr and SceneGraph.world_pose(self._sg, tr) or Matrix4x4.identity()
 	return tr and SceneGraph.world_pose(self._sg, tr) or Matrix4x4.identity()
 end
 end
 
 
 function SoundObject:set_local_position(pos)
 function SoundObject:set_local_position(pos)
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	if tr then SceneGraph.set_local_position(self._sg, tr, pos) end
 	if tr then SceneGraph.set_local_position(self._sg, tr, pos) end
 end
 end
 
 
 function SoundObject:set_local_rotation(rot)
 function SoundObject:set_local_rotation(rot)
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	if tr then SceneGraph.set_local_rotation(self._sg, tr, rot) end
 	if tr then SceneGraph.set_local_rotation(self._sg, tr, rot) end
 end
 end
 
 
 function SoundObject:set_local_scale(scale)
 function SoundObject:set_local_scale(scale)
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	if tr then SceneGraph.set_local_scale(self._sg, tr, scale) end
 	if tr then SceneGraph.set_local_scale(self._sg, tr, scale) end
 end
 end
 
 
 function SoundObject:set_local_pose(pose)
 function SoundObject:set_local_pose(pose)
-	local tr = SceneGraph.transform_instances(self._sg, self._unit_id)
+	local tr = SceneGraph.instances(self._sg, self._unit_id)
 	if tr then SceneGraph.set_local_pose(self._sg, tr, pose) end
 	if tr then SceneGraph.set_local_pose(self._sg, tr, pose) end
 end
 end
 
 
@@ -1287,7 +1287,7 @@ function LevelEditor:init()
 	self.tool = self.place_tool
 	self.tool = self.place_tool
 
 
 	-- Spawn camera
 	-- Spawn camera
-	local camera_transform = SceneGraph.transform_instances(self._sg, self._fpscamera:unit())
+	local camera_transform = SceneGraph.instances(self._sg, self._fpscamera:unit())
 	local pos = Vector3(20, 20, -20)
 	local pos = Vector3(20, 20, -20)
 	local dir = Vector3.normalize(Vector3.zero() - pos)
 	local dir = Vector3.normalize(Vector3.zero() - pos)
 	SceneGraph.set_local_rotation(self._sg, camera_transform, Quaternion.look(dir))
 	SceneGraph.set_local_rotation(self._sg, camera_transform, Quaternion.look(dir))

+ 1 - 1
samples/core/editors/unit_preview/unit_preview.lua

@@ -28,7 +28,7 @@ function UnitPreview:update(dt)
 			radius = radius > 100 and 100 or radius
 			radius = radius > 100 and 100 or radius
 
 
 			local camera_unit = self._fpscamera:unit()
 			local camera_unit = self._fpscamera:unit()
-			local tr = SceneGraph.transform_instances(self._sg, camera_unit)
+			local tr = SceneGraph.instances(self._sg, camera_unit)
 			local pos = Vector3(radius, radius, -radius) * 2
 			local pos = Vector3(radius, radius, -radius) * 2
 			local camera_pos = Matrix4x4.translation(tm) + pos
 			local camera_pos = Matrix4x4.translation(tm) + pos
 			local target_pos = Matrix4x4.translation(tm)
 			local target_pos = Matrix4x4.translation(tm)