Fade and highlight - add Preference to FadeParts and Highlight parts #…

…710
trevorsandy · May 8, 2023 · 8186d5a · 8186d5a
1 parent d515755
commit 8186d5a
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 29 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.3324
+pkgver=2.4.6.3325
 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.3324
+pkgver=2.4.6.3325
 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.3324) debian; urgency=medium
+lpub3d (2.4.6.3325) debian; urgency=medium
 
-  * LPub3D version 2.4.6.213.3324_20230508 for Linux
+  * LPub3D version 2.4.6.214.3325_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:07:09 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:07:35 +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.3324
+Version: 2.4.6.3325
 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.3324
+Version: 2.4.6.3325
 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.3324
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3325
 - 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.3324) debian; urgency=medium
+lpub3d (2.4.6.3325) debian; urgency=medium
 
-  * LPub3D version 2.4.6.213.3324_20230508 for Linux
+  * LPub3D version 2.4.6.214.3325_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:07:10 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:07:36 +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.3324
+Version: 2.4.6.3325
 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.3324
+Version: 2.4.6.3325
 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.3324
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3325
 - 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 213 3324 8e1aa2536
+2 4 6 214 3325 d5157559b
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 = 213
+        GIT_REVISION = 214
         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 = 3324
+            GIT_COMMIT = 3325
             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}.213.3324.8e1aa2536
+            GIT_VERSION = $${VERSION}.214.3325.d5157559b
             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.213.3324 (08 05 2023 15:07:10)
+LPub3D 2.4.6.214.3325 (08 05 2023 15:07:36)
 
 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.213.3324 (08 05 2023 15:07:10)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.214.3325 (08 05 2023 15:07:36)</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.213.3324
-;; Last Update.: Mon, 08 May 2023 15:07:10 +0200
+;; Version.....: 2.4.6.214.3325
+;; Last Update.: Mon, 08 May 2023 15:07:36 +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
@@ -2890,8 +2890,8 @@ int Native::renderCsi(
     Options->ZFar              = cameraZFar;
     Options->ZNear             = cameraZNear;
     Options->ZoomExtents       = false;
-    Options->FadeParts         = fadeParts;
-    Options->HighlightParts    = highlightParts;
+    Options->FadeParts         = fadeParts || Preferences::enableFadeSteps;
+    Options->HighlightParts    = highlightParts || Preferences::enableHighlightStep;
     Options->LPubFadeHighlight = (fadeParts && lpubFade) || (highlightParts && lpubHighlight);
     Options->AutoEdgeColor     = aecm->enable.value();
     Options->EdgeContrast      = aecm->contrast.value();
@@ -3604,7 +3604,7 @@ bool Render::RenderNativeView(const NativeOptions *O, bool RenderImage/*false*/)
             if (O->EdgeContrast != Preferences.mPartEdgeContrast)
                 arguments << QString("EdgeContrast: %1,").arg(O->EdgeContrast);
             if (O->EdgeSaturation != Preferences.mPartColorValueLDIndex)
-            arguments << QString("Saturation: %1,").arg(O->EdgeSaturation);
+                arguments << QString("Saturation: %1,").arg(O->EdgeSaturation);
         }
         bool IsHighContrastStudStyle = O->StudStyle >= static_cast<int>(lcStudStyle::HighContrast);
         bool StudStyleChanged = (O->StudStyle != lpub->GetStudStyle() ||
@@ -3614,9 +3614,9 @@ bool Render::RenderNativeView(const NativeOptions *O, bool RenderImage/*false*/)
         if (IsHighContrastStudStyle)
         {
             if (O->LightDarkIndex != Preferences.mPartColorValueLDIndex)
-               arguments << QString("LightDarkIndex: %1,").arg(O->LightDarkIndex);
+                arguments << QString("LightDarkIndex: %1,").arg(O->LightDarkIndex);
             if (!O->StudCylinderColorEnabled)
-               arguments << QString("StudCylinderColorEnabled: False,");
+                arguments << QString("StudCylinderColorEnabled: False,");
             if (O->StudCylinderColor != Preferences.mStudCylinderColor)
                 arguments << QString("StudCylinderColor: %1,%2,%3,%4,").arg(LC_RGBA_RED(O->StudCylinderColor)).arg(LC_RGBA_GREEN(O->StudCylinderColor)).arg(LC_RGBA_BLUE(O->StudCylinderColor)).arg(LC_RGBA_ALPHA(O->StudCylinderColor));
             if (!O->PartEdgeColorEnabled)

diff --git a/mainApp/step.cpp b/mainApp/step.cpp
@@ -549,8 +549,8 @@ int Step::createCsi(
       viewerOptions->RotStep        = Vector3(float(rotStepMeta.value().rots[0]),float(rotStepMeta.value().rots[1]),float(rotStepMeta.value().rots[2]));
       viewerOptions->RotStepType    = rotStepMeta.value().type;
       viewerOptions->LPubFadeHighlight = lpubFadeHighlight;
-      viewerOptions->FadeParts      = csiStepMeta.fadeSteps.enable.value();
-      viewerOptions->HighlightParts = csiStepMeta.highlightStep.enable.value();
+      viewerOptions->FadeParts      = csiStepMeta.fadeSteps.enable.value() || Preferences::enableFadeSteps;
+      viewerOptions->HighlightParts = csiStepMeta.highlightStep.enable.value() || Preferences::enableHighlightStep;
       viewerOptions->AutoEdgeColor  = aecm->enable.value();
       viewerOptions->EdgeContrast   = aecm->contrast.value();
       viewerOptions->EdgeSaturation = aecm->saturation.value();