Redid the tilt controls in a nicer way #4515

bollu · 2013-11-12T08:31:43Z

Plus, you can use the D-Pad, Analog Stick and the PSP action buttons

Decided to rewrite it. As of now, all of the tilt interpretetion code is in one unit - TiltEventProcessor.cpp. NativeApp requests this "module" (a set of free-standing functions) to process the tilt and send the appropriate event. Code is heavily documented ;)

EDIT:
1)Sorry for the typo in the branch name.

could someone edit the visual studio solution and add TiltEventProcessor.cpp, TiltEventProcessor.h into the solution for me?

Thanks!

…e input types

unknownbrackets · 2013-11-12T08:53:06Z

If I'm reading this right it disables regular axises (analog sticks?) And it'll break the Windows build.

-[Unknown]

bollu · 2013-11-12T09:00:32Z

Hmm, okay, I'll uncomment that in that case.

bollu · 2013-11-12T09:01:00Z

yes, I know it'll break windows. Forgot to add that. could you edit the VS solution please?

bollu · 2013-11-12T09:04:26Z

Done. enabled the default axis event if the tilt events are disabled

bollu · 2013-11-13T10:34:40Z

@hrydgard, @unknownbrackets : other than the windows build, is there anything else missing?

hrydgard · 2013-11-13T10:37:44Z

I'll take a look at it soon, been a bit busy.

bollu · 2013-11-13T12:19:46Z

sure thing :)

bollu · 2013-11-26T14:58:07Z

@hrydgard: any update? ;)

bollu · 2013-12-12T11:46:53Z

@hrydgard: sorry, college snatched programming away from me for a solid moth or so :P Going to re-merge this branch again and rewrite some code :)

sum2012 · 2013-12-13T22:01:25Z

@bollu Remember make change in
UI\UI.vcxproj and UI.vcxproj.filters

…ovedTilControls

bollu · 2013-12-15T14:49:33Z

done! :).

EDIT - the symbian build seems to have failed the build. don't know why.

thedax · 2013-12-15T15:36:24Z

The Qt project files (this is why Symbian failed) and Windows project files still need to be updated.

sum2012 · 2013-12-15T23:28:14Z

I apply windows fix and I find
TiltEventProcessor.cpp line 101 and 138 have not declared M_PI

thedax · 2013-12-15T23:32:03Z

@sum2012: Try this:

#define _USE_MATH_DEFINES
#include <cmath>

At the top of the file.

sum2012 · 2013-12-15T23:34:10Z

@thedax Thanks work

thedax · 2013-12-15T23:37:49Z

No problem. If @bollu will actually look at his repository this time (the last time I tried to help, he never saw it for some reason :( ), I'll make a pull request on it which will update the project files and include the buildfix (though it'll have an ifdef around it for MSC_VER so only Visual Studio includes cmath).

sum2012 · 2013-12-16T00:24:27Z

@thedax I see scedisplay.cpp
It doesn't ifdef MSC_VER for use cmath

sum2012 · 2013-12-16T00:31:00Z

@bollu it is windows build fix
sum2012@7e2af3e

thedax · 2013-12-16T00:32:31Z

_USE_MATH_DEFINES is a Visual Studio specific thing, I think. You might want to put ifdefs for visual studio around it and the cmath include.

unknownbrackets · 2013-12-16T00:36:02Z

Well, _USE_MATH_DEFINES probably won't harm other platforms.

-[Unknown]

This reverts commit 38fb300.

bollu · 2013-12-16T01:21:02Z

@thedax my bad, hadn't seen your pull request :]. And thanks for fixing the windows build guys (it must be annoying to babysit my pull requests, i'm sorry)

bollu · 2013-12-16T01:21:37Z

I'll pull your changes in about an hour.

thedax · 2013-12-16T01:24:14Z

Sum2012 gets the credit this time, heh. I was referring to the last major pull request you made, when it needed a few Windows fixes, and Henrik ended up fixing it.

