Skip to content

Commit

Permalink
Added: Angle snapping now works in any direction
Browse files Browse the repository at this point in the history
  • Loading branch information
@dvdvideo1234
dvdvideo1234 committed Apr 15, 2018
1 parent ff3a2fc commit a3a000f
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 12 deletions.
7 changes: 6 additions & 1 deletion lua/autorun/gearassembly_init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ local asmlib = gearasmlib

------ CONFIGURE ASMLIB ------
asmlib.InitBase("gear","assembly")
asmlib.SetOpVar("TOOL_VERSION","5.212")
asmlib.SetOpVar("TOOL_VERSION","5.213")
asmlib.SetIndexes("V",1,2,3)
asmlib.SetIndexes("A",1,2,3)
asmlib.SetIndexes("S",4,5,6,7)
Expand Down Expand Up @@ -172,6 +172,7 @@ if(CLIENT) then
asmlib.ConCommandPly(oPly, "freeze" , "0")
asmlib.ConCommandPly(oPly, "adviser" , "1")
asmlib.ConCommandPly(oPly, "igntyp" , "0")
asmlib.ConCommandPly(oPly, "angsnap" , "0")
asmlib.ConCommandPly(oPly, "rotpivt" , "0")
asmlib.ConCommandPly(oPly, "rotpivh" , "0")
asmlib.ConCommandPly(oPly, "gravity" , "1")
Expand Down Expand Up @@ -676,6 +677,8 @@ if(CLIENT) then -- con >> control, def >> default, hd >> header, lb >> label
asmlib.SetLocalify("en","tool."..gsToolNameL..".nextz_con" , "Offset Z: ")
asmlib.SetLocalify("en","tool."..gsToolNameL..".count" , "Maximum number of pieces to create while stacking")
asmlib.SetLocalify("en","tool."..gsToolNameL..".count_con" , "Pieces count: ")
asmlib.SetLocalify("en","tool."..gsToolNameL..".angsnap" , "Snap the first piece spawned at this much degrees")
asmlib.SetLocalify("en","tool."..gsToolNameL..".angsnap_con" , "Angular alignment:")
asmlib.SetLocalify("en","tool."..gsToolNameL..".resetvars" , "V Reset variables V")
asmlib.SetLocalify("en","tool."..gsToolNameL..".resetvars_con" , "Click to reset the additional values")
asmlib.SetLocalify("en","tool."..gsToolNameL..".contyp" , "Select constraint type to create between anchor/base and the gear automatically")
Expand Down Expand Up @@ -762,6 +765,8 @@ if(CLIENT) then -- con >> control, def >> default, hd >> header, lb >> label
asmlib.SetLocalify("bg","tool."..gsToolNameL..".nextz_con" , "Отместване по апликата:")
asmlib.SetLocalify("bg","tool."..gsToolNameL..".count" , "Максимален брой на създадените парчета при натрупване")
asmlib.SetLocalify("bg","tool."..gsToolNameL..".count_con" , "Брой парчета:")
asmlib.SetLocalify("bg","tool."..gsToolNameL..".angsnap" , "Залепете първото създадено парче на толкова градуса")
asmlib.SetLocalify("bg","tool."..gsToolNameL..".angsnap_con" , "Ъглово подравняване:")
asmlib.SetLocalify("bg","tool."..gsToolNameL..".resetvars" , "V Нулиране на променливите V")
asmlib.SetLocalify("bg","tool."..gsToolNameL..".resetvars_con" , "Цъкнете за да нулирате допълнителните стойности")
asmlib.SetLocalify("bg","tool."..gsToolNameL..".contyp" , "Изберете типа на връзката която да се създаде автоматично между парчето и опора/база")
Expand Down
31 changes: 25 additions & 6 deletions lua/gearassembly/gearasmlib.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2687,14 +2687,33 @@ function ApplySpawnFlat(oEnt,stSpawn,vNorm)
end; return true
end

