cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 01:23:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun)

Browse Source
This commit is contained in:
SkyMarshal
2012-06-21 13:35:34 -07:00
parent f39676cacb
commit 730461840f
92 changed files with 392 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm
+1 -1
View File
@@ -50,7 +50,7 @@ max volume of plasma storeable by the field = the total volume of a number of ti
var/obj/machinery/rust/em_field/owned_field
var/field_strength = 0.01
//
req_access = list(access_engine)
req_access = list(ACCESS_ENGINE)
//
use_power = 1
idle_power_usage = 10
code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm
+1 -1
View File
@@ -19,7 +19,7 @@
var/targetting_field = 0
layer = 4
//
req_access = list(access_engine)
req_access = list(ACCESS_ENGINE)
//
use_power = 1
idle_power_usage = 10
code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
+1 -1
View File
@@ -16,7 +16,7 @@
var/on = 1
var/remoteenabled = 1
//
req_access = list(access_engine)
req_access = list(ACCESS_ENGINE)
//
use_power = 1
idle_power_usage = 10
code/WorkInProgress/Mini/atmos_control.dm
+1 -1
View File
@@ -11,7 +11,7 @@
circuit = "/obj/item/weapon/circuitboard/atmoscontrol"
var/obj/machinery/alarm/current
var/overridden = 0 //not set yet, can't think of a good way to do it
req_access = list(access_ce)
req_access = list(ACCESS_CE)
/obj/machinery/computer/atmoscontrol/attack_hand(mob/user)
if(..())
code/WorkInProgress/Ported/policetape.dm
+2 -2
View File
@@ -9,7 +9,7 @@
/obj/item/tape/police
name = "police tape"
desc = "A length of police tape. Do not cross."
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
icon_base = "police"
/obj/item/taperoll/engineering
@@ -22,7 +22,7 @@
/obj/item/tape/engineering
name = "engineering tape"
desc = "A length of engineering tape. Better not cross it."
req_access = list(access_engine,access_atmospherics)
req_access = list(ACCESS_ENGINE,ACCESS_ATMOSPHERICS)
icon_base = "engineering"
/obj/item/taperoll/attack_self(mob/user as mob)
code/WorkInProgress/SkyMarshal/Ultralight.dm
+49 -37
View File
@@ -9,27 +9,36 @@
#define UL_I_ONZERO 2
#define ul_LightingEnabled 1
#define ul_LightingResolution 1
//#define ul_LightingResolution 2
//Uncomment if you want maybe slightly smoother lighting
#define ul_Steps 7
#define ul_FalloffStyle UL_I_FALLOFF_ROUND // Sets the lighting falloff to be either squared or circular.
#define ul_Layer 10
#define ul_TopLuminosity 12 //Maximum brightness an object can have.
var
ul_LightingResolutionSqrt = sqrt(ul_LightingResolution)
ul_SuppressLightLevelChanges = 0
//#define ul_LightLevelChangedUpdates
//Uncomment if you have code that you want triggered when the light level on an atom changes.
list/ul_FastRoot = list(0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5,
#define ul_Clamp(Value) min(max(Value, 0), ul_Steps)
#define ul_IsLuminous(A) (A.LuminosityRed > 0 || A.LuminosityGreen > 0 || A.LuminosityBlue > 0)
#define ul_Luminosity(A) max(A.LuminosityRed, A.LuminosityGreen, A.LuminosityBlue)
#ifdef ul_LightingResolution
var/ul_LightingResolutionSqrt = sqrt(ul_LightingResolution)
#endif
var/ul_SuppressLightLevelChanges = 0
var/list/ul_FastRoot = list(0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7)
proc/ul_Clamp(var/Value)
return min(max(Value, 0), ul_Steps)
proc/ul_UnblankLocal(var/list/ReApply = view(ul_TopLuminosity, src))
for(var/atom/Light in ReApply)
if(Light.ul_IsLuminous())
if(ul_IsLuminous(Light))
Light.ul_Illuminate()
return
@@ -41,7 +50,7 @@ atom/var/ul_Extinguished = UL_I_ONZERO
atom/proc/ul_SetLuminosity(var/Red, var/Green = Red, var/Blue = Red)
if(LuminosityRed == Red && LuminosityGreen == Green && LuminosityBlue == Blue)
if(LuminosityRed == min(Red, ul_TopLuminosity) && LuminosityGreen == min(Green, ul_TopLuminosity) && LuminosityBlue == min(Blue, ul_TopLuminosity))
return //No point doing all that work if it won't have any effect anyways...
if (ul_Extinguished == UL_I_EXTINGUISHED)
@@ -51,7 +60,7 @@ atom/proc/ul_SetLuminosity(var/Red, var/Green = Red, var/Blue = Red)
return
if (ul_IsLuminous())
if (ul_IsLuminous(src))
ul_Extinguish()
LuminosityRed = min(Red,ul_TopLuminosity)
@@ -60,7 +69,7 @@ atom/proc/ul_SetLuminosity(var/Red, var/Green = Red, var/Blue = Red)
ul_Extinguished = UL_I_ONZERO
if (ul_IsLuminous())
if (ul_IsLuminous(src))
ul_Illuminate()
return
@@ -71,7 +80,7 @@ atom/proc/ul_Illuminate()
ul_Extinguished = UL_I_LIT
luminosity = ul_Luminosity()
luminosity = ul_Luminosity(src)
for(var/turf/Affected in view(luminosity, src))
var/Falloff = src.ul_FalloffAmount(Affected)
@@ -117,11 +126,13 @@ atom/proc/ul_Illuminate()
Affected.ul_UpdateLight()
#ifdef ul_LightLevelChangedUpdates
if (ul_SuppressLightLevelChanges == 0)
Affected.ul_LightLevelChanged()
for(var/atom/AffectedAtom in Affected)
AffectedAtom.ul_LightLevelChanged()
#endif
return
atom/proc/ul_Extinguish()
@@ -131,7 +142,7 @@ atom/proc/ul_Extinguish()
ul_Extinguished = UL_I_EXTINGUISHED
for(var/turf/Affected in view(ul_Luminosity(), src))
for(var/turf/Affected in view(ul_Luminosity(src), src))
var/Falloff = ul_FalloffAmount(Affected)
@@ -182,11 +193,13 @@ atom/proc/ul_Extinguish()
Affected.ul_UpdateLight()
#ifdef ul_LightLevelChangedUpdates
if (ul_SuppressLightLevelChanges == 0)
Affected.ul_LightLevelChanged()
for(var/atom/AffectedAtom in Affected)
AffectedAtom.ul_LightLevelChanged()
#endif
luminosity = 0
@@ -204,17 +217,20 @@ atom/proc/ul_FalloffAmount(var/atom/ref)
if (ul_FalloffStyle == UL_I_FALLOFF_ROUND)
var/x = (ref.x - src.x)
var/y = (ref.y - src.y)
if(ul_LightingResolution != 1)
if (round((x*x + y*y)*ul_LightingResolutionSqrt,1) > ul_FastRoot.len)
for(var/i = ul_FastRoot.len, i <= round(x*x+y*y*ul_LightingResolutionSqrt,1), i++)
ul_FastRoot += round(sqrt(i))
return ul_FastRoot[round((x*x + y*y)*ul_LightingResolutionSqrt, 1) + 1]/ul_LightingResolution
else
if ((x*x + y*y) > ul_FastRoot.len)
for(var/i = ul_FastRoot.len, i <= x*x+y*y, i++)
ul_FastRoot += round(sqrt(i))
return ul_FastRoot[x*x + y*y + 1]/ul_LightingResolution
#ifdef ul_LightingResolution
if (round((x*x + y*y)*ul_LightingResolutionSqrt,1) > ul_FastRoot.len)
for(var/i = ul_FastRoot.len, i <= round(x*x+y*y*ul_LightingResolutionSqrt,1), i++)
ul_FastRoot += round(sqrt(i))
return ul_FastRoot[round((x*x + y*y)*ul_LightingResolutionSqrt, 1) + 1]/ul_LightingResolution
#else
if ((x*x + y*y) > ul_FastRoot.len)
for(var/i = ul_FastRoot.len, i <= x*x+y*y, i++)
ul_FastRoot += round(sqrt(i))
return ul_FastRoot[x*x + y*y + 1]
#endif
else if (ul_FalloffStyle == UL_I_FALLOFF_SQUARE)
return get_dist(src, ref)
@@ -237,35 +253,29 @@ atom/proc/ul_BlankLocal()
var/TurfAdjust = isturf(src) ? 1 : 0
for(var/atom/Affected in view(ul_TopLuminosity, src))
if(Affected.ul_IsLuminous() && Affected.ul_Extinguished == UL_I_LIT && (ul_FalloffAmount(Affected) <= Affected.luminosity + TurfAdjust))
if(ul_IsLuminous(Affected) && Affected.ul_Extinguished == UL_I_LIT && (ul_FalloffAmount(Affected) <= Affected.luminosity + TurfAdjust))
Affected.ul_Extinguish()
Blanked += Affected
return Blanked
atom/proc/ul_Luminosity()
return max(LuminosityRed, LuminosityGreen, LuminosityBlue)
atom/proc/ul_IsLuminous(var/Red = LuminosityRed, var/Green = LuminosityGreen, var/Blue = LuminosityBlue)
return (Red > 0 || Green > 0 || Blue > 0)
atom/proc/ul_LightLevelChanged()
//Designed for client projects to use. Called on items when the turf they are in has its light level changed
return
atom/New()
. = ..()
if(ul_IsLuminous())
spawn(2)
if(ul_IsLuminous(src))
spawn(5)
ul_Illuminate()
atom/Del()
if(ul_IsLuminous())
if(ul_IsLuminous(src))
ul_Extinguish()
. = ..()
atom/movable/Move()
if(LuminosityRed || LuminosityGreen || LuminosityBlue)
if(ul_IsLuminous(src))
ul_Extinguish()
. = ..()
ul_Illuminate()
@@ -359,7 +369,7 @@ area/proc/ul_Light(var/Red = LightLevelRed, var/Green = LightLevelGreen, var/Blu
LightLevelGreen = Green
LightLevelBlue = Blue
luminosity = ul_IsLuminous(LightLevelRed, LightLevelGreen, LightLevelBlue)
luminosity = LightLevelRed || LightLevelGreen || LightLevelBlue
ul_Overlay = image('ULIcons.dmi', , num2text(LightLevelRed) + "-" + num2text(LightLevelGreen) + "-" + num2text(LightLevelBlue), ul_Layer)
@@ -388,4 +398,6 @@ area/proc/ul_Prep()
#undef ul_Steps
#undef ul_FalloffStyle
#undef ul_Layer
#undef ul_TopLuminosity
#undef ul_TopLuminosity
#undef ul_Clamp
#undef ul_LightLevelChangedUpdates