Replace fixmath::fixed with double floating point in some cases

src/app/tools/point_shapes.h

@@ -336,22 +336,15 @@ public:
     m_pointRemainder = points_to_spray - integral_points;
     ASSERT(m_pointRemainder >= 0 && m_pointRemainder < 1.0f);
 
-    fixmath::fixed angle, radius;
+    double angle, radius;
 
     for (int c=0; c<integral_points; c++) {
-
-#if RAND_MAX <= 0xffff
-      // In Windows, rand() has a RAND_MAX too small
-      angle = fixmath::itofix(rand() * 255 / RAND_MAX);
-      radius = fixmath::itofix(rand() * spray_width / RAND_MAX);
-#else
-      angle = rand();
-      radius = rand() % fixmath::itofix(spray_width);
-#endif
+      angle = 360.0 * rand() / RAND_MAX;
+      radius = double(spray_width) * rand() / RAND_MAX;
 
       Stroke::Pt pt2(pt);
-      pt2.x += fixmath::fixtoi(fixmath::fixmul(radius, fixmath::fixcos(angle)));
-      pt2.y += fixmath::fixtoi(fixmath::fixmul(radius, fixmath::fixsin(angle)));
+      pt2.x += double(radius * std::cos(angle));
+      pt2.y += double(radius * std::sin(angle));
       m_subPointShape.transformPoint(loop, pt2);
     }
   }

src/app/tools/tool_box.cpp

@@ -28,7 +28,6 @@
 #include "doc/compressed_image.h"
 #include "doc/image_impl.h"
 #include "doc/mask.h"
-#include "fixmath/fixmath.h"
 
 #include <algorithm>
 #include <cstdlib>

src/app/ui/editor/transform_handles.cpp

@@ -14,6 +14,7 @@
 #include "app/pref/preferences.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/skin/skin_theme.h"
+#include "base/clamp.h"
 #include "base/pi.h"
 #include "os/surface.h"
 
