Elkien3/citysim_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add gun pointing to vehicles

Browse Source
This commit is contained in:
Elkien3 2022-04-20 12:48:06 -05:00
parent ea5bfccf6f
commit 1cd4b3d5c1
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mods/character_anim/main.lua
View File

@ -196,13 +196,7 @@ local function handle_player_animations(dtime, player)
Head.x = normalize_angle(Head.x + Body.x)
if interacting then Arm_Right.x = normalize_angle(Arm_Right.x + Body.x) end
Head.x = clamp(Head.x, conf.head.pitch)
Head.y = clamp(Head.y, conf.head.yaw)
if math.abs(Head.y) > conf.head.yaw_restriction then
Head.x = clamp(Head.x, conf.head.yaw_restricted)
end
Arm_Right.y = clamp(Arm_Right.y, conf.arm_right.yaw)
local clamphead = true
if spriteguns and spriteguns.is_wielding_gun(name) then
local tempvertlook = math.rad(look_vertical)
local Rightval = vector.multiply(vector.dir_to_rotation(vector.rotate({x=0,y=0,z=1}, {x=tempvertlook,y=0,z=0})), 180/math.pi)
@ -213,6 +207,30 @@ local function handle_player_animations(dtime, player)
Leftval.x = Leftval.x + 85
bone_positions.Arm_Left.euler_rotation = Leftval
bone_positions.Arm_Left.position.x = bone_positions.Arm_Left.position.x - .9
if attach_parent then
clamphead = false
local parent_rotation = attach_parent:get_rotation()
local total_rotation = normalize_rotation(vector.add(attach_rotation, vector.apply(parent_rotation, math.deg)))
local function rotate_relative(euler_rotation)
-- HACK +180
euler_rotation.y = euler_rotation.y + look_horizontal + 180
local new_rotation = normalize_rotation(vector.add(euler_rotation, total_rotation))
euler_rotation.x, euler_rotation.y, euler_rotation.z = new_rotation.x, new_rotation.y, new_rotation.z
end
rotate_relative(bone_positions.Body.euler_rotation)
bone_positions.Head.euler_rotation = vector.subtract(bone_positions.Head.euler_rotation, bone_positions.Body.euler_rotation)
bone_positions.Leg_Left.euler_rotation = vector.subtract(bone_positions.Leg_Left.euler_rotation, bone_positions.Body.euler_rotation)
bone_positions.Leg_Right.euler_rotation = vector.subtract(bone_positions.Leg_Right.euler_rotation, bone_positions.Body.euler_rotation)
end
end
if clamphead then
Head.x = clamp(Head.x, conf.head.pitch)
Head.y = clamp(Head.y, conf.head.yaw)
if math.abs(Head.y) > conf.head.yaw_restriction then
Head.x = clamp(Head.x, conf.head.yaw_restricted)
end
Arm_Right.y = clamp(Arm_Right.y, conf.arm_right.yaw)
end
for bone, values in pairs(bone_positions) do