Merge pull request #16 from Project-Collapse-Studios/psc-dev

Merge recent changes

Author: TheEnderek0

fgd/point/comp/comp_light_bounce.fgd

@@ -0,0 +1,31 @@
+@PointClass
+	iconsprite("editor/light.vmt")
+	autovis(Postcompiler)
+	color(255 0 0)
+	sphere(_fifty_percent_distance)
+	sphere(_zero_percent_distance)
+	sphere(_distance)
+	sphere(_hard_radius_override)
+	clusteredlight(point)
+= comp_light_bounce: "Generates bounced lighting (only) without direct lighting. Internally a light_rt."
+	[
+	_light(color255) : "Brightness" : "255 255 255 200" : "Color and brightness of the light."
+	_lightHDR(color255) : "BrightnessHDR" : "-1 -1 -1 1"
+	_lightscaleHDR(float) : "BrightnessScaleHDR" : 1 : "Amount to scale the light by when compiling for HDR."
+
+	linedivider_color(string) readonly : "-------------------------------------------------------------------------------------------------------"
+
+	_constant_attn(string) : "Constant" : 0
+	_linear_attn(string) : "Linear" : 0
+	_quadratic_attn(string) : "Quadratic" : 1
+	_fifty_percent_distance(string) : "50 percent falloff distance" : 0 : "Distance at which brightness should fall off to 50%. If set, overrides linear constant and quadratic parameters."
+	_zero_percent_distance(string) : "0 percent falloff distance" : 0 : "Distance at which brightness should fall off to negligible (1/256)%. Must set _fifty_percent_distance to use."
+	
+	linedivider_falloff(string) readonly : "-------------------------------------------------------------------------------------------------------"
+	
+	_hardfalloff(integer) : "Hard Falloff" : 0 : "If set, causes lights to fall to exactly zero beyond the zero percent distance. May cause unrealistic lighting if not used carefully."
+	_distance(integer) : "Maximum Distance" : 0 : "The distance that light is allowed to cast."
+	_hard_radius_threshold(float) : "Hard radius minimum brightness threshold" : 32
+	_hard_radius_override(float) : "Hard radius override" : 0
+
+	]

fgd/point/comp/comp_light_bounce_spot.fgd

@@ -0,0 +1,46 @@
+@PointClass
+	color(255 255 0)
+	autovis(Postcompiler)
+	lightprop("models/editor/spot.mdl")
+	lightcone()
+	line(255 255 255, targetname, target)
+	sphere(_fifty_percent_distance)
+	sphere(_zero_percent_distance)
+	sphere(_distance)
+	sphere(_hard_radius_override)
+	clusteredlight(spot)
+= comp_light_bounce_spot: "Generates bounced lighting (only) without direct lighting. Internally a light_rt_spot."
+	[
+		angles(angle) : "Pitch Yaw Roll (X Y Z)" : "0 0 0" : "This entity\'s orientation in the world. Roll is the rotation around the X axis, pitch is rotation around the Y axis and yaw is the rotation around the Z axis."
+
+		linedivider_base(string) readonly : "-------------------------------------------------------------------------------------------------------"
+
+		_light(color255) : "Brightness" : "255 255 255 200" : "Color and brightness of the light."
+		_lightHDR(color255) : "BrightnessHDR" : "-1 -1 -1 1"
+		_lightscaleHDR(float) : "BrightnessScaleHDR" : 1 : "Amount to scale the light by when compiling for HDR."
+
+		linedivider_color(string) readonly : "-------------------------------------------------------------------------------------------------------"
+
+		_inner_cone(integer) : "Inner (bright) angle" : 30
+		_cone(integer) : "Outer (fading) angle" : 45
+		_exponent(integer) : "Focus" : 1
+
+		linedivider_shape(string) readonly : "-------------------------------------------------------------------------------------------------------"
+
+		_constant_attn(string) : "Constant" : 0
+		_linear_attn(string) : "Linear" : 0
+		_quadratic_attn(string) : "Quadratic" : 1
+		_fifty_percent_distance(string) : "50 percent falloff distance" : 0 : "Distance at which brightness should fall off to 50%. If set, overrides linear constant and quadratic parameters."
+		_zero_percent_distance(string) : "0 percent falloff distance" : 0 : "Distance at which brightness should fall off to negligible (1/256)%. Must set _fifty_percent_distance to use."
+
+		linedivider_falloff(string) readonly : "-------------------------------------------------------------------------------------------------------"
+
+		target(target_destination) : "Entity to point at" : : "The name of an entity in the map that the spotlight will point at. This will override the spotlight\'s angles."
+		pitch(angle_negative_pitch) : "Pitch" : -90
+
+		_hardfalloff(integer) : "Hard Falloff" : 0 : "If set, causes lights to fall to exactly zero beyond the zero percent distance. May cause unrealistic lighting if not used carefully."
+		_distance(integer) : "Maximum Distance" : 0 : "The distance that light is allowed to cast."
+		_hard_radius_threshold(float) : "Hard radius minimum brightness threshold" : 32
+		_hard_radius_override(float) : "Hard radius override" : 0
+
+	]

transforms/comp_light_bounce.py

@@ -0,0 +1,23 @@
+"""An entity that generates only baked bounced lighting."""
+
+from hammeraddons.bsp_transform import trans, Context
+from srctools.logger import get_logger
+from srctools import VMF
+
+
+@trans("comp_light_bounce", priority=999) # Run last to allow other transformations to take place first
+def comp_light_bounce(ctx: Context):
+    vmf: VMF = ctx.vmf
+
+    for light in vmf.by_class["comp_light_bounce_spot"]:
+        light["classname"] = "light_rt_spot"
+        light["spawnflags"] = 1
+        light["_lightmode"] = 2
+    
+    for light in vmf.by_class["comp_light_bounce"]:
+        light["classname"] = "light_rt"
+        light["spawnflags"] = 1
+        light["_lightmode"] = 2
+
+
+    

transforms/dynamic_priority.py

@@ -126,18 +126,6 @@ def dynamic_priority(ctx: Context):
         vmf.add_ents([light_bounce])
 
 
-        # HACK: Make VRAD skip processing dynamic lights
-        match light["classname"]:
-            case "light_rt_spot":
-                light["classname"] = "_dynpr_rt_spot"
-
-            case "light_rt":
-                light["classname"] = "_dynpr_rt"
-
-            case _:
-                pass
-
-
 
 def AddLogic(vmf: VMF, pos: Vec):
     """Add the necessary logic to load the saved state on every map load."""

transforms/workaround_bakedbounce.py

@@ -2,18 +2,17 @@
 
 from hammeraddons.bsp_transform import trans, Context
 from srctools.logger import get_logger
-from srctools import Entity, VMF, Output, conv_int
+from srctools import VMF
 
 
 
 LOGGER = get_logger(__name__)
 
-@trans("workaround_bakedbounce")
+@trans("workaround_bakedbounce", priority=-999999) # Run first
 def bbounceworkaround(ctx: Context):
     vmf: VMF = ctx.vmf
     for light in vmf.by_class["light"] | vmf.by_class["light_spot"] | vmf.by_class["light_rt"] | vmf.by_class["light_rt_spot"]:
         if light["targetname", ""] and light["_lightmode", 2] == "2":
-            LOGGER.info(f"Changing light {light["targetname"]}")
             light["_lightmode"] = 3
             light["style"] = 0