Fade and highlight - convert GetLPubFade calls to bool #710

trevorsandy · May 8, 2023 · d515755 · d515755
1 parent 8e1aa25
commit d515755
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 37 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.3323
+pkgver=2.4.6.3324
 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.3323
+pkgver=2.4.6.3324
 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.3323) debian; urgency=medium
+lpub3d (2.4.6.3324) debian; urgency=medium
 
-  * LPub3D version 2.4.6.212.3323_20230508 for Linux
+  * LPub3D version 2.4.6.213.3324_20230508 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 08 May 2023 15:06:45 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 08 May 2023 15:07:09 +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.3323
+Version: 2.4.6.3324
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 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.3323
+Version: 2.4.6.3324
 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.3323
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3324
 - 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.3323) debian; urgency=medium
+lpub3d (2.4.6.3324) debian; urgency=medium
 
-  * LPub3D version 2.4.6.212.3323_20230508 for Linux
+  * LPub3D version 2.4.6.213.3324_20230508 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 08 May 2023 15:06:46 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 08 May 2023 15:07:10 +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.3323
+Version: 2.4.6.3324
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 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.3323
+Version: 2.4.6.3324
 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.3323
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3324
 - 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 212 3323 7c0becc72
+2 4 6 213 3324 8e1aa2536
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 = 212
+        GIT_REVISION = 213
         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 = 3323
+            GIT_COMMIT = 3324
             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}.212.3323.7c0becc72
+            GIT_VERSION = $${VERSION}.213.3324.8e1aa2536
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/lclib/common/lc_model.cpp b/lclib/common/lc_model.cpp
@@ -593,14 +593,22 @@ void lcModel::LoadLDraw(QIODevice& Device, Project* Project)
 /*** LPub3D Mod - lpub fade highlight ***/
 			else if (Token == QLatin1String("!FADE"))
 			{
+				mLPubFade = !mLPubFade;
 				if (gApplication->LPubFadeHighlight())
-					mLPubFade = !mLPubFade;
+				{
+					lcPreferences& Preferences = lcGetPreferences();
+					if (mLPubFade && Preferences.mFadeSteps)
+						Preferences.mFadeSteps = false;
+				}
 			}
 			else if (Token == QLatin1String("!SILHOUETTE"))
 			{
+				mLPubHighlight = !mLPubHighlight;
 				if (gApplication->LPubFadeHighlight())
 				{
-					mLPubHighlight = !mLPubHighlight;
+					lcPreferences& Preferences = lcGetPreferences();
+					if (mLPubHighlight && Preferences.mHighlightNewParts)
+						Preferences.mHighlightNewParts = false;
 				}
 			}
 /*** LPub3D Mod end ***/
@@ -779,6 +787,7 @@ void lcModel::LoadLDraw(QIODevice& Device, Project* Project)
 /*** LPub3D Mod end ***/
 /*** LPub3D Mod - lpub fade highlight ***/
 				Piece->SetLPubFade(mLPubFade);
+				Piece->SetLPubHighlight(mLPubHighlight);
 /*** LPub3D Mod end ***/
 				Piece->SetFileLine(mFileLines.size());
 				Piece->SetPieceInfo(Info, PartId, false);
