Skip to content

Commit

Permalink
Fixed: Double quote multiply on author-removed pieces when syncing DSV
Browse files Browse the repository at this point in the history 
Added: Ray intersection world origin/angle update allowing the relation to be moved across the map
Added: Ray intersection read now includes ray world origin/angle update on query
Updated: InsertRecord now logs the data on missing PK
Updated: InsertRecord now logs model with the registered trace class
  • Loading branch information
@dvdvideo1234
dvdvideo1234 committed Sep 14, 2017
1 parent 61662fa commit 6bed08e
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 54 deletions.
2 changes: 1 addition & 1 deletion lua/autorun/trackassembly_init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ local asmlib = trackasmlib

------ CONFIGURE ASMLIB ------
asmlib.InitBase("track","assembly")
asmlib.SetOpVar("TOOL_VERSION","5.372")
asmlib.SetOpVar("TOOL_VERSION","5.373")
asmlib.SetIndexes("V",1,2,3)
asmlib.SetIndexes("A",1,2,3)
asmlib.SetIndexes("S",4,5,6,7)
Expand Down
103 changes: 58 additions & 45 deletions lua/trackassembly/trackasmlib.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1869,7 +1869,10 @@ function InsertRecord(sTable,arLine)
if(not arLine) then
return StatusLog(false,"InsertRecord: Missing data table for "..sTable) end
if(not arLine[1]) then
return StatusLog(false,"InsertRecord: Missing data table is empty for "..sTable) end
for key, val in pairs(arLine) do
LogInstance("PK data ["..tostring(key).."] = <"..tostring(val)..">") end
return StatusLog(false,"InsertRecord: Missing PK for "..sTable)
end

