Skip to content

Commit

Permalink
Fade and highlight - move LPub fade and highlight flags to project #710
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorsandy committed May 8, 2023
1 parent 989cd60 commit c56ce9b
Show file tree
Hide file tree
Showing 17 changed files with 66 additions and 27 deletions.
2 changes: 1 addition & 1 deletion builds/linux/obs/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Last Update: July 19, 2020
# Copyright (C) 2017 - 2023 by Trevor SANDY
pkgname=lpub3d
pkgver=2.4.6.3332
pkgver=2.4.6.3333
pkgrel=1
pkgdesc="An LDraw Building Instruction Editor"
url="https://github.com/trevorsandy/lpub3d.git"
Expand Down
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Last Update: July 19, 2020
# Copyright (C) 2017 - 2023 by Trevor SANDY
pkgname=lpub3d
pkgver=2.4.6.3332
pkgver=2.4.6.3333
pkgrel=1
pkgdesc="An LDraw Building Instruction Editor"
url="https://github.com/trevorsandy/lpub3d.git"
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/alldeps/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lpub3d (2.4.6.3332) debian; urgency=medium
lpub3d (2.4.6.3333) debian; urgency=medium

* LPub3D version 2.4.6.221.3332_20230508 for Linux
* LPub3D version 2.4.6.222.3333_20230508 for Linux

-- Trevor SANDY <trevor.sandy@gmail.com> Mon, 08 May 2023 15:10:57 +0200
-- Trevor SANDY <trevor.sandy@gmail.com> Mon, 08 May 2023 15:11:28 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/debian/lpub3d.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: 1.0
Source: lpub3d
Binary: lpub3d
Architecture: any
Version: 2.4.6.3332
Version: 2.4.6.3333
Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/alldeps/lpub3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ BuildRequires: fdupes
Summary: An LDraw Building Instruction Editor
Name: lpub3d
Icon: lpub3d.xpm
Version: 2.4.6.3332
Version: 2.4.6.3333
Release: <B_CNT>%{?dist}
URL: https://trevorsandy.github.io/lpub3d
Vendor: Trevor SANDY
Expand Down Expand Up @@ -797,7 +797,7 @@ update-desktop-database || true
%endif

%changelog
* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3332
* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3333
- 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
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lpub3d (2.4.6.3332) debian; urgency=medium
lpub3d (2.4.6.3333) debian; urgency=medium

* LPub3D version 2.4.6.221.3332_20230508 for Linux
* LPub3D version 2.4.6.222.3333_20230508 for Linux

-- Trevor SANDY <trevor.sandy@gmail.com> Mon, 08 May 2023 15:10:59 +0200
-- Trevor SANDY <trevor.sandy@gmail.com> Mon, 08 May 2023 15:11:30 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/debian/lpub3d.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: 1.0
Source: lpub3d
Binary: lpub3d
Architecture: any
Version: 2.4.6.3332
Version: 2.4.6.3333
Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/lpub3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ BuildRequires: fdupes
Summary: An LDraw Building Instruction Editor
Name: lpub3d
Icon: lpub3d.xpm
Version: 2.4.6.3332
Version: 2.4.6.3333
Release: 1%{?dist}
URL: https://trevorsandy.github.io/lpub3d
Vendor: Trevor SANDY
Expand Down Expand Up @@ -313,7 +313,7 @@ update-desktop-database || true
%endif

%changelog
* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3332
* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3333
- 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
Expand Down
2 changes: 1 addition & 1 deletion builds/utilities/version.info
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2 4 6 221 3332 ffce367ef
2 4 6 222 3333 989cd6027
6 changes: 3 additions & 3 deletions gitversion.pri
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 221
GIT_REVISION = 222
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}
Expand Down Expand Up @@ -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 = 3332
GIT_COMMIT = 3333
message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
}

Expand Down Expand Up @@ -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}.221.3332.ffce367ef
GIT_VERSION = $${VERSION}.222.3333.989cd6027
message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
GIT_VERSION ~= s/\./" "
}
Expand Down
9 changes: 4 additions & 5 deletions lclib/common/lc_application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -337,21 +337,20 @@ lcApplication::lcApplication(const lcCommandLineOptions &Options)
/*** LPub3D Mod - load color entry ***/
bool lcApplication::LPubHighlightParts()
{
return mPreferences.mHighlightNewParts;
return mProject ? mProject->IsLPubHighlightParts() && !mProject->IsExportingHTML() : false;
}
/*** LPub3D Mod end ***/
/*** LPub3D Mod - lpub fade highlight ***/
bool lcApplication::LPubFadeParts()
{
// called by lcScene::Draw
bool const exportingHTML = mProject ? mProject->IsExportingHTML() : false;
return mPreferences.mFadeSteps && ! exportingHTML;
return mProject ? (mProject->IsLPubFadeParts() && !mProject->IsExportingHTML()) : false;
}

bool lcApplication::LPubFadeHighlight()
{
// called by lcModel::LoadLDraw, lcScene::Draw
return mPreferences.mLPubFadeHighlight;
// called by lcModel::LoadLDraw, lcScene::Draw
return mPreferences.mLPubFadeHighlight && (mProject ? !mProject->IsExportingHTML() : true);
}

