Touch control

demo/captioned_image.cpp

@@ -38,6 +38,8 @@ CaptionedImage::CaptionedImage()
     this->forwardXMLAttribute("imageHeight", this->image, "height");
 
     this->forwardXMLAttribute("caption", this->label, "text");
+
+    this->addGestureRecognizer(new brls::TapGestureRecognizer(this, brls::TapGestureConfig(false, brls::SOUND_NONE, brls::SOUND_NONE, brls::SOUND_NONE)));
 }
 
 void CaptionedImage::onChildFocusGained(brls::View* directChild, brls::View* focusedView)

library/borealis.mk

@@ -7,6 +7,7 @@ include $(TOPDIR)/$(current_dir)/lib/extern/switch-libpulsar/deps.mk
 
 SOURCES		:=	$(SOURCES) \
 				$(current_dir)/lib/core \
+				$(current_dir)/lib/core/touch \
 				$(current_dir)/lib/views \
 				$(current_dir)/lib/platforms/switch \
 				$(current_dir)/lib/extern/glad \

library/include/borealis.hpp

@@ -29,6 +29,8 @@
 #include <borealis/core/event.hpp>
 #include <borealis/core/font.hpp>
 #include <borealis/core/frame_context.hpp>
+#include <borealis/core/geometry.hpp>
+#include <borealis/core/gesture.hpp>
 #include <borealis/core/i18n.hpp>
 #include <borealis/core/input.hpp>
 #include <borealis/core/logger.hpp>
@@ -41,7 +43,7 @@
 #include <borealis/core/video.hpp>
 #include <borealis/core/view.hpp>
 
-//Views
+// Views
 #include <borealis/views/applet_frame.hpp>
 #include <borealis/views/button.hpp>
 #include <borealis/views/header.hpp>
@@ -51,3 +53,8 @@
 #include <borealis/views/scrolling_frame.hpp>
 #include <borealis/views/sidebar.hpp>
 #include <borealis/views/tab_frame.hpp>
+
+// Gestures
+#include <borealis/core/touch/pan_gesture.hpp>
+#include <borealis/core/touch/scroll_gesture.hpp>
+#include <borealis/core/touch/tap_gesture.hpp>

library/include/borealis/core/application.hpp

@@ -1,6 +1,7 @@
 /*
     Copyright 2019-2021 natinusala
     Copyright 2019 p-sam
+    Copyright 2021 XITRIX
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -36,6 +37,13 @@
 namespace brls
 {
 
+// Input types for entire app
+enum class InputType
+{
+    GAMEPAD, // Gamepad or keyboard
+    TOUCH, // Touch screen
+};
+
 typedef std::function<View*(void)> XMLViewCreator;
 
 class Application
@@ -190,6 +198,14 @@ class Application
      */
     static std::string getLocale();
 
+    /**
+     * Returns the current input type.
+     */
+    inline static InputType getInputType()
+    {
+        return inputType;
+    }
+
   private:
     inline static bool inited        = false;
     inline static bool quitRequested = false;
@@ -207,6 +223,11 @@ class Application
 
     inline static View* currentFocus;
 
+    // Return true if input type was changed
+    static bool setInputType(InputType type);
+
+    inline static InputType inputType = InputType::GAMEPAD;
+
     inline static unsigned blockInputsTokens = 0; // any value > 0 means inputs are blocked
 
     inline static std::string commonFooter = "";

library/include/borealis/core/audio.hpp

@@ -30,6 +30,8 @@ enum Sound
     SOUND_CLICK_ERROR, // played when the user clicks a disabled button / a view focused with no click action
     SOUND_HONK, // honk
     SOUND_CLICK_SIDEBAR, // played when a sidebar item is clicked
+    SOUND_TOUCH_UNFOCUS, // played when touch focus has been interrupted
+    SOUND_TOUCH, // played when touch doesn't require it's own click sound
 
     _SOUND_MAX, // not an actual sound, just used to count of many sounds there are
 };
@@ -57,7 +59,7 @@ class AudioPlayer
      *
      * Returns a boolean indicating if the sound has been played or not.
      */
-    virtual bool play(enum Sound sound) = 0;
+    virtual bool play(enum Sound sound, float pitch = 1) = 0;
 };
 
 // An AudioPlayer that does nothing
@@ -69,7 +71,7 @@ class NullAudioPlayer : public AudioPlayer
         return false;
     }
 
-    bool play(enum Sound sound) override
+    bool play(enum Sound sound, float pitch) override
     {
         return false;
     }

library/include/borealis/core/box.hpp

@@ -65,6 +65,7 @@ class Box : public View
 
     void draw(NVGcontext* vg, float x, float y, float width, float height, Style style, FrameContext* ctx) override;
     View* getDefaultFocus() override;
+    View* hitTest(Point point) override;
     View* getNextFocus(FocusDirection direction, View* currentView) override;
     void willAppear(bool resetState) override;
     void willDisappear(bool resetState) override;

library/include/borealis/core/geometry.hpp

