Skip to content

admin & admin2: Add option to make camera collide while spectate #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2021
Merged

admin & admin2: Add option to make camera collide while spectate #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 45 additions & 3 deletions [admin]/admin/client/gui/admin_spectator.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ function aSpectator.Initialize ()
i = i + 1
end

aSpectator.CollideWithWalls = guiCreateCheckBox ( 0.08, 0.8, 0.84, 0.04, "Collide with walls", true, true, aSpectator.Actions )
aSpectator.Skip = guiCreateCheckBox ( 0.08, 0.85, 0.84, 0.04, "Skip dead players", true, true, aSpectator.Actions )
guiCreateLabel ( 0.08, 0.89, 0.84, 0.04, "____________________", true, aSpectator.Actions )
aSpectator.Back = guiCreateButton ( 0.10, 0.93, 0.80, 0.05, "Back", true, aSpectator.Actions )
Expand Down Expand Up @@ -250,10 +251,19 @@ function aSpectator.Render ()
return
end

local offset = aSpectator.Offset

if guiCheckBoxGetSelected(aSpectator.CollideWithWalls) then
local nearest_hit = aSpectator.CheckCollision(x, y, z)
if nearest_hit and (nearest_hit < offset) then
offset = nearest_hit
end
end

local ox, oy, oz
ox = x - math.sin ( math.rad ( aSpectator.AngleX ) ) * aSpectator.Offset
oy = y - math.cos ( math.rad ( aSpectator.AngleX ) ) * aSpectator.Offset
oz = z + math.tan ( math.rad ( aSpectator.AngleZ ) ) * aSpectator.Offset
ox = x - math.sin ( math.rad ( aSpectator.AngleX ) ) * offset
oy = y - math.cos ( math.rad ( aSpectator.AngleX ) ) * offset
oz = z + math.tan ( math.rad ( aSpectator.AngleZ ) ) * offset
setCameraMatrix ( ox, oy, oz, x, y, z )

local sx, sy = guiGetScreenSize ()
Expand All @@ -269,6 +279,30 @@ function aSpectator.Render ()
end
end

local checks = {
{-1, -0.5},
{-1, 0.5},
{1, 0.5},
{1, -0.5},
}

function aSpectator.CheckCollision(x, y, z)
local nearest_distance

for k, v in ipairs(checks) do
local xx, yy, zz = getPositionFromOffset(getCamera(), v[1], 0, v[2])
local hit, hitx, hity, hitz = processLineOfSight(xx, yy, zz, x, y, z, true, true, false, true, true, false, false, false, (getPedOccupiedVehicle(localPlayer) or nil))
if hit then
local dist = getDistanceBetweenPoints3D(x, y, z, hitx, hity, hitz)
if (dist <= (nearest_distance or math.huge)) then
nearest_distance = dist
end
end
end

return nearest_distance or false
end

function aSpectator.MoveOffset ( key, state, inc )
if ( not isCursorShowing() ) then
aSpectator.Offset = aSpectator.Offset + tonumber ( inc )
Expand All @@ -286,3 +320,11 @@ function aSpectator.GetAlive ()
end
return alive
end

function getPositionFromOffset(element, x, y, z)
local matrix = getElementMatrix(element)
local offX = x * matrix[1][1] + y * matrix[2][1] + z * matrix[3][1] + matrix[4][1]
local offY = x * matrix[1][2] + y * matrix[2][2] + z * matrix[3][2] + matrix[4][2]
local offZ = x * matrix[1][3] + y * matrix[2][3] + z * matrix[3][3] + matrix[4][3]
return offX, offY, offZ
end
48 changes: 45 additions & 3 deletions [admin]/admin2/client/widgets/admin_spectator.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function aSpectator.Open()
end
guiGridListRemoveColumn(aSpectator.Slaps, 1)

aSpectator.CollideWithWalls = guiCreateCheckBox ( 0.08, 0.8, 0.84, 0.04, "Collide with walls", true, true, aSpectator.Actions )
aSpectator.Skip = guiCreateCheckBox(0.08, 0.85, 0.84, 0.04, "Skip dead players", true, true, aSpectator.Actions)
guiCreateLabel(0.08, 0.89, 0.84, 0.04, "____________________", true, aSpectator.Actions)
aSpectator.Back = guiCreateButton(0.10, 0.93, 0.80, 0.05, "Back", true, aSpectator.Actions)
Expand Down Expand Up @@ -244,10 +245,19 @@ function aSpectator.Render()
return
end

local offset = aSpectator.Offset

if guiCheckBoxGetSelected(aSpectator.CollideWithWalls) then
local nearest_hit = aSpectator.CheckCollision(x, y, z)
if nearest_hit and (nearest_hit < offset) then
offset = nearest_hit
end
end

local ox, oy, oz
ox = x - math.sin(math.rad(aSpectator.AngleX)) * aSpectator.Offset
oy = y - math.cos(math.rad(aSpectator.AngleX)) * aSpectator.Offset
oz = z + math.tan(math.rad(aSpectator.AngleZ)) * aSpectator.Offset
ox = x - math.sin(math.rad(aSpectator.AngleX)) * offset
oy = y - math.cos(math.rad(aSpectator.AngleX)) * offset
oz = z + math.tan(math.rad(aSpectator.AngleZ)) * offset
setCameraMatrix(ox, oy, oz, x, y, z)

local sx, sy = guiGetScreenSize()
Expand Down Expand Up @@ -300,6 +310,30 @@ function aSpectator.Render()
end
end

local checks = {
{-1, -0.5},
{-1, 0.5},
{1, 0.5},
{1, -0.5},
}

function aSpectator.CheckCollision(x, y, z)
local nearest_distance

for k, v in ipairs(checks) do
local xx, yy, zz = getPositionFromOffset(getCamera(), v[1], 0, v[2])
local hit, hitx, hity, hitz = processLineOfSight(xx, yy, zz, x, y, z, true, true, false, true, true, false, false, false, (getPedOccupiedVehicle(localPlayer) or nil))
if hit then
local dist = getDistanceBetweenPoints3D(x, y, z, hitx, hity, hitz)
if (dist <= (nearest_distance or math.huge)) then
nearest_distance = dist
end
end
end

return nearest_distance or false
end

function aSpectator.MoveOffset(key, state, inc)
if (not isCursorShowing()) then
aSpectator.Offset = aSpectator.Offset + tonumber(inc)
Expand All @@ -320,3 +354,11 @@ function aSpectator.GetAlive()
end
return alive
end

function getPositionFromOffset(element, x, y, z)
local matrix = getElementMatrix(element)
local offX = x * matrix[1][1] + y * matrix[2][1] + z * matrix[3][1] + matrix[4][1]
local offY = x * matrix[1][2] + y * matrix[2][2] + z * matrix[3][2] + matrix[4][2]
local offZ = x * matrix[1][3] + y * matrix[2][3] + z * matrix[3][3] + matrix[4][3]
return offX, offY, offZ
end