diff --git a/lua/entities/base_wire_entity.lua b/lua/entities/base_wire_entity.lua index dec0e2618d..8003fda178 100644 --- a/lua/entities/base_wire_entity.lua +++ b/lua/entities/base_wire_entity.lua @@ -3,7 +3,6 @@ DEFINE_BASECLASS( "base_gmodentity" ) ENT.Type = "anim" ENT.PrintName = "Wire Unnamed Ent" ENT.Purpose = "Base for all wired SEnts" -ENT.RenderGroup = RENDERGROUP_TRANSLUCENT ENT.Spawnable = false ENT.AdminOnly = false diff --git a/lua/entities/gmod_wire_balloondeployer.lua b/lua/entities/gmod_wire_balloondeployer.lua index cb26c03c24..bac568fb0b 100644 --- a/lua/entities/gmod_wire_balloondeployer.lua +++ b/lua/entities/gmod_wire_balloondeployer.lua @@ -2,7 +2,6 @@ AddCSLuaFile() ENT.Base = "base_wire_entity" ENT.PrintName = "Wire Balloon Deployer" -ENT.RenderGroup = RENDERGROUP_BOTH ENT.WireDebugName = "Balloon Deployer" if CLIENT then return end diff --git a/lua/entities/gmod_wire_buoyancy.lua b/lua/entities/gmod_wire_buoyancy.lua index 99369fa00f..ff06264b20 100644 --- a/lua/entities/gmod_wire_buoyancy.lua +++ b/lua/entities/gmod_wire_buoyancy.lua @@ -2,7 +2,6 @@ AddCSLuaFile() DEFINE_BASECLASS("base_wire_entity") ENT.PrintName = "Wire Buoyancy" -ENT.RenderGroup = RENDERGROUP_BOTH ENT.WireDebugName = "Buoyancy" if CLIENT then return end diff --git a/lua/entities/gmod_wire_cd_ray.lua b/lua/entities/gmod_wire_cd_ray.lua index b0014c6236..d5e335d1ae 100644 --- a/lua/entities/gmod_wire_cd_ray.lua +++ b/lua/entities/gmod_wire_cd_ray.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire CD Ray" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "CD Ray" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_characterlcd/shared.lua b/lua/entities/gmod_wire_characterlcd/shared.lua index c291b146e4..e61b46334b 100644 --- a/lua/entities/gmod_wire_characterlcd/shared.lua +++ b/lua/entities/gmod_wire_characterlcd/shared.lua @@ -8,5 +8,3 @@ ENT.Purpose = "" ENT.Instructions = "" ENT.Spawnable = false - -ENT.RenderGroup = RENDERGROUP_BOTH diff --git a/lua/entities/gmod_wire_colorer.lua b/lua/entities/gmod_wire_colorer.lua index f4ad741208..38404524fd 100644 --- a/lua/entities/gmod_wire_colorer.lua +++ b/lua/entities/gmod_wire_colorer.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Colorer" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Colorer" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_consolescreen/shared.lua b/lua/entities/gmod_wire_consolescreen/shared.lua index 872345b477..fbc3944e2f 100644 --- a/lua/entities/gmod_wire_consolescreen/shared.lua +++ b/lua/entities/gmod_wire_consolescreen/shared.lua @@ -8,5 +8,3 @@ ENT.Purpose = "" ENT.Instructions = "" ENT.Spawnable = false - -ENT.RenderGroup = RENDERGROUP_BOTH diff --git a/lua/entities/gmod_wire_data_transferer.lua b/lua/entities/gmod_wire_data_transferer.lua index 6ef5c32287..32edcc28b8 100644 --- a/lua/entities/gmod_wire_data_transferer.lua +++ b/lua/entities/gmod_wire_data_transferer.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Data Transferer" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Data Transferer" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_digitalscreen/shared.lua b/lua/entities/gmod_wire_digitalscreen/shared.lua index ff762fd458..58d398165a 100644 --- a/lua/entities/gmod_wire_digitalscreen/shared.lua +++ b/lua/entities/gmod_wire_digitalscreen/shared.lua @@ -8,5 +8,3 @@ ENT.Purpose = "" ENT.Instructions = "" ENT.Spawnable = false - -ENT.RenderGroup = RENDERGROUP_BOTH diff --git a/lua/entities/gmod_wire_egp/shared.lua b/lua/entities/gmod_wire_egp/shared.lua index 311c122b16..cf2bcfc5c7 100644 --- a/lua/entities/gmod_wire_egp/shared.lua +++ b/lua/entities/gmod_wire_egp/shared.lua @@ -8,8 +8,6 @@ ENT.Purpose = "Bring Graphic Processing to E2" ENT.Instructions = "Wirelink To E2" ENT.Spawnable = false - -ENT.RenderGroup = RENDERGROUP_BOTH ENT.IsEGP = true include("lib/init.lua") diff --git a/lua/entities/gmod_wire_egp_emitter.lua b/lua/entities/gmod_wire_egp_emitter.lua index ce6d13c0d6..90b22481b7 100644 --- a/lua/entities/gmod_wire_egp_emitter.lua +++ b/lua/entities/gmod_wire_egp_emitter.lua @@ -2,7 +2,6 @@ AddCSLuaFile() DEFINE_BASECLASS( "gmod_wire_egp" ) ENT.PrintName = "Wire E2 Graphics Processor Emitter" ENT.WireDebugName = "E2 Graphics Processor Emitter" -ENT.RenderGroup = RENDERGROUP_BOTH ENT.IsEGP = true ENT.gmod_wire_egp_emitter = true diff --git a/lua/entities/gmod_wire_forcer.lua b/lua/entities/gmod_wire_forcer.lua index a044d2003c..d939ea6237 100644 --- a/lua/entities/gmod_wire_forcer.lua +++ b/lua/entities/gmod_wire_forcer.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Forcer" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Forcer" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_gpu/shared.lua b/lua/entities/gmod_wire_gpu/shared.lua index 63b736e6bc..34f867b57f 100644 --- a/lua/entities/gmod_wire_gpu/shared.lua +++ b/lua/entities/gmod_wire_gpu/shared.lua @@ -8,5 +8,3 @@ ENT.Purpose = "" ENT.Instructions = "" ENT.Spawnable = false - -ENT.RenderGroup = RENDERGROUP_BOTH diff --git a/lua/entities/gmod_wire_grabber.lua b/lua/entities/gmod_wire_grabber.lua index 81d8913b86..d28e858b6b 100644 --- a/lua/entities/gmod_wire_grabber.lua +++ b/lua/entities/gmod_wire_grabber.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Grabber" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Grabber" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_holoemitter.lua b/lua/entities/gmod_wire_holoemitter.lua index d481a6b24d..8e39072ec6 100644 --- a/lua/entities/gmod_wire_holoemitter.lua +++ b/lua/entities/gmod_wire_holoemitter.lua @@ -1,7 +1,6 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Holographic Emitter" -ENT.RenderGroup = RENDERGROUP_BOTH ENT.WireDebugName = "Holographic Emitter" if CLIENT then diff --git a/lua/entities/gmod_wire_hologram.lua b/lua/entities/gmod_wire_hologram.lua index cf57484193..ded7396280 100644 --- a/lua/entities/gmod_wire_hologram.lua +++ b/lua/entities/gmod_wire_hologram.lua @@ -1,7 +1,6 @@ AddCSLuaFile() DEFINE_BASECLASS("base_anim") -- NOTE: Not base_wire_entity! Simpler than that ENT.PrintName = "Wire Hologram" -ENT.RenderGroup = RENDERGROUP_OPAQUE ENT.DisableDuplicator = true function ENT:SetupDataTables() @@ -117,13 +116,6 @@ if CLIENT then local selfTbl = EntityMeta.GetTable(self) if selfTbl.blocked or selfTbl.notvisible then return end - local _, _, _, alpha = EntityMeta.GetColor4Part(self) - if alpha ~= 255 then - selfTbl.RenderGroup = RENDERGROUP_BOTH - else - selfTbl.RenderGroup = RENDERGROUP_OPAQUE - end - local hasclips = next(selfTbl.clips) if hasclips then diff --git a/lua/entities/gmod_wire_hoverball.lua b/lua/entities/gmod_wire_hoverball.lua index 7333b68e36..fc8d34c1e6 100644 --- a/lua/entities/gmod_wire_hoverball.lua +++ b/lua/entities/gmod_wire_hoverball.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Hoverball" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Hoverball" -- Shared diff --git a/lua/entities/gmod_wire_igniter.lua b/lua/entities/gmod_wire_igniter.lua index f64072a460..878e1527d8 100644 --- a/lua/entities/gmod_wire_igniter.lua +++ b/lua/entities/gmod_wire_igniter.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Igniter" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Igniter" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_indicator.lua b/lua/entities/gmod_wire_indicator.lua index a78354dd9f..24b01e50bf 100644 --- a/lua/entities/gmod_wire_indicator.lua +++ b/lua/entities/gmod_wire_indicator.lua @@ -2,7 +2,6 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Indicator" ENT.WireDebugName = "Indicator" -ENT.RenderGroup = RENDERGROUP_BOTH -- Helper functions function ENT:GetFactorFromValue( value ) diff --git a/lua/entities/gmod_wire_lamp.lua b/lua/entities/gmod_wire_lamp.lua index a582064ca5..f495ab2096 100644 --- a/lua/entities/gmod_wire_lamp.lua +++ b/lua/entities/gmod_wire_lamp.lua @@ -2,7 +2,7 @@ AddCSLuaFile() DEFINE_BASECLASS("base_wire_entity") ENT.PrintName = "Wire Lamp" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Lamp" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_lever.lua b/lua/entities/gmod_wire_lever.lua index d62e7017a9..af9e0218be 100644 --- a/lua/entities/gmod_wire_lever.lua +++ b/lua/entities/gmod_wire_lever.lua @@ -20,11 +20,9 @@ if CLIENT then self.RBMax:Add(Vector(30,0,60)) end - local RenderGroup = ENT.RenderGroup - function ENT:Draw() if not IsValid(self.csmodel) then - self.csmodel = ClientsideModel("models/props_wasteland/tram_lever01.mdl",RenderGroup) + self.csmodel = ClientsideModel("models/props_wasteland/tram_lever01.mdl",RENDERGROUP_BOTH) self.csmodel:SetParent(self) self.NextRBUpdate = 0 end diff --git a/lua/entities/gmod_wire_light.lua b/lua/entities/gmod_wire_light.lua index 37c30f9cbf..6540bba9ab 100644 --- a/lua/entities/gmod_wire_light.lua +++ b/lua/entities/gmod_wire_light.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Light" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Light" function ENT:SetupDataTables() @@ -94,7 +94,7 @@ if CLIENT then return w_total, h_total end - + local function drawColorBox( color, x, y ) surface.SetDrawColor( color ) surface.DrawRect( x, y, color_box_size, color_box_size ) diff --git a/lua/entities/gmod_wire_materializer.lua b/lua/entities/gmod_wire_materializer.lua index 6eb58923a0..e71b93eca2 100644 --- a/lua/entities/gmod_wire_materializer.lua +++ b/lua/entities/gmod_wire_materializer.lua @@ -2,7 +2,7 @@ AddCSLuaFile() ENT.Base = "base_wire_entity" ENT.PrintName = "Wire Materializer" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Materializer" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_motor.lua b/lua/entities/gmod_wire_motor.lua index c1b7793cfc..7170cb4c28 100644 --- a/lua/entities/gmod_wire_motor.lua +++ b/lua/entities/gmod_wire_motor.lua @@ -4,7 +4,6 @@ ENT.PrintName = "Motor" ENT.WireDebugName = "Motor" if CLIENT then - ENT.RenderGroup = RENDERGROUP_BOTH return end diff --git a/lua/entities/gmod_wire_nailer.lua b/lua/entities/gmod_wire_nailer.lua index 335bf40dfb..7be194588e 100644 --- a/lua/entities/gmod_wire_nailer.lua +++ b/lua/entities/gmod_wire_nailer.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Nailer" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Nailer" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_painter.lua b/lua/entities/gmod_wire_painter.lua index 622b536b49..e5fce7b7d1 100644 --- a/lua/entities/gmod_wire_painter.lua +++ b/lua/entities/gmod_wire_painter.lua @@ -2,7 +2,7 @@ AddCSLuaFile() ENT.Base = "base_wire_entity" ENT.PrintName = "Wire Painter" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Painter" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_ranger.lua b/lua/entities/gmod_wire_ranger.lua index e5d9557574..3a5d33f507 100644 --- a/lua/entities/gmod_wire_ranger.lua +++ b/lua/entities/gmod_wire_ranger.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Ranger" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "Ranger" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_screen.lua b/lua/entities/gmod_wire_screen.lua index 1b42b07d89..7033803a70 100644 --- a/lua/entities/gmod_wire_screen.lua +++ b/lua/entities/gmod_wire_screen.lua @@ -3,7 +3,6 @@ DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Screen" ENT.WireDebugName = "Screen" ENT.Editable = true -ENT.RenderGroup = RENDERGROUP_BOTH function ENT:SetupDataTables() self:NetworkVar("Bool", 0, "SingleValue", { KeyName = "SingleValue", diff --git a/lua/entities/gmod_wire_spawner.lua b/lua/entities/gmod_wire_spawner.lua index 7c810a825e..20215d1350 100644 --- a/lua/entities/gmod_wire_spawner.lua +++ b/lua/entities/gmod_wire_spawner.lua @@ -1,7 +1,6 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Prop Spawner" -ENT.RenderGroup = RENDERGROUP_BOTH ENT.WireDebugName = "Prop Spawner" if CLIENT then return end -- No more client diff --git a/lua/entities/gmod_wire_thruster.lua b/lua/entities/gmod_wire_thruster.lua index 4d3272075c..6677931e8c 100644 --- a/lua/entities/gmod_wire_thruster.lua +++ b/lua/entities/gmod_wire_thruster.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Thruster" -ENT.RenderGroup = RENDERGROUP_BOTH -- TODO: this is only needed when they're active. +ENT.WantsTranslucency = true ENT.WireDebugName = "Thruster" WireLib.ThrusterNetEffects = { diff --git a/lua/entities/gmod_wire_trail.lua b/lua/entities/gmod_wire_trail.lua index 3b2f0962d5..24f9205a3b 100644 --- a/lua/entities/gmod_wire_trail.lua +++ b/lua/entities/gmod_wire_trail.lua @@ -2,7 +2,6 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Trail" ENT.WireDebugName = "Trail" -ENT.RenderGroup = RENDERGROUP_BOTH if CLIENT then return end -- No more client diff --git a/lua/entities/gmod_wire_trigger.lua b/lua/entities/gmod_wire_trigger.lua index af37c01873..8395a55900 100644 --- a/lua/entities/gmod_wire_trigger.lua +++ b/lua/entities/gmod_wire_trigger.lua @@ -2,7 +2,6 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Trigger" -ENT.RenderGroup = RENDERGROUP_BOTH ENT.WireDebugName = "Trigger" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_user.lua b/lua/entities/gmod_wire_user.lua index cda4b01838..3b998a4e78 100644 --- a/lua/entities/gmod_wire_user.lua +++ b/lua/entities/gmod_wire_user.lua @@ -1,7 +1,7 @@ AddCSLuaFile() ENT.Base = "base_wire_entity" ENT.PrintName = "Wire User" -ENT.RenderGroup = RENDERGROUP_BOTH +ENT.WantsTranslucency = true ENT.WireDebugName = "User" function ENT:SetupDataTables() diff --git a/lua/entities/gmod_wire_vectorthruster.lua b/lua/entities/gmod_wire_vectorthruster.lua index ddb9c6da99..1ed9543778 100644 --- a/lua/entities/gmod_wire_vectorthruster.lua +++ b/lua/entities/gmod_wire_vectorthruster.lua @@ -1,7 +1,7 @@ AddCSLuaFile() DEFINE_BASECLASS( "base_wire_entity" ) ENT.PrintName = "Wire Vector Thruster" -ENT.RenderGroup = RENDERGROUP_BOTH -- TODO: this is only needed when they're active. +ENT.WantsTranslucency = true ENT.WireDebugName = "Vector Thruster" function ENT:SetEffect( name )