Merge pull request #9 from xO-3670/release-1.3.0

Release 1.3.0

Author: xO-3670

Cursor.hpp

@@ -20,6 +20,7 @@ class Cursor : public sf::Drawable
         float_t      sizeOfTrailCircles,
         float_t      trailCirclesLifetime,
         bool         trailCirclesFadingEffect,
+        bool         TrailCirclesSpacingOutFadingEffect,
         sf::Texture& cursorTexture,
         sf::Texture& cursorTrailTexture
     );
@@ -43,6 +44,7 @@ class Cursor : public sf::Drawable
     float_t  _TrailCirclesLifetime;
 
     bool     _TrailCirclesFadingEffect;
+    bool     _TrailCirclesSpacingOutEffect;
 
 };
 }

README.md

@@ -11,7 +11,7 @@ Tablet Visualizer is a lightweight application designed to function as an overla
 
 [![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)](https://choosealicense.com/licenses/gpl-3.0/)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/55a8b6fbec384a7c974e34ee04daf00d)](https://app.codacy.com/gh/xO-3670/Tablet-Visualizer/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
-[![Release](https://img.shields.io/github/v/release/xO-3670/Tablet-Visualizer)](https://github.com/xO-3670/Tablet-Visualizer/releases/tag/1.2.1)
+[![Release](https://img.shields.io/github/v/release/xO-3670/Tablet-Visualizer)](https://github.com/xO-3670/Tablet-Visualizer/releases/tag/1.3.0)
 [![Build status](https://github.com/xO-3670/Tablet-Visualizer/actions/workflows/cmake-multi-platform.yml/badge.svg?branch=main&event=push)](https://github.com/xO-3670/Tablet-Visualizer/actions/workflows/cmake-multi-platform.yml)
 
 
@@ -24,13 +24,20 @@ Tablet Visualizer is a lightweight application designed to function as an overla
 - You can change the default tablet and cursor image in the `Settings.json` file
 
 - Modify cursor size, skin, and behavior (trail density, lifetime) in `Settings.json`
+
+- Graphics configurator, with it you can easily modify the `Settings.json` file (available in versions >= 1.3.0)
+  
 ## Screenshots
 
 ![App Screenshot](Screenshot1.png)
 
 ![App Screenshot](Screenshot2.png)
 
-# How to edit Settings.json
+# New graphics configurator (versions >= 1.3.0)
+
+![App Screenshot](Screenshot3.png)
+
+# How to edit MANUALLY Settings.json
 
 | Parameter | Type          | Description or examples                                                    |
 | :------------------------ | :-------------- | :------------------------------------------------------- |
@@ -48,11 +55,12 @@ Tablet Visualizer is a lightweight application designed to function as an overla
 | `CustomTablet`            | `bool`          | Condition if you're using custom tablet image            |
 | `EnableErrors`            | `bool`          | Condition if console with errors will show default: true |
 | `TrailCirclesFadingEffect`| `bool`          | Enable fading of trail circles like in osu default: true |
+| `TrailCirclesSpacingOutEffect`| `bool`          | Enable spacing out trail circles default: false |
 | `CustomTabletSize`        |`sf::Vector2f`   | Real size of tablet in mm                                |
 | `CustomTabletImageOffset` |`sf::Vector2f`   | Offset in custom tablet image to active area             |
 | `CustomTabletActiveArea`  |`sf::Vector2f`   | Active area of custom tablet                             |
 
-### If you want to customize it you should set:
+### If you want to customize MANUALLY you should set in `Settings.json`:
 
 - `CustomTablet` to `true`
 
@@ -84,17 +92,17 @@ Tablet Visualizer is a lightweight application designed to function as an overla
 
 ## Linux build dependencies
 ```bash
-libx11-dev 
-libxrandr-dev
-libxcursor-dev
-libxi-dev
-libudev-dev
-libfreetype-dev
-libflac-dev
-libvorbis-dev
-libgl1-mesa-dev
-libegl1-mesa-dev 
-libfreetype-dev
+libx11-dev \
+libxrandr-dev \
+libxcursor-dev \
+libxi-dev \
+libudev-dev \
+libfreetype-dev \
+libflac-dev \
+libvorbis-dev \
+libgl1-mesa-dev \
+libegl1-mesa-dev \
+libfreetype-dev \
 libopenal-dev
 ```
 

Screenshot3.png

@@ -11,14 +11,15 @@
     ],
     "TabletImageTransparency": 255,
 
-    "CursorSize": 15,
-    "CursorTrailSize": 8,
+    "CursorSize": 1.00,
+    "CursorTrailSize": 1.00,
     "CursorImage": "Cursor.png",
     "CursorTrailImage": "CursorTrail.png",
-    "CursorTrailDensity": 86,
+    "CursorTrailDensity": 64,
     "TrailCirclesLifetime": 120.0,
     "TrailCirclesFadingEffect": true,
-    "FramerateLimit": 120,
+    "TrailCirclesSpacingOutEffect": false,
+    "FramerateLimit": 165,
 
     "CustomTablet": false,
     "CustomTabletImage": "ctl-472-s.png",

Settings.json

@@ -17,6 +17,7 @@ class TrailCircle : public sf::Drawable
     const sf::Vector2f& GetPosition();
 
     void SetColorAlpha(uint8_t newAlpha);
+    void SetScale(sf::Vector2f newScale);
 
 private:
     virtual void draw(sf::RenderTarget& target, sf::RenderStates states)const;

TrailCircle.hpp

@@ -44,6 +44,7 @@ struct Settings
     bool          CustomTablet;
     bool          EnableErrors;
     bool          TrailCirclesFadingEffect;
+    bool          TrailCirclesSpacingOutEffect;
 
     sf::Vector2f  CustomTabletActiveArea;
     sf::Vector2f  CustomTabletSize;

Visualizer.hpp

@@ -1,6 +1,6 @@
-
 #include "../Cursor.hpp"
 
+
 TVis::Cursor::Cursor() :
   _CursorTrailTexturePtr(nullptr),
   _TrailCirclesLifetime(0),
@@ -17,14 +17,16 @@ TVis::Cursor::Cursor(
     float_t      sizeOfTrailCircles,
     float_t      trailCirclesLifetime,
     bool         TrailCirclesFadingEffect,
+    bool         TrailCirclesSpacingOutFadingEffect,
     sf::Texture& cursorTexture,
     sf::Texture& cursorTrailTexture
 ) : 
   _TrailDensity(trailDensity),
   _TrailCirclesSize(sizeOfTrailCircles),
   _CursorTrailTexturePtr(&cursorTrailTexture),
   _TrailCirclesLifetime(trailCirclesLifetime),
-  _TrailCirclesFadingEffect(TrailCirclesFadingEffect)
+  _TrailCirclesFadingEffect(TrailCirclesFadingEffect),
+  _TrailCirclesSpacingOutEffect(TrailCirclesSpacingOutFadingEffect)
 {
     _CursorBody.setRadius   (cursorSize);
     _CursorBody.setOrigin   (_CursorBody.getRadius(), _CursorBody.getRadius());
@@ -42,6 +44,11 @@ void TVis::Cursor::Update(sf::Vector2f cursorPosition)
     {
         if (_TrailCirclesFadingEffect) // fading effect switch
             _TrailCircles.at(i).SetColorAlpha(255 - static_cast<uint8_t>((_TrailCircles[i].GetLifetime() / _TrailCirclesLifetime) * 255));
+        if (_TrailCirclesSpacingOutEffect) // spacing out effect switch
+        {
+            float calculatedScale = (1000.0 - static_cast<float>((_TrailCircles[i].GetLifetime() / _TrailCirclesLifetime) * 1000.0));
+            _TrailCircles.at(i).SetScale({calculatedScale/1000, calculatedScale/1000});
+        }
 
         if (_TrailCircles[i].GetLifetime() >= _TrailCirclesLifetime)
             _TrailCircles.erase(_TrailCircles.begin());
@@ -61,4 +68,4 @@ void TVis::Cursor::draw(sf::RenderTarget &target, sf::RenderStates states) const
         target.draw(_TrailCircles[i]);
 
     target.draw(_CursorBody);
-}
+}

src/Cursor.cpp

@@ -1,5 +1,6 @@
 #include "../TrailCircle.hpp"
 
+
 TVis::TrailCircle::TrailCircle(sf::Vector2f cursorPosition, float& sizeOfTrailCircle, sf::Texture* trailTexture)
 {
     _Lifetime.restart();
@@ -27,7 +28,12 @@ void TVis::TrailCircle::SetColorAlpha(uint8_t newAlpha)
     _TrailBody.setFillColor(sf::Color(255,255,255,newAlpha));
 }
 
+void TVis::TrailCircle::SetScale(sf::Vector2f newScale)
+{
+    _TrailBody.setScale(newScale);
+}
+
 void TVis::TrailCircle::draw(sf::RenderTarget &target, sf::RenderStates states) const
 {
     target.draw(_TrailBody);
-}
+}

src/TrailCircle.cpp

@@ -43,25 +43,26 @@ bool TVis::Visualizer::_LoadSettingsFile()
 	SettingsFile = nlohmann::json::parse(SettingsFileStream);
 
     // bool values
-    settings.CustomTablet             = SettingsFile["CustomTablet"];
-    settings.EnableErrors             = SettingsFile["EnableErrors"];
-    settings.TrailCirclesFadingEffect = SettingsFile["TrailCirclesFadingEffect"];
-
-    // float values
-    settings.CursorSize               = SettingsFile["CursorSize"];
-    settings.CursorTrailSize          = SettingsFile["CursorTrailSize"];
+    settings.CustomTablet                 = SettingsFile["CustomTablet"];
+    settings.EnableErrors                 = SettingsFile["EnableErrors"];
+    settings.TrailCirclesFadingEffect     = SettingsFile["TrailCirclesFadingEffect"];
+    settings.TrailCirclesSpacingOutEffect = SettingsFile["TrailCirclesSpacingOutEffect"];
+
+    // float values                   // multiply times 10 so 1.00 will be converted to program's size standard
+    settings.CursorSize               = static_cast<float_t>(SettingsFile["CursorSize"])      * 10;
+    settings.CursorTrailSize          = static_cast<float_t>(SettingsFile["CursorTrailSize"]) * 10;
     settings.TrailCirclesLifetime     = SettingsFile["TrailCirclesLifetime"];
 
     // uint32_t
-    settings.CursorTrailDensity       = SettingsFile["CursorTrailDensity"];
-    settings.FramerateLimit           = SettingsFile["FramerateLimit"];
+    settings.CursorTrailDensity           = SettingsFile["CursorTrailDensity"];
+    settings.FramerateLimit               = SettingsFile["FramerateLimit"];
 
     // uint8_t values
-    settings.TabletImageTransparency  = SettingsFile["TabletImageTransparency"];
+    settings.TabletImageTransparency      = SettingsFile["TabletImageTransparency"];
 
     // string path
-    settings.CursorTexture            = SettingsFile["CursorImage"];
-    settings.CursorTrailTexture       = SettingsFile["CursorTrailImage"];
+    settings.CursorTexture                = SettingsFile["CursorImage"];
+    settings.CursorTrailTexture           = SettingsFile["CursorTrailImage"];
 
     settings.WindowDimensions = sf::Vector2i(
         SettingsFile["WindowDimensions"].at(0),
@@ -214,6 +215,7 @@ void TVis::Visualizer::_ApplySettings(Settings settings) // this function exist
         settings.CursorTrailSize,
         settings.TrailCirclesLifetime,
         settings.TrailCirclesFadingEffect,
+        settings.TrailCirclesSpacingOutEffect,
         _CursorTexture, 
         _CursorTrailTexture
     );
@@ -293,4 +295,4 @@ sf::Vector2i TVis::Visualizer::_GetDesktopDimensions()
 
     return sf::Vector2i(desktop.right, desktop.bottom);
 }
-#endif
+#endif