From f4115f9beabdbb9d0662401277fb506ec7477f93 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 6 Apr 2022 00:16:15 +0200 Subject: [PATCH] Use the new fade property for fading in the example events --- data/assets/actions/toggle_trail.asset | 14 +++++++++----- data/assets/events/toggle_sun.asset | 12 ++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/data/assets/actions/toggle_trail.asset b/data/assets/actions/toggle_trail.asset index 0cb559b0f3..14fe57433c 100644 --- a/data/assets/actions/toggle_trail.asset +++ b/data/assets/actions/toggle_trail.asset @@ -32,7 +32,11 @@ local toggle_trail = { visibility = not openspace.getPropertyValue("Scene." .. trail .. ".Renderable.Enabled") end - openspace.setPropertyValueSingle("Scene." .. trail .. ".Renderable.Enabled", visibility) + if visibility then + openspace.setPropertyValueSingle("Scene." .. trail .. ".Renderable.Fade", 1.0, 1.0) + else + openspace.setPropertyValueSingle("Scene." .. trail .. ".Renderable.Fade", 0.0, 1.0) + end ]], Documentation = [[Toggles the visibility of the associated trail of a scene graph node. This action takes optional arguments to 1) determine which trail to hide (as the @@ -54,9 +58,9 @@ local hide_trail = { end if openspace.hasSceneGraphNode(node .. "Trail") then - openspace.setPropertyValue("Scene." .. node .. "Trail.Renderable.Enabled", false) + openspace.setPropertyValueSingle("Scene." .. node .. "Trail.Renderable.Fade", 0.0, 1.0) elseif openspace.hasSceneGraphNode(node .. "_trail") then - openspace.setPropertyValue("Scene." .. node .. "_trail.Renderable.Enabled", false) + openspace.setPropertyValueSingle("Scene." .. node .. "_trail.Renderable.Fade", 0.0, 1.0) end ]], Documentation = [[Hides the associated trail of a scene graph node. This action takes an @@ -79,9 +83,9 @@ local show_trail = { end if openspace.hasSceneGraphNode(node .. "Trail") then - openspace.setPropertyValue("Scene." .. node .. "Trail.Renderable.Enabled", true) + openspace.setPropertyValueSingle("Scene." .. node .. "Trail.Renderable.Fade", 1.0, 1.0) elseif openspace.hasSceneGraphNode(node .. "_trail") then - openspace.setPropertyValue("Scene." .. node .. "_trail.Renderable.Enabled", true) + openspace.setPropertyValueSingle("Scene." .. node .. "_trail.Renderable.Fade", 1.0, 1.0) end ]], Documentation = [[Shows the associated trail of a scene graph node. This action takes an diff --git a/data/assets/events/toggle_sun.asset b/data/assets/events/toggle_sun.asset index 29d1a48d34..1ce6efd014 100644 --- a/data/assets/events/toggle_sun.asset +++ b/data/assets/events/toggle_sun.asset @@ -7,12 +7,16 @@ local toggle_sun = { return end - if args.Transition == "Approaching" then - openspace.setPropertyValueSingle("Scene.SunGlare.Renderable.Enabled", false) + if not openspace.getPropertyValue("Scene.Sun.Renderable.Enabled") then openspace.setPropertyValueSingle("Scene.Sun.Renderable.Enabled", true) + end + + if args.Transition == "Approaching" then + openspace.setPropertyValueSingle("Scene.SunGlare.Renderable.Fade", 0.0, 1.0) + openspace.setPropertyValueSingle("Scene.Sun.Renderable.Fade", 1.0, 1.0) else -- "Exiting" - openspace.setPropertyValueSingle("Scene.SunGlare.Renderable.Enabled", true) - openspace.setPropertyValueSingle("Scene.Sun.Renderable.Enabled", false) + openspace.setPropertyValueSingle("Scene.SunGlare.Renderable.Fade", 1.0, 1.0) + openspace.setPropertyValueSingle("Scene.Sun.Renderable.Fade", 0.0, 1.0) end ]], Documentation = [[Toggles the visibility of the Sun glare and the Sun globe when the