cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

/bay/ colored light changes.

Browse Source
This commit is contained in:
ESwordTheCat
2014-07-07 10:25:23 -08:00
parent 4bfb485596
commit 66eef0f964
2 changed files with 103 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
code/__HELPERS/game.dm
View File

@@ -457,33 +457,61 @@ var/list/DummyCache = list()
return mobs_found
/proc/GetRedPart(const/hexa)
var/hex = uppertext(hexa)
var/hi = text2ascii(hex, 2)
var/lo = text2ascii(hex, 3)
return (((hi >= 65 ? hi - 55 : hi - 48) << 4) | (lo >= 65 ? lo - 55 : lo - 48))
return hex2num(copytext(hexa, 2, 4))
/proc/GetGreenPart(const/hexa)
var/hex = uppertext(hexa)
var/hi = text2ascii(hex, 4)
var/lo = text2ascii(hex, 5)
return (((hi >= 65 ? hi - 55 : hi - 48) << 4) | (lo >= 65 ? lo - 55 : lo - 48))
return hex2num(copytext(hexa, 4, 6))
/proc/GetBluePart(const/hexa)
var/hex = uppertext(hexa)
var/hi = text2ascii(hex, 6)
var/lo = text2ascii(hex, 7)
return (((hi >= 65 ? hi - 55 : hi - 48) << 4) | (lo >= 65 ? lo - 55 : lo - 48))
return hex2num(copytext(hexa, 6, 8))
/proc/GetHexColors(const/hexa)
var/hex = uppertext(hexa)
var/hi1 = text2ascii(hex, 2)
var/lo1 = text2ascii(hex, 3)
var/hi2 = text2ascii(hex, 4)
var/lo2 = text2ascii(hex, 5)
var/hi3 = text2ascii(hex, 6)
var/lo3 = text2ascii(hex, 7)
return list(
((hi1 >= 65 ? hi1 - 55 : hi1 - 48) << 4) | (lo1 >= 65 ? lo1 - 55 : lo1 - 48),
((hi2 >= 65 ? hi2 - 55 : hi2 - 48) << 4) | (lo2 >= 65 ? lo2 - 55 : lo2 - 48),
((hi3 >= 65 ? hi3 - 55 : hi3 - 48) << 4) | (lo3 >= 65 ? lo3 - 55 : lo3 - 48)
)
return list(\
GetRedPart(hexa),\
GetGreenPart(hexa),\
GetBluePart(hexa)\
)
/proc/MixColors(const/list/colors)
var/list/reds = new
var/list/blues = new
var/list/greens = new
var/list/weights = new
for (var/i = 0, ++i <= colors.len)
reds.Add(GetRedPart(colors[i]))
blues.Add(GetBluePart(colors[i]))
greens.Add(GetGreenPart(colors[i]))
weights.Add(1)
var/r = mixOneColor(weights, reds)
var/g = mixOneColor(weights, greens)
var/b = mixOneColor(weights, blues)
return rgb(r,g,b)
/proc/mixOneColor(var/list/weight, var/list/color)
if(!weight || !color || length(weight) != length(color))
return 0
var/contents = length(weight)
// normalize weights
var/listsum = 0
for(var/i = 1, i <= contents, i++)
listsum += weight[i]
for(var/i = 1, i <= contents, i++)
weight[i] /= listsum
// mix them
var/mixedcolor = 0
for(var/i = 1, i <= contents, i++)
mixedcolor += weight[i] * color[i]
// until someone writes a formal proof for this algorithm, let's keep this in
//if(mixedcolor<0x00 || mixedcolor>0xFF)
// return 0
// that's not the kind of operation we are running here, nerd
return Clamp(round(mixedcolor), 0, 255)

111
code/controllers/_DynamicAreaLighting_TG.dm
View File