function GetNormalAngle(oPly, stTrace)
local aAng, vNorm = Angle(), stTrace.HitNormal
if(not IsPlayer(oPly)) then
return StatusLog(aAng,"GetNormalAngle: No player <"..tostring(oPly)..">") end
aAng:Set(vNorm:Cross(oPly:GetRight()):AngleEx(vNorm)); return aAng
----------------------------- SNAPPING ------------------------------

local function GetSurfaceAngle(oPly, vNorm)
local vF = oPly:GetAimVector()
local vR = vF:Cross(vNorm); vF:Set(vNorm:Cross(vR))
return vF:AngleEx(vNorm)
end

----------------------------- SNAPPING ------------------------------
--[[
* This function calculates the cross product normal angle of
* a player by a given trace. If the trace is missing it takes player trace
* It has options for snap to surface and yaw snap
* oPly > The player we need the normal angle from
* stTrace > A trace structure if nil, it takes oPly's
* bSnap > Snap to the trace surface flag
* nYSnp > Yaw snap amount
]]--
function GetNormalAngle(oPly, stTrace, nYSnp)
local nYSn, aAng = (tonumber(nYSnp) or 0), Angle()
if(not IsPlayer(oPly)) then
return StatusLog(aAng,"GetNormalAngle: No player <"..tostring(oPly)..">", aAng) end
aAng:Set(GetSurfaceAngle(oPly, stTrace.HitNormal))
if(nYSn and (nYSn > 0) and (nYSn <= GetOpVar("MAX_ROTATION"))) then
-- Snap player yaw, pitch and roll are not needed
aAng:SnapTo("pitch", nYSn):SnapTo("yaw", nYSn):SnapTo("roll", nYSn)
end; return aAng
end

