From 03d4f8ffa14da5ebe74fb44ba37748150a13d132 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 26 Jan 2014 23:56:15 +0100 Subject: [PATCH 01/33] Added Qt Multimedia support in order to replace Phonon. Currently does not work on Mac. --- JGE/include/JSoundSystem.h | 238 +++++++++++++++++++------------------ JGE/src/pc/JSfx.cpp | 201 +++++++++++++++++++------------ projects/mtg/wagic-qt.pro | 3 +- projects/mtg/wagic.pri | 1 - 4 files changed, 252 insertions(+), 191 deletions(-) diff --git a/JGE/include/JSoundSystem.h b/JGE/include/JSoundSystem.h index 93fe4f1e3..7c7dc79b8 100644 --- a/JGE/include/JSoundSystem.h +++ b/JGE/include/JSoundSystem.h @@ -23,28 +23,32 @@ #include "SLES/OpenSLES_Android.h" #elif defined USE_PHONON - #include - #include +#include +#include #elif defined WIN32 - #include +#include #define WITH_FMOD #elif defined (PSP) - #include - #include - #include - #include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include +#include +#include +#include +#include - #include "JAudio.h" - #include "JMP3.h" +#include "JAudio.h" +#include "JMP3.h" +#elif defined QT_CONFIG +#include "QMediaPlayer" +#include "QMediaPlaylist" +#include "QSoundEffect" #endif #ifdef WITH_FMOD - #include "../Dependencies/include/fmod.h" +#include "../Dependencies/include/fmod.h" #endif //------------------------------------------------------------------------------------------------ @@ -67,7 +71,7 @@ public: #ifdef USE_PHONON Phonon::AudioOutput* mOutput; Phonon::MediaObject* mMediaObject; - public slots: +public slots: void seekAtTheBegining(); #elif defined (PSP) JMP3* mTrack; @@ -82,6 +86,10 @@ public: SLPlayItf playInterface; SLSeekItf seekInterface; SLVolumeItf musicVolumeInterface; +#elif defined QT_CONFIG + QMediaPlaylist* playlist; + QMediaPlayer* player; + string fullpath; #else void* mTrack; #endif //WITH_FMOD @@ -92,13 +100,15 @@ public: //------------------------------------------------------------------------------------------------ class JSample { - public: +public: JSample(); ~JSample(); unsigned long fileSize(); - -#if defined (PSP) +#ifdef QT_CONFIG + QSoundEffect effect; + void* mSample; +#elif defined (PSP) WAVDATA *mSample; #elif defined (IOS) std::string filename; @@ -133,126 +143,128 @@ class JSoundSystem public: - ////////////////////////////////////////////////////////////////////////// - /// Get the singleton instance - /// - ////////////////////////////////////////////////////////////////////////// - static JSoundSystem* GetInstance(); + ////////////////////////////////////////////////////////////////////////// + /// Get the singleton instance + /// + ////////////////////////////////////////////////////////////////////////// + static JSoundSystem* GetInstance(); - static void Destroy(); + static void Destroy(); - ////////////////////////////////////////////////////////////////////////// - /// Load music. - /// - /// @note MP3 is the only supported format for the moment. - /// - /// @param filename - Name of the music file. - /// - ////////////////////////////////////////////////////////////////////////// - JMusic *LoadMusic(const char *fileName); + ////////////////////////////////////////////////////////////////////////// + /// Load music. + /// + /// @note MP3 is the only supported format for the moment. + /// + /// @param filename - Name of the music file. + /// + ////////////////////////////////////////////////////////////////////////// + JMusic *LoadMusic(const char *fileName); - ////////////////////////////////////////////////////////////////////////// - /// Delete music from memory. - /// - /// @param music - Music to be deleted. - /// - ////////////////////////////////////////////////////////////////////////// - //void FreeMusic(JMusic *music); + ////////////////////////////////////////////////////////////////////////// + /// Delete music from memory. + /// + /// @param music - Music to be deleted. + /// + ////////////////////////////////////////////////////////////////////////// + //void FreeMusic(JMusic *music); - ////////////////////////////////////////////////////////////////////////// - /// Play music. - /// - /// @param music - Music to be played. - /// @param looping - Play the music in a loop. - /// - ////////////////////////////////////////////////////////////////////////// - void PlayMusic(JMusic *music, bool looping = false); + ////////////////////////////////////////////////////////////////////////// + /// Play music. + /// + /// @param music - Music to be played. + /// @param looping - Play the music in a loop. + /// + ////////////////////////////////////////////////////////////////////////// + void PlayMusic(JMusic *music, bool looping = false); - ////////////////////////////////////////////////////////////////////////// - /// Stop playing. - /// - /// @param music - Music to be stopped. - /// - ////////////////////////////////////////////////////////////////////////// - void StopMusic(JMusic *music); + ////////////////////////////////////////////////////////////////////////// + /// Stop playing. + /// + /// @param music - Music to be stopped. + /// + ////////////////////////////////////////////////////////////////////////// + void StopMusic(JMusic *music); - ////////////////////////////////////////////////////////////////////////// - /// Resume playing. - /// - /// @param music - Music to be resumed. - /// - ////////////////////////////////////////////////////////////////////////// - void ResumeMusic(JMusic *music); + ////////////////////////////////////////////////////////////////////////// + /// Resume playing. + /// + /// @param music - Music to be resumed. + /// + ////////////////////////////////////////////////////////////////////////// + void ResumeMusic(JMusic *music); - ////////////////////////////////////////////////////////////////////////// - /// Pause playing. - /// - /// @param music - Music to be paused. - /// - ////////////////////////////////////////////////////////////////////////// - void PauseMusic(JMusic *music); + ////////////////////////////////////////////////////////////////////////// + /// Pause playing. + /// + /// @param music - Music to be paused. + /// + ////////////////////////////////////////////////////////////////////////// + void PauseMusic(JMusic *music); - ////////////////////////////////////////////////////////////////////////// - /// Load sound effect. - /// - /// @note WAV sound effect only. - /// - /// @param fileName - Sound effect for loading. - /// - ////////////////////////////////////////////////////////////////////////// - JSample *LoadSample(const char *fileName); + ////////////////////////////////////////////////////////////////////////// + /// Load sound effect. + /// + /// @note WAV sound effect only. + /// + /// @param fileName - Sound effect for loading. + /// + ////////////////////////////////////////////////////////////////////////// + JSample *LoadSample(const char *fileName); - ////////////////////////////////////////////////////////////////////////// - /// Delete sound effect from memory. - /// - /// @param sample - Sound to be deleted. - /// - ////////////////////////////////////////////////////////////////////////// - //void FreeSample(JSample *sample); + ////////////////////////////////////////////////////////////////////////// + /// Delete sound effect from memory. + /// + /// @param sample - Sound to be deleted. + /// + ////////////////////////////////////////////////////////////////////////// + //void FreeSample(JSample *sample); - ////////////////////////////////////////////////////////////////////////// - /// Play sound effect. - /// - /// @param sample - Sound for playing. - /// - ////////////////////////////////////////////////////////////////////////// - void PlaySample(JSample *sample); + ////////////////////////////////////////////////////////////////////////// + /// Play sound effect. + /// + /// @param sample - Sound for playing. + /// + ////////////////////////////////////////////////////////////////////////// + void PlaySample(JSample *sample); - ////////////////////////////////////////////////////////////////////////// - /// Set volume for audio playback. - /// - /// @param volume - New volume. - /// - ////////////////////////////////////////////////////////////////////////// - void SetVolume(int volume); + ////////////////////////////////////////////////////////////////////////// + /// Set volume for audio playback. + /// + /// @param volume - New volume. + /// + ////////////////////////////////////////////////////////////////////////// + void SetVolume(int volume); - void SetMusicVolume(int volume); + void SetMusicVolume(int volume); - void SetSfxVolume(int volume); + void SetSfxVolume(int volume); - int mChannel; + int mChannel; protected: - JSoundSystem(); - ~JSoundSystem(); + JSoundSystem(); + ~JSoundSystem(); - void InitSoundSystem(); - void DestroySoundSystem(); + void InitSoundSystem(); + void DestroySoundSystem(); private: - - JMusic *mCurrentMusic; +#ifdef PSP + JMusic *mCurrentMusic; JSample *mCurrentSample; +#endif - int mVolume; - int mMusicVolume; - int mSampleVolume; + int mVolume; + int mMusicVolume; + int mSampleVolume; - static JSoundSystem* mInstance; + static JSoundSystem* mInstance; }; #endif + diff --git a/JGE/src/pc/JSfx.cpp b/JGE/src/pc/JSfx.cpp index 4977bc831..faa4fa71c 100644 --- a/JGE/src/pc/JSfx.cpp +++ b/JGE/src/pc/JSfx.cpp @@ -22,6 +22,8 @@ JMusic::JMusic() #ifdef USE_PHONON : mOutput(0), mMediaObject(0) +#elif defined QT_CONFIG + : playlist(0), player(0) #endif { } @@ -40,7 +42,12 @@ int JMusic::getPlayTime(){ JMusic::~JMusic() { -#ifdef USE_PHONON +#ifdef QT_CONFIG + if(player) + delete player; + if(playlist) + delete playlist; +#elif defined USE_PHONON if(mOutput) delete mOutput; if(mMediaObject) @@ -144,65 +151,88 @@ void JSoundSystem::DestroySoundSystem() JMusic *JSoundSystem::LoadMusic(const char *fileName) { -#ifdef USE_PHONON - JMusic* music = new JMusic(); - if (music) - { - music->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0); - music->mMediaObject = new Phonon::MediaObject(0); - string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName); - music->mMediaObject->setCurrentSource(QString(fullpath.c_str())); - Phonon::Path mediapath = Phonon::createPath(music->mMediaObject, music->mOutput); - Q_ASSERT(mediapath.isValid()); - } - return music; -#elif (defined WITH_FMOD) - JMusic* music = new JMusic(); - if (music) + JMusic* music = NULL; +#ifdef QT_CONFIG + music = new JMusic(); + if (music) { - JFileSystem* fileSystem = JFileSystem::GetInstance(); - if (fileSystem->OpenFile(fileName)) - { - int size = fileSystem->GetFileSize(); - char *buffer = new char[size]; - fileSystem->ReadFile(buffer, size); - music->mTrack = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size); - - delete[] buffer; - fileSystem->CloseFile(); - } + music->player = new QMediaPlayer; + music->player->setVolume(100); + music->playlist = new QMediaPlaylist; + music->fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName); + music->playlist->addMedia(QUrl(music->fullpath.c_str())); + music->playlist->setCurrentIndex(0); + } +#elif defined USE_PHONON + music = new JMusic(); + if (music) + { + music->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0); + music->mMediaObject = new Phonon::MediaObject(0); + string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName); + music->mMediaObject->setCurrentSource(QString(fullpath.c_str())); + Phonon::Path mediapath = Phonon::createPath(music->mMediaObject, music->mOutput); + Q_ASSERT(mediapath.isValid()); + } +#elif (defined WITH_FMOD) + music = new JMusic(); + if (music) + { + JFileSystem* fileSystem = JFileSystem::GetInstance(); + if (fileSystem->OpenFile(fileName)) + { + int size = fileSystem->GetFileSize(); + char *buffer = new char[size]; + fileSystem->ReadFile(buffer, size); + music->mTrack = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size); + + delete[] buffer; + fileSystem->CloseFile(); + } } - return music; #else cerr << fileName << endl; - return NULL; #endif + return music; } void JSoundSystem::PlayMusic(JMusic *music, bool looping) { -#ifdef USE_PHONON - if (music && music->mMediaObject && music->mOutput) - { - if(looping) +#ifdef QT_CONFIG + if(music && music->player && music->playlist) { - music->mMediaObject->connect(music->mMediaObject, SIGNAL(aboutToFinish()), music, SLOT(seekAtTheBegining())); + if(looping) + music->playlist->setPlaybackMode(QMediaPlaylist::Loop); + +// music->player->setPlaylist(music->playlist); + music->player->setMedia(QUrl(music->fullpath.c_str())); + music->player->play(); + stringstream stream; + stream << "Player state : " << music->player->state(); + DebugTrace(stream.str()); } - music->mOutput->setVolume((qreal)mVolume*0.01); - music->mMediaObject->play(); - - } -#elif (defined WITH_FMOD) - if (music && music->mTrack) +#elif USE_PHONON + if (music && music->mMediaObject && music->mOutput) { - mChannel = FSOUND_PlaySound(mChannel, music->mTrack); - SetMusicVolume(mVolume); + if(looping) + { + music->mMediaObject->connect(music->mMediaObject, SIGNAL(aboutToFinish()), music, SLOT(seekAtTheBegining())); + } + music->mOutput->setVolume((qreal)mVolume*0.01); + music->mMediaObject->play(); - if (looping) - FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_NORMAL); - else - FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_OFF); + } +#elif (defined WITH_FMOD) + if (music && music->mTrack) + { + mChannel = FSOUND_PlaySound(mChannel, music->mTrack); + SetMusicVolume(mVolume); + + if (looping) + FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_NORMAL); + else + FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_OFF); } #else music = 0; @@ -213,7 +243,12 @@ void JSoundSystem::PlayMusic(JMusic *music, bool looping) void JSoundSystem::StopMusic(JMusic *music) { -#ifdef USE_PHONON +#ifdef QT_CONFIG + if (music && music->player && music->playlist) + { + music->player->stop(); + } +#elif defined USE_PHONON if (music && music->mMediaObject && music->mOutput) { music->mMediaObject->stop(); @@ -264,47 +299,61 @@ void JSoundSystem::SetSfxVolume(int volume){ JSample *JSoundSystem::LoadSample(const char *fileName) { -#if (defined USE_PHONON) - JSample* sample = new JSample(); - if (sample) - { - sample->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0); - sample->mMediaObject = new Phonon::MediaObject(0); - string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName); - sample->mMediaObject->setCurrentSource(QString(fullpath.c_str())); - Phonon::Path mediapath = Phonon::createPath(sample->mMediaObject, sample->mOutput); - Q_ASSERT(mediapath.isValid()); - } - return sample; -#elif (defined WITH_FMOD) - JSample* sample = new JSample(); - if (sample) + JSample* sample = NULL; +#ifdef QT_CONFIG + sample = new JSample(); + if (sample) { - JFileSystem* fileSystem = JFileSystem::GetInstance(); - if (fileSystem->OpenFile(fileName)) - { - int size = fileSystem->GetFileSize(); - char *buffer = new char[size]; - fileSystem->ReadFile(buffer, size); - sample->mSample = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size); + string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName); + sample->effect.setSource(QUrl::fromLocalFile(fullpath.c_str())); + sample->effect.setLoopCount(0); + sample->effect.setVolume(1); + sample->mSample = &(sample->effect); + } +#elif (defined USE_PHONON) + sample = new JSample(); + if (sample) + { + sample->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0); + sample->mMediaObject = new Phonon::MediaObject(0); + string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName); + sample->mMediaObject->setCurrentSource(QString(fullpath.c_str())); + Phonon::Path mediapath = Phonon::createPath(sample->mMediaObject, sample->mOutput); + Q_ASSERT(mediapath.isValid()); + } +#elif (defined WITH_FMOD) + sample = new JSample(); + if (sample) + { + JFileSystem* fileSystem = JFileSystem::GetInstance(); + if (fileSystem->OpenFile(fileName)) + { + int size = fileSystem->GetFileSize(); + char *buffer = new char[size]; + fileSystem->ReadFile(buffer, size); + sample->mSample = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size); - delete[] buffer; - fileSystem->CloseFile(); - }else - sample->mSample = NULL; + delete[] buffer; + fileSystem->CloseFile(); + }else + sample->mSample = NULL; } - return sample; #else cerr << fileName << endl; - return NULL; #endif + return sample; } void JSoundSystem::PlaySample(JSample *sample) { -#ifdef USE_PHONON +#ifdef QT_CONFIG + if(sample) + { + sample->effect.play(); + } +#elif defined USE_PHONON if (sample && sample->mMediaObject && sample->mOutput) { sample->mOutput->setVolume((qreal)mSampleVolume*0.01); diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index 487557c3f..40e4c5104 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -17,7 +17,7 @@ else:CONFIG(graphics, graphics|console){ folder_01.source = qml/QmlWagic folder_01.target = /usr/share DEPLOYMENTFOLDERS = folder_01 - QT += core gui opengl network + QT += core gui opengl network multimedia QT -= declarative quick qml #maemo5:DEFINES += QT_WIDGET DEFINES += QT_WIDGET @@ -46,6 +46,7 @@ CONFIG(graphics, graphics|console){ ../../JGE/src/qt/corewrapper.cpp\ ../../JGE/src/Qtmain.cpp\ ../../JGE/src/JMD2Model.cpp\ + ../../JGE/src/pc/JSfx.cpp\ ../../JGE/src/pc/JGfx.cpp } else:CONFIG(console, graphics|console){ diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri index 7ed0465dc..6c8cd4198 100644 --- a/projects/mtg/wagic.pri +++ b/projects/mtg/wagic.pri @@ -303,7 +303,6 @@ SOURCES += \ ../../JGE/src/JSpline.cpp\ ../../JGE/src/JNetwork.cpp\ ../../JGE/src/pc/JSocket.cpp\ - ../../JGE/src/pc/JSfx.cpp\ ../../JGE/src/JSprite.cpp\ ../../JGE/src/Vector2D.cpp\ ../../JGE/src/tinyxml/tinystr.cpp\ From 18383579e9a1e7480bfcea7952abd1690d1fecc5 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Mon, 27 Jan 2014 06:31:23 +0100 Subject: [PATCH 02/33] Fixed android compilation --- JGE/include/JSoundSystem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JGE/include/JSoundSystem.h b/JGE/include/JSoundSystem.h index 7c7dc79b8..6897fc71c 100644 --- a/JGE/include/JSoundSystem.h +++ b/JGE/include/JSoundSystem.h @@ -252,7 +252,7 @@ protected: void DestroySoundSystem(); private: -#ifdef PSP +#if (defined PSP || defined ANDROID) JMusic *mCurrentMusic; JSample *mCurrentSample; #endif From 5d7667dc01c6b494278fdb41c1768540297d8b71 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Fri, 31 Jan 2014 21:53:27 +0100 Subject: [PATCH 03/33] Cleaned Phonon vs QtMultimedia config --- JGE/include/JSoundSystem.h | 8 ++++---- projects/mtg/wagic.pri | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/JGE/include/JSoundSystem.h b/JGE/include/JSoundSystem.h index 6897fc71c..30be731e8 100644 --- a/JGE/include/JSoundSystem.h +++ b/JGE/include/JSoundSystem.h @@ -25,6 +25,10 @@ #elif defined USE_PHONON #include #include +#elif defined QT_CONFIG +#include "QMediaPlayer" +#include "QMediaPlaylist" +#include "QSoundEffect" #elif defined WIN32 #include #define WITH_FMOD @@ -41,10 +45,6 @@ #include "JAudio.h" #include "JMP3.h" -#elif defined QT_CONFIG -#include "QMediaPlayer" -#include "QMediaPlaylist" -#include "QSoundEffect" #endif #ifdef WITH_FMOD diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri index 6c8cd4198..7fceea568 100644 --- a/projects/mtg/wagic.pri +++ b/projects/mtg/wagic.pri @@ -41,8 +41,8 @@ INCLUDEPATH += ../../Boost INCLUDEPATH += include unix:!symbian:LIBS += -lz -win32:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib -win32:LIBS += ../../JGE/Dependencies/lib/zlibd.lib +windows:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib +windows:LIBS += ../../JGE/Dependencies/lib/zlibd.lib PRECOMPILED_HEADER = include/PrecompiledHeader.h #DEFINES += TRACK_OBJECT_USAGE From 197540763e417184d41cc1ba76cbfddf16be7b86 Mon Sep 17 00:00:00 2001 From: Tobias Loose Date: Mon, 3 Feb 2014 13:52:40 +0100 Subject: [PATCH 04/33] Remove unused Effects.h/.cpp and class Effect There was an empty vector of effect* in PlayGuiObject. --- projects/mtg/include/Effects.h | 13 ------------- projects/mtg/include/PlayGuiObject.h | 2 -- projects/mtg/src/Effects.cpp | 3 --- projects/mtg/src/PlayGuiObject.cpp | 4 ---- projects/mtg/template.vcxproj | 3 +-- projects/mtg/template.vcxproj.filters | 5 +---- projects/mtg/wagic.pri | 2 -- projects/mtg/wagic.xcodeproj/project.pbxproj | 8 -------- 8 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 projects/mtg/include/Effects.h delete mode 100644 projects/mtg/src/Effects.cpp diff --git a/projects/mtg/include/Effects.h b/projects/mtg/include/Effects.h deleted file mode 100644 index 248e22a3c..000000000 --- a/projects/mtg/include/Effects.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _EFFECTS_H_ -#define _EFFECTS_H_ - -#include - -class Effect: public JGuiObject -{ - static int id_counter; -public: - Effect() : JGuiObject(++id_counter) {}; -}; - -#endif // _EFFECTS_H_ diff --git a/projects/mtg/include/PlayGuiObject.h b/projects/mtg/include/PlayGuiObject.h index 5855c2884..c09d1a4c8 100644 --- a/projects/mtg/include/PlayGuiObject.h +++ b/projects/mtg/include/PlayGuiObject.h @@ -12,7 +12,6 @@ #define GUI_OPPONENTHAND 5 #include -#include "Effects.h" #include "WEvent.h" #include "Pos.h" @@ -65,7 +64,6 @@ public: } ; virtual ~PlayGuiObject() {}; - vector effects; }; #endif diff --git a/projects/mtg/src/Effects.cpp b/projects/mtg/src/Effects.cpp deleted file mode 100644 index 50056df0d..000000000 --- a/projects/mtg/src/Effects.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "../include/Effects.h" - -int Effect::id_counter = 0; diff --git a/projects/mtg/src/PlayGuiObject.cpp b/projects/mtg/src/PlayGuiObject.cpp index 5d84ca3a8..56069802a 100644 --- a/projects/mtg/src/PlayGuiObject.cpp +++ b/projects/mtg/src/PlayGuiObject.cpp @@ -38,13 +38,9 @@ void PlayGuiObject::Update(float dt) if (mHeight < defaultHeight) mHeight = defaultHeight; } wave = (wave + 2 * (int) (100 * dt)) % 255; - for (vector::iterator it = effects.begin(); it != effects.end(); ++it) - (*it)->Update(dt); Pos::Update(dt); } void PlayGuiObject::Render() { - for (vector::iterator it = effects.begin(); it != effects.end(); ++it) - (*it)->Render(); } diff --git a/projects/mtg/template.vcxproj b/projects/mtg/template.vcxproj index 912ece289..16e66111e 100644 --- a/projects/mtg/template.vcxproj +++ b/projects/mtg/template.vcxproj @@ -493,7 +493,6 @@ - @@ -592,4 +591,4 @@ - \ No newline at end of file + diff --git a/projects/mtg/template.vcxproj.filters b/projects/mtg/template.vcxproj.filters index 0e2cdef9e..263d9ab9e 100644 --- a/projects/mtg/template.vcxproj.filters +++ b/projects/mtg/template.vcxproj.filters @@ -417,9 +417,6 @@ inc - - inc - inc @@ -725,4 +722,4 @@ res - \ No newline at end of file + diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri index 85ea223a2..a292833a1 100644 --- a/projects/mtg/wagic.pri +++ b/projects/mtg/wagic.pri @@ -80,7 +80,6 @@ SOURCES += \ src/DeckStats.cpp\ src/DeckView.cpp\ src/DuelLayers.cpp\ - src/Effects.cpp\ src/ExtraCost.cpp\ src/GameApp.cpp\ src/GameLauncher.cpp\ @@ -271,7 +270,6 @@ HEADERS += \ include/WResourceManager.h\ include/DuelLayers.h\ include/GuiStatic.h\ - include/Effects.h\ include/StyleManager.h\ include/WFont.h\ include/DeckManager.h\ diff --git a/projects/mtg/wagic.xcodeproj/project.pbxproj b/projects/mtg/wagic.xcodeproj/project.pbxproj index 6f4b9057d..2a9feb644 100755 --- a/projects/mtg/wagic.xcodeproj/project.pbxproj +++ b/projects/mtg/wagic.xcodeproj/project.pbxproj @@ -85,7 +85,6 @@ 12059DBA14980B7300DAC43B /* DeckMetaData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377061291C60500B9016A /* DeckMetaData.cpp */; }; 12059DBB14980B7300DAC43B /* DeckStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377071291C60500B9016A /* DeckStats.cpp */; }; 12059DBC14980B7300DAC43B /* DuelLayers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377081291C60500B9016A /* DuelLayers.cpp */; }; - 12059DBD14980B7300DAC43B /* Effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377091291C60500B9016A /* Effects.cpp */; }; 12059DBE14980B7300DAC43B /* ExtraCost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770A1291C60500B9016A /* ExtraCost.cpp */; }; 12059DBF14980B7300DAC43B /* GameApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770B1291C60500B9016A /* GameApp.cpp */; }; 12059DC014980B7300DAC43B /* GameLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770C1291C60500B9016A /* GameLauncher.cpp */; }; @@ -325,7 +324,6 @@ CEA377701291C60500B9016A /* DeckMetaData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377061291C60500B9016A /* DeckMetaData.cpp */; }; CEA377711291C60500B9016A /* DeckStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377071291C60500B9016A /* DeckStats.cpp */; }; CEA377721291C60500B9016A /* DuelLayers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377081291C60500B9016A /* DuelLayers.cpp */; }; - CEA377731291C60500B9016A /* Effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377091291C60500B9016A /* Effects.cpp */; }; CEA377741291C60500B9016A /* ExtraCost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770A1291C60500B9016A /* ExtraCost.cpp */; }; CEA377751291C60500B9016A /* GameApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770B1291C60500B9016A /* GameApp.cpp */; }; CEA377761291C60500B9016A /* GameLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770C1291C60500B9016A /* GameLauncher.cpp */; }; @@ -627,7 +625,6 @@ CEA3769E1291C60500B9016A /* DeckMetaData.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DeckMetaData.h; sourceTree = ""; }; CEA3769F1291C60500B9016A /* DeckStats.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DeckStats.h; sourceTree = ""; }; CEA376A01291C60500B9016A /* DuelLayers.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DuelLayers.h; sourceTree = ""; }; - CEA376A11291C60500B9016A /* Effects.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = Effects.h; sourceTree = ""; }; CEA376A21291C60500B9016A /* ExtraCost.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = ExtraCost.h; sourceTree = ""; }; CEA376A31291C60500B9016A /* GameApp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = GameApp.h; sourceTree = ""; }; CEA376A41291C60500B9016A /* GameObserver.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = GameObserver.h; sourceTree = ""; }; @@ -729,7 +726,6 @@ CEA377061291C60500B9016A /* DeckMetaData.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = DeckMetaData.cpp; sourceTree = ""; }; CEA377071291C60500B9016A /* DeckStats.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = DeckStats.cpp; sourceTree = ""; }; CEA377081291C60500B9016A /* DuelLayers.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = DuelLayers.cpp; sourceTree = ""; }; - CEA377091291C60500B9016A /* Effects.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = Effects.cpp; sourceTree = ""; }; CEA3770A1291C60500B9016A /* ExtraCost.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = ExtraCost.cpp; sourceTree = ""; }; CEA3770B1291C60500B9016A /* GameApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = GameApp.cpp; sourceTree = ""; }; CEA3770C1291C60500B9016A /* GameLauncher.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = GameLauncher.cpp; sourceTree = ""; }; @@ -1324,7 +1320,6 @@ CEA3769E1291C60500B9016A /* DeckMetaData.h */, CEA3769F1291C60500B9016A /* DeckStats.h */, CEA376A01291C60500B9016A /* DuelLayers.h */, - CEA376A11291C60500B9016A /* Effects.h */, CEA376A21291C60500B9016A /* ExtraCost.h */, CEA376A31291C60500B9016A /* GameApp.h */, CEA376A41291C60500B9016A /* GameObserver.h */, @@ -1445,7 +1440,6 @@ CEA377061291C60500B9016A /* DeckMetaData.cpp */, CEA377071291C60500B9016A /* DeckStats.cpp */, CEA377081291C60500B9016A /* DuelLayers.cpp */, - CEA377091291C60500B9016A /* Effects.cpp */, CEA3770A1291C60500B9016A /* ExtraCost.cpp */, CEA3770B1291C60500B9016A /* GameApp.cpp */, CEA3770C1291C60500B9016A /* GameLauncher.cpp */, @@ -1845,7 +1839,6 @@ 12059DBA14980B7300DAC43B /* DeckMetaData.cpp in Sources */, 12059DBB14980B7300DAC43B /* DeckStats.cpp in Sources */, 12059DBC14980B7300DAC43B /* DuelLayers.cpp in Sources */, - 12059DBD14980B7300DAC43B /* Effects.cpp in Sources */, 12059DBE14980B7300DAC43B /* ExtraCost.cpp in Sources */, 12059DBF14980B7300DAC43B /* GameApp.cpp in Sources */, 12059DC014980B7300DAC43B /* GameLauncher.cpp in Sources */, @@ -2027,7 +2020,6 @@ CEA377701291C60500B9016A /* DeckMetaData.cpp in Sources */, CEA377711291C60500B9016A /* DeckStats.cpp in Sources */, CEA377721291C60500B9016A /* DuelLayers.cpp in Sources */, - CEA377731291C60500B9016A /* Effects.cpp in Sources */, CEA377741291C60500B9016A /* ExtraCost.cpp in Sources */, CEA377751291C60500B9016A /* GameApp.cpp in Sources */, CEA377761291C60500B9016A /* GameLauncher.cpp in Sources */, From 8f233b302707498761779b29c8cac4dd0aa5bbf5 Mon Sep 17 00:00:00 2001 From: Tobias Loose Date: Mon, 3 Feb 2014 19:44:51 +0100 Subject: [PATCH 05/33] Avoid circular initialization --- projects/mtg/include/ActionStack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mtg/include/ActionStack.h b/projects/mtg/include/ActionStack.h index 06e7f2afe..7a3bdde16 100644 --- a/projects/mtg/include/ActionStack.h +++ b/projects/mtg/include/ActionStack.h @@ -72,7 +72,7 @@ public: } Interruptible(GameObserver* observer, int inID = 0, bool hasFocus = false) - : PlayGuiObject(40, x, y, inID, hasFocus), Targetable(observer), state(NOT_RESOLVED), display(0), source(NULL) + : PlayGuiObject(40, 0.0f, 0.0f, inID, hasFocus), Targetable(observer), state(NOT_RESOLVED), display(0), source(NULL) { } From 51b4755242a2d5b14f3dbe339c548e59f09bb7e4 Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Wed, 5 Feb 2014 23:39:57 -0500 Subject: [PATCH 06/33] Update README.md Added sample play-through video link --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 1ac0bfee0..a481bfaa8 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,8 @@ It is highly customizable and allows the player to tweak the rules / create thei Info, downloads, discussions and more at http://wololo.net/forum/index.php -![alt text](http://wololo.net/wagic/wp-content/uploads/2009/10/shop.jpg "Screenshot") + + + +### Sample round play-through video +[![IMAGE ALT TEXT HERE](http://img.youtube.com/vi/WUFSAPZuDIk/0.jpg)](http://www.youtube.com/watch?v=WUFSAPZuDIk) From 225dd23753aa954606eccb141bbbb67eb7f7b8a7 Mon Sep 17 00:00:00 2001 From: Tobias Loose Date: Tue, 11 Mar 2014 17:17:36 +0100 Subject: [PATCH 07/33] Fix makefile --- projects/mtg/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index a5db9bda5..7b53ff162 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -6,7 +6,7 @@ OBJS = objs/InteractiveButton.o objs/AbilityParser.o objs/ActionElement.o\ objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o\ objs/DeckDataWrapper.o objs/DeckEditorMenu.o objs/DeckMenu.o\ objs/DeckMenuItem.o objs/DeckMetaData.o objs/DeckStats.o objs/DuelLayers.o\ - objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o\ + objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o\ objs/GameObserver.o objs/GameOptions.o objs/GameState.o\ objs/GameStateAwards.o objs/GameStateDeckViewer.o objs/GameStateDuel.o\ objs/DeckManager.o objs/GameStateMenu.o objs/GameStateOptions.o\ @@ -128,7 +128,7 @@ clean: endif define compile -$(CXX) -c $(CXXFLAGS) $< -o $@ +$(CXX) -c $(CXXFLAGS) $< -o $@ endef PrecompiledHeader.h.gch: ../../projects/mtg/include/PrecompiledHeader.h From b078dd1f6a4641a9cfc135f92745b078e06a869c Mon Sep 17 00:00:00 2001 From: Tobias Loose Date: Tue, 11 Mar 2014 17:31:25 +0100 Subject: [PATCH 08/33] Fix android makefile --- projects/mtg/Android/jni/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/mtg/Android/jni/Android.mk b/projects/mtg/Android/jni/Android.mk index 31f425266..563b80b63 100644 --- a/projects/mtg/Android/jni/Android.mk +++ b/projects/mtg/Android/jni/Android.mk @@ -57,7 +57,6 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \ $(MTG_PATH)/src/DeckMetaData.cpp \ $(MTG_PATH)/src/DeckStats.cpp \ $(MTG_PATH)/src/DuelLayers.cpp \ - $(MTG_PATH)/src/Effects.cpp \ $(MTG_PATH)/src/ExtraCost.cpp \ $(MTG_PATH)/src/GameApp.cpp \ $(MTG_PATH)/src/GameLauncher.cpp \ From d2390b1227b09b2e29d21221e2e25ab49f7c9099 Mon Sep 17 00:00:00 2001 From: Michael Nguyen Date: Sun, 13 Apr 2014 08:34:21 -0700 Subject: [PATCH 09/33] updated project file for iOS to work with current codebase - added missing source/headers (GameView.h, CarouselView.h, etc ) - removed dependency on admob static library - removed CardEffect.h and CardEffect.cpp from project reference - removed -no_implicit_dylibs flag (apparently no longer supported) - added -fno-objc-arc (turns off ARC compilation for entire project) - added -DTIXML_USE_STL --- projects/mtg/wagic.xcodeproj/project.pbxproj | 51 ++++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/projects/mtg/wagic.xcodeproj/project.pbxproj b/projects/mtg/wagic.xcodeproj/project.pbxproj index 2a9feb644..f0a904c42 100755 --- a/projects/mtg/wagic.xcodeproj/project.pbxproj +++ b/projects/mtg/wagic.xcodeproj/project.pbxproj @@ -67,7 +67,6 @@ 12059DA814980B7300DAC43B /* AllAbilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F41291C60500B9016A /* AllAbilities.cpp */; }; 12059DA914980B7300DAC43B /* CardDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F51291C60500B9016A /* CardDescriptor.cpp */; }; 12059DAA14980B7300DAC43B /* CardDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F61291C60500B9016A /* CardDisplay.cpp */; }; - 12059DAB14980B7300DAC43B /* CardEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F71291C60500B9016A /* CardEffect.cpp */; }; 12059DAC14980B7300DAC43B /* CardGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F81291C60500B9016A /* CardGui.cpp */; }; 12059DAD14980B7300DAC43B /* CardPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F91291C60500B9016A /* CardPrimitive.cpp */; }; 12059DAE14980B7300DAC43B /* CardSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376FA1291C60500B9016A /* CardSelector.cpp */; }; @@ -197,7 +196,6 @@ 12059E4A14980B7300DAC43B /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 12D095E014417D0500F69056 /* libstdc++.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 12059E4B14980B7300DAC43B /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12211EBA14934A2C00641703 /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 12059E4C14980B7300DAC43B /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12211EB814934A1800641703 /* MobileCoreServices.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 12059E4D14980B7300DAC43B /* libGoogleAdMobAds.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED379148BAE7B00C58E83 /* libGoogleAdMobAds.a */; settings = {ATTRIBUTES = (Weak, ); }; }; 12059E4E14980B7300DAC43B /* libc++abi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1216D632148F7411000F2295 /* libc++abi.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 12059E4F14980B7300DAC43B /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED50F148BCC1900C58E83 /* libsqlite3.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 12059E5014980B7300DAC43B /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 129654D0148A52730031100B /* iAd.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; @@ -216,7 +214,6 @@ 12059E5D14980B7300DAC43B /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED50B148BCBBC00C58E83 /* MapKit.framework */; }; 12059E5E14980B7300DAC43B /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED518148BF0E000C58E83 /* MediaPlayer.framework */; }; 1216D633148F7411000F2295 /* libc++abi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1216D632148F7411000F2295 /* libc++abi.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 1216D634148F747D000F2295 /* libGoogleAdMobAds.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED379148BAE7B00C58E83 /* libGoogleAdMobAds.a */; settings = {ATTRIBUTES = (Weak, ); }; }; 12211E7914931CBB00641703 /* ASIAuthenticationDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 12211E2814931CBB00641703 /* ASIAuthenticationDialog.m */; }; 12211E7A14931CBB00641703 /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 12211E2B14931CBB00641703 /* ASIDataCompressor.m */; }; 12211E7B14931CBB00641703 /* ASIDataDecompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 12211E2D14931CBB00641703 /* ASIDataDecompressor.m */; }; @@ -284,6 +281,9 @@ 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; + 751E1F1518FAE53E001B1E16 /* CarouselDeckView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 751E1F1218FAE53E001B1E16 /* CarouselDeckView.cpp */; }; + 751E1F1618FAE53E001B1E16 /* DeckView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 751E1F1318FAE53E001B1E16 /* DeckView.cpp */; }; + 751E1F1718FAE53E001B1E16 /* GridDeckView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 751E1F1418FAE53E001B1E16 /* GridDeckView.cpp */; }; 75D209D3181D54FD009916AC /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 75D209D1181D54FD009916AC /* Default-568h@2x.png */; }; 75D209D4181D54FD009916AC /* wagic-80x80.png in Resources */ = {isa = PBXBuildFile; fileRef = 75D209D2181D54FD009916AC /* wagic-80x80.png */; }; CE97CD1E1295AB4300FDFD3B /* SimplePopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE97CD1D1295AB4300FDFD3B /* SimplePopup.cpp */; }; @@ -306,7 +306,6 @@ CEA3775E1291C60500B9016A /* AllAbilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F41291C60500B9016A /* AllAbilities.cpp */; }; CEA3775F1291C60500B9016A /* CardDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F51291C60500B9016A /* CardDescriptor.cpp */; }; CEA377601291C60500B9016A /* CardDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F61291C60500B9016A /* CardDisplay.cpp */; }; - CEA377611291C60500B9016A /* CardEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F71291C60500B9016A /* CardEffect.cpp */; }; CEA377621291C60500B9016A /* CardGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F81291C60500B9016A /* CardGui.cpp */; }; CEA377631291C60500B9016A /* CardPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F91291C60500B9016A /* CardPrimitive.cpp */; }; CEA377641291C60500B9016A /* CardSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376FA1291C60500B9016A /* CardSelector.cpp */; }; @@ -576,6 +575,13 @@ 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 28FD14FF0DC6FC520079059D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + 751E1F0E18FAE52D001B1E16 /* CarouselDeckView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CarouselDeckView.h; sourceTree = ""; }; + 751E1F0F18FAE52D001B1E16 /* DeckView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeckView.h; sourceTree = ""; }; + 751E1F1018FAE52D001B1E16 /* Easing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Easing.h; sourceTree = ""; }; + 751E1F1118FAE52D001B1E16 /* GridDeckView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridDeckView.h; sourceTree = ""; }; + 751E1F1218FAE53E001B1E16 /* CarouselDeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CarouselDeckView.cpp; sourceTree = ""; }; + 751E1F1318FAE53E001B1E16 /* DeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeckView.cpp; sourceTree = ""; }; + 751E1F1418FAE53E001B1E16 /* GridDeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GridDeckView.cpp; sourceTree = ""; }; 75D209D1181D54FD009916AC /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; }; 75D209D2181D54FD009916AC /* wagic-80x80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wagic-80x80.png"; sourceTree = SOURCE_ROOT; }; 8D1107310486CEB800E47090 /* wagic-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "wagic-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; @@ -607,7 +613,6 @@ CEA3768C1291C60500B9016A /* AllAbilities.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = AllAbilities.h; sourceTree = ""; }; CEA3768D1291C60500B9016A /* CardDescriptor.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardDescriptor.h; sourceTree = ""; }; CEA3768E1291C60500B9016A /* CardDisplay.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardDisplay.h; sourceTree = ""; }; - CEA3768F1291C60500B9016A /* CardEffect.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardEffect.h; sourceTree = ""; }; CEA376901291C60500B9016A /* CardGui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardGui.h; sourceTree = ""; }; CEA376911291C60500B9016A /* CardPrimitive.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardPrimitive.h; sourceTree = ""; }; CEA376921291C60500B9016A /* CardSelector.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardSelector.h; sourceTree = ""; }; @@ -708,7 +713,6 @@ CEA376F41291C60500B9016A /* AllAbilities.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = AllAbilities.cpp; sourceTree = ""; }; CEA376F51291C60500B9016A /* CardDescriptor.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardDescriptor.cpp; sourceTree = ""; }; CEA376F61291C60500B9016A /* CardDisplay.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardDisplay.cpp; sourceTree = ""; }; - CEA376F71291C60500B9016A /* CardEffect.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardEffect.cpp; sourceTree = ""; }; CEA376F81291C60500B9016A /* CardGui.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardGui.cpp; sourceTree = ""; }; CEA376F91291C60500B9016A /* CardPrimitive.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardPrimitive.cpp; sourceTree = ""; }; CEA376FA1291C60500B9016A /* CardSelector.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardSelector.cpp; sourceTree = ""; }; @@ -886,7 +890,6 @@ 12059E4A14980B7300DAC43B /* libstdc++.dylib in Frameworks */, 12059E4B14980B7300DAC43B /* CFNetwork.framework in Frameworks */, 12059E4C14980B7300DAC43B /* MobileCoreServices.framework in Frameworks */, - 12059E4D14980B7300DAC43B /* libGoogleAdMobAds.a in Frameworks */, 12059E4E14980B7300DAC43B /* libc++abi.dylib in Frameworks */, 12059E4F14980B7300DAC43B /* libsqlite3.dylib in Frameworks */, 12059E5014980B7300DAC43B /* iAd.framework in Frameworks */, @@ -918,7 +921,6 @@ 12D095E114417D0500F69056 /* libstdc++.dylib in Frameworks */, 12211EBB14934A2C00641703 /* CFNetwork.framework in Frameworks */, 12211EB914934A1900641703 /* MobileCoreServices.framework in Frameworks */, - 1216D634148F747D000F2295 /* libGoogleAdMobAds.a in Frameworks */, 1216D633148F7411000F2295 /* libc++abi.dylib in Frameworks */, 128ED510148BCC1900C58E83 /* libsqlite3.dylib in Frameworks */, 129654D1148A52740031100B /* iAd.framework in Frameworks */, @@ -1280,6 +1282,10 @@ CEA376851291C60500B9016A /* include */ = { isa = PBXGroup; children = ( + 751E1F0E18FAE52D001B1E16 /* CarouselDeckView.h */, + 751E1F0F18FAE52D001B1E16 /* DeckView.h */, + 751E1F1018FAE52D001B1E16 /* Easing.h */, + 751E1F1118FAE52D001B1E16 /* GridDeckView.h */, 12272FC114CD558C00192DC7 /* SimpleButton.h */, 12CCA032144A05DF00E343A0 /* AbilityParser.h */, 127694891441274D0088F6D3 /* AIPlayerBaka.h */, @@ -1302,7 +1308,6 @@ CEA3768C1291C60500B9016A /* AllAbilities.h */, CEA3768D1291C60500B9016A /* CardDescriptor.h */, CEA3768E1291C60500B9016A /* CardDisplay.h */, - CEA3768F1291C60500B9016A /* CardEffect.h */, CEA376901291C60500B9016A /* CardGui.h */, CEA376911291C60500B9016A /* CardPrimitive.h */, CEA376921291C60500B9016A /* CardSelector.h */, @@ -1403,6 +1408,9 @@ CEA376ED1291C60500B9016A /* src */ = { isa = PBXGroup; children = ( + 751E1F1218FAE53E001B1E16 /* CarouselDeckView.cpp */, + 751E1F1318FAE53E001B1E16 /* DeckView.cpp */, + 751E1F1418FAE53E001B1E16 /* GridDeckView.cpp */, 12CCA02F144A05D100E343A0 /* AbilityParser.cpp */, 12769483144127380088F6D3 /* AIPlayerBaka.cpp */, 12769484144127380088F6D3 /* AIPlayerBakaB.cpp */, @@ -1422,7 +1430,6 @@ CEA376F41291C60500B9016A /* AllAbilities.cpp */, CEA376F51291C60500B9016A /* CardDescriptor.cpp */, CEA376F61291C60500B9016A /* CardDisplay.cpp */, - CEA376F71291C60500B9016A /* CardEffect.cpp */, CEA376F81291C60500B9016A /* CardGui.cpp */, CEA376F91291C60500B9016A /* CardPrimitive.cpp */, CEA376FA1291C60500B9016A /* CardSelector.cpp */, @@ -1821,7 +1828,6 @@ 12059DA814980B7300DAC43B /* AllAbilities.cpp in Sources */, 12059DA914980B7300DAC43B /* CardDescriptor.cpp in Sources */, 12059DAA14980B7300DAC43B /* CardDisplay.cpp in Sources */, - 12059DAB14980B7300DAC43B /* CardEffect.cpp in Sources */, 12059DAC14980B7300DAC43B /* CardGui.cpp in Sources */, 12059DAD14980B7300DAC43B /* CardPrimitive.cpp in Sources */, 12059DAE14980B7300DAC43B /* CardSelector.cpp in Sources */, @@ -2002,7 +2008,6 @@ CEA3775E1291C60500B9016A /* AllAbilities.cpp in Sources */, CEA3775F1291C60500B9016A /* CardDescriptor.cpp in Sources */, CEA377601291C60500B9016A /* CardDisplay.cpp in Sources */, - CEA377611291C60500B9016A /* CardEffect.cpp in Sources */, CEA377621291C60500B9016A /* CardGui.cpp in Sources */, CEA377631291C60500B9016A /* CardPrimitive.cpp in Sources */, CEA377641291C60500B9016A /* CardSelector.cpp in Sources */, @@ -2049,6 +2054,7 @@ CEA3778F1291C60500B9016A /* ManaCostHybrid.cpp in Sources */, CEA377901291C60500B9016A /* MenuItem.cpp in Sources */, CEA377911291C60500B9016A /* MTGAbility.cpp in Sources */, + 751E1F1718FAE53E001B1E16 /* GridDeckView.cpp in Sources */, CEA377931291C60500B9016A /* MTGCard.cpp in Sources */, CEA377941291C60500B9016A /* MTGCardInstance.cpp in Sources */, CEA377951291C60500B9016A /* MTGDeck.cpp in Sources */, @@ -2087,6 +2093,7 @@ CEA377BA1291C60500B9016A /* utils.cpp in Sources */, CEA377BB1291C60500B9016A /* WCachedResource.cpp in Sources */, CEA377BC1291C60500B9016A /* WDataSrc.cpp in Sources */, + 751E1F1618FAE53E001B1E16 /* DeckView.cpp in Sources */, CEA377BD1291C60500B9016A /* WEvent.cpp in Sources */, CEA377BE1291C60500B9016A /* WFilter.cpp in Sources */, CEA377BF1291C60500B9016A /* WFont.cpp in Sources */, @@ -2096,6 +2103,7 @@ CE9A478512B514BA00C9F38A /* EAGLView.m in Sources */, CE9A478612B514BA00C9F38A /* EAGLViewController.m in Sources */, CE9A478912B514BA00C9F38A /* ES2Renderer.m in Sources */, + 751E1F1518FAE53E001B1E16 /* CarouselDeckView.cpp in Sources */, CE9A478A12B514BA00C9F38A /* main.m in Sources */, CE9A478D12B514BA00C9F38A /* wagicAppDelegate.m in Sources */, CE9E71DD1375A58600759DDC /* thread.cpp in Sources */, @@ -2283,10 +2291,7 @@ "\"$(SRCROOT)/../../admobsdk/iOS/GoogleAdMobAdsSDKiOS-5.0.5\"", ); "New Setting" = ""; - OTHER_LDFLAGS = ( - "-no_implicit_dylibs", - "-Wl", - ); + OTHER_LDFLAGS = "-Wl"; PRODUCT_NAME = wagic; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -2331,10 +2336,7 @@ "$(inherited)", "\"$(SRCROOT)/../../admobsdk/iOS/GoogleAdMobAdsSDKiOS-5.0.5\"", ); - OTHER_LDFLAGS = ( - "-no_implicit_dylibs", - "-Wl", - ); + OTHER_LDFLAGS = "-Wl"; PRODUCT_NAME = wagic; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -2357,6 +2359,10 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../Boost/boost; IPHONEOS_DEPLOYMENT_TARGET = 5.1; + OTHER_CFLAGS = ( + "-DTIXML_USE_STL", + "-fno-objc-arc", + ); PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2374,7 +2380,10 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../Boost/boost; IPHONEOS_DEPLOYMENT_TARGET = 5.1; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + OTHER_CFLAGS = ( + "-DNS_BLOCK_ASSERTIONS=1", + "-DTIXML_USE_STL=1", + ); PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; From 63561e61221cf8e953e580d298892b16170a8af3 Mon Sep 17 00:00:00 2001 From: Michael Nguyen Date: Sun, 13 Apr 2014 11:39:40 -0700 Subject: [PATCH 10/33] update Xcode build preferences as recommended by XCode. --- projects/mtg/wagic.xcodeproj/project.pbxproj | 21 ++----------------- .../xcschemes/wagic-opengl1.1.xcscheme | 2 +- .../xcschemes/wagic.xcscheme | 2 +- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/projects/mtg/wagic.xcodeproj/project.pbxproj b/projects/mtg/wagic.xcodeproj/project.pbxproj index f0a904c42..d951b708e 100755 --- a/projects/mtg/wagic.xcodeproj/project.pbxproj +++ b/projects/mtg/wagic.xcodeproj/project.pbxproj @@ -1704,7 +1704,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0510; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "wagic" */; compatibilityVersion = "Xcode 3.2"; @@ -2152,10 +2152,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; @@ -2205,10 +2201,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = YES; @@ -2252,10 +2244,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; @@ -2304,10 +2292,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = YES; @@ -2348,7 +2332,6 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEPLOYMENT_LOCATION = NO; @@ -2359,6 +2342,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../Boost/boost; IPHONEOS_DEPLOYMENT_TARGET = 5.1; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-DTIXML_USE_STL", "-fno-objc-arc", @@ -2372,7 +2356,6 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; GCC_C_LANGUAGE_STANDARD = c99; diff --git a/projects/mtg/wagic.xcodeproj/xcuserdata/mnguyen.xcuserdatad/xcschemes/wagic-opengl1.1.xcscheme b/projects/mtg/wagic.xcodeproj/xcuserdata/mnguyen.xcuserdatad/xcschemes/wagic-opengl1.1.xcscheme index ff4186a80..71e41a631 100644 --- a/projects/mtg/wagic.xcodeproj/xcuserdata/mnguyen.xcuserdatad/xcschemes/wagic-opengl1.1.xcscheme +++ b/projects/mtg/wagic.xcodeproj/xcuserdata/mnguyen.xcuserdatad/xcschemes/wagic-opengl1.1.xcscheme @@ -1,6 +1,6 @@ Date: Wed, 23 Jul 2014 00:17:07 +0200 Subject: [PATCH 11/33] Update README.md Added build status on AppVeyor --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a481bfaa8..f3eea73d2 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ [![Build Status](https://travis-ci.org/WagicProject/wagic.png?branch=master)](https://travis-ci.org/WagicProject/wagic) +[![Build status](https://ci.appveyor.com/api/projects/status/7j4fbr6m62aqej59/branch/master)](https://ci.appveyor.com/project/xawotihs/wagic/branch/master) + ## Description From 539c5bd18a1d7aaaf6b2545b456600f7e0314f48 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Wed, 23 Jul 2014 20:53:25 +0200 Subject: [PATCH 12/33] Trying to fix android build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee8290632..1ccda6837 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r22-linux.tgz - $ANDROID list sdk --extended -a -- echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.0.1","android-10" --no-ui --force > log.txt +- echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force > log.txt - sudo pip install pyjavaproperties script: ./travis-script.sh env: From 9bc750da9a198d884bb9d9656980a1f94b4fb6a4 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Wed, 23 Jul 2014 22:05:02 +0200 Subject: [PATCH 13/33] Upgrade Android SDK to r23.0.2 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ccda6837..dd23686c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,9 @@ install: - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - tar -x --xz -f sdk.lzma - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv -- wget http://dl.google.com/android/android-sdk_r22-linux.tgz -nv +- wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 -- tar -zxf android-sdk_r22-linux.tgz +- tar -zxf android-sdk_r23.0.2-linux.tgz - $ANDROID list sdk --extended -a - echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force > log.txt - sudo pip install pyjavaproperties From f2a527302911a5b4d6edeaf106e2159915ea90ed Mon Sep 17 00:00:00 2001 From: xawotihs Date: Wed, 23 Jul 2014 22:22:06 +0200 Subject: [PATCH 14/33] Activating logs on android issue --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd23686c6..591b9acf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r23.0.2-linux.tgz - $ANDROID list sdk --extended -a -- echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force > log.txt +- echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force - sudo pip install pyjavaproperties script: ./travis-script.sh env: From e87996a7f29cec10ef0adb5fbf0d4a69e0f1e20e Mon Sep 17 00:00:00 2001 From: xawotihs Date: Wed, 23 Jul 2014 23:20:54 +0200 Subject: [PATCH 15/33] Deactivate window cross-compiling build --- travis-script.sh | 37 +++++++++++++++++++------------------ upload-binaries.sh | 24 ++++++++++++------------ 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/travis-script.sh b/travis-script.sh index 244d7c19a..b42f6c070 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -74,24 +74,25 @@ make -j 8 # we're cross-compiling a Qt Windows version here, # PATH is only set here to prevent colision -export PATH="$PATH:/opt/mingw32/bin" -mkdir build -cd build -mkdir win-cross -cd win-cross -/opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics -make -j 8 -cd release -cp ../../../projects/mtg/bin/fmod.dll . -cp /opt/mingw32/bin/QtCore4.dll . -cp /opt/mingw32/bin/QtGui4.dll . -cp /opt/mingw32/bin/QtNetwork4.dll . -cp /opt/mingw32/bin/QtOpenGL4.dll . -cp ../../../projects/mtg/bin/zlib1.dll . -cp /opt/mingw32/bin/libpng15-15.dll . -cd .. -zip win-cross.zip -r release/ -cd ../.. + +# export PATH="$PATH:/opt/mingw32/bin" +# mkdir build +# cd build +# mkdir win-cross +# cd win-cross +# /opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics +# make -j 8 +# cd release +# cp ../../../projects/mtg/bin/fmod.dll . +# cp /opt/mingw32/bin/QtCore4.dll . +# cp /opt/mingw32/bin/QtGui4.dll . +# cp /opt/mingw32/bin/QtNetwork4.dll . +# cp /opt/mingw32/bin/QtOpenGL4.dll . +# cp ../../../projects/mtg/bin/zlib1.dll . +# cp /opt/mingw32/bin/libpng15-15.dll . +# cd .. +# zip win-cross.zip -r release/ +# cd ../.. # Now we run the testsuite (Res needs to be in the working directory) cd projects/mtg diff --git a/upload-binaries.sh b/upload-binaries.sh index a558ccbb9..272b4771d 100755 --- a/upload-binaries.sh +++ b/upload-binaries.sh @@ -26,12 +26,12 @@ if [ "$TRAVIS_BRANCH" == "alphas" ]; then --data-binary @projects/mtg/psprelease.zip \ "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip" - echo -e "Uploading Windows package\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @build/win-cross/win-cross.zip \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" +# echo -e "Uploading Windows package\n" +# curl -X POST -H "Authorization: token ${GH_TOKEN}" \ +# -H "Accept: application/vnd.github.manifold-preview" \ +# -H "Content-Type: application/zip" \ +# --data-binary @build/win-cross/win-cross.zip \ +# "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" echo -e "Done uploading\n" fi @@ -87,12 +87,12 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then --data-binary @projects/mtg/psprelease.zip \ "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip" - echo -e "Uploading Windows package\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @build/win-cross/win-cross.zip \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" +# echo -e "Uploading Windows package\n" +# curl -X POST -H "Authorization: token ${GH_TOKEN}" \ +# -H "Accept: application/vnd.github.manifold-preview" \ +# -H "Content-Type: application/zip" \ +# --data-binary @build/win-cross/win-cross.zip \ +# "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" echo -e "Done uploading\n" fi From 36ecc1ffef8e25f4f3eddbb09f2b3d067da550cb Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 26 Jul 2014 19:38:14 +0200 Subject: [PATCH 16/33] Cleaned up cross-compiling travis stuff --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 591b9acf4..41aa3091f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,7 @@ before_install: - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" - export ANDROID="android-sdk-linux/tools/android" install: -- sudo add-apt-repository ppa:tobydox/mingw -y -- sudo apt-get update -qq -- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq mingw32-x-gcc mingw32-x-qt; fi -- sudo ln -s /opt/mingw32/bin/moc /opt/mingw32/bin/i686-w64-mingw32-moc +- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - tar -x --xz -f sdk.lzma - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv From 28db88449831de7054ee9d75436dfffcfb075eb3 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 26 Jul 2014 19:45:59 +0200 Subject: [PATCH 17/33] Cleaned up cross-compiling travis stuff --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 41aa3091f..398e27662 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ before_install: - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" - export ANDROID="android-sdk-linux/tools/android" install: +- sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - tar -x --xz -f sdk.lzma From 1e24f25c18d309f0bba04a4ea8cbf163b5f72584 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 2 Aug 2014 15:56:52 +0200 Subject: [PATCH 18/33] Fixed repository against Qt5.3.1 --- projects/mtg/wagic.pri | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri index a292833a1..5c7b4709e 100644 --- a/projects/mtg/wagic.pri +++ b/projects/mtg/wagic.pri @@ -11,6 +11,7 @@ unix:!*macx*:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs unix:!*macx*:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror windows:DEFINES += _CRT_SECURE_NO_WARNINGS +windows|winrt:DEFINES += NOMINMAX unix|macx:DEFINES += LINUX CONFIG(debug, debug|release) { DEFINES += _DEBUG @@ -32,6 +33,7 @@ windows{ *-msvc* { INCLUDEPATH += extra DEFINES += WIN32 + DEFINES += FORCE_GL2 } } macx:INCLUDEPATH += /opt/include From ac5c14b97725e6a06aad5a9c0a41adc932d2fdca Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 2 Aug 2014 17:12:19 +0200 Subject: [PATCH 19/33] Fixed QtMultimedia port, replaced QSoundEffect by QMediaPlayer as all codecs were not supported by first class. --- JGE/include/JSoundSystem.h | 3 ++- JGE/src/pc/JSfx.cpp | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/JGE/include/JSoundSystem.h b/JGE/include/JSoundSystem.h index 30be731e8..7c6308aab 100644 --- a/JGE/include/JSoundSystem.h +++ b/JGE/include/JSoundSystem.h @@ -106,7 +106,8 @@ public: unsigned long fileSize(); #ifdef QT_CONFIG - QSoundEffect effect; + QMediaPlayer* effect; +// QSoundEffect effect; void* mSample; #elif defined (PSP) WAVDATA *mSample; diff --git a/JGE/src/pc/JSfx.cpp b/JGE/src/pc/JSfx.cpp index faa4fa71c..f7d08e3ba 100644 --- a/JGE/src/pc/JSfx.cpp +++ b/JGE/src/pc/JSfx.cpp @@ -76,7 +76,10 @@ JSample::JSample() JSample::~JSample() { -#ifdef USE_PHONON +#ifdef QT_CONFIG + if(effect) + delete effect; +#elif USE_PHONON if(mOutput) delete mOutput; if(mMediaObject) @@ -160,7 +163,7 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName) music->player->setVolume(100); music->playlist = new QMediaPlaylist; music->fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName); - music->playlist->addMedia(QUrl(music->fullpath.c_str())); + music->playlist->addMedia(QUrl::fromLocalFile(music->fullpath.c_str())); music->playlist->setCurrentIndex(0); } #elif defined USE_PHONON @@ -205,12 +208,8 @@ void JSoundSystem::PlayMusic(JMusic *music, bool looping) if(looping) music->playlist->setPlaybackMode(QMediaPlaylist::Loop); -// music->player->setPlaylist(music->playlist); - music->player->setMedia(QUrl(music->fullpath.c_str())); + music->player->setPlaylist(music->playlist); music->player->play(); - stringstream stream; - stream << "Player state : " << music->player->state(); - DebugTrace(stream.str()); } #elif USE_PHONON if (music && music->mMediaObject && music->mOutput) @@ -305,9 +304,9 @@ JSample *JSoundSystem::LoadSample(const char *fileName) if (sample) { string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName); - sample->effect.setSource(QUrl::fromLocalFile(fullpath.c_str())); - sample->effect.setLoopCount(0); - sample->effect.setVolume(1); + sample->effect = new QMediaPlayer; + sample->effect->setMedia(QUrl::fromLocalFile(fullpath.c_str())); + sample->effect->setVolume(100); sample->mSample = &(sample->effect); } #elif (defined USE_PHONON) @@ -351,7 +350,7 @@ void JSoundSystem::PlaySample(JSample *sample) #ifdef QT_CONFIG if(sample) { - sample->effect.play(); + sample->effect->play(); } #elif defined USE_PHONON if (sample && sample->mMediaObject && sample->mOutput) From 06f30eca3ab452e755a274273fe7c8a77e8d902d Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 2 Aug 2014 17:50:45 +0200 Subject: [PATCH 20/33] Upgraded travis to use qt5 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 398e27662..e735d6745 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,10 @@ before_install: - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" - export ANDROID="android-sdk-linux/tools/android" install: +- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi +- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - tar -x --xz -f sdk.lzma - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv From 7d4e5177b9ab437911749cf18be7dde2b2f8a2c1 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 2 Aug 2014 18:15:45 +0200 Subject: [PATCH 21/33] Reordered actions from install to before_install --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e735d6745..00a203ff1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,15 @@ before_install: - export PSPSDK="$PSPDEV/psp/sdk" - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" - export ANDROID="android-sdk-linux/tools/android" -install: - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi - sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download -- tar -x --xz -f sdk.lzma - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv +install: +- tar -x --xz -f sdk.lzma - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r23.0.2-linux.tgz - $ANDROID list sdk --extended -a From 7053531a4d184ba3d3c8ce2742a25fee8338911b Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 2 Aug 2014 18:37:53 +0200 Subject: [PATCH 22/33] Added qmake qt5 configuration --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 00a203ff1..abb742e75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,9 @@ install: - $ANDROID list sdk --extended -a - echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force - sudo pip install pyjavaproperties +before_script: +- qmake -qt=qt5 -v +- qmake -qt=qt5 script: ./travis-script.sh env: global: From 555fb3ae9349de04407f3f62ee57ad89fb3d4b9b Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 2 Aug 2014 18:54:28 +0200 Subject: [PATCH 23/33] Updated Qt building scripts to use qt5 qmake and no fmod --- .travis.yml | 4 +--- projects/mtg/wagic.pri | 1 - travis-script.sh | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index abb742e75..6411cdfb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_install: - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi - sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev +- export QMAKE="qmake -qt=qt5" - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv @@ -21,9 +22,6 @@ install: - $ANDROID list sdk --extended -a - echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force - sudo pip install pyjavaproperties -before_script: -- qmake -qt=qt5 -v -- qmake -qt=qt5 script: ./travis-script.sh env: global: diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri index 5122f3d72..7360f681e 100644 --- a/projects/mtg/wagic.pri +++ b/projects/mtg/wagic.pri @@ -43,7 +43,6 @@ INCLUDEPATH += ../../Boost INCLUDEPATH += include unix:!symbian:LIBS += -lz -windows:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib windows:LIBS += ../../JGE/Dependencies/lib/zlibd.lib PRECOMPILED_HEADER = include/PrecompiledHeader.h diff --git a/travis-script.sh b/travis-script.sh index b42f6c070..3cd466e71 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -64,12 +64,12 @@ ant debug -f projects/mtg/Android/build.xml # we're building a Qt version with GUI here mkdir qt-gui-build cd qt-gui-build -qmake ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics +$QMAKE ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics make -j 8 cd .. # let's try an Intel linux binary in debug text-mode-only -qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR +$QMAKE projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR make -j 8 # we're cross-compiling a Qt Windows version here, From a447a0c9af4493d62b732887daf9b1da0a78111e Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 2 Aug 2014 19:22:38 +0200 Subject: [PATCH 24/33] Trying with --all --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6411cdfb1..7a2333c88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r23.0.2-linux.tgz - $ANDROID list sdk --extended -a -- echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force +- echo yes | $ANDROID update sdk --all --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force - sudo pip install pyjavaproperties script: ./travis-script.sh env: From 8d58baf4a30dfe96133da19e2676072ab09157e8 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 2 Aug 2014 19:38:11 +0200 Subject: [PATCH 25/33] adding qtmultimedia in apt-get --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7a2333c88..72586c119 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi -- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev +- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev - export QMAKE="qmake -qt=qt5" - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv From 8b22d032cdf6dd54cd9a25f647373fae032e97d9 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 2 Aug 2014 21:05:55 +0200 Subject: [PATCH 26/33] Fixed QT version needed for pixelRatio API --- JGE/include/qt/corewrapper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/JGE/include/qt/corewrapper.h b/JGE/include/qt/corewrapper.h index cd019c6a7..284a878aa 100644 --- a/JGE/include/qt/corewrapper.h +++ b/JGE/include/qt/corewrapper.h @@ -137,14 +137,14 @@ private slots: private: int lastPosx(){ -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= 0x050100 return m_lastPos.x()*devicePixelRatio(); #else return m_lastPos.x(); #endif } int lastPosy(){ -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= 0x050100 return m_lastPos.y()*devicePixelRatio(); #else return m_lastPos.y(); From 26e905a36e8a569649ee7c06b5fb6deb017bf173 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 2 Aug 2014 23:16:22 +0200 Subject: [PATCH 27/33] Update Androi build tools to 20.0.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72586c119..4fd49d65a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r23.0.2-linux.tgz - $ANDROID list sdk --extended -a -- echo yes | $ANDROID update sdk --all --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force +- echo yes | $ANDROID update sdk --all --filter "tools","platform-tools","build-tools-20.0.0","android-10" --no-ui --force - sudo pip install pyjavaproperties script: ./travis-script.sh env: From 6b90956af1de9815af12023f7e1504513b40ad57 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 2 Aug 2014 23:35:25 +0200 Subject: [PATCH 28/33] Adding pulse --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4fd49d65a..fa27a1a2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi -- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev +- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulse-dev - export QMAKE="qmake -qt=qt5" - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv From ad8859222912682e121b4368c002db33d76e9243 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 2 Aug 2014 23:44:40 +0200 Subject: [PATCH 29/33] Replaced pulse-dev with pulseaudio --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa27a1a2b..36aaf47d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi -- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulse-dev +- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio - export QMAKE="qmake -qt=qt5" - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv From 846ba308211c106296d752e0104900164fe45f2d Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sun, 3 Aug 2014 01:34:53 +0200 Subject: [PATCH 30/33] Tries to fix android sdk update issue --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36aaf47d6..c9830d2b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r23.0.2-linux.tgz - $ANDROID list sdk --extended -a -- echo yes | $ANDROID update sdk --all --filter "tools","platform-tools","build-tools-20.0.0","android-10" --no-ui --force +- echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-20.0.0,android-10 --no-ui --force - sudo pip install pyjavaproperties script: ./travis-script.sh env: From 775143355d72a708008fade939039c975c4c329e Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sun, 3 Aug 2014 01:51:41 +0200 Subject: [PATCH 31/33] Add lib pulse-dev --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9830d2b2..c1db5aa20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi -- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio +- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev - export QMAKE="qmake -qt=qt5" - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv From 7560db571c2a5a4408ca6a4d29476bf6cc66d746 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sun, 3 Aug 2014 11:43:55 +0200 Subject: [PATCH 32/33] Trying without HTTPS to speed up SDK update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1db5aa20..e3e70fef7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r23.0.2-linux.tgz - $ANDROID list sdk --extended -a -- echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-20.0.0,android-10 --no-ui --force +- echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-20.0.0,android-10 --no-ui --force --no-https - sudo pip install pyjavaproperties script: ./travis-script.sh env: From d7628b3eb281f72547feac266b932454da0f847d Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 3 Aug 2014 12:20:45 +0200 Subject: [PATCH 33/33] Fixed console with Qtmultimedia --- JGE/include/JSoundSystem.h | 6 +++--- projects/mtg/wagic-qt.pro | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/JGE/include/JSoundSystem.h b/JGE/include/JSoundSystem.h index 7c6308aab..5b50b023c 100644 --- a/JGE/include/JSoundSystem.h +++ b/JGE/include/JSoundSystem.h @@ -25,7 +25,7 @@ #elif defined USE_PHONON #include #include -#elif defined QT_CONFIG +#elif (defined QT_CONFIG) #include "QMediaPlayer" #include "QMediaPlaylist" #include "QSoundEffect" @@ -86,7 +86,7 @@ public slots: SLPlayItf playInterface; SLSeekItf seekInterface; SLVolumeItf musicVolumeInterface; -#elif defined QT_CONFIG +#elif (defined QT_CONFIG) QMediaPlaylist* playlist; QMediaPlayer* player; string fullpath; @@ -105,7 +105,7 @@ public: ~JSample(); unsigned long fileSize(); -#ifdef QT_CONFIG +#if (defined QT_CONFIG) QMediaPlayer* effect; // QSoundEffect effect; void* mSample; diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index 40e4c5104..9c547d11a 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -5,7 +5,7 @@ addExclusiveBuilds(graphics, Graphics, console, Console) INCLUDEPATH += ../../JGE/include/qt CONFIG(console, graphics|console){ - QT += core network + QT += core network multimedia QT -= gui DEFINES += CONSOLE_CONFIG @@ -55,6 +55,7 @@ else:CONFIG(console, graphics|console){ SOURCES += \ ../../JGE/src/OutputCapturer.cpp\ + ../../JGE/src/pc/JSfx.cpp\ ../../JGE/src/JGfx-fake.cpp\ ../../JGE/src/Qtconsole.cpp\ }