From b48a69d5921c3f3402f281d443473ae1315ea01d Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Mon, 19 Dec 2016 18:16:36 +0100 Subject: [PATCH 1/8] started to add travis --- .travis.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..3293676 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,49 @@ +language: cpp +sudo: false +matrix: + include: + - os: linux + sudo: required + dist: trusty + compiler: clang + - os: linux + sudo: required + dist: trusty + compiler: gcc + - os: osx + compiler: clang + - os: osx + compiler: gcc +git: + depth: 5 +addons: + apt: + packages: + - qt5-qmake + - qtbase5-dev +before_install: +- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get install + -y qt5-qmake qtbase5-dev; fi +#- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt5-qmake qtbase5-dev; fi +install: +- git clone --quiet --depth 1 https://github.com/fifengine/fifengine-atlas-creator.git +- cd src; qmake +- make -j2 +- sudo make install +- cd .. +script: +- cd .. +- cd src; qmake +- ls -alh . +- make -j2 +- sudo make install +notifications: + irc: irc.freenode.org#fife + email: false +#deploy: +# provider: releases +# api_key: +# secure: Bi5esH9G3mPpMdDAyVXsbrvoOhHm9lf38NBI5BR85GDuBg4gE3Gm8nlprBQWhm7jXSZH9qc58MeC48B4YWqA/TjVBRqJ2n+H0dK0jLUZi4yo1kB+bDxkshZP7GtAC62wUSKF81aPY38kH3yj8AR3iUHaYUBRc54BkeWzsvJ3C1g= +# file: Fifengine*.tar.gz +# on: + # repo: fifengine/fifengine From cb160148596d635fb6a26cb6f3612306c7417ab8 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Mon, 19 Dec 2016 18:25:59 +0100 Subject: [PATCH 2/8] changed to qt4 because not support for qt5 yet --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3293676..20a917a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,12 +19,12 @@ git: addons: apt: packages: - - qt5-qmake - - qtbase5-dev + - qt4-qmake + - libqt4-dev before_install: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get install - -y qt5-qmake qtbase5-dev; fi -#- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt5-qmake qtbase5-dev; fi + -y qt4-qmake libqt4-dev; fi +#- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt4-qmake libqt4-dev; fi install: - git clone --quiet --depth 1 https://github.com/fifengine/fifengine-atlas-creator.git - cd src; qmake From 463dce1b1333bd2f29b66097d3fbb0b0db7c0cb2 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Mon, 19 Dec 2016 18:36:53 +0100 Subject: [PATCH 3/8] more testing --- .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20a917a..44b28aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ matrix: sudo: required dist: trusty compiler: gcc - - os: osx - compiler: clang - - os: osx - compiler: gcc +# - os: osx +# compiler: clang +# - os: osx +# compiler: gcc git: depth: 5 addons: @@ -21,19 +21,21 @@ addons: packages: - qt4-qmake - libqt4-dev + - qt5-qmake + - qtbase5-dev before_install: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get install - -y qt4-qmake libqt4-dev; fi + -y qt4-qmake libqt4-dev qt5-qmake qtbase5-dev; fi #- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt4-qmake libqt4-dev; fi install: - git clone --quiet --depth 1 https://github.com/fifengine/fifengine-atlas-creator.git -- cd src; qmake +- cd src; qmake-qt4 - make -j2 - sudo make install - cd .. script: - cd .. -- cd src; qmake +- cd src; qmake-qt4 - ls -alh . - make -j2 - sudo make install From 9570770ab2d7da01ec81ee8dca8a4b380050e119 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Mon, 19 Dec 2016 18:42:38 +0100 Subject: [PATCH 4/8] more testing --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44b28aa..f83112f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,21 +23,22 @@ addons: - libqt4-dev - qt5-qmake - qtbase5-dev + - freeglut3-dev before_install: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get install - -y qt4-qmake libqt4-dev qt5-qmake qtbase5-dev; fi + -y qt4-qmake libqt4-dev qt5-qmake qtbase5-dev freeglut3-dev; fi #- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt4-qmake libqt4-dev; fi install: - git clone --quiet --depth 1 https://github.com/fifengine/fifengine-atlas-creator.git - cd src; qmake-qt4 -- make -j2 +- make - sudo make install - cd .. script: - cd .. - cd src; qmake-qt4 - ls -alh . -- make -j2 +- make - sudo make install notifications: irc: irc.freenode.org#fife From 58412539837f0bcec183eea8d23b53a647e5b558 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Mon, 19 Dec 2016 18:46:24 +0100 Subject: [PATCH 5/8] more testing --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f83112f..f3d0517 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,13 +30,13 @@ before_install: #- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt4-qmake libqt4-dev; fi install: - git clone --quiet --depth 1 https://github.com/fifengine/fifengine-atlas-creator.git -- cd src; qmake-qt4 +- cd src; qmake - make - sudo make install - cd .. script: - cd .. -- cd src; qmake-qt4 +- cd src; qmake - ls -alh . - make - sudo make install From f8a2a8f572930f18117d9217e5fe39f4d96c1660 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Tue, 20 Dec 2016 16:30:08 +0100 Subject: [PATCH 6/8] Start port to qt5 --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 7dc839d..30925ce 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include #include "mainwindow.h" int main(int argc, char *argv[]) From 9f7bf1131f7429027005b89e380ad8f2156f86f5 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Tue, 20 Dec 2016 16:33:45 +0100 Subject: [PATCH 7/8] remove qt4 from the deps --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3d0517..16e5d75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,14 +19,13 @@ git: addons: apt: packages: - - qt4-qmake - - libqt4-dev - qt5-qmake - qtbase5-dev - freeglut3-dev + - qt5-default before_install: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get install - -y qt4-qmake libqt4-dev qt5-qmake qtbase5-dev freeglut3-dev; fi + -y qt5-qmake qtbase5-dev freeglut3-dev qt5-default; fi #- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt4-qmake libqt4-dev; fi install: - git clone --quiet --depth 1 https://github.com/fifengine/fifengine-atlas-creator.git From 8bea542ed0444133021fd2270c3d22057add5305 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Fri, 6 Jan 2017 18:02:04 +0100 Subject: [PATCH 8/8] fixed linux support and resaved it qith qtcreater5 --- src/atlascreator.pro | 2 +- src/glwidget.cpp | 6 +++--- src/glwidget.h | 6 +++--- src/mainwindow.ui | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/atlascreator.pro b/src/atlascreator.pro index d26b2f3..da4804e 100644 --- a/src/atlascreator.pro +++ b/src/atlascreator.pro @@ -33,7 +33,7 @@ RESOURCES += resources.qrc win32:CONFIG(release, debug|release): LIBS += -L$$PWD/freeglut/lib/ -lfreeglut else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/freeglut/lib/ -lfreeglutd -else:unix:!macx: LIBS += -L$$PWD/freeglut/lib/ -lfreeglut +else:unix:!macx: LIBS += -lglut -lGLU -lGL INCLUDEPATH += $$PWD/freeglut/include DEPENDPATH += $$PWD/freeglut/include diff --git a/src/glwidget.cpp b/src/glwidget.cpp index ee13aed..96bdf40 100644 --- a/src/glwidget.cpp +++ b/src/glwidget.cpp @@ -26,10 +26,10 @@ #include #include //#include +#include +#ifdef WIN32 #include -//#ifdef WIN32 -//#include -//#endif +#endif const int timerInterval = 20; diff --git a/src/glwidget.h b/src/glwidget.h index 9ebe52c..36fcd8d 100644 --- a/src/glwidget.h +++ b/src/glwidget.h @@ -31,8 +31,8 @@ class GLWidget : public QGLWidget { Q_OBJECT public: - GLWidget(QWidget* parent); - virtual ~GLWidget(); + GLWidget(QWidget* parent); + virtual ~GLWidget(); void resizeGL(int width, int height); void refreshed(QImage const& tex); @@ -53,7 +53,7 @@ private slots: void timerEvent(QTimerEvent* event); private: - float mCam_xpos; + float mCam_xpos; float mCam_ypos; float mCam_zpos; diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 8e793e9..279a072 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -184,7 +184,7 @@ 10 90 341 - 141 + 162 @@ -301,7 +301,7 @@ 80 530 171 - 43 + 48