Skip to content

Allow calling entity:setPos and entity:setAng on entities without collisions #2188

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
thegrb93 merged 2 commits into from
Jul 3, 2021
Merged

Allow calling entity:setPos and entity:setAng on entities without collisions #2188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f651350
Allow calling entity:setPos and entity:setAng on entities without col…
stepa2 Jun 29, 2021
f18a5c6
Update prop.lua
stepa2 Jun 29, 2021
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
13 changes: 10 additions & 3 deletions lua/entities/gmod_wire_expression2/core/custom/prop.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ function PropCore.ValidSpawn(ply, model, isVehicle)
return ret
end

local canHaveInvalidPhysics = {delete=true, parent=true, deparent=true, solid=true, shadow=true, draw=true, use=true}
local canHaveInvalidPhysics = {
delete=true, parent=true, deparent=true, solid=true,
shadow=true, draw=true, use=true, pos=true, ang=true,
manipulate=true
}
function PropCore.ValidAction(self, entity, cmd)
if(cmd=="spawn" or cmd=="Tdelete") then return true end
if(!IsValid(entity)) then return false end
Expand Down Expand Up @@ -142,9 +146,12 @@ end

function PropCore.PhysManipulate(this, pos, rot, freeze, gravity, notsolid)
local phys = this:GetPhysicsObject()
local physOrThis = IsValid(phys) and phys or this

if pos ~= nil then WireLib.setPos( physOrThis, Vector( pos[1],pos[2],pos[3] ) ) end
if rot ~= nil then WireLib.setAng( physOrThis, Angle( rot[1],rot[2],rot[3] ) ) end

if IsValid( phys ) then
if pos ~= nil then WireLib.setPos( phys, Vector( pos[1],pos[2],pos[3] ) ) end
if rot ~= nil then WireLib.setAng( phys, Angle( rot[1],rot[2],rot[3] ) ) end
if freeze ~= nil and this:GetUnFreezable() ~= true then phys:EnableMotion( freeze == 0 ) end
if gravity ~= nil then phys:EnableGravity( gravity ~= 0 ) end
if notsolid ~= nil then this:SetSolid( notsolid ~= 0 and SOLID_NONE or SOLID_VPHYSICS ) end
Expand Down