Fix triple tap issue

foxhatleo · Mar 27, 2021 · fc8a5d1 · fc8a5d1
1 parent 9c40cfb
commit fc8a5d1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/build-win10/PanicPainter/PanicPainter.vcxproj b/build-win10/PanicPainter/PanicPainter.vcxproj
@@ -195,6 +195,7 @@
     <ClCompile Include="..\..\source\PPApp.cpp" />
     <ClCompile Include="..\..\source\scenes\gameplay\PPCanvas.cpp" />
     <ClCompile Include="..\..\source\scenes\gameplay\PPCanvasBlock.cpp" />
+    <ClCompile Include="..\..\source\scenes\gameplay\PPColorPaletteView.cpp" />
     <ClCompile Include="..\..\source\scenes\gameplay\PPGlobalTimer.cpp" />
     <ClCompile Include="..\..\source\scenes\gameplay\PPColorPalette.cpp" />
     <ClCompile Include="..\..\source\scenes\gameplay\PPColorStrip.cpp" />
@@ -224,6 +225,7 @@
     <ClInclude Include="..\..\source\PPApp.h" />
     <ClInclude Include="..\..\source\scenes\gameplay\PPCanvas.h" />
     <ClInclude Include="..\..\source\scenes\gameplay\PPCanvasBlock.h" />
+    <ClInclude Include="..\..\source\scenes\gameplay\PPColorPaletteView.h" />
     <ClInclude Include="..\..\source\scenes\gameplay\PPGlobalTimer.h" />
     <ClInclude Include="..\..\source\scenes\gameplay\PPColorPalette.h" />
     <ClInclude Include="..\..\source\scenes\gameplay\PPColorStrip.h" />

diff --git a/build-win10/PanicPainter/PanicPainter.vcxproj.filters b/build-win10/PanicPainter/PanicPainter.vcxproj.filters
@@ -79,6 +79,9 @@
     <ClCompile Include="..\..\source\scenes\pause\PPPauseScene.cpp">
       <Filter>Scenes\Pause</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\scenes\gameplay\PPColorPaletteView.cpp">
+      <Filter>Scenes\Gameplay</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="PanicPainter.rc">
@@ -145,5 +148,8 @@
     <ClInclude Include="..\..\source\scenes\pause\PPPauseScene.h">
       <Filter>Scenes\Pause</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\scenes\gameplay\PPColorPaletteView.h">
+      <Filter>Scenes\Gameplay</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/source/controllers/PPActionController.cpp b/source/controllers/PPActionController.cpp
@@ -31,6 +31,7 @@ void ActionController::update(const set<pair<uint, uint>> &activeCanvases,
                 if (input.didTripleTap() && input.justReleased() &&
                     startingPointIn && currentPointIn) {
                     _state.clearColor(i, i2, selectedColor);
+                    input.clearPreviousTaps();
                 }
 
                 if (input.isPressing() && startingPointIn && currentPointIn) {

diff --git a/source/controllers/PPInputController.cpp b/source/controllers/PPInputController.cpp
@@ -165,3 +165,10 @@ bool InputController::didTripleTap() const {
            _inputs[2]->isJustTap() &&
            _inputs[1]->timeSinceLastInstance <= _consecutiveTapThreshold;
 }
+
+void InputController::clearPreviousTaps() {
+    _inputs.clear();
+    if (_currentInput != nullptr) {
+        _inputs.push_front(_currentInput);
+    }
+}
diff --git a/source/controllers/PPInputController.h b/source/controllers/PPInputController.h
@@ -136,6 +136,8 @@ class InputController {
     /** Check if last input resulted in a triple tap. */
     bool didTripleTap() const;
 
+    void clearPreviousTaps();
+
     /** Utility function to check if a point is in a scene node. */
     static bool inScene(const Vec2 &point, const ptr<SceneNode> &scene);