From d4f64c02e0432f65f262c04a76df2affdf93347b Mon Sep 17 00:00:00 2001 From: Samantha Wright Date: Thu, 3 Oct 2024 18:41:31 -0700 Subject: [PATCH] patreon controller screens --- ARES/hardware/controller/analyte-screen.lsl | 2 +- ARES/hardware/controller/ctrl.h.lsl | 1 + ARES/hardware/controller/ctrl.lsl | 132 +++--- ARES/hardware/controller/metropolis-hatch.lsl | 209 ++++++++++ .../controller/refurbished-aegis-screen.lsl | 376 ++++++++++++++++++ 5 files changed, 666 insertions(+), 54 deletions(-) create mode 100644 ARES/hardware/controller/metropolis-hatch.lsl create mode 100644 ARES/hardware/controller/refurbished-aegis-screen.lsl diff --git a/ARES/hardware/controller/analyte-screen.lsl b/ARES/hardware/controller/analyte-screen.lsl index 4b70ad7..70a4515 100644 --- a/ARES/hardware/controller/analyte-screen.lsl +++ b/ARES/hardware/controller/analyte-screen.lsl @@ -6,7 +6,7 @@ * * ========================================================================= * - * YS-712 XSU Hardware Driver + * VAR/I Analyte Hardware Driver * * This program is covered under the terms of the ARES Software Copyright * License, Section 3 (ASCL-iii). It may be redistributed or used as the diff --git a/ARES/hardware/controller/ctrl.h.lsl b/ARES/hardware/controller/ctrl.h.lsl index 33f4307..d2ef9fe 100644 --- a/ARES/hardware/controller/ctrl.h.lsl +++ b/ARES/hardware/controller/ctrl.h.lsl @@ -12,3 +12,4 @@ #define SCREEN_REVENANT 6 #define SCREEN_AIDE 7 #define SCREEN_DAX3 8 +#define SCREEN_DAYBREAK 9 diff --git a/ARES/hardware/controller/ctrl.lsl b/ARES/hardware/controller/ctrl.lsl index e3086d9..0d9bfd6 100644 --- a/ARES/hardware/controller/ctrl.lsl +++ b/ARES/hardware/controller/ctrl.lsl @@ -65,6 +65,7 @@ SCREEN_REVENANT - projected hybrid display with accessory positioning HUD SCREEN_DAX3 - cylindrical image is on the outside of a tube prim with path cut 0.3625 to 0.6375 (centered at 0.5) SCREEN_AEGIS - concave cylindrical display and lever-action hinge + SCREEN_DAYBREAK - only the background prim exists; non-interactive */ #if SCREEN_TYPE == SCREEN_SUPERVISOR @@ -243,6 +244,10 @@ float lubricant = 1.0; integer opo; integer obo; +#ifndef SOCKET_NAME + #define SOCKET_NAME "socket" +#endif + integer FAN; integer POWER_GAUGE; integer RATE_GAUGE; @@ -269,7 +274,7 @@ integer door_open; integer soothe; -#if SCREEN_TYPE == SCREEN_SXD || SCREEN_TYPE == SCREEN_AIDE +#if SCREEN_TYPE == SCREEN_SXD || SCREEN_TYPE == SCREEN_AIDE || SCREEN_TYPE == SCREEN_DAYBREAK // on these screen types only, suppress beep from displaying menu after session start integer silence_menu; #endif @@ -335,7 +340,11 @@ integer timer_spark; #define play_sound(_name) llTriggerSound(getjs(sounds, [_name]), (float)getjs(sounds, ["volume"])) -#if SCREEN_TYPE != SCREEN_NONE +#if SCREEN_TYPE == SCREEN_DAYBREAK +clear_screen(integer partial) { + +} +#elif SCREEN_TYPE != SCREEN_NONE clear_screen(integer partial) { // #define ALIGN_TEXT integer pmax = llGetNumberOfPrims(); @@ -753,7 +762,7 @@ default { operate_door(); } #endif - #if SCREEN_TYPE != SCREEN_NONE + #if (SCREEN_TYPE != SCREEN_NONE) && (SCREEN_TYPE != SCREEN_DAYBREAK) } else if(part == "text" && power_on) { list ps = llParseString2List(gets(getp(pi, [PRIM_DESC]), 0), ["T", ","], []); integer row = (integer)gets(ps, 0); @@ -895,7 +904,7 @@ default { tell(system, c, "conf-get interface.sound"); tell(system, c, "conf-get hardware.controller"); #ifndef OVERRIDE_TOUCH - #if SCREEN_TYPE != SCREEN_NONE + #if SCREEN_TYPE != SCREEN_NONE && SCREEN_TYPE != SCREEN_DAYBREAK tell(system, c, "menu start " + (string)avatar); // menu get|touch|... [