From 88669946d7248932951b16d4e7613b2ec8384fbe Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke <grumbel@gmail.com>
Date: Tue, 5 Aug 2014 02:15:04 +0200
Subject: [PATCH] Splitted the mouse cursor into three separate images to avoid
 blending artifacts

---
 data/images/engine/menu/mousecursor-click.png | Bin 0 -> 1895 bytes
 data/images/engine/menu/mousecursor-link.png  | Bin 0 -> 2418 bytes
 data/images/engine/menu/mousecursor.png       | Bin 5056 -> 1723 bytes
 src/gui/mousecursor.cpp                       |  68 ++++++++----------
 src/gui/mousecursor.hpp                       |  27 ++++---
 src/supertux/resources.cpp                    |   5 +-
 6 files changed, 45 insertions(+), 55 deletions(-)
 create mode 100644 data/images/engine/menu/mousecursor-click.png
 create mode 100644 data/images/engine/menu/mousecursor-link.png

diff --git a/data/images/engine/menu/mousecursor-click.png b/data/images/engine/menu/mousecursor-click.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f2852f057bb5d19d49104370e59ce60b24a93fc
GIT binary patch
literal 1895
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

literal 0
HcmV?d00001

diff --git a/data/images/engine/menu/mousecursor-link.png b/data/images/engine/menu/mousecursor-link.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ca6839acfed2c01e342fbf71ce5ffa92e3ac32e
GIT binary patch
literal 2418
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

literal 0
HcmV?d00001

diff --git a/data/images/engine/menu/mousecursor.png b/data/images/engine/menu/mousecursor.png
index 888152fd5c9318fbdf17a4cf8157a841c541ff83..e846b9e3ccbd5941d973186cbad81df3cf271537 100644
GIT binary patch
delta 1720
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
O0000<MNUMnLSTZ=!CKP*

literal 5056
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
WL5T@*=G>700000<MNUMnLSTZvEV8Ts

diff --git a/src/gui/mousecursor.cpp b/src/gui/mousecursor.cpp
index 101cf1f8d46..f03dd1c2017 100644
--- a/src/gui/mousecursor.cpp
+++ b/src/gui/mousecursor.cpp
@@ -25,65 +25,57 @@
 
 MouseCursor* MouseCursor::current_ = 0;
 
-MouseCursor::MouseCursor(std::string cursor_file) : 
-  mid_x(0), 
-  mid_y(0),
-  state_before_click(),
-  cur_state(),
-  cursor()
+MouseCursor::MouseCursor(const std::string& cursor_file,
+                         const std::string& cursor_click_file,
+                         const std::string& cursor_link_file) :
+  m_mid_x(0), 
+  m_mid_y(0),
+  m_state(MC_NORMAL),
+  m_cursor()
 {
-  cursor = Surface::create(cursor_file);
-
-  cur_state = MC_NORMAL;
+  m_cursor.push_back(Surface::create(cursor_file));
+  m_cursor.push_back(Surface::create(cursor_click_file));
+  m_cursor.push_back(Surface::create(cursor_link_file));
 }
 
 MouseCursor::~MouseCursor()
 {
 }
 