@@ -1371,17 +1380,25 @@ void lcModel::GetScene(lcScene* Scene, const lcCamera* ViewCamera, bool AllowHig
 	{
 		if (Piece->IsVisible(mCurrentStep))
 		{
+/*** LPub3D Mod - lpub fade highlight ***/
+			bool LPubFade = gApplication->LPubFadeHighlight();
 /*** LPub3D Mod - export ***/
 			if (lcGetActiveProject()->IsExportingHTML())
 			{
 				const lcStep StepShow = Piece->GetStepShow();
+				AllowFade &= StepShow < mCurrentStep;
 				AllowHighlight &= StepShow == mCurrentStep;
-				AllowFade      &= StepShow < mCurrentStep;
 			}
 /*** LPub3D Mod end ***/
-/*** LPub3D Mod - lpub fade highlight ***/
-			bool LPubFade  = gApplication->LPubFadeHighlight();
-				 LPubFade &= Piece->GetLPubFade();
+			else if (!LPubFade)
+			{
+				AllowFade &= Piece->GetLPubFade();
+				AllowHighlight &= Piece->GetLPubHighlight();
+			}
+			else
+			{
+				LPubFade &= Piece->GetLPubFade();
+			}
 			Piece->AddMainModelRenderMeshes(Scene, AllowHighlight, AllowFade, LPubFade);
 /*** LPub3D Mod end ***/
 		}

diff --git a/lclib/common/lc_scene.cpp b/lclib/common/lc_scene.cpp
@@ -358,7 +358,7 @@ void lcScene::DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawF
 	if (LPubFadeArg)
 	{
 		// Enable BFC
-		Context->EnableCullFace(true, true);
+	Context->EnableCullFace(true, true);
 
 		// Disable color writes
 		if (LPubFadeArg == LC_DISABLE_COLOR_WRITES){
@@ -469,7 +469,7 @@ void lcScene::DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawF
 /*** LPub3D Mod - lpub fade highlight ***/
 	if (LPubFadeArg)
 	{
-		Context->SetDepthWrite(true);
+	Context->SetDepthWrite(true);
 		Context->EnableColorBlend(false);
 
 		// Wrap up, Disable BFC
@@ -498,9 +498,9 @@ void lcScene::Draw(lcContext* Context) const
 	const bool DrawConditional = Preferences.mDrawConditionalLines && Preferences.mLineWidth > 0.0f;
 /*** LPub3D Mod - lpub fade highlight ***/
 // 03/22/2021 8039f5b Draw conditional lines on a separate pass.
-	const bool LPubFadeHighlight = gApplication->LPubFadeParts()  && // turn off during HTML Steps export
-								   Preferences.mLPubFadeHighlight &&
-								   mHasLPubFadedParts             &&
+	const bool LPubFadeHighlight = gApplication->LPubFadeParts()     && // turn off during HTML Steps export
+								   gApplication->LPubFadeHighlight() &&
+								   mHasLPubFadedParts                &&
 								  !mTranslucentMeshes.IsEmpty();
 /*** LPub3D Mod end ***/
 

diff --git a/lclib/common/lc_scene.h b/lclib/common/lc_scene.h
@@ -6,7 +6,7 @@
 /*** LPub3D Mod - lpub fade highlight ***/
 enum lcFadeArgs
 {
-	LC_NO_FADE,
+	LC_NO_LPUB_FADE,
 	LC_DISABLE_COLOR_WRITES,
 	LC_ENABLE_COLOR_WRITES,
 	LC_DISABLE_BFC
@@ -111,7 +111,7 @@ class lcScene
 protected:
 	void DrawOpaqueMeshes(lcContext* Context, bool DrawLit, int PrimitiveTypes, bool DrawFaded, bool DrawNonFaded) const;
 /*** LPub3D Mod - lpub fade highlight ***/
-	void DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawFadePrepass, bool DrawFaded, bool DrawNonFaded, lcFadeArgs LPubFadeArg = LC_NO_FADE) const;
+	void DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawFadePrepass, bool DrawFaded, bool DrawNonFaded, lcFadeArgs LPubFadeArg = LC_NO_LPUB_FADE) const;
 /*** LPub3D Mod end ***/
 	void DrawDebugNormals(lcContext* Context, const lcMesh* Mesh) const;
 

diff --git a/lclib/common/piece.h b/lclib/common/piece.h
@@ -153,10 +153,20 @@ class lcPiece : public lcObject
 		mLPubFade = Faded;
 	}
 
-	int GetLPubFade() const
+	bool GetLPubFade() const
 	{
 		return mLPubFade;
 	}
+
+	void SetLPubHighlight(bool Highlighted)
+	{
+		mLPubHighlight = Highlighted;
+	}
+
+	bool GetLPubHighlight() const
+	{
+		return mLPubHighlight;
+	}
 /*** LPub3D Mod end ***/
 
 	void RayTest(lcObjectRayTest& ObjectRayTest) const override;
@@ -397,7 +407,8 @@ class lcPiece : public lcObject
 	int mPieceModified;
 /*** LPub3D Mod end ***/
 /*** LPub3D Mod - lpub fade highlight ***/
-	int mLPubFade;
+	bool mLPubFade;
+	bool mLPubHighlight;
 /*** LPub3D Mod end ***/
 	QString mID;
 

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.6.212.3323 (08 05 2023 15:06:46)
+LPub3D 2.4.6.213.3324 (08 05 2023 15:07:10)
 
 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.212.3323 (08 05 2023 15:06:46)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.213.3324 (08 05 2023 15:07:10)</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.212.3323
-;; Last Update.: Mon, 08 May 2023 15:06:46 +0200
+;; Version.....: 2.4.6.213.3324
+;; Last Update.: Mon, 08 May 2023 15:07:10 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY