From fefecf73401e0f4088d28029720ba6f98c21d884 Mon Sep 17 00:00:00 2001 From: Jarr3 Date: Sat, 6 Jan 2024 12:26:15 +0100 Subject: [PATCH] Events of overlapping pictures get merged #76 Add possibility to turn of merging of pictures --- .../b2sbackglassserverexe/Forms/formBackglass.vb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb b/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb index 1fe9f1f..14a29c7 100644 --- a/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb +++ b/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb @@ -1800,6 +1800,8 @@ Public Class formBackglass ' get top node Dim topnode As Xml.XmlElement = XML.SelectSingleNode("DirectB2SData") + Dim mergeBulbs As Boolean = topnode.SelectSingleNode("MergeBulbs") IsNot Nothing AndAlso topnode.SelectSingleNode("MergeBulbs").Attributes("Value").InnerText <> "0" + ' clear all data B2SData.ClearAll(True) @@ -2552,7 +2554,7 @@ Public Class formBackglass End If ' maybe draw some light images for pretty fast image changing - If top4Authentic >= minSize4Image Then + If top4Authentic >= minSize4Image And mergeBulbs Then ' create some light images If TopLightImage4Authentic Is Nothing Then TopLightImage4Authentic = CreateLightImage(DarkImage4Authentic, B2SData.eDualMode.Authentic, topkey4Authentic, , TopRomID4Authentic, TopRomIDType4Authentic, TopRomInverted4Authentic) @@ -2565,7 +2567,7 @@ Public Class formBackglass TopAndSecondLightImage4Authentic = CreateLightImage(TopLightImage4Authentic, B2SData.eDualMode.Authentic, topkey4Authentic) End If End If - If B2SData.DualBackglass AndAlso top4Fantasy >= minSize4Image Then + If B2SData.DualBackglass AndAlso top4Fantasy >= minSize4Image And mergeBulbs Then ' create some light images If TopLightImage4Fantasy Is Nothing Then TopLightImage4Fantasy = CreateLightImage(DarkImage4Fantasy, B2SData.eDualMode.Fantasy, topkey4Fantasy, , TopRomID4Fantasy, TopRomIDType4Fantasy, TopRomInverted4Fantasy)