diff --git a/ARES/system/power.lsl b/ARES/system/power.lsl index 47f0bf6..342a5cb 100644 --- a/ARES/system/power.lsl +++ b/ARES/system/power.lsl @@ -195,6 +195,10 @@ apply_state(integer update, integer report_state) { e_call(C_STATUS, E_SIGNAL_CALL, (string)avatar + " " + (string)avatar + " status update"); llSleep(0.25); e_call(C_THERMAL, E_SIGNAL_CALL, (string)avatar + " " + (string)avatar + " thermal update"); + + // we hardcoding it up in here + llSleep(0.25); + notify_program("subsys update", avatar, NULL_KEY, avatar); } // task_end(ek); @@ -656,20 +660,15 @@ main(integer src, integer n, string m, key outs, key ins, key user) { has_motors = TRUE; effector_release("a:motors"); } - + if(lidar_state && !optics_state && video_state && !video_in_lidar_mode) { effector_restrict( - "power_lidar", "setsphere=?||setsphere_mode:0=force,setsphere_param:0/0/0/0=force,setsphere_distmin:0=force,setsphere_distmax:10=force,setsphere_distextend:3=force,setsphere_valuemin:0.0=force,setsphere_valuemax:1=force" - ); - effector_restrict( - "power_lidar-2", "setenv_daytime:-1=force,setenv=?,setenv_daytime:-1=force||setenv_ambient:2/2/2=force,setenv_bluedensity:1/1/1=force,setenv_bluehorizon:1/1/1=force,setenv_scenegamma:2=force,setenv_hazedensity:1=force,setenv_hazehorizon:0=force,setenv_maxaltitude:4000=force,setenv_densitymultiplier:2=force,setenv_distancemultiplier:2000=force,setenv_starbrightness:0=force" + "power_lidar", "setsphere=?,camdistmax:5=?||setsphere_mode:0=force,setsphere_param:0.0/0.0/0.0/0=force,setsphere_distmin:2=force,setsphere_distmax:2.5=force,setsphere_valuemin:0=force,setsphere_valuemax:1=force" ); video_in_lidar_mode = TRUE; } else if(video_in_lidar_mode) { effector_release("power_lidar"); - effector_release("power_lidar-2"); llSleep(0.2); - echo("@setenv=n,setenv_reset=force,setenv=y"); video_in_lidar_mode = FALSE; } @@ -744,15 +743,18 @@ main(integer src, integer n, string m, key outs, key ins, key user) { if(overlay_active) { // is active if(power_on && !(no_video_mode || no_signal_mode)) { // but we don't need it overlay_active = FALSE; + effector_release("power_vision"); effector_release("power_overlay"); } else if(overlay != "") { // we changed it // echo("[_power] RLV overlay " + overlay + " applied during notify " + m); // echo("subsystem states: " + (string)power_state + ", " + getdbl("status", ["state"])); - effector_restrict("power_overlay", "setoverlay=?,setoverlay_alpha:1=force,setoverlay_tint:1/1/1=force,setoverlay_texture:" + overlay + "=force"); + effector_restrict("power_vision", "setsphere=?,camdistmax:3=?||setsphere_mode:0=force,setsphere_param:0/0/0/0=force,setsphere_distmin:1=force,setsphere_distmax:1.05=force,setsphere_valuemin:0=force,setsphere_valuemin:1=force"); + effector_restrict("power_overlay", "setoverlay=?,setoverlay_alpha:0.3=force,setoverlay_tint:1/1/1=force,setoverlay_texture:" + overlay + "=force"); } } else if(overlay != "") { // isn't active but we need to apply it overlay_active = TRUE; - effector_restrict("power_overlay", "setoverlay=?,setoverlay_alpha:1=force,setoverlay_tint:1/1/1=force,setoverlay_texture:" + overlay + "=force"); + effector_restrict("power_vision", "setsphere=?,camdistmax:3=?||setsphere_mode:0=force,setsphere_param:0/0/0/0=force,setsphere_distmin:1=force,setsphere_distmax:1.05=force,setsphere_valuemin:0=force,setsphere_valuemin:1=force"); + effector_restrict("power_overlay", "setoverlay=?,setoverlay_alpha:0.3=force,setoverlay_tint:1/1/1=force,setoverlay_texture:" + overlay + "=force"); } // else isn't active and we don't need it if(locomotion_state && !can_move) {