More cleanups & checks

Author: Astralcircle

lua/entities/gmod_wire_lamp.lua

@@ -8,18 +8,12 @@ ENT.WireDebugName = "Lamp"
 function ENT:SetupDataTables()
 	self:NetworkVar("Bool", "On")
 	self:NetworkVar("Int", "FOV")
-	self:NetworkVar("Int", "Red")
-	self:NetworkVar("Int", "Green")
-	self:NetworkVar("Int", "Blue")
 	self:NetworkVar("Int", "Distance")
 	self:NetworkVar("Int", "Brightness")
 	self:NetworkVar("String", "Texture")
 
 	if CLIENT then
 		self:NetworkVarNotify("FOV", self.OnVarChanged)
-		self:NetworkVarNotify("Red", self.OnVarChanged)
-		self:NetworkVarNotify("Green", self.OnVarChanged)
-		self:NetworkVarNotify("Blue", self.OnVarChanged)
 		self:NetworkVarNotify("Distance", self.OnVarChanged)
 		self:NetworkVarNotify("Brightness", self.OnVarChanged)
 		self:NetworkVarNotify("Texture", self.OnVarChanged)
@@ -75,7 +69,7 @@ if CLIENT then
 
 			render.SetMaterial(light)
 
-			local color = Color(self:GetRed(), self:GetGreen(), self:GetBlue())
+			local color = self:GetColor()
 			color.a = math.Clamp((1000 - math.Clamp(distance, 32, 800)) * visdot, 0, 100)
 
 			local size = math.Clamp(distance * visdot * (light_info.Scale or 2), 64, 512)
@@ -92,12 +86,6 @@ if CLIENT then
 
 		if name == "FOV" then
 			flashlight:SetFOV(game.SinglePlayer() and new or math.Clamp(new, 0, 170))
-		elseif name == "Red" then
-			flashlight:SetColor(Color(new, self:GetGreen(), self:GetBlue()))
-		elseif name == "Green" then
-			flashlight:SetColor(Color(self:GetRed(), new, self:GetBlue()))
-		elseif name == "Blue" then
-			flashlight:SetColor(Color(self:GetRed(), self:GetGreen(), new))
 		elseif name == "Distance" then
 			flashlight:SetFarZ(game.SinglePlayer() and new or math.Clamp(new, 64, 2048))
 		elseif name == "Brightness" then
@@ -121,7 +109,6 @@ if CLIENT then
 			local singleplayer = game.SinglePlayer()
 
 			flashlight:SetFOV(singleplayer and self:GetFOV() or math.Clamp(self:GetFOV(), 0, 170))
-			flashlight:SetColor(Color(self:GetRed(), self:GetGreen(), self:GetBlue()))
 			flashlight:SetFarZ(singleplayer and self:GetDistance() or math.Clamp(self:GetDistance(), 64, 2048))
 			flashlight:SetBrightness(singleplayer and self:GetBrightness() or math.Clamp(self:GetBrightness(), 0, 8))
 			flashlight:SetTexture(self:GetTexture())
@@ -130,17 +117,20 @@ if CLIENT then
 		end
 
 		local matrix = self:GetWorldTransformMatrix()
+		local color = self:GetColor()
 
-		if self.LastLampMatrix ~= matrix then
+		if self.LastLampMatrix ~= matrix or self.LastLampColor ~= color then
 			local flashlight = self.Flashlight
 			local light_info = self:GetLightInfo()
 			local lightpos = self:LocalToWorld(light_info.Offset or vector_offset)
 
+			flashlight:SetColor(color)
 			flashlight:SetPos(lightpos)
 			flashlight:SetAngles(self:LocalToWorldAngles(light_info.Angle or angle_zero))
 			flashlight:Update()
 
 			self.LastLampMatrix = matrix
+			self.LastLampColor = color
 		end
 	end
 
@@ -149,25 +139,38 @@ if CLIENT then
 			self.Flashlight:Remove()
 			self.Flashlight = nil
 			self.LastLampMatrix = nil
+			self.LastLampColor = nil
 		end
 	end
+
+	return
 end
 
 function ENT:TriggerInput(name, value)
+	local color = self:GetColor()
+
 	if name == "On" then
 		self:SetOn(value ~= 0)
 	elseif name == "FOV" then
 		self:SetFOV(value)
 	elseif name == "Red" then
-		self:SetRed(math.Clamp(value, 0, 255))
+		local color = self:GetColor()
+		color.r = value
+		self:SetColor(color)
 	elseif name == "Green" then
-		self:SetGreen(math.Clamp(value, 0, 255))
+		local color = self:GetColor()
+		color.g = value
+		self:SetColor(color)
 	elseif name == "Blue" then
-		self:SetBlue(math.Clamp(value, 0, 255))
+		local color = self:GetColor()
+		color.b = value
+		self:SetColor(color)
 	elseif name == "RGB" then
-		self:SetRed(math.Clamp(value.r, 0, 255))
-		self:SetGreen(math.Clamp(value.g, 0, 255))
-		self:SetBlue(math.Clamp(value.b, 0, 255))
+		local color = self:GetColor()
+		color.r = value.r
+		color.g = value.g
+		color.b = value.b
+		self:SetColor(color)
 	elseif name == "Distance" then
 		self:SetDistance(value)
 	elseif name == "Brightness" then
@@ -181,15 +184,21 @@ function ENT:TriggerInput(name, value)
 	end
 end
 
+function ENT:PrepareOverlayData()
+	local color = self:GetColor()
+	self:SetOverlayText(string.format("Red: %i Green: %i Blue: %i\nFOV: %i Distance: %i Brightness: %i", color.r, color.g, color.b, self:GetFOV(), self:GetDistance(), self:GetBrightness()))
+end
+
 function ENT:Setup(r, g, b, texture, fov, distance, brightness, on)
 	self:SetOn(on and true or false)
 	self:SetFOV(fov or 90)
-	self:SetRed(math.Clamp(r or 255, 0, 255))
-	self:SetGreen(math.Clamp(g or 255, 0, 255))
-	self:SetBlue(math.Clamp(b or 255, 0, 255))
 	self:SetDistance(distance or 1024)
 	self:SetBrightness(brightness or 8)
 	self:SetTexture(texture or "effects/flashlight001")
+
+	local color = self:GetColor()
+	color.r, color.g, color.b = math.Clamp(r or 255, 0, 255), math.Clamp(g or 255, 0, 255), math.Clamp(b or 255, 0, 255)
+	self:SetColor(color)
 end
 
 duplicator.RegisterEntityClass("gmod_wire_lamp", WireLib.MakeWireEnt, "Data", "r", "g", "b", "Texture", "FOV", "Dist", "Brightness", "on")