if(sTable == "PIECES") then
local trClass = GetOpVar("TRACE_CLASS")
Expand All @@ -1879,7 +1882,7 @@ function InsertRecord(sTable,arLine)
if(IsString(arLine[8]) and (arLine[8] ~= "NULL")
and not trClass[arLine[8]] and not IsEmptyString(arLine[8])) then
trClass[arLine[8]] = true -- Register the class provided
LogInstance("InsertRecord: Register trace <"..tostring(arLine[8])..">")
LogInstance("InsertRecord: Register trace <"..tostring(arLine[8]).."@"..arLine[1]..">")
end -- Add the special class to the trace list
elseif(sTable == "PHYSPROPERTIES") then
arLine[1] = DisableString(arLine[1],DefaultType(),"TYPE")
Expand Down Expand Up @@ -2727,8 +2730,8 @@ function SynchronizeDSV(sTable, tData, bRepl, sPref, sDelim)
tostring(vID).." desynchronized <"..sKey.."> of <"..sTable..">") end
tKey.Kept = nID; tKey[tKey.Kept] = {}
local kKey, nCnt = tKey[tKey.Kept], 3
while(tLine[nCnt]) do -- Do a value matching without automatic quotes
local vMatch = MatchType(defTable,tLine[nCnt],nCnt-1,true,"\"",true)
while(tLine[nCnt]) do -- Do a value matching without quotes
local vMatch = MatchType(defTable,tLine[nCnt],nCnt-1)
if(not IsExistent(vMatch)) then
I:Close(); return StatusLog(false,"SynchronizeDSV("..fPref.."): Read matching failed <"
..tostring(tLine[nCnt]).."> to <"..tostring(nCnt-1).." # "
Expand All @@ -2754,19 +2757,21 @@ function SynchronizeDSV(sTable, tData, bRepl, sPref, sDelim)
LogInstance("SynchronizeDSV("..fPref.."): Missing piece <"..key..">") end
elseif(sTable == "ADDITIONS") then vID = tRec[3]; nID = tonumber(vID) or 0
elseif(sTable == "PHYSPROPERTIES") then vID = tRec[1]; nID = tonumber(vID) or 0 end
for nCnt = 1, #tRec do -- Do a value matching without automatic quotes
local vMatch = MatchType(defTable,tRec[nCnt],nCnt+1,true,"\"",true)
for nCnt = 1, #tRec do -- Do a value matching without quotes
local vMatch = MatchType(defTable,tRec[nCnt],nCnt+1)
if(not IsExistent(vMatch)) then
return StatusLog(false,"SynchronizeDSV("..fPref.."): Given matching failed <"
..tostring(tRec[nCnt]).."> to <"..tostring(nCnt+1).." # "
..defTable[nCnt+1][1].."> of "..sTable)
end
end
end -- Register the read line to the output file
if((fData[key] and bRepl) or not fData[key]) then
fData[key] = rec
fData[key].Kept = #rec
end
if(bRepl) then
if(tData[key]) then -- Update the file with the new data
fData[key] = rec
fData[key].Kept = #rec
end
else --[[ Do not modify fData ]] end
end
local tSort = Sort(tableGetKeys(fData))
if(not tSort) then
Expand Down Expand Up @@ -3206,55 +3211,70 @@ local function IntersectRayParallel(vO1, vD1, vO2, vD2)
return f1, f2, x1, x2, xx
end

local function IntersectRayUpdate(stRay)
if(not IsExistent(stRay)) then
return StatusLog(nil,"IntersectRayUpdate: Ray invalid") end
local ryEnt = stRay.Ent
if(ryEnt and ryEnt:IsValid()) then
local ePos, eAng = stRay.Ent:GetPos(), stRay.Ent:GetAngles()
stRay.Orw:Set(stRay.Org); stRay.Orw:Rotate(eAng); stRay.Orw:Add(ePos)
stRay.Diw:Set(stRay.Ent:LocalToWorldAngles(stRay.Dir))
end; return stRay
end

--[[
* This function updates an active ray for a player.
* Every player has their own place in the cache.
* This function creates/updates an active ray for a player.
* Every player has own place in the cache.
* The dedicated table can contain rays with different purpose
* oPly --> Player who wants to register a ray
* oEnt --> The trace entity to register the raw with
* trHit --> The world position to search for point ID
* sKey --> String identifier. Used to distinguish rays form one another
]]--
function IntersectRayUpdate(oPly, oEnt, vHit, sKey)
function IntersectRayCreate(oPly, oEnt, vHit, sKey)
if(not IsString(sKey)) then
return StatusLog(nil,"IntersectRayUpdate: Key invalid <"..tostring(sKey)..">") end
return StatusLog(nil,"IntersectRayCreate: Key invalid <"..tostring(sKey)..">") end
if(not IsPlayer(oPly)) then
return StatusLog(nil,"IntersectRayUpdate: Player invalid <"..tostring(oPly)..">") end
return StatusLog(nil,"IntersectRayCreate: Player invalid <"..tostring(oPly)..">") end
local trID, trMin, trPOA, trRec = GetEntityHitID(oEnt, vHit)
if(not trID) then
return StatusLog(nil,"IntersectRayUpdate: Entity no hit <"..tostring(oEnt).."/"..tostring(vHit)..">") end
return StatusLog(nil,"IntersectRayCreate: Entity no hit <"..tostring(oEnt).."/"..tostring(vHit)..">") end
local tRay = GetOpVar("RAY_INTERSECT")
if(not tRay[oPly]) then tRay[oPly] = {} end; tRay = tRay[oPly]
local stRay = tRay[sKey]
if(not stRay) then -- Define a ray via origin and direction
tRay[sKey] = {Org = Vector(), Dir = Angle(),
ID = trID , Ent = oEnt ,
tRay[sKey] = {Org = Vector(), Dir = Angle(), -- Local direction and origin
Orw = Vector(), Diw = Angle(), -- World direction and origin
ID = trID , Ent = oEnt , -- Point ID and entity realtion
Key = sKey , Ply = oPly }; stRay = tRay[sKey]
else
else -- Update internal settings
stRay.Ply, stRay.Ent, stRay.ID, stRay.Key = oPly, oEnt, trID, sKey
end; SetAngle(stRay.Dir, trPOA.A) stRay.Dir:Set(oEnt:LocalToWorldAngles(stRay.Dir))
SetVector(stRay.Org, trPOA.O); stRay.Org:Rotate(oEnt:GetAngles()); stRay.Org:Add(oEnt:GetPos())
return stRay;
end; SetAngle(stRay.Dir, trPOA.A); SetVector(stRay.Org, trPOA.O)
return IntersectRayUpdate(stRay)
end

function IntersectRayRead(oPly, sKey)
if(not IsPlayer(oPly)) then
return StatusLog(nil,"IntersectRayRead: Player invalid <"..tostring(oPly)..">") end
if(not IsString(sKey)) then
return StatusLog(nil,"IntersectRayRead: Key invalid <"..tostring(sKey)..">") end
local tRay = GetOpVar("RAY_INTERSECT")[oPly]
if(not tRay) then return StatusLog(nil,"IntersectRayRead: No player <"..tostring(oPly)..">") end
local stRay = tRay[sKey]
if(not stRay) then return StatusLog(nil,"IntersectRayRead: No Key <"..sKey..">") end
return stRay -- Obtain personal ray from the cache
local tRay = GetOpVar("RAY_INTERSECT")[oPly]; if(not tRay) then
return StatusLog(nil,"IntersectRayRead: No player <"..tostring(oPly)..">") end
local stRay = tRay[sKey]; if(not stRay) then
return StatusLog(nil,"IntersectRayRead: No Key <"..sKey..">") end
return IntersectRayUpdate(stRay) -- Obtain personal ray from the cache
end

function IntersectRayClear(oPly)
function IntersectRayClear(oPly, sKey)
if(not IsPlayer(oPly)) then
return StatusLog(false,"IntersectRayClear: Player invalid <"..tostring(oPly)..">") end
local tRay = GetOpVar("RAY_INTERSECT")[oPly]
if(not tRay) then return StatusLog(true,"IntersectRayClear: Clean") end
GetOpVar("RAY_INTERSECT")[oPly] = nil; collectgarbage()
local tRay = GetOpVar("RAY_INTERSECT")
if(not tRay[oPly]) then return StatusLog(true,"IntersectRayClear: Clean") end
if(sKey) then
if(not IsString(sKey)) then
return StatusLog(true,"IntersectRayClear: Key invalid <"..type(sKey).."/"..tostring(sKey)..">") end
tRay[oPly][sKey] = nil; collectgarbage()
else tRay[oPly] = nil; collectgarbage() end
return StatusLog(true,"IntersectRayClear: Deleted <"..tostring(oPly)..">")
end

Expand All @@ -3264,21 +3284,14 @@ end
* sKey1 --> First ray identifier
* sKey2 --> Second ray identifier
]]--
function IntersectRayMake(oPly, sKey1, sKey2)
if(not IsPlayer(oPly)) then
return StatusLog(nil,"IntersectRayMake: Player invalid <"..tostring(oPly)..">") end
if(not IsString(sKey1)) then
return StatusLog(nil,"IntersectRayMake: Key1 invalid <"..tostring(sKey1)..">") end
if(not IsString(sKey2)) then
return StatusLog(nil,"IntersectRayMake: Key2 invalid <"..tostring(sKey2)..">") end
local tRay = GetOpVar("RAY_INTERSECT")[oPly]
if(not tRay) then return StatusLog(nil,"IntersectRayMake: No player <"..tostring(oPly)..">") end
local stRay1, stRay2 = tRay[sKey1], tRay[sKey2]
if(not stRay1) then return StatusLog(nil,"IntersectRayMake: No Key1 <"..tostring(sKey1)..">") end
if(not stRay2) then return StatusLog(nil,"IntersectRayMake: No Key2 <"..tostring(sKey2)..">") end
local f1, f2, x1, x2, xx = IntersectRay(stRay1.Org, stRay1.Dir:Forward(), stRay2.Org, stRay2.Dir:Forward())
function IntersectRayHash(oPly, sKey1, sKey2)
local stRay1 = IntersectRayRead(oPly, sKey1)
if(not stRay1) then return StatusLog(nil,"IntersectRayHash: No read <"..tostring(sKey1)..">") end
local stRay2 = IntersectRayRead(oPly, sKey2)
if(not stRay2) then return StatusLog(nil,"IntersectRayHash: No read <"..tostring(sKey2)..">") end
local f1, f2, x1, x2, xx = IntersectRay(stRay1.Orw, stRay1.Diw:Forward(), stRay2.Orw, stRay2.Diw:Forward())
if(not xx) then
f1, f2, x1, x2, xx = IntersectRayParallel(stRay1.Org, stRay1.Dir:Forward(), stRay2.Org, stRay2.Dir:Forward()) end
f1, f2, x1, x2, xx = IntersectRayParallel(stRay1.Orw, stRay1.Diw:Forward(), stRay2.Orw, stRay2.Diw:Forward()) end
return xx, x1, x2, stRay1, stRay2
end