@@ -38,25 +39,25 @@ static struct HandlesInfo {
   //
   int i1, i2;
   // The angle bias of this specific handle.
-  fixmath::fixed angle;
+  double angle;
   // The exact handle type ([0] for scaling, [1] for rotating).
   HandleType handle[2];
 } handles_info[HANDLES] = {
-  { 1, 2,   0 << 16, { ScaleEHandle,  SkewEHandle } },
-  { 1, 1,  32 << 16, { ScaleNEHandle, RotateNEHandle } },
-  { 0, 1,  64 << 16, { ScaleNHandle,  SkewNHandle } },
-  { 0, 0,  96 << 16, { ScaleNWHandle, RotateNWHandle } },
-  { 0, 3, 128 << 16, { ScaleWHandle,  SkewWHandle } },
-  { 3, 3, 160 << 16, { ScaleSWHandle, RotateSWHandle } },
-  { 3, 2, 192 << 16, { ScaleSHandle,  SkewSHandle } },
-  { 2, 2, 224 << 16, { ScaleSEHandle, RotateSEHandle } },
+  { 1, 2, (PI *   0.0 / 180.0), { ScaleEHandle,  SkewEHandle } },
+  { 1, 1, (PI *  45.0 / 180.0), { ScaleNEHandle, RotateNEHandle } },
+  { 0, 1, (PI *  90.0 / 180.0), { ScaleNHandle,  SkewNHandle } },
+  { 0, 0, (PI * 135.0 / 180.0), { ScaleNWHandle, RotateNWHandle } },
+  { 0, 3, (PI * 180.0 / 180.0), { ScaleWHandle,  SkewWHandle } },
+  { 3, 3, (PI * 225.0 / 180.0), { ScaleSWHandle, RotateSWHandle } },
+  { 3, 2, (PI * 270.0 / 180.0), { ScaleSHandle,  SkewSHandle } },
+  { 2, 2, (PI * 315.0 / 180.0), { ScaleSEHandle, RotateSEHandle } },
 };
 
 HandleType TransformHandles::getHandleAtPoint(Editor* editor, const gfx::Point& pt, const Transformation& transform)
 {
   SkinTheme* theme = SkinTheme::instance();
   os::Surface* gfx = theme->parts.transformationHandle()->bitmap(0);
-  fixmath::fixed angle = fixmath::ftofix(128.0 * transform.angle() / PI);
+  double angle = transform.angle();
 
   auto corners = transform.transformedCorners();
 
@@ -87,7 +88,7 @@ HandleType TransformHandles::getHandleAtPoint(Editor* editor, const gfx::Point&
 void TransformHandles::drawHandles(Editor* editor, ui::Graphics* g,
                                    const Transformation& transform)
 {
-  fixmath::fixed angle = fixmath::ftofix(128.0 * transform.angle() / PI);
+  double angle = transform.angle();
 
   auto corners = transform.transformedCorners();
 
@@ -129,6 +130,24 @@ void TransformHandles::drawHandles(Editor* editor, ui::Graphics* g,
 
     g->drawPath(p, paint);
   }
+  // Mouse active areas
+  {
+    auto theme = SkinTheme::instance();
+    auto gfx = theme->parts.transformationHandle()->bitmap(0);
+
+    int handle_rs[2] = { gfx->width()*2, gfx->width()*3 };
+    for (int i=0; i<2; ++i) {
+      int handle_r = handle_rs[i];
+      for (size_t c=0; c<HANDLES; ++c) {
+        int x = (screenPoints[handles_info[c].i1].x+screenPoints[handles_info[c].i2].x)/2 - origin.x;
+        int y = (screenPoints[handles_info[c].i1].y+screenPoints[handles_info[c].i2].y)/2 - origin.y;
+        adjustHandle(x, y, handle_r, handle_r, angle + handles_info[c].angle);
+        g->drawRect(
+          gfx::rgba(255, 0, 0),
+          gfx::Rect(x, y, handle_r, handle_r));
+      }
+    }
+  }
 #endif
 
   // Draw corner handle
@@ -155,7 +174,7 @@ void TransformHandles::drawHandles(Editor* editor, ui::Graphics* g,
 void TransformHandles::invalidateHandles(Editor* editor, const Transformation& transform)
 {
   SkinTheme* theme = SkinTheme::instance();
-  fixmath::fixed angle = fixmath::ftofix(128.0 * transform.angle() / PI);
+  double angle = transform.angle();
 
   auto corners = transform.transformedCorners();
 
@@ -202,7 +221,7 @@ gfx::Rect TransformHandles::getPivotHandleBounds(Editor* editor,
     partSize.h);
 }
 
-bool TransformHandles::inHandle(const gfx::Point& pt, int x, int y, int gfx_w, int gfx_h, fixmath::fixed angle)
+bool TransformHandles::inHandle(const gfx::Point& pt, int x, int y, int gfx_w, int gfx_h, double angle)
 {
   adjustHandle(x, y, gfx_w, gfx_h, angle);
 
@@ -210,7 +229,7 @@ bool TransformHandles::inHandle(const gfx::Point& pt, int x, int y, int gfx_w, i
           pt.y >= y && pt.y < y+gfx_h);
 }
 
-void TransformHandles::drawHandle(Graphics* g, int x, int y, fixmath::fixed angle)
+void TransformHandles::drawHandle(Graphics* g, int x, int y, double angle)
 {
   SkinTheme* theme = SkinTheme::instance();
   os::Surface* part = theme->parts.transformationHandle()->bitmap(0);
@@ -220,15 +239,13 @@ void TransformHandles::drawHandle(Graphics* g, int x, int y, fixmath::fixed angl
   g->drawRgbaSurface(part, x, y);
 }
 
-void TransformHandles::adjustHandle(int& x, int& y, int handle_w, int handle_h, fixmath::fixed angle)
+void TransformHandles::adjustHandle(int& x, int& y, int handle_w, int handle_h, double angle)
 {
-  angle = fixmath::fixadd(angle, fixmath::itofix(16));
-  angle &= (255<<16);
-  angle >>= 16;
-  angle /= 32;
+  angle = base::fmod_radians(angle + PI) + PI;
+  const int angleInt = base::clamp<int>(std::floor(8.0 * angle / (2.0*PI) + 0.5), 0, 8) % 8;
 
   // Adjust x,y position depending the angle of the handle
-  switch (angle) {
+  switch (angleInt) {
 
     case 0:
       y = y-handle_h/2;
@@ -267,7 +284,7 @@ void TransformHandles::adjustHandle(int& x, int& y, int handle_w, int handle_h,
   }
 }
 
-bool TransformHandles::visiblePivot(fixmath::fixed angle) const
+bool TransformHandles::visiblePivot(double angle) const
 {
   return (Preferences::instance().selection.pivotVisibility() || angle != 0);
 }

src/app/ui/editor/transform_handles.h

@@ -11,7 +11,6 @@
 
 #include "app/transformation.h"
 #include "app/ui/editor/handle_type.h"
-#include "fixmath/fixmath.h"
 #include "gfx/point.h"
 
 #include <vector>
@@ -40,10 +39,10 @@ namespace app {
       const Transformation& transform,
       const Transformation::Corners& corners);
 
-    bool inHandle(const gfx::Point& pt, int x, int y, int gfx_w, int gfx_h, fixmath::fixed angle);
-    void drawHandle(ui::Graphics* g, int x, int y, fixmath::fixed angle);
-    void adjustHandle(int& x, int& y, int handle_w, int handle_h, fixmath::fixed angle);
-    bool visiblePivot(fixmath::fixed angle) const;
+    bool inHandle(const gfx::Point& pt, int x, int y, int gfx_w, int gfx_h, double angle);
+    void drawHandle(ui::Graphics* g, int x, int y, double angle);
+    void adjustHandle(int& x, int& y, int handle_w, int handle_h, double angle);
+    bool visiblePivot(double angle) const;
     void getScreenPoints(
       Editor* editor,
       const Transformation::Corners& corners,