--[[
* This function is the backbone of the tool for Trace.Normal
Expand Down
25 changes: 20 additions & 5 deletions lua/weapons/gmod_tool/stools/gearassembly.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ TOOL.ClientConVar = {
[ "freeze" ] = "0",
[ "adviser" ] = "1",
[ "igntyp" ] = "0",
[ "angsnap" ] = "0",
[ "rotpivt" ] = "0",
[ "rotpivh" ] = "0",
[ "gravity" ] = "1",
Expand Down Expand Up @@ -231,6 +232,10 @@ function TOOL:GetStackMode()
return (self:GetClientNumber("stmode") or 1)
end

function TOOL:GetAngSnap()
return mathClamp(self:GetClientNumber("angsnap"),0,gnMaxOffRot)
end

function TOOL:GetContrType()
return (self:GetClientNumber("contyp") or 1)
end
Expand Down Expand Up @@ -327,19 +332,24 @@ function TOOL:GetStatus(stTrace,anyMessage,hdEnt)
sDu = sDu..sSpace.." HD.File: <"..tostring(hdModel and hdModel:GetFileFromFilename() or gsNoAV)..">"..sDelim
sDu = sDu..sSpace.." HD.Mass: <"..tostring(self:GetMass())..">"..sDelim
sDu = sDu..sSpace.." HD.StackCNT: <"..tostring(self:GetCount())..">"..sDelim
sDu = sDu..sSpace.." HD.Freeze: <"..tostring(self:GetFreeze())..">"..sDelim
sDu = sDu..sSpace.." HD.Gravity: <"..tostring(self:GetGravity())..">"..sDelim
sDu = sDu..sSpace.." HD.Adviser: <"..tostring(self:GetAdviser())..">"..sDelim
sDu = sDu..sSpace.." HD.ExportDB: <"..tostring(self:GetExportDB())..">"..sDelim
sDu = sDu..sSpace.." HD.YawSnap: <"..tostring(self:GetAngSnap())..">"..sDelim
sDu = sDu..sSpace.." HD.Friction: <"..tostring(self:GetFriction())..">"..sDelim
sDu = sDu..sSpace.." HD.ExportDB: <"..tostring(self:GetExportDB())..">"..sDelim
sDu = sDu..sSpace.." HD.NoCollide: <"..tostring(self:GetNoCollide())..">"..sDelim
sDu = sDu..sSpace.." HD.SpawnFlat: <"..tostring(self:GetSpawnFlat())..">"..sDelim
sDu = sDu..sSpace.." HD.StkMode: <"..tostring(self:GetStackMode())..">"..sDelim
sDu = sDu..sSpace.." HD.ConstrType: <"..tostring(self:GetContrType())..">"..sDelim
sDu = sDu..sSpace.." HD.IgnoreType: <"..tostring(self:GetIgnoreType())..">"..sDelim
sDu = sDu..sSpace.." HD.ForceLimit: <"..tostring(self:GetForceLimit())..">"..sDelim
sDu = sDu..sSpace.." HD.TorqueLimit: <"..tostring(self:GetTorqueLimit())..">"..sDelim
sDu = sDu..sSpace.." HD.GhostHold: <"..tostring(self:GetGhostHolder())..">"..sDelim
sDu = sDu..sSpace.." HD.SkinBG: <"..tostring(self:GetBodyGroupSkin())..">"..sDelim
sDu = sDu..sSpace.." HD.StackAtempt: <"..tostring(self:GetStackAttempts())..">"..sDelim
sDu = sDu..sSpace.." HD.IgnorePG: <"..tostring(self:GetIgnorePhysgun())..">"..sDelim
sDu = sDu..sSpace.." HD.DeltaRot: <"..tostring(self:GetDeltaRotation())..">"..sDelim
sDu = sDu..sSpace.." HD.TrOrgAngle: <"..tostring(self:GetTraceOriginAngle())..">"..sDelim
sDu = sDu..sSpace.." HD.ModDataBase: <"..gsModeDataB..","..tostring(asmlib.GetAsmVar("modedb" ,"STR"))..">"..sDelim
sDu = sDu..sSpace.." HD.TimerMode: <"..tostring(asmlib.GetAsmVar("timermode","STR"))..">"..sDelim
Expand All @@ -350,6 +360,7 @@ function TOOL:GetStatus(stTrace,anyMessage,hdEnt)
sDu = sDu..sSpace.." HD.MaxStackCnt: <"..tostring(asmlib.GetAsmVar("maxstcnt" ,"INT"))..">"..sDelim
sDu = sDu..sSpace.." HD.BoundErrMod: <"..tostring(asmlib.GetAsmVar("bnderrmod","STR"))..">"..sDelim
sDu = sDu..sSpace.." HD.MaxFrequent: <"..tostring(asmlib.GetAsmVar("maxfruse" ,"INT"))..">"..sDelim
sDu = sDu..sSpace.." HD.MaxTrMargin: <"..tostring(asmlib.GetAsmVar("maxtrmarg","FLT"))..">"..sDelim
sDu = sDu..sSpace.." HD.RotatePivot: {"..tostring(rotpivt)..", "..tostring(rotpivh).."}"..sDelim
sDu = sDu..sSpace.." HD.Anchor: {"..tostring(anEnt or gsNoAV).."}<"..tostring(aninfo)..">"..sDelim
sDu = sDu..sSpace.." HD.AngOffsets: ["..tostring(nextx)..","..tostring(nexty)..","..tostring(nextz).."]"..sDelim
Expand Down Expand Up @@ -380,6 +391,7 @@ function TOOL:LeftClick(stTrace)
local count = self:GetCount()
local freeze = self:GetFreeze()
local gravity = self:GetGravity()
local angsnap = self:GetAngSnap()
local friction = self:GetFriction()
local nocollide = self:GetNoCollide()
local spnflat = self:GetSpawnFlat()
Expand All @@ -404,7 +416,7 @@ function TOOL:LeftClick(stTrace)
if(not asmlib.CheckButtonPly(ply,IN_SPEED) and not asmlib.CheckButtonPly(ply,IN_DUCK)) then
if(not (eBase and eBase:IsValid()) and (trEnt and trEnt:IsValid())) then eBase = trEnt end
local vPos, vAxis = stTrace.HitPos, Vector()
local aAng = asmlib.GetNormalAngle(ply, stTrace)
local aAng = asmlib.GetNormalAngle(ply, stTrace, angsnap)
local stSpawn = asmlib.GetNormalSpawn(ply,vPos,aAng,model,rotpivh,trorang,nextx,nexty,nextz,nextpic,nextyaw,nextrol)
if(not stSpawn) then return asmlib.StatusLog(false,self:GetStatus(stTrace,"TOOL:LeftClick(World): Normal spawn failed")) end
local ePiece = asmlib.MakePiece(ply,model,stTrace.HitPos,ANG_ZERO,mass,bgskids,conPalette:Select("w"),bnderrmod)
Expand Down Expand Up @@ -600,11 +612,12 @@ function TOOL:UpdateGhost(ePiece, oPly)
end
else
local model = self:GetModel()
local angsnap = self:GetAngSnap()
local spnflat = self:GetSpawnFlat()
local nextx, nexty, nextz = self:GetPosOffsets()
local nextpic, nextyaw, nextrol = self:GetAngOffsets()
local vPos = stTrace.HitPos
local aAng = asmlib.GetNormalAngle(oPly, stTrace)
local aAng = asmlib.GetNormalAngle(oPly, stTrace, angsnap)
local stSpawn = asmlib.GetNormalSpawn(oPly,vPos,aAng,model,rotpivh,trorang,nextx,nexty,nextz,nextpic,nextyaw,nextrol)
if(not stSpawn) then return end
if(spnflat) then asmlib.ApplySpawnFlat(ePiece,stSpawn,stTrace.HitNormal) end
Expand Down Expand Up @@ -682,7 +695,7 @@ function TOOL:DrawHUD()
if(not self:GetAdviser()) then return end
local trEnt, trHit = stTrace.Entity, stTrace.HitPos
local spnflat, model = self:GetSpawnFlat(), self:GetModel()
local trorang = self:GetTraceOriginAngle()
local trorang, angsnap = self:GetTraceOriginAngle(), self:GetAngSnap()
local rotpivt, rotpivh = self:GetRotatePivot()
local nextx , nexty , nextz = self:GetPosOffsets()
local nextpic, nextyaw, nextrol = self:GetAngOffsets()
Expand All @@ -707,7 +720,7 @@ function TOOL:DrawHUD()
if(not self:GetDeveloperMode()) then return end
self:DrawTextSpawn(hudMonitor, "k","SURF",{"Trebuchet18"})
else
local aAng = asmlib.GetNormalAngle(oPly, stTrace)
local aAng = asmlib.GetNormalAngle(oPly, stTrace, angsnap)
local stSpawn = asmlib.GetNormalSpawn(oPly,trHit,aAng,model,rotpivh,trorang,nextx,nexty,nextz,nextpic,nextyaw,nextrol)
if(not stSpawn) then return false end
local Op = self:DrawUCS(hudMonitor, stSpawn.OPos, stSpawn.F:AngleEx(stSpawn.U), plyrad, "y", true)
Expand Down Expand Up @@ -917,6 +930,8 @@ function TOOL.BuildCPanel(CPanel)
pItem:SetTooltip(languageGetPhrase("tool."..gsToolNameL..".mass"))
pItem = CPanel:NumSlider(languageGetPhrase("tool."..gsToolNameL..".count_con"), gsToolPrefL.."count", 1, asmlib.GetAsmVar("maxstcnt" , "INT"), 0)
pItem:SetTooltip(languageGetPhrase("tool."..gsToolNameL..".count"))
pItem = CPanel:NumSlider(languageGetPhrase ("tool."..gsToolNameL..".angsnap_con"), gsToolPrefL.."angsnap", 0, gnMaxOffRot, 7)
pItem:SetTooltip(languageGetPhrase("tool."..gsToolNameL..".angsnap"))
pItem = CPanel:Button(languageGetPhrase("tool."..gsToolNameL..".resetvars_con"), gsToolPrefL.."resetvars")
pItem:SetTooltip(languageGetPhrase("tool."..gsToolNameL..".resetvars"))
pItem = CPanel:NumSlider(languageGetPhrase("tool."..gsToolNameL..".rotpivt_con"), gsToolPrefL.."rotpivt", -gnMaxOffRot, gnMaxOffRot, 3)
Expand Down

0 comments on commit a3a000f

Please sign in to comment.