Expand Down
16 changes: 8 additions & 8 deletions lua/weapons/gmod_tool/stools/trackassembly.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,13 @@ function TOOL:IntersectClear()
if(stRay.Ent and stRay.Ent:IsValid()) then
stRay.Ent:SetColor(conPalette:Select("w")) end
asmlib.PrintNotifyPly(ply,"Intersection relation clear !","CLEANUP")
end; asmlib.IntersectRayClear(ply)
end; asmlib.IntersectRayClear(ply, "ray_relate")
return asmlib.StatusLog(true,"TOOL:IntersectClear(): Relation cleared")
end

function TOOL:IntersectRelate(oPly, oEnt, vHit)
self:IntersectClear() -- Clear intersect related player on new relation
stRay = asmlib.IntersectRayUpdate(oPly, oEnt, vHit, "ray_relate")
stRay = asmlib.IntersectRayCreate(oPly, oEnt, vHit, "ray_relate")
if(not stRay) then
return asmlib.StatusLog(false,"TOOL:IntersectRelate(): Update fail") end
if(SERVER) then
Expand Down Expand Up @@ -360,9 +360,9 @@ function TOOL:IntersectSnap(trEnt, vHit, stSpawn, bLoop)
local ply = self:GetOwner()
local model = self:GetModel()
local pointid, pnextid = self:GetPointID()
if(not asmlib.IntersectRayUpdate(ply, trEnt, vHit, "ray_origin")) then
if(not asmlib.IntersectRayCreate(ply, trEnt, vHit, "ray_origin")) then
return asmlib.StatusLog(false,"TOOL:LeftClick(): Failed updating ray") end
local xx, x1, x2, stRay1, stRay2 = asmlib.IntersectRayMake(ply, "ray_origin", "ray_relate")
local xx, x1, x2, stRay1, stRay2 = asmlib.IntersectRayHash(ply, "ray_origin", "ray_relate")
if(not xx) then
if(bLoop) then return false
else asmlib.PrintNotifyPly(ply, "Define intersection relation !", "ERROR")
Expand All @@ -375,14 +375,14 @@ function TOOL:IntersectSnap(trEnt, vHit, stSpawn, bLoop)
else return asmlib.StatusLog(false, "TOOL:IntersectSnap(): Model ray mismatch") end
end
local aOrg, vx, vy, vz = stSpawn.OAng, stSpawn.PNxt[cvX], stSpawn.PNxt[cvY], stSpawn.PNxt[cvZ]
if(self:ApplyAngularFirst()) then aOrg = stRay1.Dir end
if(self:ApplyAngularFirst()) then aOrg = stRay1.Diw end
mx:Rotate(stSpawn.SAng); mx:Mul(-1) -- Translate newly created entity local intersection to world
stSpawn.SPos:Set(mx); stSpawn.SPos:Add(xx); -- Update spawn position with the ray intersection
local cx, cy, cz = aOrg:Forward(), aOrg:Right(), aOrg:Up()
if(self:ApplyLinearFirst()) then
local dx = Vector(); dx:Set(o1); dx:Rotate(stSpawn.SAng); dx:Add(stSpawn.SPos); dx:Sub(stRay1.Org)
local dy = Vector(); dy:Set(o2); dy:Rotate(stSpawn.SAng); dy:Add(stSpawn.SPos); dy:Sub(stRay2.Org)
local dz = 0.5 * (stRay2.Org - stRay1.Org)
local dx = Vector(); dx:Set(o1); dx:Rotate(stSpawn.SAng); dx:Add(stSpawn.SPos); dx:Sub(stRay1.Orw)
local dy = Vector(); dy:Set(o2); dy:Rotate(stSpawn.SAng); dy:Add(stSpawn.SPos); dy:Sub(stRay2.Orw)
local dz = 0.5 * (stRay2.Orw - stRay1.Orw)
local lx = mathAbs(dx:Dot(aOrg:Forward()))
local ly = mathAbs(dy:Dot(aOrg:Right()))
local lz = mathAbs(dz:Dot(aOrg:Up()))
Expand Down

0 comments on commit 6bed08e

Please sign in to comment.