Fade and highlight - rename visual editor lcFadeArgs to lcLPubFade #710

trevorsandy · May 8, 2023 · 7bc8d69 · 7bc8d69
1 parent d57261e
commit 7bc8d69
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 32 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.3329
+pkgver=2.4.6.3330
 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.3329
+pkgver=2.4.6.3330
 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.3329) debian; urgency=medium
+lpub3d (2.4.6.3330) debian; urgency=medium
 
-  * LPub3D version 2.4.6.218.3329_20230508 for Linux
+  * LPub3D version 2.4.6.219.3330_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:09:34 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:10:03 +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.3329
+Version: 2.4.6.3330
 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.3329
+Version: 2.4.6.3330
 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.3329
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3330
 - 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.3329) debian; urgency=medium
+lpub3d (2.4.6.3330) debian; urgency=medium
 
-  * LPub3D version 2.4.6.218.3329_20230508 for Linux
+  * LPub3D version 2.4.6.219.3330_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:09:35 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:10:04 +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.3329
+Version: 2.4.6.3330
 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.3329
+Version: 2.4.6.3330
 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.3329
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3330
 - 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 218 3329 3c4d2a09d
+2 4 6 219 3330 d57261e45
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 = 218
+        GIT_REVISION = 219
         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 = 3329
+            GIT_COMMIT = 3330
             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}.218.3329.3c4d2a09d
+            GIT_VERSION = $${VERSION}.219.3330.d57261e45
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/lclib/common/lc_scene.cpp b/lclib/common/lc_scene.cpp
@@ -324,7 +324,7 @@ void lcScene::DrawOpaqueMeshes(lcContext* Context, bool DrawLit, int PrimitiveTy
 }
 
 /*** LPub3D Mod - lpub fade highlight ***/
-void lcScene::DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawFadePrepass, bool DrawFaded, bool DrawNonFaded, lcFadeArgs LPubFadeArg) const
+void lcScene::DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawFadePrepass, bool DrawFaded, bool DrawNonFaded, lcLPubFade LPubFade) const
 /*** LPub3D Mod end ***/
 {
 	if (mTranslucentMeshes.IsEmpty())
@@ -344,13 +344,13 @@ void lcScene::DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawF
 	}
 
 /*** LPub3D Mod - lpub fade highlight ***/
-	if (LPubFadeArg)
+	if (LPubFade)
 	{
 		// Enable BFC
-	Context->EnableCullFace(true, true);
+		Context->EnableCullFace(true, true);
 
 		// Disable color writes
-		if (LPubFadeArg == LC_DISABLE_COLOR_WRITES){
+		if (LPubFade == LC_DISABLE_COLOR_WRITES){
 			Context->EnableColorBlend(false);
 			Context->EnableColorWrite(false);
 		}
@@ -361,7 +361,7 @@ void lcScene::DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawF
 			Context->EnableColorWrite(true);
 		}
 
-		Context->SetDepthWrite(LPubFadeArg == LC_DISABLE_COLOR_WRITES);
+		Context->SetDepthWrite(LPubFade == LC_DISABLE_COLOR_WRITES);
 	}
 	else
 /*** LPub3D Mod end ***/
@@ -401,7 +401,7 @@ void lcScene::DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawF
 			ColorIndex = RenderMesh.ColorIndex;
 
 /*** LPub3D Mod - lpub fade highlight ***/
-		if (!LPubFadeArg && DrawFadePrepass && lcIsColorTranslucent(ColorIndex))
+		if (!LPubFade && DrawFadePrepass && lcIsColorTranslucent(ColorIndex))
 			continue;
 /*** LPub3D Mod end ***/
 
@@ -456,9 +456,9 @@ void lcScene::DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawF
 	Context->SetPolygonOffset(lcPolygonOffset::None);
 
 /*** LPub3D Mod - lpub fade highlight ***/
-	if (LPubFadeArg)
+	if (LPubFade)
 	{
-	Context->SetDepthWrite(true);
+		Context->SetDepthWrite(true);
 		Context->EnableColorBlend(false);
 
 		// Wrap up, Disable BFC

diff --git a/lclib/common/lc_scene.h b/lclib/common/lc_scene.h
@@ -4,7 +4,7 @@
 #include "lc_array.h"
 
 /*** LPub3D Mod - lpub fade highlight ***/
-enum lcFadeArgs
+enum lcLPubFade
 {
 	LC_NO_LPUB_FADE,
 	LC_DISABLE_COLOR_WRITES,
@@ -110,7 +110,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_LPUB_FADE) const;
+	void DrawTranslucentMeshes(lcContext* Context, bool DrawLit, bool DrawFadePrepass, bool DrawFaded, bool DrawNonFaded, lcLPubFade LPubFade = LC_NO_LPUB_FADE) const;
 /*** LPub3D Mod end ***/
 	void DrawDebugNormals(lcContext* Context, const lcMesh* Mesh) const;
 

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