[Scummvm-cvs-logs] SF.net SVN: scummvm:[47709] scummvm/trunk/backends/platform/n64/ osys_n64_events.cpp
Hkz at users.sourceforge.net
Hkz at users.sourceforge.net
Sat Jan 30 13:57:58 CET 2010
Revision: 47709
http://scummvm.svn.sourceforge.net/scummvm/?rev=47709&view=rev
Author: Hkz
Date: 2010-01-30 12:57:57 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
N64: added comments and slight cleanup
Modified Paths:
--------------
scummvm/trunk/backends/platform/n64/osys_n64_events.cpp
Modified: scummvm/trunk/backends/platform/n64/osys_n64_events.cpp
===================================================================
--- scummvm/trunk/backends/platform/n64/osys_n64_events.cpp 2010-01-30 12:53:08 UTC (rev 47708)
+++ scummvm/trunk/backends/platform/n64/osys_n64_events.cpp 2010-01-30 12:57:57 UTC (rev 47709)
@@ -23,10 +23,10 @@
*
*/
+#include <math.h> // Needed for "tan()" function
+
#include "osys_n64.h"
-#include <math.h>
-
// Pad buttons
#define START_BUTTON(a) (a & 0x1000)
#define A_BUTTON(a) (a & 0x8000)
@@ -77,21 +77,23 @@
float mx = _tempMouseX;
float my = _tempMouseY;
+ // Limit the analog range for pad.
+ // When moving in diagonal the max/min of 128/-128 was not reached
+ // yielding weird results for the tangent acceleration function
if (pad_analogX > 60) pad_analogX = 60;
else if (pad_analogX < -60) pad_analogX = -60;
-
if (pad_analogY > 60) pad_analogY = 60;
else if (pad_analogY < -60) pad_analogY = -60;
+ // Gamepad
if (abs(pad_analogX) > PAD_DEADZONE)
mx += tan(pad_analogX * (PI / 140));
-
if (abs(pad_analogY) > PAD_DEADZONE)
my -= tan(pad_analogY * (PI / 140));
+ // Mouse
if (abs(pad_mouseX) > MOUSE_DEADZONE)
mx += pad_mouseX;
-
if (abs(pad_mouseY) > MOUSE_DEADZONE)
my -= pad_mouseY;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list