Merge pull request #358 from OffLegAz/OffLegAz-patch-6

Improvments to vendors PhysicsObjects and their collision

Author: alexgrist

plugins/vendor/entities/entities/ix_vendor.lua

@@ -19,8 +19,13 @@ function ENT:Initialize()
 		self:SetUseType(SIMPLE_USE)
 		self:SetMoveType(MOVETYPE_NONE)
 		self:DrawShadow(true)
-		self:SetSolid(SOLID_BBOX)
-		self:PhysicsInit(SOLID_BBOX)
+		self:InitPhysObj()
+
+		self:AddCallback("OnAngleChange", function(entity)
+			local mins, maxs = entity:GetAxisAlignedBoundingBox()
+
+			entity:SetCollisionBounds(mins, maxs)
+		end)
 
 		self.items = {}
 		self.messages = {}
@@ -31,13 +36,6 @@ function ENT:Initialize()
 		self:SetDescription("")
 
 		self.receivers = {}
-
-		local physObj = self:GetPhysicsObject()
-
-		if (IsValid(physObj)) then
-			physObj:EnableMotion(false)
-			physObj:Sleep()
-		end
 	end
 
 	timer.Simple(1, function()
@@ -47,6 +45,25 @@ function ENT:Initialize()
 	end)
 end
 
+function ENT:InitPhysObj()
+	local mins, maxs = self:GetAxisAlignedBoundingBox()
+	local bPhysObjCreated = self:PhysicsInitBox(mins, maxs)
+
+	if (bPhysObjCreated) then
+		local physObj = self:GetPhysicsObject()
+		physObj:EnableMotion(false)
+		physObj:Sleep()
+	end
+end
+
+function ENT:GetAxisAlignedBoundingBox()
+	local mins, maxs = self:GetModelBounds()
+	mins = Vector(mins.x, mins.y, 0)
+	mins, maxs = self:GetRotatedAABB(mins, maxs)
+
+	return mins, maxs
+end
+
 function ENT:CanAccess(client)
 	local bAccess = false
 	local uniqueID = ix.faction.indices[client:Team()].uniqueID

plugins/vendor/sh_plugin.lua

@@ -86,15 +86,7 @@ if (SERVER) then
 
 			entity:SetModel(v.model)
 			entity:SetSkin(v.skin or 0)
-			entity:SetSolid(SOLID_BBOX)
-			entity:PhysicsInit(SOLID_BBOX)
-
-			local physObj = entity:GetPhysicsObject()
-
-			if (IsValid(physObj)) then
-				physObj:EnableMotion(false)
-				physObj:Sleep()
-			end
+			entity:InitPhysObj()
 
 			entity:SetNoBubble(v.bubble)
 			entity:SetDisplayName(v.name)
@@ -287,8 +279,7 @@ if (SERVER) then
 			data = {uniqueID, entity.classes[uniqueID]}
 		elseif (key == "model") then
 			entity:SetModel(data)
-			entity:SetSolid(SOLID_BBOX)
-			entity:PhysicsInit(SOLID_BBOX)
+			entity:InitPhysObj()
 			entity:SetAnim()
 		elseif (key == "useMoney") then
 			if (entity.money) then