@@ -37,19 +37,24 @@ datum/light_source
var/atom/owner
var/changed = 1
var/list/effect = list()
var/__x = 0 //x coordinate at last update
var/__y = 0 //y coordinate at last update
var/l_color
var/__x = 0 // x coordinate at last update
var/__y = 0 // y coordinate at last update
var/__z = 0 // z coordinate at last update
var/_l_color // do not use directly, only used as reference for updating
var/col_r
var/col_g
var/col_b
New(atom/A)
if(!istype(A))
CRASH("The first argument to the light object's constructor must be the atom that is the light source. Expected atom, received '[A]' instead.")
..()
owner = A
l_color = owner.l_color
readrgb(owner.l_color)
__x = owner.x
__y = owner.y
__z = owner.z
// the lighting object maintains a list of all light sources
lighting_controller.lights += src
@@ -61,12 +66,13 @@ datum/light_source
return 1 //causes it to be removed from our list of lights. The garbage collector will then destroy it.
// check to see if we've moved since last update
if(owner.x != __x || owner.y != __y)
if(owner.x != __x || owner.y != __y || owner.z != __z)
__x = owner.x
__y = owner.y
__z = owner.z
changed = 1
if (owner.l_color != l_color)
if (owner.l_color != _l_color)
changed = 1
if(changed)
@@ -75,23 +81,22 @@ datum/light_source
return add_effect()
return 0
proc/remove_effect()
// before we apply the effect we remove the light's current effect.
for(var/turf/T in effect) // negate the effect of this light source
T.update_lumcount(-effect[T], l_color, 1)
T.update_lumcount(-effect[T], col_r, col_g, col_b, 1)
effect.Cut() // clear the effect list
proc/add_effect()
// only do this if the light is turned on and is on the map
if(owner.loc && owner.luminosity > 0)
l_color = owner.l_color
readrgb(owner.l_color)
effect = list()
for(var/turf/T in view(owner.get_light_range(),owner))
var/delta_lumen = lum(T)
if(delta_lumen > 0)
effect[T] = delta_lumen
T.update_lumcount(delta_lumen, l_color, 0)
T.update_lumcount(delta_lumen, col_r, col_g, col_b, 0)
return 0
else
@@ -116,6 +121,16 @@ datum/light_source
else
return sqrtTable[owner.trueLuminosity] - dist
proc/readrgb(const/col)
_l_color = col
if(col)
col_r = GetRedPart(col)
col_g = GetGreenPart(col)
col_b = GetBluePart(col)
else
col_r = null
atom
var/datum/light_source/light
var/trueLuminosity = 0 // Typically 'luminosity' squared. The builtin luminosity must remain linear.
@@ -214,63 +229,38 @@ turf
var/lighting_lumcount = 0
var/lighting_changed = 0
var/color_lighting_lumcount = 0
var/list/colors = list()
var/lumcount_r = 0
var/lumcount_g = 0
var/lumcount_b = 0
var/light_col_sources = 0
turf/space
lighting_lumcount = 4 //starlight
turf/proc/update_lumcount(amount, _lcolor, removing = 0)
turf/proc/update_lumcount(amount, col_r, col_g, col_b, removing = 0)
lighting_lumcount += amount
var/blended
if (_lcolor)
if (l_color && _lcolor && l_color != _lcolor && !removing) // Blend colors.
var/redblend = min((GetRedPart(l_color)) + (GetRedPart(_lcolor)), 255)
var/greenblend = min((GetGreenPart(l_color)) + (GetGreenPart(_lcolor)), 255)
var/blueblend = min((GetBluePart(l_color)) + (GetBluePart(_lcolor)), 255)
blended = "#[add_zero2(num2hex(redblend), 2)][add_zero2(num2hex(greenblend),2)][add_zero2(num2hex(blueblend),2)]"
if(!isnull(col_r)) //col_r is the "key" var, if it's null so will the rest
if(removing)
light_col_sources--
lumcount_r -= col_r
lumcount_g -= col_g
lumcount_b -= col_b
else
light_col_sources++
lumcount_r += col_r
lumcount_g += col_g
lumcount_b += col_b
if (removing)
colors.Remove(_lcolor) // Remove the color that's leaving us from our list.
if(light_col_sources)
var/r_avg = max(0, min(255, round(lumcount_r / light_col_sources, 16) + 15))
var/g_avg = max(0, min(255, round(lumcount_g / light_col_sources, 16) + 15))
var/b_avg = max(0, min(255, round(lumcount_b / light_col_sources, 16) + 15))
l_color = rgb(r_avg, g_avg, b_avg)
else
l_color = null
if (colors && !colors.len)
l_color = null // All our color is gone, no color for us.
else if (colors && colors.len > 1)
var/maxdepth = 3 // Will blend 3 colors, anymore than that and it looks bad or we will get lag on every tile update.
var/currentblended
for (var/i = 0, ++i <= colors.len)
if (i > maxdepth)
//world << "Maxdepth reached, breaking loop."
break
if (!currentblended)
//world << "First iteration, currentblended = [colors[i]]."
currentblended = colors[i] // Start with the first of the remaining colors.
continue
var/redblend = min((GetRedPart(currentblended)) + (GetRedPart(colors[i])), 255)
var/greenblend = min((GetGreenPart(currentblended)) + (GetGreenPart(colors[i])), 255)
var/blueblend = min((GetBluePart(currentblended)) + (GetBluePart(colors[i])), 255)
currentblended = "#[add_zero2(num2hex(redblend), 2)][add_zero2(num2hex(greenblend), 2)][add_zero2(num2hex(blueblend), 2)]"
//world << "Finished [i] [currentblended]."
if (currentblended)
//world << "Ended up with [currentblended]"
l_color = currentblended // blended the remaining colors so apply it.
else
l_color = null // Something went wrong, no color for you.
else
l_color = colors[colors.len]
else // we added a color.
colors.Add(_lcolor) // Add the base color to the list.
if (blended)
l_color = blended // If we had a blended color, this is what we get otherwise.
else
l_color = _lcolor // Basecolor is our color.
// if ((l_color != LIGHT_WHITE && l_color != "#FFF") || removing)
color_lighting_lumcount = max(color_lighting_lumcount + amount, 0) // Minimum of 0.
if(!lighting_changed)
@@ -316,7 +306,8 @@ turf/proc/shift_to_subarea()
// pomf - If we have a lighting color that is not null, apply the new tag to seperate the areas.
if (l_color)
new_tag += "[l_color][color_lighting_lumcount]" // pomf - We append the color lighting lumcount so we can have colored lights.
// pomf - We append the (rounded!) color lighting lumcount so we can have colored lights.
new_tag += "[l_color][Clamp(0, round(color_lighting_lumcount, 1), lighting_controller.lighting_states)]"
if(Area.tag!=new_tag) //skip if already in this area
var/area/A = locate(new_tag) // find an appropriate area