diff --git a/README.md b/README.md index 36bdfe2e7..177b12915 100644 --- a/README.md +++ b/README.md @@ -143,9 +143,9 @@ LEGO® is a trademark of the LEGO Group of companies which does not sponsor, aut [univention-icon]: https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/univention.png [windows-icon]: https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/windows.png -[windows-url]: https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1067_20181203.exe -[macos-url]: https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1067_20181203-macos.dmg -[appimage-url]: https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1067_20181203-x86_64.AppImage +[windows-url]: https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1068_20181203.exe +[macos-url]: https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1068_20181203-macos.dmg +[appimage-url]: https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1068_20181203-x86_64.AppImage [arch-url]: https://download.opensuse.org/repositories/home:/trevorsandy/Arch_Extra/ [centos-url]: https://download.opensuse.org/repositories/home:/trevorsandy/CentOS_7/ diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index cc2c18206..c878e76a2 100644 --- a/builds/linux/obs/alldeps/PKGBUILD +++ b/builds/linux/obs/alldeps/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Trevor SANDY # Last Update October 02, 2018 pkgname=lpub3d -pkgver=2.3.4.1067 +pkgver=2.3.4.1068 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 index f849413a4..518f98689 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.3.4.1067) debian; urgency=medium +lpub3d (2.3.4.1068) debian; urgency=medium - * LPub3D version 2.3.4.1.1067_20181203 for Linux + * LPub3D version 2.3.4.1.1068_20181203 for Linux - -- Trevor SANDY Mon, 03 Dec 2018 06:49:16 +0100 + -- Trevor SANDY Mon, 03 Dec 2018 06:52:23 +0100 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 681553768..da4d98d04 100644 --- 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.3.4.1067 +Version: 2.3.4.1068 Maintainer: Trevor SANDY 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 index 2904305cd..16eaeaccd 100644 --- a/builds/linux/obs/alldeps/lpub3d.spec +++ b/builds/linux/obs/alldeps/lpub3d.spec @@ -115,7 +115,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.3.4.1067 +Version: 2.3.4.1068 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -711,5 +711,5 @@ update-mime-database /usr/share/mime >/dev/null || true update-desktop-database || true %endif -* Mon Dec 03 2018 - trevor.dot.sandy.at.gmail.dot.com 2.3.4.1067 +* Mon Dec 03 2018 - trevor.dot.sandy.at.gmail.dot.com 2.3.4.1068 - LPub3D Linux package (rpm) release diff --git a/builds/utilities/ci/secure/.secrets.tar.enc b/builds/utilities/ci/secure/.secrets.tar.enc index cdda2af18..f96628114 100644 Binary files a/builds/utilities/ci/secure/.secrets.tar.enc and b/builds/utilities/ci/secure/.secrets.tar.enc differ diff --git a/builds/utilities/version.info b/builds/utilities/version.info index 324035bb0..136674947 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 3 4 1 1067 3fe1177 +2 3 4 1 1068 f829af3 diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index 5e123d948..2a2385255 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.3.4.1.1067 (03 12 2018 06:49:16) +LPub3D 2.3.4.1.1068 (03 12 2018 06:52:23) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 5e0b4f2b9..48f982f54 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -9,7 +9,7 @@ +
-

LPub3D 2.3.4.1.1067 (03 12 2018 06:49:16)

+

LPub3D 2.3.4.1.1068 (03 12 2018 06:52:23)

LPub3D version 2.3.3
@@ -35,6 +35,7 @@

Features, enhancements

Fix - Line comment colours now working properly #142
Fix - Page range dialogue reports false invalid range #143
Fix - Submodel instances count setting not set #148
Fix - Wrong rotation when rotstep REL/END after rotstep ABS in multi-step #160

LPub3D 2.3.0.0.887 (04 09 2018 06:52:44) Release Notes

