From 853c6cddaa2713a9eb0c1f1c55e3f61592f04a46 Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Fri, 13 Jul 2018 18:24:17 +0200 Subject: don't know --- Camera.cpp | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'Camera.cpp') diff --git a/Camera.cpp b/Camera.cpp index 3992863..6ba6f29 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -4,6 +4,7 @@ #include "Camera.h" #include +#include /* ******************************************************************* * Defines @@ -50,8 +51,13 @@ Camera::Camera(void) : void Camera::handler(void) { - _xOffset += _xSpeed; - _yOffset += _ySpeed; + if (((_xOffset + _xSpeed) >= -16) + || + ((_xOffset + _xSpeed) <= 0) ) + { + _xOffset += _xSpeed; + //~_yOffset += _ySpeed; + } if (++_speedTimer >= SPEED_CALCULATION_TIME) { @@ -133,13 +139,24 @@ void Camera::onLeftBtnPressed(void) *********************************************************************/ void Camera::onRightBtnPressed(void) { + int8_t acc = 0; + if (_xSpeed > 0) { - _xSpeed -= CAMERA_ACCELERATION << 1; + acc = CAMERA_ACCELERATION << 1; } else if (_xSpeed > -MAX_CAMERA_SPEED) { - _xSpeed -= CAMERA_ACCELERATION; + acc = CAMERA_ACCELERATION; + } + + if ((_xOffset + (_xSpeed - acc)) >= -16) + { + _xSpeed -= acc; + } + else + { + _xSpeed = 0; } } -- cgit v1.2.3