add throw signal to player
This commit is contained in:
parent
aff1bfd247
commit
2515fe7b27
@ -1,5 +1,6 @@
|
|||||||
local Vector3 = require("types.vector3")
|
local Vector3 = require("types.vector3")
|
||||||
local util = require("util")
|
local util = require("util")
|
||||||
|
local Signal = require("types.signal")
|
||||||
|
|
||||||
local Player = {
|
local Player = {
|
||||||
position = Vector3(0, 1, 0),
|
position = Vector3(0, 1, 0),
|
||||||
@ -10,6 +11,8 @@ local Player = {
|
|||||||
|
|
||||||
yaw = 0,
|
yaw = 0,
|
||||||
yaw_speed = 0.05,
|
yaw_speed = 0.05,
|
||||||
|
|
||||||
|
ThrowPressed = Signal.new(),
|
||||||
}
|
}
|
||||||
|
|
||||||
function Player:tick(ctx)
|
function Player:tick(ctx)
|
||||||
@ -18,6 +21,8 @@ function Player:tick(ctx)
|
|||||||
input_action{name = "forward", control = "W"}
|
input_action{name = "forward", control = "W"}
|
||||||
input_action{name = "back", control = "S"}
|
input_action{name = "back", control = "S"}
|
||||||
|
|
||||||
|
input_action{name = "throw", control = "SPACE"}
|
||||||
|
|
||||||
local camera_forward = Vector3(draw_camera_from_principal_axes(self).direction)
|
local camera_forward = Vector3(draw_camera_from_principal_axes(self).direction)
|
||||||
camera_forward.y = 0
|
camera_forward.y = 0
|
||||||
camera_forward = camera_forward:normalized()
|
camera_forward = camera_forward:normalized()
|
||||||
@ -29,6 +34,10 @@ function Player:tick(ctx)
|
|||||||
local direction = ((camera_forward * forward_input) + (camera_right * strafe_input)):normalized()
|
local direction = ((camera_forward * forward_input) + (camera_right * strafe_input)):normalized()
|
||||||
self.velocity = direction * self.speed
|
self.velocity = direction * self.speed
|
||||||
|
|
||||||
|
if input_action_just_pressed{name = "throw"} then
|
||||||
|
self.ThrowPressed:emit(self.position:copy(), camera_forward:copy())
|
||||||
|
end
|
||||||
|
|
||||||
if ctx.mouse_capture then
|
if ctx.mouse_capture then
|
||||||
self.yaw = self.yaw + self.mouse_sensitivity * ctx.mouse_movement.x
|
self.yaw = self.yaw + self.mouse_sensitivity * ctx.mouse_movement.x
|
||||||
end
|
end
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
local player = require "classes.player"
|
local player = require "classes.player"
|
||||||
local util = require "util"
|
local util = require "util"
|
||||||
local Vector3 = require "types.vector3"
|
local Vector3 = require "types.vector3"
|
||||||
|
local Signal = require("types.signal")
|
||||||
|
|
||||||
-- called every frame, with constant delta time
|
-- called every frame, with constant delta time
|
||||||
function game_tick()
|
function game_tick()
|
||||||
@ -10,6 +11,11 @@ function game_tick()
|
|||||||
ctx.udata = {
|
ctx.udata = {
|
||||||
capture = false
|
capture = false
|
||||||
}
|
}
|
||||||
|
player.ThrowPressed:connect(
|
||||||
|
function (position, direction)
|
||||||
|
print(position, " ", direction)
|
||||||
|
end
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
ctx.mouse_capture = ctx.udata.capture
|
ctx.mouse_capture = ctx.udata.capture
|
||||||
|
@ -211,6 +211,11 @@ function Vector3:rotated(axis, angle)
|
|||||||
return Vector3(v)
|
return Vector3(v)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---Returns a copy of this vector.
|
||||||
|
---@return Vector3
|
||||||
|
function Vector3:copy()
|
||||||
|
return Vector3(self)
|
||||||
|
end
|
||||||
---- CONSTANTS
|
---- CONSTANTS
|
||||||
|
|
||||||
Vector3.UP = Vector3(0, 1, 0)
|
Vector3.UP = Vector3(0, 1, 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user