@@ -0,0 +1,110 @@
+/*
+    Copyright 2021 XITRIX
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#pragma once
+
+#include <string>
+
+namespace brls
+{
+
+// A structure that contains a point in a two-dimensional coordinate system.
+struct Point
+{
+    float x; // The x-coordinate of the point.
+    float y; // The y-coordinate of the point.
+
+    // Creates a point with location (0,0).
+    Point();
+
+    // Creates a point with coordinates specified as float values.
+    Point(float x, float y);
+
+    Point operator+(const Point& a) const;
+    Point operator-(const Point& a) const;
+    Point operator/(const float& a) const;
+    Point operator*(const float& a) const;
+    bool operator==(const Point& other) const;
+    bool operator!=(const Point& other) const;
+    void operator+=(const Point& a);
+    void operator-=(const Point& a);
+};
+
+// A structure that contains width and height values.
+struct Size
+{
+    float width; // A width value.
+    float height; // A height value.
+
+    // Creates a size with zero width and height.
+    Size();
+
+    // Creates a size with dimensions specified as float values.
+    Size(float width, float height);
+
+    Size operator+(const Size& a) const;
+    Size operator-(const Size& a) const;
+    Size operator/(const float& a) const;
+    Size operator*(const float& a) const;
+    bool operator==(const Size& other) const;
+};
+
+// Rect
+// A structure that contains the location and dimensions of a rectangle.
+struct Rect
+{
+    Point origin; // A point that specifies the coordinates of the rectangle’s origin.
+    Size size; // A size that specifies the height and width of the rectangle.
+
+    // Creates a rectangle with origin (0,0) and size (0,0).
+    Rect();
+
+    // Creates a rectangle with the specified origin and size.
+    Rect(Point origin, Size size);
+
+    // Creates a rectangle with coordinates and dimensions specified as float values.
+    Rect(float x, float y, float width, float height);
+
+    // Returns the width of a rectangle.
+    float getWidth() const;
+    // Returns the height of a rectangle.
+    float getHeight() const;
+
+    // Returns the smallest value for the x-coordinate of the rectangle.
+    float getMinX() const;
+    // Returns the smallest value for the y-coordinate of the rectangle.
+    float getMinY() const;
+
+    // Returns the x-coordinate that establishes the center of a rectangle.
+    float getMidX() const;
+    // Returns the y-coordinate that establishes the center of the rectangle.
+    float getMidY() const;
+
+    // Returns the largest value of the x-coordinate for the rectangle.
+    float getMaxX() const;
+    // Returns the largest value for the y-coordinate of the rectangle.
+    float getMaxY() const;
+
+    bool operator==(const Rect& other) const;
+
+    // Returns true if point is inside this Rect
+    bool pointInside(Point point);
+
+    // Returns string with description of current Rect
+    std::string describe();
+};
+
+} // namespace brls

library/include/borealis/core/gesture.hpp

@@ -0,0 +1,94 @@
+/*
+    Copyright 2021 XITRIX
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#pragma once
+
+#include <borealis/core/audio.hpp>
+#include <borealis/core/input.hpp>
+#include <functional>
+
+namespace brls
+{
+
+class View;
+
+// Represents current gesture state
+enum class GestureState
+{
+    INTERRUPTED, // Gesture has been interupted, no callbacks will come
+    UNSURE, // Gesture started recognition and not sure if it should interupt other recognizers
+    START, // Gesture sure that it match to conditions and will interupt other recognizers
+    STAY, // Gesture in process, user still hold finger on screen
+    END, // User released their finger from screen, final frame of gesture
+    FAILED, // Gesture failed conditions
+};
+
+/*
+* Superclass for all recognizers
+* 
+* To create a new type of gesture recognizer, you should implement 
+* recognitionLoop method.
+* 
+* It should contain logic with changing gesture's state. 
+* Recognizers' first state is UNSURE, in that state calling stack cannot tell
+* which gesture user tries to apply. I.E. user puts and holds finger on the screen, so it can't be 
+* told whether it's going to be a tap or a swipe
+*
+* If gesture has been recognized, change its state to START, but ONLY for the first frame, 
+* on the next frame it should be changed to STAY and remain the same until the end, then it 
+* should change state to END. 
+* 
+* When any recognizer changes its state to START, it sends an interrupt event to every recognizer in the stack,
+* so don't forget to handle that case.
+* 
+* If gesture does not apply to recognizer's pattern, change its state to FAILED. 
+* It could also be used as a placerholder when recognizer is not in use.
+* 
+* Use touch argument to get current state of touch.
+*
+* View argument contains the view to which this recognizer is attached.
+* 
+* Use soundToPlay pointer to set sound which will be played in current frame.
+* Leave it empty or use SOUND_NONE to not play any sound.
+*/
+class GestureRecognizer
+{
+  public:
+    virtual ~GestureRecognizer() { }
+
+    // Main recognition loop, for internal usage only, should not be called anywhere, but Application
+    virtual GestureState recognitionLoop(TouchState touch, View* view, Sound* soundToPlay);
+
+    // Interrupt this recognizer
+    // If onlyIfUnsureState == true recognizer will be interupted
+    // only if current state is UNSURE
+    void interrupt(bool onlyIfUnsureState);
+
+    // If false, this recognizer will be skipped
+    bool isEnabled() const { return this->enabled; }
+
+    // If false, this recognizer will be skipped
+    void setEnabled(bool enabled) { this->enabled = enabled; }
+
+    // Get the current state of recognizer
+    GestureState getState() const { return state; }
+
+  protected:
+    GestureState state = GestureState::FAILED;
+    bool enabled       = true;
+};
+
+} // namespace brls