From 1f798a9f40f07b3b9c66154f6ad45da2813e1a7b Mon Sep 17 00:00:00 2001 From: Jim Grandpre Date: Tue, 13 Jul 2010 18:31:09 -0400 Subject: [PATCH] Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. --- VisualC/SDL/SDL_VS2005.vcproj | 40 +++++++++++++++++ VisualC/SDLmain/SDLmain_VS2005.vcproj | 19 +++++++++ include/SDL_events.h | 1 + src/video/uikit/SDL_uikitview.h | 10 ++--- src/video/uikit/SDL_uikitview.m | 59 +++++++++++++++++++++++--- touchTest/gestureSDLTest.c | 2 +- touchTest/touchPong | Bin 29723 -> 29367 bytes touchTest/touchSimp | Bin 29536 -> 29172 bytes touchTest/touchSimp.c | 2 +- touchTest/touchTest.c | 2 +- 10 files changed, 122 insertions(+), 13 deletions(-) diff --git a/VisualC/SDL/SDL_VS2005.vcproj b/VisualC/SDL/SDL_VS2005.vcproj index b77c0a811..e15ec0fc0 100644 --- a/VisualC/SDL/SDL_VS2005.vcproj +++ b/VisualC/SDL/SDL_VS2005.vcproj @@ -1,11 +1,18 @@ >>>>>> other Name="SDL" ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" RootNamespace="SDL" +<<<<<<< local +======= TargetFrameworkVersion="131072" +>>>>>>> other > >>>>>> other AdditionalDependencies="msimg32.lib winmm.lib" OutputFile=".\Debug/SDL.dll" LinkIncremental="2" SuppressStartupBanner="true" +<<<<<<< local + IgnoreAllDefaultLibraries="true" +======= IgnoreAllDefaultLibraries="false" IgnoreDefaultLibraryNames="" +>>>>>>> other GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/SDL.pdb" +<<<<<<< local + SubSystem="2" +======= SubSystem="0" RandomizedBaseAddress="1" DataExecutionPrevention="0" +>>>>>>> other ImportLibrary=".\Debug/SDL.lib" +<<<<<<< local +======= Profile="true" CLRThreadAttribute="0" +>>>>>>> other CLRUnmanagedCodeCheck="false" /> + >>>>>> other Name="VCPostBuildEventTool" /> @@ -188,8 +216,11 @@ IgnoreAllDefaultLibraries="true" ProgramDatabaseFile=".\Release/SDL.pdb" SubSystem="2" +<<<<<<< local +======= RandomizedBaseAddress="1" DataExecutionPrevention="0" +>>>>>>> other ImportLibrary=".\Release/SDL.lib" /> + >>>>>> other Name="VCPostBuildEventTool" /> @@ -943,6 +980,8 @@ > @@ -951,6 +990,7 @@ > >>>>>> other RelativePath="..\..\src\video\SDL_video.c" > diff --git a/VisualC/SDLmain/SDLmain_VS2005.vcproj b/VisualC/SDLmain/SDLmain_VS2005.vcproj index 16c191458..aa328c4c1 100644 --- a/VisualC/SDLmain/SDLmain_VS2005.vcproj +++ b/VisualC/SDLmain/SDLmain_VS2005.vcproj @@ -1,10 +1,17 @@ >>>>>> other Name="SDLmain" ProjectGUID="{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" +<<<<<<< local +======= TargetFrameworkVersion="131072" +>>>>>>> other > >>>>>> other /> >>>>>> other /> >>>>>> other /> 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 delta 8626 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 N$fBaUd3oKU{|hOI{5Svr diff --git a/touchTest/touchSimp b/touchTest/touchSimp index 2249aaef1a6aa4d3d181eb6905ef08307ed21b39..93709a1270b6ccc9c1c8daacbc27fcb1d25df706 100755 GIT binary patch delta 7912 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 YuHZ|jJQe6MH`B?#vvm!Y%{}h;FG7BH!~g&Q delta 8363 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 TH~Dr