Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation of the Qt frontend with latest scroll changes

Browse Source 
fixed Qt project compilation with Mingw on Windows
This commit is contained in:
Xawotihs@gmail.com
2012-01-26 23:17:40 +00:00
parent c56d907eb5
commit b9a52ab447
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JGE/include/JTypes.h
View File

@@ -85,7 +85,7 @@ enum {
#define BLEND_OPTION_BLEND GU_TFX_BLEND #define BLEND_OPTION_BLEND GU_TFX_BLEND
#endif #endif
#ifdef WIN32 #if (defined WIN32) && (!defined LINUX)
#include <windows.h> #include <windows.h>
#endif #endif
#if defined(LINUX) || defined(IOS) || defined (ANDROID) #if defined(LINUX) || defined(IOS) || defined (ANDROID)

4
JGE/include/qt/corewrapper.h
View File

@@ -72,8 +72,8 @@ public:
Q_INVOKABLE qint64 getTick() { Q_INVOKABLE qint64 getTick() {
return g_startTimer.elapsed(); return g_startTimer.elapsed();
}; };
Q_INVOKABLE void doScroll(int x, int y) { Q_INVOKABLE void doScroll(int x, int y, int magnitude) {
m_engine->Scroll(x, y); m_engine->Scroll(x, y, magnitude);
}; };
int getNominalHeight(){ return SCREEN_HEIGHT;}; int getNominalHeight(){ return SCREEN_HEIGHT;};
int getNominalWidth(){ return SCREEN_WIDTH;}; int getNominalWidth(){ return SCREEN_WIDTH;};

4
JGE/src/qt/corewrapper.cpp
View File

@@ -333,10 +333,10 @@ void WagicCore::wheelEvent ( QGraphicsSceneWheelEvent * event)
#endif #endif
{ {
if(event->orientation() == Qt::Vertical) if(event->orientation() == Qt::Vertical)
m_engine->Scroll(0, 3*event->delta()); m_engine->Scroll(0, 3*event->delta(), static_cast<int>(sqrt(9*event->delta()*event->delta())));
else else
m_engine->Scroll(3*event->delta(), 0); m_engine->Scroll(3*event->delta(), 0, static_cast<int>(sqrt(9*event->delta()*event->delta())));
event->accept(); event->accept();
} }

2
projects/mtg/include/PrecompiledHeader.h
View File

@@ -23,7 +23,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#if defined (IOS) || defined (ANDROID) #if defined (IOS) || defined (ANDROID) || defined (QT_CONFIG)
#define TOUCH_ENABLED #define TOUCH_ENABLED
#endif #endif

2
projects/mtg/include/config.h
View File

@@ -1,7 +1,7 @@
#ifndef _DEBUG_H_ #ifndef _DEBUG_H_
#define _DEBUG_H_ #define _DEBUG_H_
#if WIN32 #if (defined WIN32) && (!defined QT_CONFIG)
#define snprintf sprintf_s #define snprintf sprintf_s
#endif #endif