-int MouseCursor::state()
-{
-  return cur_state;
-}
-
-void MouseCursor::set_state(int nstate)
+void MouseCursor::set_state(MouseCursorState nstate)
 {
-  cur_state = nstate;
+  m_state = nstate;
 }
 
 void MouseCursor::set_mid(int x, int y)
 {
-  mid_x = x;
-  mid_y = y;
+  m_mid_x = x;
+  m_mid_y = y;
 }
 
 void MouseCursor::draw(DrawingContext& context)
 {
-  if(cur_state == MC_HIDE)
-    return;
+  if (m_state != MC_HIDE)
+  {
+    int x;
+    int y;
+    Uint8 ispressed = SDL_GetMouseState(&x, &y);
 
-  int x,y,w,h;
-  Uint8 ispressed = SDL_GetMouseState(&x,&y);
+    Vector mouse_pos = Renderer::instance()->to_logical(x, y);
 
-  Vector mouse_pos = Renderer::instance()->to_logical(x, y);
+    x = int(mouse_pos.x);
+    y = int(mouse_pos.y);
 
-  x = int(mouse_pos.x);
-  y = int(mouse_pos.y);
-
-  w = (int) cursor->get_width();
-  h = (int) (cursor->get_height() / MC_STATES_NB);
-  if(ispressed &SDL_BUTTON(1) || ispressed &SDL_BUTTON(2)) {
-    if(cur_state != MC_CLICK) {
-      state_before_click = cur_state;
-      cur_state = MC_CLICK;
+    int tmp_state = m_state;
+    if (ispressed & SDL_BUTTON(1) || ispressed & SDL_BUTTON(2))
+    {
+      tmp_state = MC_CLICK;
     }
-  } else {
-    if(cur_state == MC_CLICK)
-      cur_state = state_before_click;
-  }
 
-  context.draw_surface_part(cursor, Vector(0, h*cur_state),
-                            Vector(w, h), Vector(x-mid_x, y-mid_y), LAYER_GUI+100);
+    context.draw_surface(m_cursor[static_cast<int>(tmp_state)],
+                         Vector(x - m_mid_x, y - m_mid_y),
+                         LAYER_GUI + 100);
+  }
 }
 
 /* EOF */
diff --git a/src/gui/mousecursor.hpp b/src/gui/mousecursor.hpp
index 30afd565537..3ecd84e785b 100644
--- a/src/gui/mousecursor.hpp
+++ b/src/gui/mousecursor.hpp
@@ -23,7 +23,8 @@
 
 #define MC_STATES_NB 3
 
-enum {
+enum MouseCursorState
+{
   MC_NORMAL = 0,
   MC_CLICK,
   MC_LINK,
@@ -40,16 +41,15 @@ class DrawingContext;
 class MouseCursor
 {
 public:
-  /// Constructor of MouseCursor.
-  /** Expects an imagefile for the cursor and  the number of animation frames it contains. */
-  MouseCursor(std::string cursor_file);
+  MouseCursor(const std::string& cursor_file,
+              const std::string& cursor_click_file,
+              const std::string& cursor_link_file);
   ~MouseCursor();
-  /// Get MouseCursor state.
-  /** (MC_NORMAL, MC_CLICK, MC_LINK or MC_HIDE) */
-  int state();
+
   /// Set MouseCursor state.
   /** (MC_NORMAL, MC_CLICK, MC_LINK or MC_HIDE) */
-  void set_state(int nstate);
+  void set_state(MouseCursorState nstate);
+
   /// Define the middle of a MouseCursor.
   /** Useful for cross mouse cursor images in example. */
   void set_mid(int x, int y);
@@ -64,14 +64,11 @@ class MouseCursor
   static void set_current(MouseCursor* pcursor)
   {        current_ = pcursor;      };
   
-  friend class Resources;
-
 private:
-  int mid_x;
-  int mid_y;
-  int state_before_click;
-  int cur_state;
-  SurfacePtr cursor;
+  int m_mid_x;
+  int m_mid_y;
+  MouseCursorState m_state;
+  std::vector<SurfacePtr> m_cursor;
 
 private:
   static MouseCursor* current_;
diff --git a/src/supertux/resources.cpp b/src/supertux/resources.cpp
index 011393c54f0..2eac6a6d8e1 100644
--- a/src/supertux/resources.cpp
+++ b/src/supertux/resources.cpp
@@ -41,7 +41,9 @@ void
 Resources::load_shared()
 {
   /* Load the mouse-cursor */
-  mouse_cursor = new MouseCursor("images/engine/menu/mousecursor.png");
+  mouse_cursor = new MouseCursor("images/engine/menu/mousecursor.png",
+                                 "images/engine/menu/mousecursor-click.png",
+                                 "images/engine/menu/mousecursor-link.png");
   MouseCursor::set_current(mouse_cursor);
 
   /* Load global images: */
@@ -106,7 +108,6 @@ Resources::unload_shared()
   /* Free mouse-cursor */
   if(mouse_cursor != NULL)
   {
-    mouse_cursor->cursor.reset();
     delete mouse_cursor;
   }
 }