cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4602 from VOREStation/upstream-merge-5765

Browse Source 
[MIRROR] Speeds up getFlatIcon
This commit is contained in:
Novacat
2019-03-27 03:07:16 -04:00
committed by GitHub
parent 869cd74795 cd49ba1bfc
commit a5cfa5519a
1 changed files with 162 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

320
code/_helpers/icons.dm
View File

@@ -627,22 +627,44 @@ proc/ColorTone(rgb, tone)
if(gray <= tone_gray) return BlendRGB("#000000", tone, gray/(tone_gray || 1)) if(gray <= tone_gray) return BlendRGB("#000000", tone, gray/(tone_gray || 1))
else return BlendRGB(tone, "#ffffff", (gray-tone_gray)/((255-tone_gray) || 1)) else return BlendRGB(tone, "#ffffff", (gray-tone_gray)/((255-tone_gray) || 1))
// Ported from /tg/station
/* // Creates a single icon from a given /atom or /image. Only the first argument is required.
Get flat icon by DarkCampainger. As it says on the tin, will return an icon with all the overlays
as a single icon. Useful for when you want to manipulate an icon via the above as overlays are not normally included.
The _flatIcons list is a cache for generated icon files.
*/
/proc/getFlatIcon(image/A, defdir, deficon, defstate, defblend, start = TRUE, no_anim = FALSE) /proc/getFlatIcon(image/A, defdir, deficon, defstate, defblend, start = TRUE, no_anim = FALSE)
// We start with a blank canvas, otherwise some icon procs crash silently //Define... defines.
var/icon/flat = icon('icons/effects/effects.dmi', "nothing") // Final flattened icon var/static/icon/flat_template = icon('icons/effects/effects.dmi', "nothing")
if(!A)
return flat
if(A.alpha <= 0)
return flat
var/noIcon = FALSE
#define BLANK icon(flat_template)
#define SET_SELF(SETVAR) do { \
var/icon/SELF_ICON=icon(icon(curicon, curstate, base_icon_dir),"",SOUTH,no_anim?1:null); \
if(A.alpha<255) { \
SELF_ICON.Blend(rgb(255,255,255,A.alpha),ICON_MULTIPLY);\
} \
if(A.color) { \
if(islist(A.color)){ \
SELF_ICON.MapColors(arglist(A.color))} \
else{ \
SELF_ICON.Blend(A.color,ICON_MULTIPLY)} \
} \
##SETVAR=SELF_ICON;\
} while (0)
#define INDEX_X_LOW 1
#define INDEX_X_HIGH 2
#define INDEX_Y_LOW 3
#define INDEX_Y_HIGH 4
#define flatX1 flat_size[INDEX_X_LOW]
#define flatX2 flat_size[INDEX_X_HIGH]
#define flatY1 flat_size[INDEX_Y_LOW]
#define flatY2 flat_size[INDEX_Y_HIGH]
#define addX1 add_size[INDEX_X_LOW]
#define addX2 add_size[INDEX_X_HIGH]
#define addY1 add_size[INDEX_Y_LOW]
#define addY2 add_size[INDEX_Y_HIGH]
if(!A || A.alpha <= 0)
return BLANK
var/noIcon = FALSE
if(start) if(start)
if(!defdir) if(!defdir)
defdir = A.dir defdir = A.dir
@@ -653,26 +675,16 @@ The _flatIcons list is a cache for generated icon files.
if(!defblend) if(!defblend)
defblend = A.blend_mode defblend = A.blend_mode
var/curicon var/curicon = A.icon || deficon
if(A.icon) var/curstate = A.icon_state || defstate
curicon = A.icon
else
curicon = deficon
if(!curicon) if(!((noIcon = (!curicon))))
noIcon = TRUE // Do not render this object. var/curstates = icon_states(curicon)
if(!(curstate in curstates))
var/curstate if("" in curstates)
if(A.icon_state) curstate = ""
curstate = A.icon_state else
else noIcon = TRUE // Do not render this object.
curstate = defstate
if(!noIcon && !(curstate in icon_states(curicon)))
if("" in icon_states(curicon))
curstate = ""
else
noIcon = TRUE // Do not render this object.
var/curdir var/curdir
var/base_icon_dir //We'll use this to get the icon state to display if not null BUT NOT pass it to overlays as the dir we have var/base_icon_dir //We'll use this to get the icon state to display if not null BUT NOT pass it to overlays as the dir we have
@@ -683,148 +695,140 @@ The _flatIcons list is a cache for generated icon files.
else else
curdir = A.dir curdir = A.dir
//Let's check if the icon actually contains any diagonals, just skip if it's south to save (lot of) time //Try to remove/optimize this section ASAP, CPU hog.
if(curdir != SOUTH) //Determines if there's directionals.
var/icon/test_icon if(!noIcon && curdir != SOUTH)
var/directionals_exist = FALSE var/exist = FALSE
var/list/dirs_to_check = cardinal - SOUTH var/static/list/checkdirs = list(NORTH, EAST, WEST)
outer: for(var/i in checkdirs) //Not using GLOB for a reason.
for(var/possible_dir in dirs_to_check) if(length(icon_states(icon(curicon, curstate, i))))
test_icon = icon(curicon,curstate,possible_dir,frame=1) exist = TRUE
for(var/x in 1 to world.icon_size) break
for(var/y in 1 to world.icon_size) if(!exist)
if(!isnull(test_icon.GetPixel(x,y)))
directionals_exist = TRUE
break outer
if(!directionals_exist)
base_icon_dir = SOUTH base_icon_dir = SOUTH
//
if(!base_icon_dir) if(!base_icon_dir)
base_icon_dir = curdir base_icon_dir = curdir
var/curblend ASSERT(!BLEND_DEFAULT) //I might just be stupid but lets make sure this define is 0.
if(A.blend_mode == BLEND_DEFAULT)
curblend = defblend
else
curblend = A.blend_mode
// Before processing overlays, make sure any pending overlays are applied var/curblend = A.blend_mode || defblend
if (isloc(A))
var/atom/aAtom = A
if(aAtom.flags & OVERLAY_QUEUED)
COMPILE_OVERLAYS(aAtom)
// Layers will be a sorted list of icons/overlays, based on the order in which they are displayed if(A.overlays.len || A.underlays.len)
var/list/layers = list() var/icon/flat = BLANK
var/image/copy // Layers will be a sorted list of icons/overlays, based on the order in which they are displayed
// Add the atom's icon itself, without pixel_x/y offsets. var/list/layers = list()
if(!noIcon) var/image/copy
copy = image(icon=curicon, icon_state=curstate, layer=A.layer, dir=base_icon_dir) // Add the atom's icon itself, without pixel_x/y offsets.
copy.color = A.color if(!noIcon)
copy.alpha = A.alpha copy = image(icon=curicon, icon_state=curstate, layer=A.layer, dir=base_icon_dir)
copy.blend_mode = curblend copy.color = A.color
layers[copy] = A.layer copy.alpha = A.alpha
copy.blend_mode = curblend
layers[copy] = A.layer
// Loop through the underlays, then overlays, sorting them into the layers list // Loop through the underlays, then overlays, sorting them into the layers list
var/list/process = A.underlays // Current list being processed for(var/process_set in 0 to 1)
var/pSet=0 // Which list is being processed: 0 = underlays, 1 = overlays var/list/process = process_set? A.overlays : A.underlays
var/curIndex=1 // index of 'current' in list being processed for(var/i in 1 to process.len)
var/current // Current overlay being sorted var/image/current = process[i]
var/currentLayer // Calculated layer that overlay appears on (special case for FLOAT_LAYER) if(!current)
var/compare // The overlay 'add' is being compared against continue
var/cmpIndex // The index in the layers list of 'compare' if(current.plane != FLOAT_PLANE && current.plane != A.plane)
while(TRUE) continue
if(curIndex<=process.len) var/current_layer = current.layer
current = process[curIndex] if(current_layer < 0)
if(!current) if(current_layer <= -1000)
curIndex++ //Try the next layer return flat
current_layer = process_set + A.layer + current_layer / 1000
for(var/p in 1 to layers.len)
var/image/cmp = layers[p]
if(current_layer < layers[cmp])
layers.Insert(p, current)
break
layers[current] = current_layer
//sortTim(layers, /proc/cmp_image_layer_asc)
var/icon/add // Icon of overlay being added
// Current dimensions of flattened icon
var/list/flat_size = list(1, flat.Width(), 1, flat.Height())
// Dimensions of overlay being added
var/list/add_size[4]
for(var/V in layers)
var/image/I = V
if(I.alpha == 0)
continue continue
var/image/I = current
if(I.plane != FLOAT_PLANE && I.plane != A.plane) if(I == copy) // 'I' is an /image based on the object being flattened.
curIndex++ curblend = BLEND_OVERLAY
add = icon(I.icon, I.icon_state, base_icon_dir)
else // 'I' is an appearance object.
add = getFlatIcon(image(I), curdir, curicon, curstate, curblend, FALSE, no_anim)
if(!add)
continue continue
currentLayer = I.layer // Find the new dimensions of the flat icon to fit the added overlay
if(currentLayer<0) // Special case for FLOAT_LAYER add_size = list(
if(currentLayer <= -1000) min(flatX1, I.pixel_x+1),
return flat max(flatX2, I.pixel_x+add.Width()),
if(pSet == 0) // Underlay min(flatY1, I.pixel_y+1),
currentLayer = A.layer+currentLayer/1000 max(flatY2, I.pixel_y+add.Height())
else // Overlay )
currentLayer = A.layer+(1000+currentLayer)/1000
// Sort add into layers list if(flat_size ~! add_size)
for(cmpIndex=1,cmpIndex<=layers.len,cmpIndex++) // Resize the flattened icon so the new icon fits
compare = layers[cmpIndex] flat.Crop(
if(currentLayer < layers[compare]) // Associated value is the calculated layer addX1 - flatX1 + 1,
layers.Insert(cmpIndex,current) addY1 - flatY1 + 1,
layers[current] = currentLayer addX2 - flatX1 + 1,
break addY2 - flatY1 + 1
if(cmpIndex>layers.len) // Reached end of list without inserting )
layers[current]=currentLayer // Place at end flat_size = add_size.Copy()
curIndex++ // Blend the overlay into the flattened icon
flat.Blend(add, blendMode2iconMode(curblend), I.pixel_x + 2 - flatX1, I.pixel_y + 2 - flatY1)
if(curIndex>process.len) if(A.color)
if(pSet == 0) // Switch to overlays if(islist(A.color))
curIndex = 1 flat.MapColors(arglist(A.color))
pSet = 1 else
process = A.overlays flat.Blend(A.color, ICON_MULTIPLY)
else // All done
break
var/icon/add // Icon of overlay being added if(A.alpha < 255)
flat.Blend(rgb(255, 255, 255, A.alpha), ICON_MULTIPLY)
// Current dimensions of flattened icon if(no_anim)
var/flatX1=1 //Clean up repeated frames
var/flatX2=flat.Width() var/icon/cleaned = new /icon()
var/flatY1=1 cleaned.Insert(flat, "", SOUTH, 1, 0)
var/flatY2=flat.Height() . = cleaned
// Dimensions of overlay being added else
var/addX1 . = icon(flat, "", SOUTH)
var/addX2 else //There's no overlays.
var/addY1 if(!noIcon)
var/addY2 SET_SELF(.)
for(var/V in layers)
var/image/I = V
if(I.alpha == 0)
continue
if(I == copy) // 'I' is an /image based on the object being flattened.
curblend = BLEND_OVERLAY
add = icon(I.icon, I.icon_state, base_icon_dir)
else // 'I' is an appearance object.
add = getFlatIcon(new/image(I), curdir, curicon, curstate, curblend, FALSE, no_anim)
// Find the new dimensions of the flat icon to fit the added overlay
addX1 = min(flatX1, I.pixel_x+1)
addX2 = max(flatX2, I.pixel_x+add.Width())
addY1 = min(flatY1, I.pixel_y+1)
addY2 = max(flatY2, I.pixel_y+add.Height())
if(addX1!=flatX1 || addX2!=flatX2 || addY1!=flatY1 || addY2!=flatY2)
// Resize the flattened icon so the new icon fits
flat.Crop(addX1-flatX1+1, addY1-flatY1+1, addX2-flatX1+1, addY2-flatY1+1)
flatX1=addX1;flatX2=addX2
flatY1=addY1;flatY2=addY2
// Blend the overlay into the flattened icon
flat.Blend(add, blendMode2iconMode(curblend), I.pixel_x + 2 - flatX1, I.pixel_y + 2 - flatY1)
if(A.color)
flat.Blend(A.color, ICON_MULTIPLY)
if(A.alpha < 255)
flat.Blend(rgb(255, 255, 255, A.alpha), ICON_MULTIPLY)
if(no_anim)
//Clean up repeated frames
var/icon/cleaned = new /icon()
cleaned.Insert(flat, "", SOUTH, 1, 0)
return cleaned
else
return icon(flat, "", SOUTH)
//Clear defines
#undef flatX1
#undef flatX2
#undef flatY1
#undef flatY2
#undef addX1
#undef addX2
#undef addY1
#undef addY2
#undef INDEX_X_LOW
#undef INDEX_X_HIGH
#undef INDEX_Y_LOW
#undef INDEX_Y_HIGH
#undef BLANK
#undef SET_SELF
/proc/getIconMask(atom/A)//By yours truly. Creates a dynamic mask for a mob/whatever. /N /proc/getIconMask(atom/A)//By yours truly. Creates a dynamic mask for a mob/whatever. /N
var/icon/alpha_mask = new(A.icon,A.icon_state)//So we want the default icon and icon state of A. var/icon/alpha_mask = new(A.icon,A.icon_state)//So we want the default icon and icon state of A.