From 4fa276c9e20a1c5a9b329c9035fe92dffe936c90 Mon Sep 17 00:00:00 2001 From: Jeremy Hu Date: Wed, 27 Jun 2018 08:19:14 +0800 Subject: [PATCH] Remove g++-4.9 requirement --- .travis.yml | 71 ++++- ci/AppRun-patched-x86_64 | Bin 0 -> 14016 bytes ....dust3d.appdata.xml => dust3d.appdata.xml} | 2 +- ci/{org.dust3d.desktop => dust3d.desktop} | 1 + ci/exec-x86_64.so | Bin 0 -> 8712 bytes ci/upload-github-release-asset.sh | 2 +- src/ccdikresolver.cpp | 2 +- src/skeletondocumentwindow.cpp | 261 +++++++++--------- thirdparty/json/json.hpp | 2 +- 9 files changed, 191 insertions(+), 150 deletions(-) create mode 100644 ci/AppRun-patched-x86_64 rename ci/{org.dust3d.appdata.xml => dust3d.appdata.xml} (96%) rename ci/{org.dust3d.desktop => dust3d.desktop} (90%) create mode 100644 ci/exec-x86_64.so diff --git a/.travis.yml b/.travis.yml index cca2f3f4..d0ca4015 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,21 +16,26 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - packages: - - gcc-4.9 - - g++-4.9 - os: osx compiler: clang osx_image: xcode8 install: + # (Mac) Install CGAL - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall cgal; fi + + # (Linux) Prepare build environment - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository --yes ppa:beineri/opt-qt591-trusty; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install gcc-4.9 g++-4.9; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libcgal-dev; fi + #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install gcc-4.9 g++-4.9; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install cmake; fi + + # (Linux) Install CGAL + # (Linux) First install a maybe old version CGAL to resolve dependencies + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libcgal-dev; fi + + # (Linux) Build from source - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.11.1/CGAL-4.11.1.zip; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then unzip CGAL-4.11.1.zip; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd CGAL-4.11.1; fi @@ -40,15 +45,22 @@ install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo make install; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd ../../; fi + + # (Mac) Install Qt5 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall qt5; fi + + # (Linux) Install Qt5 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install qt59base qt59tools --force-yes; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt59/bin/qt59-env.sh; fi + + # Install Rust - wget -O installrust.sh https://sh.rustup.rs - sh installrust.sh -y - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="$HOME/.cargo/bin:/usr/local/opt/qt/bin:$(brew --prefix)/bin:$PATH"; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH="~/.cargo/bin:$PATH"; fi script: + # Build Meshlite - git clone https://github.com/huxingyi/meshlite.git || travis_terminate 1 - cd meshlite - cargo build --release @@ -56,22 +68,51 @@ script: - cp meshlite/include/meshlite.h thirdparty/meshlite/meshlite.h || travis_terminate 1 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cp meshlite/target/release/libmeshlite.dylib thirdparty/meshlite/libmeshlite.dylib || travis_terminate 1; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp meshlite/target/release/libmeshlite.so thirdparty/meshlite/libmeshlite.so || travis_terminate 1; fi + + # Build Dust3D - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then qmake -config release || travis_terminate 1; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then qmake -config release || travis_terminate 1; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make CXX="g++-4.9 -fext-numeric-literals" || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make CXX="g++ -fext-numeric-literals" || travis_terminate 1; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/thirdparty/meshlite || travis_terminate 1; fi + + # (Mac) Prepare dmg - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mv dust3d.app dust3d_unstable.app || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir -p dust3d_unstable/usr/share/metainfo || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir dust3d_unstable/usr/share/applications || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv ./dust3d dust3d_unstable/dust3d_unstable || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv ./ci/icon.png dust3d_unstable/icon.png || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv ./ci/org.dust3d.appdata.xml dust3d_unstable/usr/share/metainfo/org.dust3d.appdata.xml || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp ./ci/org.dust3d.desktop dust3d_unstable/usr/share/applications/org.dust3d.desktop || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp ./ci/org.dust3d.desktop dust3d_unstable/org.dust3d.desktop || travis_terminate 1; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then macdeployqt dust3d_unstable.app -dmg || travis_terminate 1; fi + + # (Linux) Prepare AppImage + # References: + # https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html + # https://packages.ubuntu.com/search?suite=trusty&arch=amd64&mode=exactfilename&searchon=contents&keywords=libstdc%2B%2B.so.6 + # https://github.com/darealshinji/AppImageKit-checkrt/issues/1 + # https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/AppRun-patched-x86_64 + # https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so + # https://github.com/probonopd/audacity/blob/AppImage/.travis.yml + # https://discourse.appimage.org/t/im-a-big-fan-of-this-but-graphics-driver-libstdc-conflict/171 + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir -p appdir/usr/share/metainfo || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir -p appdir/usr/share/applications || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir -p appdir/usr/bin || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir -p appdir/usr/optional/libstdc++ || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ldd --version; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ls /usr/lib/x86_64-linux-gnu/ | grep libstdc; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 appdir/usr/optional/libstdc++/libstdc++.so.6 || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp ./ci/exec-x86_64.so appdir/usr/optional/exec.so || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp ./ci/icon.png appdir/icon.png || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp ./ci/dust3d.appdata.xml appdir/usr/share/metainfo/dust3d.appdata.xml || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp ./dust3d appdir/usr/bin/dust3d || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp ./ci/dust3d.desktop appdir/usr/share/applications/dust3d.desktop || travis_terminate 1; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod a+x ./ci/linuxdeployqt.AppImage || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./ci/linuxdeployqt.AppImage dust3d_unstable/dust3d_unstable -appimage -bundle-non-qt-libs -verbose=2 || travis_terminate 1; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv ./Dust3D-x86_64.AppImage ./dust3d_unstable-x86_64.AppImage || travis_terminate 1;fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then unset QTDIR; unset QT_PLUGIN_PATH ; export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/thirdparty/meshlite; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./ci/linuxdeployqt.AppImage appdir/usr/share/applications/dust3d.desktop -bundle-non-qt-libs -verbose=2 || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then rm appdir/AppRun || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cp ./ci/AppRun-patched-x86_64 appdir/AppRun || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod a+x appdir/AppRun || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./ci/linuxdeployqt.AppImage --appimage-extract || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=$(readlink -f ./squashfs-root/usr/bin):$PATH || travis_terminate 1; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./squashfs-root/usr/bin/appimagetool -g ./appdir/ dust3d_unstable-x86_64.AppImage || travis_terminate 1; fi + + # Distribute + - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then echo "No distribution on pull request"; fi + - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then travis_terminate 0; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh ci/upload-github-release-asset.sh github_api_token=${my_auth_token} branch=$TRAVIS_BRANCH owner=huxingyi repo=dust3d tag=unstable filename=dust3d_unstable.dmg; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash ci/upload-github-release-asset.sh github_api_token=${my_auth_token} branch=$TRAVIS_BRANCH owner=huxingyi repo=dust3d tag=unstable filename=dust3d_unstable-x86_64.AppImage; fi diff --git a/ci/AppRun-patched-x86_64 b/ci/AppRun-patched-x86_64 new file mode 100644 index 0000000000000000000000000000000000000000..46a9756942a43f52d0a24ac405d7b5a07f3371bd GIT binary patch literal 14016 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 HIYIt!nf+Sr literal 0 HcmV?d00001 diff --git a/ci/org.dust3d.appdata.xml b/ci/dust3d.appdata.xml similarity index 96% rename from ci/org.dust3d.appdata.xml rename to ci/dust3d.appdata.xml index 072810a8..9c704e40 100644 --- a/ci/org.dust3d.appdata.xml +++ b/ci/dust3d.appdata.xml @@ -1,6 +1,6 @@ -​ org.dust3d.desktop +​ dust3d.desktop ​ FSFAP ​ MIT ​ Dust3D diff --git a/ci/org.dust3d.desktop b/ci/dust3d.desktop similarity index 90% rename from ci/org.dust3d.desktop rename to ci/dust3d.desktop index 3bb100bc..f85028ab 100644 --- a/ci/org.dust3d.desktop +++ b/ci/dust3d.desktop @@ -2,5 +2,6 @@ Type=Application Name=Dust3D Icon=icon +Exec=dust3d Categories=Graphics; Comment=A quick 3D modeling tool diff --git a/ci/exec-x86_64.so b/ci/exec-x86_64.so new file mode 100644 index 0000000000000000000000000000000000000000..44ba29c152343bfe339b9db012f1fac7d501602e GIT binary patch literal 8712 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 0 && abs(distance2 - lastDistance2) <= m_distanceCeaseThreshold2) + if (lastDistance2 > 0 && fabs(distance2 - lastDistance2) <= m_distanceCeaseThreshold2) break; lastDistance2 = distance2; iterate(); diff --git a/src/skeletondocumentwindow.cpp b/src/skeletondocumentwindow.cpp index dec265d4..d3dc446f 100644 --- a/src/skeletondocumentwindow.cpp +++ b/src/skeletondocumentwindow.cpp @@ -36,7 +36,7 @@ int SkeletonDocumentWindow::m_skeletonRenderWidgetInitialX = SkeletonDocumentWin int SkeletonDocumentWindow::m_skeletonRenderWidgetInitialY = SkeletonDocumentWindow::m_modelRenderWidgetInitialY; int SkeletonDocumentWindow::m_skeletonRenderWidgetInitialSize = SkeletonDocumentWindow::m_modelRenderWidgetInitialSize; -QPointer g_logBrowser; +LogBrowser *g_logBrowser = nullptr; std::set g_documentWindows; QTextBrowser *g_acknowlegementsWidget = nullptr; AboutWidget *g_aboutWidget = nullptr; @@ -84,45 +84,45 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : g_logBrowser = new LogBrowser; qInstallMessageHandler(&outputMessage); } - + g_documentWindows.insert(this); - + m_document = new SkeletonDocument; - + QVBoxLayout *toolButtonLayout = new QVBoxLayout; toolButtonLayout->setSpacing(0); toolButtonLayout->setContentsMargins(5, 10, 4, 0); - + QPushButton *undoButton = new QPushButton(QChar(fa::undo)); initAwesomeButton(undoButton); - + QPushButton *addButton = new QPushButton(QChar(fa::plus)); initAwesomeButton(addButton); - + QPushButton *selectButton = new QPushButton(QChar(fa::mousepointer)); initAwesomeButton(selectButton); - + QPushButton *dragButton = new QPushButton(QChar(fa::handrocko)); initAwesomeButton(dragButton); - + QPushButton *zoomInButton = new QPushButton(QChar(fa::searchplus)); initAwesomeButton(zoomInButton); - + QPushButton *zoomOutButton = new QPushButton(QChar(fa::searchminus)); initAwesomeButton(zoomOutButton); - + m_xlockButton = new QPushButton(QChar('X')); initLockButton(m_xlockButton); updateXlockButtonState(); - + m_ylockButton = new QPushButton(QChar('Y')); initLockButton(m_ylockButton); updateYlockButtonState(); - + m_zlockButton = new QPushButton(QChar('Z')); initLockButton(m_zlockButton); updateZlockButtonState(); - + toolButtonLayout->addWidget(undoButton); toolButtonLayout->addSpacing(10); toolButtonLayout->addWidget(addButton); @@ -134,16 +134,16 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : toolButtonLayout->addWidget(m_xlockButton); toolButtonLayout->addWidget(m_ylockButton); toolButtonLayout->addWidget(m_zlockButton); - + QLabel *verticalLogoLabel = new QLabel; QImage verticalLogoImage; verticalLogoImage.load(":/resources/dust3d_vertical.png"); verticalLogoLabel->setPixmap(QPixmap::fromImage(verticalLogoImage)); - + QHBoxLayout *logoLayout = new QHBoxLayout; logoLayout->addWidget(verticalLogoLabel); logoLayout->setContentsMargins(0, 0, 0, 0); - + QVBoxLayout *mainLeftLayout = new QVBoxLayout; mainLeftLayout->setSpacing(0); mainLeftLayout->setContentsMargins(0, 0, 0, 0); @@ -151,10 +151,10 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : mainLeftLayout->addStretch(); mainLeftLayout->addLayout(logoLayout); mainLeftLayout->addSpacing(10); - + SkeletonGraphicsWidget *graphicsWidget = new SkeletonGraphicsWidget(m_document); m_graphicsWidget = graphicsWidget; - + SkeletonGraphicsContainerWidget *containerWidget = new SkeletonGraphicsContainerWidget; containerWidget->setGraphicsWidget(graphicsWidget); QGridLayout *containerLayout = new QGridLayout; @@ -163,38 +163,38 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : containerLayout->addWidget(graphicsWidget); containerWidget->setLayout(containerLayout); containerWidget->setMinimumSize(400, 400); - + m_modelRenderWidget = new ModelWidget(containerWidget); m_modelRenderWidget->setMinimumSize(SkeletonDocumentWindow::m_modelRenderWidgetInitialSize, SkeletonDocumentWindow::m_modelRenderWidgetInitialSize); m_modelRenderWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); m_modelRenderWidget->move(SkeletonDocumentWindow::m_modelRenderWidgetInitialX, SkeletonDocumentWindow::m_modelRenderWidgetInitialY); m_modelRenderWidget->setGraphicsFunctions(graphicsWidget); - + //m_skeletonRenderWidget = new ModelWidget(containerWidget); //m_skeletonRenderWidget->setMinimumSize(SkeletonDocumentWindow::m_skeletonRenderWidgetInitialSize, SkeletonDocumentWindow::m_skeletonRenderWidgetInitialSize); //m_skeletonRenderWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); //m_skeletonRenderWidget->move(SkeletonDocumentWindow::m_skeletonRenderWidgetInitialX, SkeletonDocumentWindow::m_skeletonRenderWidgetInitialY); //m_skeletonRenderWidget->setGraphicsFunctions(graphicsWidget); //m_skeletonRenderWidget->hide(); - + QDockWidget *partListDocker = new QDockWidget(QString(), this); partListDocker->setAllowedAreas(Qt::RightDockWidgetArea); - + SkeletonPartListWidget *partListWidget = new SkeletonPartListWidget(m_document, partListDocker); //partListWidget->setWindowFlags(Qt::Tool); //partListWidget->move(100, 200); //partListWidget->show(); - + partListDocker->setWidget(partListWidget); addDockWidget(Qt::RightDockWidgetArea, partListDocker); - + partListDocker->hide(); - + //QVBoxLayout *mainRightLayout = new QVBoxLayout; //mainRightLayout->setSpacing(0); //mainRightLayout->setContentsMargins(0, 0, 0, 0); //mainRightLayout->addWidget(partListWidget); - + QHBoxLayout *mainLayout = new QHBoxLayout; mainLayout->setSpacing(0); mainLayout->setContentsMargins(0, 0, 0, 0); @@ -202,164 +202,164 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : mainLayout->addWidget(containerWidget); mainLayout->addSpacing(3); //mainLayout->addLayout(mainRightLayout); - + QWidget *centralWidget = new QWidget; centralWidget->setLayout(mainLayout); - + setCentralWidget(centralWidget); setWindowTitle(tr("Dust3D")); - + m_fileMenu = menuBar()->addMenu(tr("File")); - + m_newWindowAction = new QAction(tr("New Window"), this); connect(m_newWindowAction, &QAction::triggered, this, &SkeletonDocumentWindow::newWindow, Qt::QueuedConnection); m_fileMenu->addAction(m_newWindowAction); - + m_newDocumentAction = new QAction(tr("New"), this); connect(m_newDocumentAction, &QAction::triggered, this, &SkeletonDocumentWindow::newDocument); m_fileMenu->addAction(m_newDocumentAction); - + m_openAction = new QAction(tr("Open..."), this); connect(m_openAction, &QAction::triggered, this, &SkeletonDocumentWindow::open, Qt::QueuedConnection); m_fileMenu->addAction(m_openAction); - + m_saveAction = new QAction(tr("Save"), this); connect(m_saveAction, &QAction::triggered, this, &SkeletonDocumentWindow::save, Qt::QueuedConnection); m_fileMenu->addAction(m_saveAction); - + m_saveAsAction = new QAction(tr("Save As..."), this); connect(m_saveAsAction, &QAction::triggered, this, &SkeletonDocumentWindow::saveAs, Qt::QueuedConnection); m_fileMenu->addAction(m_saveAsAction); - + m_saveAllAction = new QAction(tr("Save All"), this); connect(m_saveAllAction, &QAction::triggered, this, &SkeletonDocumentWindow::saveAll, Qt::QueuedConnection); m_fileMenu->addAction(m_saveAllAction); - + m_fileMenu->addSeparator(); - + m_exportMenu = m_fileMenu->addMenu(tr("Export")); - + m_exportModelAction = new QAction(tr("Wavefront (.obj)..."), this); connect(m_exportModelAction, &QAction::triggered, this, &SkeletonDocumentWindow::exportModelResult, Qt::QueuedConnection); m_exportMenu->addAction(m_exportModelAction); - + m_exportSkeletonAction = new QAction(tr("GL Transmission Format (.gltf)..."), this); connect(m_exportSkeletonAction, &QAction::triggered, this, &SkeletonDocumentWindow::showExportPreview, Qt::QueuedConnection); m_exportMenu->addAction(m_exportSkeletonAction); - + m_changeTurnaroundAction = new QAction(tr("Change Turnaround..."), this); connect(m_changeTurnaroundAction, &QAction::triggered, this, &SkeletonDocumentWindow::changeTurnaround, Qt::QueuedConnection); m_fileMenu->addAction(m_changeTurnaroundAction); - + connect(m_fileMenu, &QMenu::aboutToShow, [=]() { m_exportModelAction->setEnabled(m_graphicsWidget->hasItems()); m_exportSkeletonAction->setEnabled(m_graphicsWidget->hasItems()); }); - + m_editMenu = menuBar()->addMenu(tr("Edit")); - + m_addAction = new QAction(tr("Add..."), this); connect(m_addAction, &QAction::triggered, [=]() { m_document->setEditMode(SkeletonDocumentEditMode::Add); }); m_editMenu->addAction(m_addAction); - + m_undoAction = new QAction(tr("Undo"), this); connect(m_undoAction, &QAction::triggered, m_document, &SkeletonDocument::undo); m_editMenu->addAction(m_undoAction); - + m_redoAction = new QAction(tr("Redo"), this); connect(m_redoAction, &QAction::triggered, m_document, &SkeletonDocument::redo); m_editMenu->addAction(m_redoAction); - + m_deleteAction = new QAction(tr("Delete"), this); connect(m_deleteAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::deleteSelected); m_editMenu->addAction(m_deleteAction); - + m_breakAction = new QAction(tr("Break"), this); connect(m_breakAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::breakSelected); m_editMenu->addAction(m_breakAction); - + m_connectAction = new QAction(tr("Connect"), this); connect(m_connectAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::connectSelected); m_editMenu->addAction(m_connectAction); - + m_cutAction = new QAction(tr("Cut"), this); connect(m_cutAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::cut); m_editMenu->addAction(m_cutAction); - + m_copyAction = new QAction(tr("Copy"), this); connect(m_copyAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::copy); m_editMenu->addAction(m_copyAction); - + m_pasteAction = new QAction(tr("Paste"), this); connect(m_pasteAction, &QAction::triggered, m_document, &SkeletonDocument::paste); m_editMenu->addAction(m_pasteAction); - + m_flipHorizontallyAction = new QAction(tr("H Flip"), this); connect(m_flipHorizontallyAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::flipHorizontally); m_editMenu->addAction(m_flipHorizontallyAction); - + m_flipVerticallyAction = new QAction(tr("V Flip"), this); connect(m_flipVerticallyAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::flipVertically); m_editMenu->addAction(m_flipVerticallyAction); - + m_rotateClockwiseAction = new QAction(tr("Rotate 90D CW"), this); connect(m_rotateClockwiseAction, &QAction::triggered, [=] { m_graphicsWidget->rotateClockwise90Degree(); }); m_editMenu->addAction(m_rotateClockwiseAction); - + m_rotateCounterclockwiseAction = new QAction(tr("Rotate 90D CCW"), this); connect(m_rotateCounterclockwiseAction, &QAction::triggered, [=] { m_graphicsWidget->rotateCounterclockwise90Degree(); }); m_editMenu->addAction(m_rotateCounterclockwiseAction); - + m_switchXzAction = new QAction(tr("Switch XZ"), this); connect(m_switchXzAction, &QAction::triggered, [=] { m_graphicsWidget->switchSelectedXZ(); }); m_editMenu->addAction(m_switchXzAction); - + m_alignToMenu = new QMenu(tr("Align To")); - + m_alignToGlobalCenterAction = new QAction(tr("Global Center"), this); connect(m_alignToGlobalCenterAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::alignSelectedToGlobalCenter); m_alignToMenu->addAction(m_alignToGlobalCenterAction); - + m_alignToGlobalVerticalCenterAction = new QAction(tr("Global Vertical Center"), this); connect(m_alignToGlobalVerticalCenterAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::alignSelectedToGlobalVerticalCenter); m_alignToMenu->addAction(m_alignToGlobalVerticalCenterAction); - + m_alignToGlobalHorizontalCenterAction = new QAction(tr("Global Horizontal Center"), this); connect(m_alignToGlobalHorizontalCenterAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::alignSelectedToGlobalHorizontalCenter); m_alignToMenu->addAction(m_alignToGlobalHorizontalCenterAction); - + m_alignToLocalCenterAction = new QAction(tr("Local Center"), this); connect(m_alignToLocalCenterAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::alignSelectedToLocalCenter); m_alignToMenu->addAction(m_alignToLocalCenterAction); - + m_alignToLocalVerticalCenterAction = new QAction(tr("Local Vertical Center"), this); connect(m_alignToLocalVerticalCenterAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::alignSelectedToLocalVerticalCenter); m_alignToMenu->addAction(m_alignToLocalVerticalCenterAction); - + m_alignToLocalHorizontalCenterAction = new QAction(tr("Local Horizontal Center"), this); connect(m_alignToLocalHorizontalCenterAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::alignSelectedToLocalHorizontalCenter); m_alignToMenu->addAction(m_alignToLocalHorizontalCenterAction); - + m_editMenu->addMenu(m_alignToMenu); - + m_markAsMenu = new QMenu(tr("Mark As")); - + m_markAsNoneAction = new QAction(tr("None"), this); connect(m_markAsNoneAction, &QAction::triggered, [=]() { m_graphicsWidget->setSelectedNodesBoneMark(SkeletonBoneMark::None); }); m_markAsMenu->addAction(m_markAsNoneAction); - + m_markAsMenu->addSeparator(); - + for (int i = 0; i < SKELETON_BONE_MARK_TYPE_NUM; i++) { SkeletonBoneMark boneMark = (SkeletonBoneMark)(i + 1); m_markAsActions[i] = new QAction(MarkIconCreator::createIcon(boneMark), SkeletonBoneMarkToDispName(boneMark), this); @@ -368,21 +368,21 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : }); m_markAsMenu->addAction(m_markAsActions[i]); } - + m_editMenu->addMenu(m_markAsMenu); - + m_selectAllAction = new QAction(tr("Select All"), this); connect(m_selectAllAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::selectAll); m_editMenu->addAction(m_selectAllAction); - + m_selectPartAllAction = new QAction(tr("Select Part"), this); connect(m_selectPartAllAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::selectPartAll); m_editMenu->addAction(m_selectPartAllAction); - + m_unselectAllAction = new QAction(tr("Unselect All"), this); connect(m_unselectAllAction, &QAction::triggered, m_graphicsWidget, &SkeletonGraphicsWidget::unselectAll); m_editMenu->addAction(m_unselectAllAction); - + connect(m_editMenu, &QMenu::aboutToShow, [=]() { m_undoAction->setEnabled(m_document->undoable()); m_redoAction->setEnabled(m_document->redoable()); @@ -409,14 +409,14 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : m_selectPartAllAction->setEnabled(m_graphicsWidget->hasItems()); m_unselectAllAction->setEnabled(m_graphicsWidget->hasSelection()); }); - + m_viewMenu = menuBar()->addMenu(tr("View")); - + auto modelIsSitInVisibleArea = [](ModelWidget *modelWidget) { QRect parentRect = QRect(QPoint(0, 0), modelWidget->parentWidget()->size()); return parentRect.contains(modelWidget->geometry().center()); }; - + m_resetModelWidgetPosAction = new QAction(tr("Show Model"), this); connect(m_resetModelWidgetPosAction, &QAction::triggered, [=]() { if (!modelIsSitInVisibleArea(m_modelRenderWidget)) { @@ -424,95 +424,95 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : } }); m_viewMenu->addAction(m_resetModelWidgetPosAction); - + m_toggleWireframeAction = new QAction(tr("Toggle Wireframe"), this); connect(m_toggleWireframeAction, &QAction::triggered, [=]() { m_modelRenderWidget->toggleWireframe(); }); m_viewMenu->addAction(m_toggleWireframeAction); - + m_viewMenu->addSeparator(); - + m_showPartsListAction = new QAction(tr("Show Parts List"), this); connect(m_showPartsListAction, &QAction::triggered, [=]() { partListDocker->show(); }); m_viewMenu->addAction(m_showPartsListAction); - + m_viewMenu->addSeparator(); - + m_showAnimationPanelAction = new QAction(tr("Show Animation Panel"), this); connect(m_showAnimationPanelAction, &QAction::triggered, this, &SkeletonDocumentWindow::showAnimationPanel); m_viewMenu->addAction(m_showAnimationPanelAction); - + m_viewMenu->addSeparator(); - + m_showDebugDialogAction = new QAction(tr("Show Debug Dialog"), this); connect(m_showDebugDialogAction, &QAction::triggered, g_logBrowser, &LogBrowser::showDialog); m_viewMenu->addAction(m_showDebugDialogAction); - + connect(m_viewMenu, &QMenu::aboutToShow, [=]() { m_showPartsListAction->setEnabled(partListDocker->isHidden()); m_showAnimationPanelAction->setEnabled(nullptr == m_animationPanelWidget || m_animationPanelWidget->isHidden()); m_resetModelWidgetPosAction->setEnabled(!modelIsSitInVisibleArea(m_modelRenderWidget)); }); - + m_helpMenu = menuBar()->addMenu(tr("Help")); - + m_viewSourceAction = new QAction(tr("Fork me on GitHub"), this); connect(m_viewSourceAction, &QAction::triggered, this, &SkeletonDocumentWindow::viewSource); m_helpMenu->addAction(m_viewSourceAction); - + m_helpMenu->addSeparator(); - + m_seeReferenceGuideAction = new QAction(tr("Reference Guide"), this); connect(m_seeReferenceGuideAction, &QAction::triggered, this, &SkeletonDocumentWindow::seeReferenceGuide); m_helpMenu->addAction(m_seeReferenceGuideAction); - + m_helpMenu->addSeparator(); - + m_aboutAction = new QAction(tr("About"), this); connect(m_aboutAction, &QAction::triggered, this, &SkeletonDocumentWindow::about); m_helpMenu->addAction(m_aboutAction); - + m_reportIssuesAction = new QAction(tr("Report Issues"), this); connect(m_reportIssuesAction, &QAction::triggered, this, &SkeletonDocumentWindow::reportIssues); m_helpMenu->addAction(m_reportIssuesAction); - + m_seeAcknowlegementsAction = new QAction(tr("Acknowlegements"), this); connect(m_seeAcknowlegementsAction, &QAction::triggered, this, &SkeletonDocumentWindow::seeAcknowlegements); m_helpMenu->addAction(m_seeAcknowlegementsAction); - + connect(containerWidget, &SkeletonGraphicsContainerWidget::containerSizeChanged, graphicsWidget, &SkeletonGraphicsWidget::canvasResized); - + connect(m_document, &SkeletonDocument::turnaroundChanged, graphicsWidget, &SkeletonGraphicsWidget::turnaroundChanged); - + connect(undoButton, &QPushButton::clicked, [=]() { m_document->undo(); }); - + connect(addButton, &QPushButton::clicked, [=]() { m_document->setEditMode(SkeletonDocumentEditMode::Add); }); - + connect(selectButton, &QPushButton::clicked, [=]() { m_document->setEditMode(SkeletonDocumentEditMode::Select); }); - + connect(dragButton, &QPushButton::clicked, [=]() { m_document->setEditMode(SkeletonDocumentEditMode::Drag); }); - + connect(zoomInButton, &QPushButton::clicked, [=]() { m_document->setEditMode(SkeletonDocumentEditMode::ZoomIn); }); - + connect(zoomOutButton, &QPushButton::clicked, [=]() { m_document->setEditMode(SkeletonDocumentEditMode::ZoomOut); }); - + connect(m_xlockButton, &QPushButton::clicked, [=]() { m_document->setXlockState(!m_document->xlocked); }); @@ -522,7 +522,7 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : connect(m_zlockButton, &QPushButton::clicked, [=]() { m_document->setZlockState(!m_document->zlocked); }); - + m_partListDockerVisibleSwitchConnection = connect(m_document, &SkeletonDocument::skeletonChanged, [=]() { if (m_graphicsWidget->hasItems()) { if (partListDocker->isHidden()) @@ -530,11 +530,11 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : disconnect(m_partListDockerVisibleSwitchConnection); } }); - + connect(m_document, &SkeletonDocument::editModeChanged, graphicsWidget, &SkeletonGraphicsWidget::editModeChanged); - + connect(graphicsWidget, &SkeletonGraphicsWidget::zoomRenderedModelBy, m_modelRenderWidget, &ModelWidget::zoom); - + connect(graphicsWidget, &SkeletonGraphicsWidget::addNode, m_document, &SkeletonDocument::addNode); connect(graphicsWidget, &SkeletonGraphicsWidget::scaleNodeByAddRadius, m_document, &SkeletonDocument::scaleNodeByAddRadius); connect(graphicsWidget, &SkeletonGraphicsWidget::moveNodeBy, m_document, &SkeletonDocument::moveNodeBy); @@ -555,22 +555,22 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : connect(graphicsWidget, &SkeletonGraphicsWidget::partChecked, m_document, &SkeletonDocument::partChecked); connect(graphicsWidget, &SkeletonGraphicsWidget::partUnchecked, m_document, &SkeletonDocument::partUnchecked); connect(graphicsWidget, &SkeletonGraphicsWidget::switchNodeXZ, m_document, &SkeletonDocument::switchNodeXZ); - + connect(graphicsWidget, &SkeletonGraphicsWidget::setPartLockState, m_document, &SkeletonDocument::setPartLockState); connect(graphicsWidget, &SkeletonGraphicsWidget::setPartVisibleState, m_document, &SkeletonDocument::setPartVisibleState); connect(graphicsWidget, &SkeletonGraphicsWidget::setPartSubdivState, m_document, &SkeletonDocument::setPartSubdivState); connect(graphicsWidget, &SkeletonGraphicsWidget::setPartDisableState, m_document, &SkeletonDocument::setPartDisableState); connect(graphicsWidget, &SkeletonGraphicsWidget::setPartXmirrorState, m_document, &SkeletonDocument::setPartXmirrorState); connect(graphicsWidget, &SkeletonGraphicsWidget::setPartRoundState, m_document, &SkeletonDocument::setPartRoundState); - + connect(graphicsWidget, &SkeletonGraphicsWidget::setXlockState, m_document, &SkeletonDocument::setXlockState); connect(graphicsWidget, &SkeletonGraphicsWidget::setYlockState, m_document, &SkeletonDocument::setYlockState); connect(graphicsWidget, &SkeletonGraphicsWidget::setZlockState, m_document, &SkeletonDocument::setZlockState); - + connect(graphicsWidget, &SkeletonGraphicsWidget::changeTurnaround, this, &SkeletonDocumentWindow::changeTurnaround); connect(graphicsWidget, &SkeletonGraphicsWidget::save, this, &SkeletonDocumentWindow::save); connect(graphicsWidget, &SkeletonGraphicsWidget::open, this, &SkeletonDocumentWindow::open); - + connect(m_document, &SkeletonDocument::nodeAdded, graphicsWidget, &SkeletonGraphicsWidget::nodeAdded); connect(m_document, &SkeletonDocument::nodeRemoved, graphicsWidget, &SkeletonGraphicsWidget::nodeRemoved); connect(m_document, &SkeletonDocument::edgeAdded, graphicsWidget, &SkeletonGraphicsWidget::edgeAdded); @@ -588,7 +588,7 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : connect(m_document, &SkeletonDocument::uncheckAll, graphicsWidget, &SkeletonGraphicsWidget::unselectAll); connect(m_document, &SkeletonDocument::checkNode, graphicsWidget, &SkeletonGraphicsWidget::addSelectNode); connect(m_document, &SkeletonDocument::checkEdge, graphicsWidget, &SkeletonGraphicsWidget::addSelectEdge); - + connect(m_document, &SkeletonDocument::partListChanged, partListWidget, &SkeletonPartListWidget::partListChanged); connect(m_document, &SkeletonDocument::partPreviewChanged, partListWidget, &SkeletonPartListWidget::partPreviewChanged); connect(m_document, &SkeletonDocument::partLockStateChanged, partListWidget, &SkeletonPartListWidget::partLockStateChanged); @@ -603,7 +603,7 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : connect(m_document, &SkeletonDocument::cleanup, partListWidget, &SkeletonPartListWidget::partListChanged); connect(m_document, &SkeletonDocument::partChecked, partListWidget, &SkeletonPartListWidget::partChecked); connect(m_document, &SkeletonDocument::partUnchecked, partListWidget, &SkeletonPartListWidget::partUnchecked); - + connect(m_document, &SkeletonDocument::skeletonChanged, m_document, &SkeletonDocument::generateMesh); connect(m_document, &SkeletonDocument::resultMeshChanged, [=]() { if ((m_exportPreviewWidget && m_exportPreviewWidget->isVisible()) || @@ -615,30 +615,30 @@ SkeletonDocumentWindow::SkeletonDocumentWindow() : connect(m_document, &SkeletonDocument::postProcessedResultChanged, m_document, &SkeletonDocument::generateTexture); connect(m_document, &SkeletonDocument::resultTextureChanged, m_document, &SkeletonDocument::bakeAmbientOcclusionTexture); connect(m_document, &SkeletonDocument::postProcessedResultChanged, m_document, &SkeletonDocument::generateAllAnimationClips); - + connect(m_document, &SkeletonDocument::resultMeshChanged, [=]() { m_modelRenderWidget->updateMesh(m_document->takeResultMesh()); }); //connect(m_document, &SkeletonDocument::resultSkeletonChanged, [=]() { // m_skeletonRenderWidget->updateMesh(m_document->takeResultSkeletonMesh()); //}); - + connect(graphicsWidget, &SkeletonGraphicsWidget::cursorChanged, [=]() { m_modelRenderWidget->setCursor(graphicsWidget->cursor()); //m_skeletonRenderWidget->setCursor(graphicsWidget->cursor()); }); - + connect(m_document, &SkeletonDocument::skeletonChanged, this, &SkeletonDocumentWindow::documentChanged); connect(m_document, &SkeletonDocument::turnaroundChanged, this, &SkeletonDocumentWindow::documentChanged); - + connect(m_modelRenderWidget, &ModelWidget::customContextMenuRequested, [=](const QPoint &pos) { graphicsWidget->showContextMenu(graphicsWidget->mapFromGlobal(m_modelRenderWidget->mapToGlobal(pos))); }); - + connect(m_document, &SkeletonDocument::xlockStateChanged, this, &SkeletonDocumentWindow::updateXlockButtonState); connect(m_document, &SkeletonDocument::ylockStateChanged, this, &SkeletonDocumentWindow::updateYlockButtonState); connect(m_document, &SkeletonDocument::zlockStateChanged, this, &SkeletonDocumentWindow::updateZlockButtonState); - + connect(this, &SkeletonDocumentWindow::initialized, m_document, &SkeletonDocument::uiReady); } @@ -656,7 +656,7 @@ void SkeletonDocumentWindow::closeEvent(QCloseEvent *event) event->accept(); return; } - + QMessageBox::StandardButton answer = QMessageBox::question(this, APP_NAME, tr("Do you really want to close while there are unsaved changes?"), @@ -769,7 +769,7 @@ void SkeletonDocumentWindow::initLockButton(QPushButton *button) font.setWeight(QFont::Light); font.setPixelSize(Theme::toolIconFontSize); font.setBold(false); - + button->setFont(font); button->setFixedSize(Theme::toolIconSize, Theme::toolIconSize); button->setStyleSheet("QPushButton {color: #f7d9c8}"); @@ -818,7 +818,7 @@ void SkeletonDocumentWindow::save() void SkeletonDocumentWindow::saveTo(const QString &saveAsFilename) { QString filename = saveAsFilename; - + if (filename.isEmpty()) { filename = QFileDialog::getSaveFileName(this, QString(), QString(), tr("Dust3D Document (*.ds3)")); @@ -826,11 +826,11 @@ void SkeletonDocumentWindow::saveTo(const QString &saveAsFilename) return; } } - + QApplication::setOverrideCursor(Qt::WaitCursor); - + Ds3FileWriter ds3Writer; - + QByteArray modelXml; QXmlStreamWriter stream(&modelXml); SkeletonSnapshot snapshot; @@ -838,7 +838,7 @@ void SkeletonDocumentWindow::saveTo(const QString &saveAsFilename) saveSkeletonToXmlStream(&snapshot, &stream); if (modelXml.size() > 0) ds3Writer.add("model.xml", "model", &modelXml); - + QByteArray imageByteArray; QBuffer pngBuffer(&imageByteArray); if (!m_document->turnaround.isNull()) { @@ -847,11 +847,11 @@ void SkeletonDocumentWindow::saveTo(const QString &saveAsFilename) if (imageByteArray.size() > 0) ds3Writer.add("canvas.png", "asset", &imageByteArray); } - + if (ds3Writer.save(filename)) { setCurrentFilename(filename); } - + QApplication::restoreOverrideCursor(); } @@ -865,12 +865,12 @@ void SkeletonDocumentWindow::open() if (answer != QMessageBox::Yes) return; } - + QString filename = QFileDialog::getOpenFileName(this, QString(), QString(), tr("Dust3D Document (*.ds3)")); if (filename.isEmpty()) return; - + QApplication::setOverrideCursor(Qt::WaitCursor); Ds3FileReader ds3Reader(filename); for (int i = 0; i < ds3Reader.items().size(); ++i) { @@ -893,7 +893,7 @@ void SkeletonDocumentWindow::open() } } QApplication::restoreOverrideCursor(); - + setCurrentFilename(filename); } @@ -1001,4 +1001,3 @@ void SkeletonDocumentWindow::updateZlockButtonState() else m_zlockButton->setStyleSheet("QPushButton {color: #aaebc4}"); } - diff --git a/thirdparty/json/json.hpp b/thirdparty/json/json.hpp index c9ef7581..3f074d18 100644 --- a/thirdparty/json/json.hpp +++ b/thirdparty/json/json.hpp @@ -124,7 +124,7 @@ using json = basic_json<>; #endif #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER)) #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900 - #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" + //#error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" #endif #endif