dvdvideo1234/TrackAssemblyTool
1
0
Fork 0
mirror of https://github.com/dvdvideo1234/TrackAssemblyTool.git synced 2025-03-04 03:13:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added: Physical settings unpack-er UnpackPhysicalSettings

Browse Source
This commit is contained in:
dvdvideo1234 2019-09-26 15:40:31 +03:00
parent 75f206e1fa
commit ab4f4ff96d
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lua/autorun/trackassembly_init.lua
View File

@ -71,7 +71,7 @@ local gtInitLogs = {"*Init", false, 0}
------ CONFIGURE ASMLIB ------
asmlib.InitBase("track","assembly")
asmlib.SetOpVar("TOOL_VERSION","6.556")
asmlib.SetOpVar("TOOL_VERSION","6.557")
asmlib.SetIndexes("V" , "x", "y", "z")
asmlib.SetIndexes("A" ,"pitch","yaw","roll")
asmlib.SetIndexes("WV",1,2,3)
@ -947,11 +947,8 @@ local conContextMenu = asmlib.MakeContainer("CONTEXT_MENU")
conContextMenu:Insert(5,
{"tool."..gsToolNameL..".ignphysgn", true,
function(ePiece, oPly, oTr, sKey)
local oPhy = ePiece:GetPhysicsObject()
local bPi = (not tobool(ePiece.PhysgunDisabled)) -- Inverted
local bFr = (not oPhy:IsMotionEnabled())
local bGr = oPhy:IsGravityEnabled()
local sPh = oPhy:GetMaterial()
local bSuc,bPi,bFr,bGr,sPh = asmlib.UnpackPhysicalSettings(ePiece)
if(bSuc) then bPi = (not bPi) else return bSuc end
return asmlib.ApplyPhysicalSettings(ePiece,bPi,bFr,bGr,sPh)
end, nil,
function(ePiece)
@ -961,11 +958,8 @@ local conContextMenu = asmlib.MakeContainer("CONTEXT_MENU")
conContextMenu:Insert(6,
{"tool."..gsToolNameL..".freeze", true,
function(ePiece, oPly, oTr, sKey)
local oPhy = ePiece:GetPhysicsObject()
local bPi = tobool(ePiece.PhysgunDisabled)
local bFr = oPhy:IsMotionEnabled() -- Inverted
local bGr = oPhy:IsGravityEnabled()
local sPh = oPhy:GetMaterial()
local bSuc,bPi,bFr,bGr,sPh = asmlib.UnpackPhysicalSettings(ePiece)
if(bSuc) then bFr = (not bFr) else return bSuc end
return asmlib.ApplyPhysicalSettings(ePiece,bPi,bFr,bGr,sPh)
end, nil,
function(ePiece)
@ -975,11 +969,8 @@ local conContextMenu = asmlib.MakeContainer("CONTEXT_MENU")
conContextMenu:Insert(7,
{"tool."..gsToolNameL..".gravity", true,
function(ePiece, oPly, oTr, sKey)
local oPhy = ePiece:GetPhysicsObject()
local bPi = tobool(ePiece.PhysgunDisabled)
local bFr = (not oPhy:IsMotionEnabled())
local bGr = oPhy:IsGravityEnabled() -- Inverted
local sPh = oPhy:GetMaterial()
local bSuc,bPi,bFr,bGr,sPh = asmlib.UnpackPhysicalSettings(ePiece)
if(bSuc) then bGr = (not bGr) else return bSuc end
return asmlib.ApplyPhysicalSettings(ePiece,bPi,bFr,bGr,sPh)
end, nil,
function(ePiece)

22
lua/trackassembly/trackasmlib.lua
View File

@ -3581,16 +3581,28 @@ function MakePiece(pPly,sModel,vPos,aAng,nMass,sBgSkIDs,clColor,sMode)
LogInstance("{"..tostring(ePiece).."}"..sModel); return ePiece
end
function UnpackPhysicalSettings(ePiece)
if(CLIENT) then LogInstance("Working on client"); return true end
if(not (ePiece and ePiece:IsValid())) then -- Cannot manipulate invalid entities
LogInstance("Piece entity invalid "..GetReport(ePiece)); return false end
local pyPiece = ePiece:GetPhysicsObject() -- Get the physics object
if(not (pyPiece and pyPiece:IsValid())) then -- Cannot manipulate invalid physics
LogInstance("Piece physical object invalid "..GetReport(ePiece)); return false end
local bPi, bFr = ePiece.PhysgunDisabled, (not oPhy:IsMotionEnabled())
local bGr, sPh = oPhy:IsGravityEnabled(), oPhy:GetMaterial()
return true, bPi, bFr, bGr, sPh -- Returns status and settings
end
function ApplyPhysicalSettings(ePiece,bPi,bFr,bGr,sPh)
if(CLIENT) then LogInstance("Working on client"); return true end
local bPi, bFr = (tobool(bPi) or false), (tobool(bFr) or false)
local bGr, sPh = (tobool(bGr) or false), tostring(sPh or "")
LogInstance("{"..tostring(bPi)..","..tostring(bFr)..","..tostring(bGr)..","..sPh.."}")
if(not (ePiece and ePiece:IsValid())) then -- Cannot manipulate invalid entities
LogInstance("Piece entity invalid <"..tostring(ePiece)..">"); return false end
LogInstance("Piece entity invalid "..GetReport(ePiece)); return false end
local pyPiece = ePiece:GetPhysicsObject() -- Get the physics object
if(not (pyPiece and pyPiece:IsValid())) then -- Cannot manipulate invalid physics
LogInstance("Piece physical object invalid <"..tostring(ePiece)..">"); return false end
LogInstance("Piece physical object invalid "..GetReport(ePiece)); return false end
local arSettings = {bPi,bFr,bGr,sPh} -- Initialize dupe settings using this array
ePiece.PhysgunDisabled = bPi -- If enabled stop the player from grabbing the track piece
ePiece:SetUnFreezable(bPi) -- If enabled stop the player from hitting reload to mess it all up
@ -3631,7 +3643,7 @@ function ApplyPhysicalAnchor(ePiece,eBase,bWe,bNc,bNw,nFm)
cnW = constraintWeld(ePiece, eBase, 0, 0, nFm, false, false)
if(cnW and cnW:IsValid()) then
ePiece:DeleteOnRemove(cnW); eBase:DeleteOnRemove(cnW)
else LogInstance("Weld ignored "..tostring(cnW)) end
else LogInstance("Weld ignored "..GetReport(cnW)) end
else LogInstance("Weld base unconstrained "..GetReport(eBase)) end
else LogInstance("Weld base invalid "..GetReport(eBase)) end
end
@ -3642,7 +3654,7 @@ function ApplyPhysicalAnchor(ePiece,eBase,bWe,bNc,bNw,nFm)
cnN = constraintNoCollide(ePiece, eBase, 0, 0)
if(cnN and cnN:IsValid()) then
ePiece:DeleteOnRemove(cnN); eBase:DeleteOnRemove(cnN)
else LogInstance("NoCollide ignored") end
else LogInstance("NoCollide ignored "..GetReport(cnN)) end
else LogInstance("NoCollide base unconstrained "..GetReport(eBase)) end
else LogInstance("NoCollide base invalid "..GetReport(eBase)) end
end
@ -3654,7 +3666,7 @@ function ApplyPhysicalAnchor(ePiece,eBase,bWe,bNc,bNw,nFm)
cnG = constraintAdvBallsocket(ePiece, eWorld,
0, 0, vO, vO, nFm, 0, -nA, -nA, -nA, nA, nA, nA, 0, 0, 0, 1, 1)
if(cnG and cnG:IsValid()) then ePiece:DeleteOnRemove(cnG)
else LogInstance("AdvBallsocket ignored "..tostring(cnG)) end
else LogInstance("AdvBallsocket ignored "..GetReport(cnG)) end
else LogInstance("AdvBallsocket base unconstrained "..GetReport(eWorld)) end
else LogInstance("AdvBallsocket base invalid "..GetReport(eWorld)) end
end