diff --git a/mainApp/org.trevorsandy.lpub3d.appdata.xml b/mainApp/org.trevorsandy.lpub3d.appdata.xml index 951764085..e5582b6a0 100644 --- a/mainApp/org.trevorsandy.lpub3d.appdata.xml +++ b/mainApp/org.trevorsandy.lpub3d.appdata.xml @@ -68,7 +68,7 @@ lpub3d23 ​ - +

LPub3D Linux AppImage package

 diff --git a/mainApp/step.cpp b/mainApp/step.cpp index 48835c726..5d9a3e94b 100644 --- a/mainApp/step.cpp +++ b/mainApp/step.cpp @@ -199,7 +199,10 @@ int Step::createCsi( bool doFadeStep = meta.LPub.fadeStep.fadeStep.value(); bool doHighlightStep = meta.LPub.highlightStep.highlightStep.value() && !gui->suppressColourMeta(); bool invalidIMStep = ((modelDisplayOnlyStep) || (stepNumber.number == 1)); - if (meta.rotStep.value().type == "ABS") meta.LPub.assem.cameraAngles.setValues(0.0f,0.0f); + bool absRotstep = meta.rotStep.value().type == "ABS"; + FloatPairMeta absCA; + if (absRotstep) + absCA.setValues(0.0f,0.0f); ldrName.clear(); @@ -227,8 +230,8 @@ int Step::createCsi( .arg(resolutionType() == DPI ? "DPI" : "DPCM") .arg(modelScale) .arg(meta.LPub.assem.cameraFoV.value()) - .arg(meta.LPub.assem.cameraAngles.value(0)) - .arg(meta.LPub.assem.cameraAngles.value(1));; + .arg(absRotstep ? absCA.value(0) : meta.LPub.assem.cameraAngles.value(0)) + .arg(absRotstep ? absCA.value(1) : meta.LPub.assem.cameraAngles.value(1)); // populate png name pngName = QString("%1/%2.png").arg(csiPngFilePath).arg(key); @@ -280,7 +283,7 @@ int Step::createCsi( QStringList rotatedParts = csiParts; // rotate parts for 3DViewer display - do not apply camera angles - if ((rc = renderer->rotateParts(addLine,meta.rotStep,rotatedParts,meta.LPub.assem.cameraAngles,false)) != 0) + if ((rc = renderer->rotateParts(addLine,meta.rotStep,rotatedParts,absRotstep ? absCA : meta.LPub.assem.cameraAngles,false)) != 0) emit gui->messageSig(LOG_ERROR,QString("Failed to rotate viewer CSI parts")); // add ROTSTEP command @@ -316,7 +319,7 @@ int Step::createCsi( if (nativeRenderer) ldrName = csiLdrFile; - if ((rc = renderer->rotateParts(addLine, meta.rotStep, csiParts, ldrName, top.modelName, meta.LPub.assem.cameraAngles)) != 0) { + if ((rc = renderer->rotateParts(addLine, meta.rotStep, csiParts, ldrName, top.modelName, absRotstep ? absCA : meta.LPub.assem.cameraAngles)) != 0) { emit gui->messageSig(LOG_ERROR,QString("Failed to create and rotate CSI ldr file: %1.") .arg(ldrName)); return rc; @@ -353,8 +356,8 @@ int Step::createCsi( // set viewer camera options viewerOptions.ViewerCsiKey = viewerCsiKey; viewerOptions.FoV = meta.LPub.assem.cameraFoV.value(); - viewerOptions.Latitude = meta.LPub.assem.cameraAngles.value(0); - viewerOptions.Longitude = meta.LPub.assem.cameraAngles.value(1); + viewerOptions.Latitude = absRotstep ? absCA.value(0) : meta.LPub.assem.cameraAngles.value(0); + viewerOptions.Longitude = absRotstep ? absCA.value(1) : meta.LPub.assem.cameraAngles.value(1); // Load the 3DViewer loadTheViewer();