Merge pull request #8581 from MrPerson/lighting_2015

Object based lighting system

code/controllers/subsystem/garbage.dm

@@ -82,7 +82,8 @@ var/datum/subsystem/garbage_collector/SSgarbage
 // Return true if the the GC controller should allow the object to continue existing. (Useful if pooling objects.)
 /datum/proc/Destroy()
 	//del(src)
-	return
+	tag = null
+	return 0
 
 /datum/var/gc_destroyed //Time when this object was destroyed.
 

code/controllers/subsystem/lighting.dm

@@ -1,56 +1,50 @@
 var/datum/subsystem/lighting/SSlighting
 
 #define MC_AVERAGE(average, current) (0.8*(average) + 0.2*(current))
-#define LIGHTING_ICON 'icons/effects/ss13_dark_alpha6.dmi'
-#define LIGHTING_LAYER 10									//Drawing layer for lighting overlays
 
 /datum/subsystem/lighting
 	name = "Lighting"
 	wait = 5
 	priority = 1
 
-	var/list/lighting_images = list()		//replaces lighting_states (use lighting_images.len) ~carn
-	var/list/lights = list()				//list of all datum/light_source
-	var/lights_workload = 0					//stats on the largest number of lights (max lights.len)
-	var/list/changed_turfs = list()			//list of all turfs which need moving to a new lighting subarea
+	var/list/changed_lights = list()		//list of all datum/light_source that need updating
+	var/changed_lights_workload = 0			//stats on the largest number of lights (max changed_lights.len)
+	var/list/changed_turfs = list()			//list of all turfs which may have a different light level
 	var/changed_turfs_workload = 0			//stats on the largest number of turfs changed (max changed_turfs.len)
 
 
 /datum/subsystem/lighting/New()
 	NEW_SS_GLOBAL(SSlighting)
 
-	//cache lighting images
-	if(!lighting_images.len)
-		for(var/icon_state in icon_states(LIGHTING_ICON))
-			lighting_images += image(LIGHTING_ICON, null, icon_state, LIGHTING_LAYER)
-
 	return ..()
 
 
 /datum/subsystem/lighting/stat_entry()
-	stat(name, "[round(cost,0.001)]ds (CPU:[round(cpu,1)]%) L:[round(lights_workload,1)]/T:[round(changed_turfs_workload,1)]")
+	stat(name, "[round(cost,0.001)]ds (CPU:[round(cpu,1)]%) L:[round(changed_lights_workload,1)]/T:[round(changed_turfs_workload,1)]")
 
 
-//Workhorse of lighting. It cycles through each light to see which ones need their effects updating. It updates their
-//effects and then processes every turf in the queue, moving the turfs to the corresponing lighting sub-area.
-//All queue lists prune themselves, which will cause lights with no luminosity to be garbage collected (cheaper and safer
-//than deleting them).
+//Workhorse of lighting. It cycles through each light that needs updating. It updates their
+//effects and then processes every turf in the queue, updating their lighting object's appearance
+//Any light that returns 1 in check() deletes itself
 //By using queues we are ensuring we don't perform more updates than are necessary
 /datum/subsystem/lighting/fire()
-	lights_workload = MC_AVERAGE(lights_workload, lights.len)
-	var/i=1
-	for(var/thing in lights)
-		if(thing && !thing:check())	//yes, cry that I'm using the : operator, it's much faster looping like this. And this gets called a lot. Dealwithit.
-			++i
-			continue
-		lights.Cut(i, i+1)
+	changed_lights_workload = MC_AVERAGE(changed_lights_workload, changed_lights.len)
+
+//	for(var/area/A in sortedAreas)
+//		A.luminosity = 1
+
+	for(var/datum/light_source/thing in changed_lights)
+		thing.check()
+	changed_lights.Cut()
 
 	changed_turfs_workload = MC_AVERAGE(changed_turfs_workload, changed_turfs.len)
-	for(var/thing in changed_turfs)
-		if(thing && thing:lighting_changed)
-			thing:shift_to_subarea()
+	for(var/turf/thing in changed_turfs)
+		if(thing && thing.lighting_changed)
+			thing.redraw_lighting()
 	changed_turfs.Cut()
 
