Fade and highlight - fix step and render LPubFadeHighlight #710

trevorsandy · May 8, 2023 · 9877f5e · 9877f5e
1 parent 8186d5a
commit 9877f5e
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 28 deletions.
diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: July 19, 2020
 #  Copyright (C) 2017 - 2023 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.6.3325
+pkgver=2.4.6.3326
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: July 19, 2020
 #  Copyright (C) 2017 - 2023 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.6.3325
+pkgver=2.4.6.3326
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.6.3325) debian; urgency=medium
+lpub3d (2.4.6.3326) debian; urgency=medium
 
-  * LPub3D version 2.4.6.214.3325_20230508 for Linux
+  * LPub3D version 2.4.6.215.3326_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:07:35 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:08:05 +0200
diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.6.3325
+Version: 2.4.6.3326
 Maintainer: Trevor SANDY <[email protected]>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3325
+Version: 2.4.6.3326
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -797,7 +797,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3325
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3326
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670

diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.6.3325) debian; urgency=medium
+lpub3d (2.4.6.3326) debian; urgency=medium
 
-  * LPub3D version 2.4.6.214.3325_20230508 for Linux
+  * LPub3D version 2.4.6.215.3326_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:07:36 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:08:07 +0200
diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.6.3325
+Version: 2.4.6.3326
 Maintainer: Trevor SANDY <[email protected]>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec
@@ -82,7 +82,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3325
+Version: 2.4.6.3326
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -313,7 +313,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3325
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3326
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670

diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 4 6 214 3325 d5157559b
+2 4 6 215 3326 8186d5a6d
diff --git a/gitversion.pri b/gitversion.pri
@@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) {
 
     # Check if we do not have a valid version number (i.e. no version tag found)
     isEmpty(GIT_VERSION) {
-        GIT_REVISION = 214
+        GIT_REVISION = 215
         GIT_SHA      = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE)
         GIT_COMMIT   = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         GIT_VERSION  = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA}
@@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) {
         # Get commit count
         GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         isEmpty(GIT_COMMIT) {
-            GIT_COMMIT = 3325
+            GIT_COMMIT = 3326
             message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
         }
 
@@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) {
             GIT_VERSION = $$cat($$GIT_VER_FILE, lines)
         } else {
             message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~")
-            GIT_VERSION = $${VERSION}.214.3325.d5157559b
+            GIT_VERSION = $${VERSION}.215.3326.8186d5a6d
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.6.214.3325 (08 05 2023 15:07:36)
+LPub3D 2.4.6.215.3326 (08 05 2023 15:08:07)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -18,7 +18,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.214.3325 (08 05 2023 15:07:36)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.215.3326 (08 05 2023 15:08:07)</h4>
         <hr>
           <p>
              <span class="tg-1pky">LPub3D Official release.</span><br>

diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml
@@ -14,8 +14,8 @@
 ;;
 ;; Author......: Trevor SANDY
 ;; Name........: LPub3D_Npp_UDL.xml
-;; Version.....: 2.4.6.214.3325
-;; Last Update.: Mon, 08 May 2023 15:07:36 +0200
+;; Version.....: 2.4.6.215.3326
+;; Last Update.: Mon, 08 May 2023 15:08:07 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY

diff --git a/mainApp/render.cpp b/mainApp/render.cpp
@@ -2892,7 +2892,7 @@ int Native::renderCsi(
     Options->ZoomExtents       = false;
     Options->FadeParts         = fadeParts || Preferences::enableFadeSteps;
     Options->HighlightParts    = highlightParts || Preferences::enableHighlightStep;
-    Options->LPubFadeHighlight = (fadeParts && lpubFade) || (highlightParts && lpubHighlight);
+    Options->LPubFadeHighlight = lpubFade || lpubHighlight;
     Options->AutoEdgeColor     = aecm->enable.value();
     Options->EdgeContrast      = aecm->contrast.value();
     Options->EdgeSaturation    = aecm->saturation.value();

diff --git a/mainApp/step.cpp b/mainApp/step.cpp
@@ -38,7 +38,6 @@
 #include "calloutbackgrounditem.h"
 #include "csiannotation.h"
 #include "pointer.h"
-#include "calloutpointeritem.h"
 #include "numberitem.h"
 #include "resolution.h"
 #include "dependencies.h"
@@ -528,8 +527,7 @@ int Step::createCsi(
       StudStyleMeta* ssm = meta.LPub.studStyle.value() ? &meta.LPub.studStyle : &csiStepMeta.studStyle;
       AutoEdgeColorMeta* aecm = meta.LPub.autoEdgeColor.enable.value() ? &meta.LPub.autoEdgeColor : &csiStepMeta.autoEdgeColor;
       HighContrastColorMeta* hccm = meta.LPub.studStyle.value() ? &meta.LPub.highContrast : &csiStepMeta.highContrast;
-      bool lpubFadeHighlight  = (csiStepMeta.fadeSteps.lpubFade.value() && csiStepMeta.fadeSteps.enable.value()) ||
-                                (csiStepMeta.highlightStep.lpubHighlight.value() && csiStepMeta.highlightStep.enable.value());
+      bool lpubFadeHighlight  = csiStepMeta.fadeSteps.lpubFade.value() || csiStepMeta.highlightStep.lpubHighlight.value();
       viewerOptions                 = new NativeOptions();
       viewerOptions->HighlightNewParts = false; // gui->suppressColourMeta();
       viewerOptions->CameraDistance = camDistance > 0 ? camDistance : renderer->ViewerCameraDistance(meta,csiStepMeta.modelScale.value());
@@ -721,8 +719,8 @@ QStringList Step::configureModelStep(const QStringList &csiParts, Where &current
 
   bool enableFadeSteps       = csiStepMeta.fadeSteps.enable.value();
   bool enableHighlightStep   = csiStepMeta.highlightStep.enable.value();
-  bool lpubFadeHighlight     = (csiStepMeta.fadeSteps.lpubFade.value() && enableFadeSteps) ||
-                               (csiStepMeta.highlightStep.lpubHighlight.value() && enableHighlightStep);
+  bool lpubFadeHighlight     = csiStepMeta.fadeSteps.lpubFade.value() ||
+                               csiStepMeta.highlightStep.lpubHighlight.value();
 
   bool highlightFirstStep    = Preferences::highlightFirstStep;