bool lcApplication::LPubDisplayModelStep()
Expand Down
13 changes: 13 additions & 0 deletions lclib/common/project.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ Project::Project(bool IsPreview, bool IsRenderImage)
mModels.Add(mActiveModel);
/*** LPub3D Mod - export ***/
mExportingHTML = false;
/*** LPub3D Mod end ***/
/*** LPub3D Mod - lpub fade highlight ***/
mLPubFadeParts = false;
mLPubHighlightParts = false;
/*** LPub3D Mod end ***/
if (!mIsPreview && gMainWindow)
QObject::connect(&mFileWatcher, SIGNAL(fileChanged(const QString&)), gMainWindow, SLOT(ProjectFileChanged(const QString&)));
Expand All @@ -112,6 +116,15 @@ Project::~Project()
mModels.DeleteAll();
}

/*** LPub3D Mod - lpub fade highlight ***/
void Project::SetLPubFadeHighlightParts(
const int LPubFadeParts,
const int LPubHighlightParts)
{
mLPubFadeParts = LPubFadeParts;
mLPubHighlightParts = LPubHighlightParts;
}
/*** LPub3D Mod end ***/
/*** LPub3D Mod - Camera Globe and Image Export ***/
void Project::SetRenderAttributes(
const int Renderer,
Expand Down
17 changes: 17 additions & 0 deletions lclib/common/project.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,19 @@ class Project
return mExportingHTML;
}
/*** LPub3D Mod end ***/
/*** LPub3D Mod - lpub fade highlight ***/
bool IsLPubFadeParts() const
{
return mLPubFadeParts;
}
bool IsLPubHighlightParts() const
{
return mLPubHighlightParts;
}
void SetLPubFadeHighlightParts(
const int LPubFadeParts,
const int LPubHighlightParts);
/*** LPub3D Mod end ***/
/*** LPub3D Mod - Camera Globe and Image Export ***/
void SetRenderAttributes(
const int Renderer,
Expand Down Expand Up @@ -231,6 +244,10 @@ class Project
/*** LPub3D Mod - export ***/
bool mExportingHTML;
/*** LPub3D Mod end ***/
/*** LPub3D Mod - lpub fade highlight ***/
int mLPubFadeParts;
int mLPubHighlightParts;
/*** LPub3D Mod end ***/
/*** LPub3D Mod - set Timeline top item ***/
QString mTimelineTopItem;
/*** LPub3D Mod end ***/
Expand Down
2 changes: 1 addition & 1 deletion mainApp/docs/README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LPub3D 2.4.6.221.3332 (08 05 2023 15:10:59)
LPub3D 2.4.6.222.3333 (08 05 2023 15:11:30)

Features, enhancements, fixes and changes
------------
Expand Down
2 changes: 1 addition & 1 deletion mainApp/docs/RELEASE_NOTES.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<table class="tg">
<tr>
<th class="tg-0pky">
<h4><a id="LPub3D_0"></a>LPub3D 2.4.6.221.3332 (08 05 2023 15:10:59)</h4>
<h4><a id="LPub3D_0"></a>LPub3D 2.4.6.222.3333 (08 05 2023 15:11:30)</h4>
<hr>
<p>
<span class="tg-1pky">LPub3D Official release.</span><br>
Expand Down
4 changes: 2 additions & 2 deletions mainApp/extras/LPub3D_Npp_UDL.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
;;
;; Author......: Trevor SANDY
;; Name........: LPub3D_Npp_UDL.xml
;; Version.....: 2.4.6.221.3332
;; Last Update.: Mon, 08 May 2023 15:10:59 +0200
;; Version.....: 2.4.6.222.3333
;; Last Update.: Mon, 08 May 2023 15:11:30 +0200
;; License.....: GPLv3
;; Homepage....: https://trevorsandy.github.io/lpub3d
;; Copyright (C) 2021 - 2023 by Trevor SANDY
Expand Down
10 changes: 10 additions & 0 deletions mainApp/lpub_object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,11 @@ bool LPub::OpenProject(const NativeOptions* Options, int Type/*NATIVE_VIEW*/, bo
else
Loader = new Project();

if (Options->LPubFadeHighlight)
Loader->SetLPubFadeHighlightParts(
Options->FadeParts,
Options->HighlightParts);

QString FileName, StepKey;
if (UseFile && !Options->InputFileName.isEmpty())
FileName = Options->InputFileName;
Expand All @@ -377,6 +382,11 @@ bool LPub::OpenProject(const NativeOptions* Options, int Type/*NATIVE_VIEW*/, bo
{
Loader = new Project();

if (Options->LPubFadeHighlight)
Loader->SetLPubFadeHighlightParts(
Options->FadeParts,
Options->HighlightParts);

if (UseFile && !Options->InputFileName.isEmpty())
Loaded = Loader->Load(Options->InputFileName, true/*ShowErrors*/);
else
Expand Down

0 comments on commit c56ce9b

Please sign in to comment.