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

Fixed: Additional piece offsets. Positive goes to the right and up

Browse Source 
Removed: F,R,U spawn direction vectors. Not needed anymore
Removed: Dedicated negate angle routine. Not needed anymore
Removed: Calculation of F,R,U spawn direction. Extracted from the angle instead
This commit is contained in:
dvdvideo1234 2025-02-01 18:40:38 +02:00
parent ee9920c23e
commit 821632a678
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua/autorun/trackassembly_init.lua
View File

@ -87,7 +87,7 @@ local asmlib = trackasmlib; if(not asmlib) then -- Module present
------------ CONFIGURE ASMLIB ------------
asmlib.InitBase("track","assembly")
asmlib.SetOpVar("TOOL_VERSION","9.775")
asmlib.SetOpVar("TOOL_VERSION","9.776")
------------ CONFIGURE GLOBAL INIT OPVARS ------------
@ -304,9 +304,6 @@ asmlib.SetOpVar("STRUCT_SPAWN",{
end,
},
{Name = "Origin",
{"F" , "VEC", "Origin forward vector"},
{"R" , "VEC", "Origin right vector"},
{"U" , "VEC", "Origin up vector"},
{"BPos", "VEC", "Base coordinate position"},
{"BAng", "ANG", "Base coordinate angle"},
{"OPos", "VEC", "Origin position"},

23
lua/trackassembly/trackasmlib.lua
View File

@ -872,14 +872,6 @@ function GridAngle(aBase, nvDec)
aBase:SetUnpacked(P, Y, R) return aBase
end
function NegAngle(aBase, bP, bY, bR)
if(not aBase) then LogInstance("Base invalid"); return nil end
local P, Y, R = aBase:Unpack()
P = (IsHere(bP) and (bP and -P or P) or -P)
Y = (IsHere(bY) and (bY and -Y or Y) or -Y)
R = (IsHere(bR) and (bR and -R or R) or -R)
aBase:SetUnpacked(P, Y, R); return aBase
end
------------- VECTOR ---------------
function BasisVector(vBase, aUnit)
@ -4530,22 +4522,15 @@ function GetNormalSpawn(oPly,ucsPos,ucsAng,shdModel,ivhdPoID,
if(ucsAng) then stSpawn.BAng:Set(ucsAng) end
stSpawn.OPos:Set(stSpawn.BPos); stSpawn.OAng:Set(stSpawn.BAng)
-- Initialize F, R, U Copy the UCS like that to support database POA
stSpawn.ANxt:SetUnpacked(tonumber(ucsAngP) or 0,
tonumber(ucsAngY) or 0,
tonumber(ucsAngR) or 0)
stSpawn.PNxt:SetUnpacked(tonumber(ucsPosX) or 0,
tonumber(ucsPosY) or 0,
tonumber(ucsPosZ) or 0)
local pX, pY, pZ = (tonumber(ucsPosX) or 0), (tonumber(ucsPosY) or 0), (tonumber(ucsPosZ) or 0)
local aP, aY, aR = (tonumber(ucsAngP) or 0), (tonumber(ucsAngY) or 0), (tonumber(ucsAngR) or 0)
stSpawn.ANxt:SetUnpacked(-aP, -aY, aR)
stSpawn.PNxt:SetUnpacked( pX, -pY, pZ)
-- Integrate additional position offset into the origin position
if(not (stSpawn.ANxt:IsZero() and stSpawn.PNxt:IsZero())) then
NegAngle(stSpawn.ANxt, true, true, false)
local vW, aW = LocalToWorld(stSpawn.PNxt, stSpawn.ANxt, stSpawn.BPos, stSpawn.BAng)
stSpawn.OPos:Set(vW); stSpawn.OAng:Set(aW)
end
-- Update snap directions
stSpawn.F:Set(stSpawn.OAng:Forward())
stSpawn.R:Set(stSpawn.OAng:Right())
stSpawn.U:Set(stSpawn.OAng:Up())
-- Read holder record
stSpawn.HPnt:SetUnpacked(hdPOA.P:Get())
stSpawn.HOrg:SetUnpacked(hdPOA.O:Get())