Merge branch 'vibrationforharmattan' into harmattan

[ghostsoverboard] / orientationcontrolledgraphicspixmapobject.cpp

diff --git a/orientationcontrolledgraphicspixmapobject.cpp b/orientationcontrolledgraphicspixmapobject.cpp
index adc7b26..272c7cf 100644 (file)
--- a/orientationcontrolledgraphicspixmapobject.cpp
+++ b/orientationcontrolledgraphicspixmapobject.cpp
@@ -1,3 +1,26 @@
+/**************************************************************************
+        Ghosts Overboard - a game for Maemo 5
+
+        Copyright (C) 2011  Heli Hyvättinen
+
+        This file is part of Ghosts Overboard
+
+        Ghosts Overboard is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**************************************************************************/
+
+
 #include "orientationcontrolledgraphicspixmapobject.h"
 #include <QDebug>
 #include <QGraphicsScene>
@@ -42,17 +65,25 @@ void OrientationControlledGraphicsPixmapObject::readRotationSensor()
 
     QRotationReading* pSensorData = rotationSensor_.reading();
 
-    int deltay = pSensorData->x(); //yes, you need the "x" value from the sensor for "y" direction in the scene...
-    int deltax = pSensorData->y(); //...and vice versa
+    //    int deltay = pSensorData->x(); //yes, in Maemo 5 you need the "x" value from the sensor for "y" direction in the scene...
+    //    int deltax = pSensorData->y(); //...and vice versa
 
+        int deltay = -pSensorData->y(); //But in Harmattan, you need the "y" value from the sensor for "y" direction in the scene...
+        int deltax = pSensorData->x(); //...and x for x (when in landscape)
+                                      //and you need to reverse the y value
 
  //   qDebug() << deltax << " " << deltay;
 
     int oldx = x();
     int oldy = y();
 
-    int newx = x() + deltax/15;
-    int newy = y() + deltay/15;
+    //this is how it works on maemo
+//    int newx = x() + deltax/15;
+//    int newy = y() + deltay/15;
+
+    //this is for Harmattan
+    int newx = x() + deltax/5;
+    int newy = y() + deltay/5;
 
 
 //    qDebug() << sceneRectangle.left() << sceneRectangle.right();