Skip to content

Commit

Permalink
Fixed: Misconception when leaving the active point origin empty
Browse files Browse the repository at this point in the history
Updated: Desynchronization point ID warning when POA is registered
  • Loading branch information
dvdvideo1234 committed Jan 12, 2021
1 parent e32fc75 commit 0ee9397
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 14 deletions.
8 changes: 4 additions & 4 deletions data/trackassembly/set/z_autorun_[trackassembly].txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,14 @@ if(asmlib) then
* Use that to swap the active points around by only moving the desired row up or down.
* For the example table definition below, the line ID in the database will be the same.
* POINT > This is the local position vector that TA searches and selects the related
* ORIGIN for. An empty string is treated as taking the ORIGIN.
* ORIGIN for. An empty or disabled string is treated as taking the ORIGIN.
* Disabling this using the disable event makes it hidden when the active point is searched for
* ORIGIN > This is the origin relative to which the next track piece position is calculated
* An empty string is treated as {0,0,0}. Disabling this makes it non-selectable by the holder
* You can also fill it with attachment event /!/ followed by your attachment name.
* An empty string is treated as {0,0,0}. Disabling this also makes it use {0,0,0}
* You can also fill it with attachment event /!/ followed by your attachment name. It's mandatory
* ANGLE > This is the angle relative to which the forward and up vectors are calculated.
* An empty string is treated as {0,0,0}. Disabling this also makes it use {0,0,0}
* You can also fill it with attachment event /!/ followed by your attachment name.
* You can also fill it with attachment event /!/ followed by your attachment name. It's mandatory
* CLASS > This string is populated up when your entity class is not /prop_physics/ but something else
* used by ents.Create of the gmod ents API library. Keep this empty if your stuff is a normal prop.
]]--
Expand Down
6 changes: 3 additions & 3 deletions data/trackassembly/set/z_autoset_[trackassembly].txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ if(asmlib) then
* ORIGIN for. An empty string is treated as taking the ORIGIN.
* Disabling this using the disable event makes it hidden when the active point is searched for
* ORIGIN > This is the origin relative to which the next track piece position is calculated
* An empty string is treated as {0,0,0}. Disabling this makes it non-selectable by the holder
* You can also fill it with attachment event /!/ followed by your attachment name.
* An empty string is treated as {0,0,0}. Disabling this also makes it use {0,0,0}
* You can also fill it with attachment event /!/ followed by your attachment name. It's mandatory
* ANGLE > This is the angle relative to which the forward and up vectors are calculated.
* An empty string is treated as {0,0,0}. Disabling this also makes it use {0,0,0}
* You can also fill it with attachment event /!/ followed by your attachment name.
* You can also fill it with attachment event /!/ followed by your attachment name. It's mandatory
* CLASS > This string is populated up when your entity class is not /prop_physics/ but something else
* used by ents.Create of the gmod ents API library. Keep this empty if your stuff is a normal prop.
]]--
Expand Down
10 changes: 7 additions & 3 deletions lua/autorun/trackassembly_init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ local gtInitLogs = {"*Init", false, 0}
------------ CONFIGURE ASMLIB ------------

asmlib.InitBase("track","assembly")
asmlib.SetOpVar("TOOL_VERSION","8.641")
asmlib.SetOpVar("TOOL_VERSION","8.642")
asmlib.SetIndexes("V" ,1,2,3)
asmlib.SetIndexes("A" ,1,2,3)
asmlib.SetIndexes("WV",1,2,3)
Expand Down Expand Up @@ -1630,8 +1630,12 @@ if(CLIENT) then
end

--[[ Track pieces parametrization legend
* Disabling of a component is preformed by using "OPSYM_DISABLE"
* Disabling A - The ID angle is treated as {0,0,0}
* Utilizing a trasnform attacment is done by using "OPSYM_ENTPOSANG"
* Disabling a component is preformed by using "OPSYM_DISABLE"
* Active points data are strings of floats delimited by "OPSYM_SEPARATOR"
* Disabling P - The ID search point is treated as taking the origin
* Disabling O - The ID snap origin is treated as {0,0,0} vector
* Disabling A - The ID snap angle is treated as {0,0,0} angle
* Disabling Type - Makes it use the value of Categorize()
* Disabling Name - Makes it generate it using the model via ModelToName()
* Disabling Class - Makes it use the default /prop_physics/
Expand Down
6 changes: 3 additions & 3 deletions lua/autorun/z_autorun_[shinji85_s_rails].lua
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ if(asmlib) then
* ORIGIN for. An empty string is treated as taking the ORIGIN.
* Disabling this using the disable event makes it hidden when the active point is searched for
* ORIGIN > This is the origin relative to which the next track piece position is calculated
* An empty string is treated as {0,0,0}. Disabling this makes it non-selectable by the holder
* You can also fill it with attachment event /!/ followed by your attachment name.
* An empty string is treated as {0,0,0}. Disabling this also makes it use {0,0,0}
* You can also fill it with attachment event /!/ followed by your attachment name. It's mandatory
* ANGLE > This is the angle relative to which the forward and up vectors are calculated.
* An empty string is treated as {0,0,0}. Disabling this also makes it use {0,0,0}
* You can also fill it with attachment event /!/ followed by your attachment name.
* You can also fill it with attachment event /!/ followed by your attachment name. It's mandatory
* CLASS > This string is populated up when your entity class is not /prop_physics/ but something else
* used by ents.Create of the gmod ents API library. Keep this empty if your stuff is a normal prop.
]]--
Expand Down
2 changes: 1 addition & 1 deletion lua/trackassembly/trackasmlib.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2103,7 +2103,7 @@ function RegisterPOA(stPiece, ivID, sP, sO, sA)
LogInstance("Exists ID #"..tostring(iID)); return nil
else
if((iID > 1) and (not tOffs[iID - 1])) then
LogInstance("No sequential ID #"..tostring(iID - 1)); return nil end
LogInstance("Desynchronized ID #"..tostring(iID)); return nil end
tOffs[iID] = {}; tOffs[iID].P = {}; tOffs[iID].O = {}; tOffs[iID].A = {}; tOffs = tOffs[iID]
end; local sE, sD = GetOpVar("OPSYM_ENTPOSANG"), GetOpVar("OPSYM_DISABLE")
---------- Origin ----------
Expand Down

0 comments on commit 0ee9397

Please sign in to comment.