bollu · 2013-12-16T01:26:39Z

hmm, can I directly pull from @sum2012 or does he have to make a pull request to me?

EDIT - @sum2012: I'm slightly curious as to why you pulled from my copy of ppsspp as opposed to Henrik's. I'm honored though :D

thedax · 2013-12-16T01:35:54Z

Because it makes merging easier. If you accept his pullrq, it'll add his commits to this pullrq.

bollu · 2013-12-16T01:42:50Z

I'm assuming this will be merged once the build passes yes? EDIT - symbian build still fails on a linker error. What am I missing?

 FAILED linkandpostlink  for arm.v5.urel.gcce4_6_3: epoc32/release/armv5/urel/PPSSPPQt.exe
  mmp: PPSSPPQt_exe.mmp
   /home/travis/build/hrydgard/ppsspp/tools/gcce4/bin/../lib/gcc/arm-none-symbianelf/4.6.3/../../../../arm-none-symbianelf/bin/ld: warning: /home/travis/build/hrydgard/ppsspp/SDKs/SymbianSR1Qt474/epoc32/release/armv5/urel/usrt3_1.lib(ucppinit.o) uses variable-size enums yet the output is to use 32-bit enums; use of enum values across objects may fail
   /home/travis/build/hrydgard/ppsspp/SDKs/SymbianSR1Qt474/epoc32/build/qt/c_935d2be41e14a474/PPSSPPQt_exe/armv5/urel/GameSettingsScreen.o: In function `GameSettingsScreen::OnTiltTypeChange(UI::EventParams&)':
   /home/travis/build/hrydgard/ppsspp/UI/GameSettingsScreen.cpp:509: undefined reference to `TiltEventProcessor::ResetTiltEvents()'
   /home/travis/build/hrydgard/ppsspp/SDKs/SymbianSR1Qt474/epoc32/build/qt/c_935d2be41e14a474/PPSSPPQt_exe/armv5/urel/NativeApp.o: In function `NativeAxis(AxisInput const&)':
   /home/travis/build/hrydgard/ppsspp/UI/NativeApp.cpp:735: undefined reference to `TiltEventProcessor::GenTilt(TiltEventProcessor::Tilt const&, TiltEventProcessor::Tilt const&, bool, bool, float, float, float)'
   /home/travis/build/hrydgard/ppsspp/UI/NativeApp.cpp:741: undefined reference to `TiltEventProcessor::GenerateAnalogStickEvent(TiltEventProcessor::Tilt const&)'
   /home/travis/build/hrydgard/ppsspp/UI/NativeApp.cpp:749: undefined reference to `TiltEventProcessor::GenerateActionButtonEvent(TiltEventProcessor::Tilt const&)'
   /home/travis/build/hrydgard/ppsspp/UI/NativeApp.cpp:745: undefined reference to `TiltEventProcessor::GenerateDPadEvent(TiltEventProcessor::Tilt const&)'
   collect2: ld returned 1 exit status

    make[1]: *** [/home/travis/build/hrydgard/ppsspp/SDKs/SymbianSR1Qt474/epoc32/release/armv5/urel/PPSSPPQt.exe] Error 1
sbs: error: The make-engine exited with errors.

…ovedTilControls

thedax · 2013-12-16T01:56:15Z

The Qt project files still need to be updated.

bollu · 2013-12-16T01:58:04Z

How would I do that?. Also, that an extra step that's been added while I was gone?

thedax · 2013-12-16T02:17:18Z

It's been a necessary step for as long as Qt has been supported in PPSSPP.

Edit the section in https://github.com/hrydgard/ppsspp/blob/master/Qt/PPSSPP.pro#L80 and it should work.

unknownbrackets · 2013-12-16T02:42:40Z

Qt builds on Linux too, just use Qt Creator.

-[Unknown]

thedax · 2013-12-16T03:05:12Z

And there you go, assuming no other issues exist, this should be ready for merging.

bollu · 2013-12-16T03:07:26Z

Yep! At last! :)

thedax · 2013-12-16T03:10:22Z

Giving this a quick test compile in VS 2013 (it's pretty picky).

sum2012 · 2013-12-16T03:11:05Z

This is my first time to fork other people branch :)

thedax · 2013-12-16T03:13:12Z

Visual Studio 2013 compiled it fine. This is all good to go.

bollu · 2013-12-16T03:45:26Z

Thanks for the awesome help guys!. @hrydgard: merge this? :3

sum2012 · 2013-12-16T14:29:13Z

@hrydgard the commit still have porblem ?

bollu · 2013-12-22T09:27:52Z

Any reason this hasn't been merged yet? :)

hrydgard · 2013-12-22T10:13:26Z

I wanted to see if I can find a more generic design but I've realized I don't have the time, so here we go :P Can always be changed later.

Redid the tilt controls in a nicer way

bollu added 2 commits November 11, 2013 17:22

moved tilt logic to separate unit and enabled tilt to control multipl…

9c219bc

…e input types

enable default tilt controls

35adc5e

bollu added 2 commits December 14, 2013 16:45

Merge branch 'master' of https://github.com/hrydgard/ppsspp into impr…

b0c7e82

…ovedTilControls

fixed a tilt bug

ee5a9fb

Fix windows build

7e2af3e

sum2012 added 2 commits December 16, 2013 08:37

Add def for Visual Studio

38fb300

Revert "Add def for Visual Studio"

34ae0e6

This reverts commit 38fb300.

Merge branch 'master' of https://github.com/hrydgard/ppsspp into impr…

fc1da7c

…ovedTilControls

fixed Qt build

094bc01

hrydgard added a commit that referenced this pull request Dec 22, 2013

Merge pull request #4515 from bollu/improvedTilControls

b0bfda6

Redid the tilt controls in a nicer way

hrydgard merged commit b0bfda6 into hrydgard:master Dec 22, 2013

bhavin192 mentioned this pull request Dec 22, 2013

Tilt controls are not working Qt #4907

Closed

Redid the tilt controls in a nicer way #4515

Redid the tilt controls in a nicer way #4515

Conversation

bollu commented Nov 12, 2013

unknownbrackets commented Nov 12, 2013

bollu commented Nov 12, 2013

bollu commented Nov 12, 2013

bollu commented Nov 12, 2013

bollu commented Nov 13, 2013

hrydgard commented Nov 13, 2013

bollu commented Nov 13, 2013

bollu commented Nov 26, 2013

bollu commented Dec 12, 2013

sum2012 commented Dec 13, 2013

bollu commented Dec 15, 2013

thedax commented Dec 15, 2013

sum2012 commented Dec 15, 2013

thedax commented Dec 15, 2013

sum2012 commented Dec 15, 2013

thedax commented Dec 15, 2013

sum2012 commented Dec 16, 2013

sum2012 commented Dec 16, 2013

thedax commented Dec 16, 2013

unknownbrackets commented Dec 16, 2013

bollu commented Dec 16, 2013

bollu commented Dec 16, 2013

thedax commented Dec 16, 2013

bollu commented Dec 16, 2013

thedax commented Dec 16, 2013

bollu commented Dec 16, 2013

thedax commented Dec 16, 2013

bollu commented Dec 16, 2013

thedax commented Dec 16, 2013

unknownbrackets commented Dec 16, 2013

thedax commented Dec 16, 2013

bollu commented Dec 16, 2013

thedax commented Dec 16, 2013

sum2012 commented Dec 16, 2013

thedax commented Dec 16, 2013

bollu commented Dec 16, 2013

sum2012 commented Dec 16, 2013

bollu commented Dec 22, 2013

hrydgard commented Dec 22, 2013