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

reverted changes to the Scroll/OnScroll method signatures.

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2012-01-27 23:47:02 +00:00
parent 3079faeedd
commit 9faf2ffc72
16 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JGE/include/JApp.h
View File

@@ -83,7 +83,7 @@ public:
//////////////////////////////////////////////////////////////////////////
virtual void Resume() = 0;
virtual void OnScroll(int inXVelocity, int inYVelocity, int magnitude = 0) = 0;
virtual void OnScroll(int inXVelocity, int inYVelocity) = 0;
};

2
JGE/include/JGE.h
View File

@@ -331,7 +331,7 @@ class JGE
// Scroll events - currently triggered by SDL JOYBALL events
void Scroll(int inXVelocity, int inYVelocity, int magnitude);
void Scroll(int inXVelocity, int inYVelocity);
//////////////////////////////////////////////////////////////////////////
/// Get if the system is ended/paused or not.

4
JGE/src/JGE.cpp
View File

@@ -577,11 +577,11 @@ void JGE::Assert(const char *filename, long lineNumber)
mCriticalAssert = true;
}
void JGE::Scroll(int inXVelocity, int inYVelocity, int magnitude)
void JGE::Scroll(int inXVelocity, int inYVelocity)
{
if (mApp != NULL)
{
mApp->OnScroll(inXVelocity, inYVelocity, magnitude);
mApp->OnScroll(inXVelocity, inYVelocity);
}
}

3
JGE/src/iOS/EAGLView.m
View File

@@ -419,8 +419,7 @@ static NSString *_MY_AD_WHIRL_APPLICATION_KEY_IPAD = @"2e70e3f3da40408588b9a3170
else
{
CGPoint v2 = [panGesture velocityInView: self];
int magnitude = [self distanceBetweenPointA: currentLocation andPointB: v2];
g_engine->Scroll( 0 - static_cast<int>(v2.x), 0 - static_cast<int>(v2.y), static_cast<int>(magnitude));
g_engine->Scroll( 0 - static_cast<int>(v2.x), 0 - static_cast<int>(v2.y));
[self performSelector: @selector(resetInput) withObject: nil afterDelay: 0.5];
}