+//	for(var/area/A in sortedAreas)
+//		A.luminosity = !A.lighting_use_dynamic
 
 //same as above except it attempts to shift ALL turfs in the world regardless of lighting_changed status
 //Does not loop. Should be run prior to process() being called for the first time.
@@ -58,12 +52,13 @@ var/datum/subsystem/lighting/SSlighting
 //z-levels with the z_level argument
 /datum/subsystem/lighting/Initialize(timeofday, z_level)
 
-	var/i=1
-	for(var/thing in lights)
-		if(thing && !thing:check())
-			++i
-			continue
-		lights.Cut(i, i+1)
+//	for(var/area/A in sortedAreas)
+//		A.luminosity = 1
+
+	for(var/datum/light_source/thing in changed_lights)
+		thing.add_effect()
+		thing.changed = 0
+	changed_lights.Cut()
 
 	var/z_start = 1
 	var/z_finish = world.maxz
@@ -72,28 +67,24 @@ var/datum/subsystem/lighting/SSlighting
 		z_start = z_level
 		z_finish = z_level
 
-	for(var/z=z_start, z<=z_finish, ++z)
-		for(var/x=1, x<=world.maxx, ++x)
-			for(var/y=1, y<=world.maxy, ++y)
-				var/turf/T = locate(x,y,z)
-				if(T)
-					T.shift_to_subarea()
+	var/list/turfs_to_init = block(locate(1, 1, z_start), locate(world.maxx, world.maxy, z_finish))
+
+	for(var/turf/T in turfs_to_init)
+		T.init_lighting()
 
 	if(z_level)
 		//we need to loop through to clear only shifted turfs from the list. or we will cause errors
-		i=1
-		for(var/thing in changed_turfs)
-			if(thing && thing:z < z_start && z_finish < thing:z)
+		var/i=1
+		for(var/turf/thing in changed_turfs)
+			if(thing && thing.z < z_start && z_finish < thing.z)
 				++i
 				continue
 			changed_turfs.Cut(i, i+1)
 	else
 		changed_turfs.Cut()
 
-	if(config.starlight)
-		set background = 1
-		for(var/turf/space/S in world)
-			S.update_starlight()
+//	for(var/area/A in sortedAreas)
+//		A.luminosity = !A.lighting_use_dynamic
 
 	..()
 
@@ -103,21 +94,20 @@ var/datum/subsystem/lighting/SSlighting
 /datum/subsystem/lighting/Recover()
 	if(!istype(SSlighting.changed_turfs))
 		SSlighting.changed_turfs = list()
-	if(!istype(SSlighting.lights))
-		SSlighting.lights = list()
+	if(!istype(SSlighting.changed_lights))
+		SSlighting.changed_lights = list()
 
-	if(istype(SSlighting.lighting_images))
-		lighting_images = SSlighting.lighting_images
+//	for(var/area/A in sortedAreas)
+//		A.luminosity = 1
 
-	for(var/datum/light_source/L in SSlighting.lights)
+	for(var/datum/light_source/L in SSlighting.changed_lights)
 		spawn(-1)			//so we don't crash the loop (inefficient)
 			L.check()
-			lights += L		//If we didn't runtime then this will get transferred over
 
 	for(var/turf/T in changed_turfs)
 		if(T.lighting_changed)
 			spawn(-1)
-				T.shift_to_subarea()
+				T.redraw_lighting()
 
 	var/msg = "## DEBUG: [time2text(world.timeofday)] [name] subsystem restarted. Reports:\n"
 	for(var/varname in SSlighting.vars)
@@ -132,5 +122,5 @@ var/datum/subsystem/lighting/SSlighting
 				msg += "\t [varname] = [varval1] -> [varval2]\n"
 	world.log << msg
 
-#undef LIGHTING_ICON
-#undef LIGHTING_LAYER
+//	for(var/area/A in sortedAreas)
+//		A.luminosity = !A.lighting_use_dynamic