Skip to content

Commit

Permalink
Rounding problem
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgth
mgth committed Nov 16, 2015
1 parent a2208fc commit 76bed50
Show file tree
Hide file tree
Showing 5 changed files with 142 additions and 157 deletions.
8 changes: 4 additions & 4 deletions LittleBigMouse.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x64.ActiveCfg = Release|x64
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x64.Build.0 = Release|x64
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x64.ActiveCfg = Debug|x64
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x64.Build.0 = Debug|x64
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x86.ActiveCfg = Release|x86
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x86.Build.0 = Release|x86
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -75,8 +75,8 @@ Global
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Release|x86.ActiveCfg = Release|x86
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Release|x86.Build.0 = Release|x86
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|Any CPU.ActiveCfg = Debug|Win32
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x64.ActiveCfg = Release|x64
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x64.Build.0 = Release|x64
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x64.ActiveCfg = Debug|x64
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x64.Build.0 = Debug|x64
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x86.ActiveCfg = Debug|Win32
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x86.Build.0 = Debug|Win32
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Release|Any CPU.ActiveCfg = Release|Win32
Expand Down
2 changes: 1 addition & 1 deletion LittleBigMouse_Control/setup/LittleBigMouse.iss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
; -- LittleBigMouse.iss --
;#define AppVer GetFileVersion('..\bin\x64\Release\LittleBigMouse.exe')
#define AppVer '2.0-beta2'
#define AppVer '2.0-beta3'

[Setup]
AppName=Little Big Mouse
Expand Down
217 changes: 104 additions & 113 deletions LittleBigMouse_Daemon/Geo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ You should have received a copy of the GNU General Public License
*/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Windows;
using System.Windows.Navigation;

namespace LittleBigMouseGeo
{
Expand All @@ -34,10 +37,33 @@ public enum Side
Left,
Right,
}

public static class GeoExtentions
{
public static Segment Segment(this Rect rect, Side side)
{
switch (side)
{
case Side.Left:
return new Segment(rect.TopLeft, rect.BottomLeft);
case Side.Right:
return new Segment(rect.TopRight, rect.BottomRight);
case Side.Top:
return new Segment(rect.TopLeft, rect.TopRight);
case Side.Bottom:
return new Segment(rect.BottomLeft, rect.BottomRight);
case Side.None:
default:
return null;
}
}
}

public class Line
{
public static Line fromSegment(Segment s)
{
// Line is vertical
if (s.A.X == s.B.X)
{
return new Line(s.A.X);
Expand All @@ -49,149 +75,97 @@ public static Line fromSegment(Segment s)
return new Line(coef, origine);
}

private double _coef;
public double Coef { get { return _coef; } }
public double Coef { get; }

private double _origine;
public double OrigineY
{
get
{
if (double.IsNaN(_coef)) return double.NaN;
return _origine;
}
}
public double OrigineX
{
get
{
if (double.IsNaN(_coef)) return _origine;
return (0 - _origine) / _coef;
}
}
private readonly double _origine;
public double OrigineY => double.IsPositiveInfinity(Coef) ? 0 : _origine;

public double OrigineX => double.IsPositiveInfinity(Coef) ? _origine : (0 - _origine)/Coef;

public Point Origine => new Point(OrigineX, OrigineY);

public Line(double coef, double origine)
{
_coef = coef;
Coef = coef;
_origine = origine;
}

public Line(double X)
// Specific case of vertical line vhere coef is infinit
public Line(double x)
{
_coef = double.NaN;
_origine = X;
Coef = double.PositiveInfinity;
_origine = x;
}

public Point? Intersect(Line l)
{
double X;
double Y;
double x;
double y;

if (Coef == l.Coef) return null;
if (Coef == l.Coef)
{
if (OrigineY == l.OrigineY) { return Origine; }
return null;
}


if (double.IsNaN(Coef))
if (double.IsPositiveInfinity(Coef))
{
if (double.IsNaN(l.Coef))
{
return null;
}
else
{
X = OrigineX;
Y = l.Coef * X + l.OrigineY;
}
if (double.IsPositiveInfinity(l.Coef)) { return null;}

x = OrigineX;
y = l.Coef * x + l.OrigineY;
}
else
{
if (double.IsNaN(l.Coef))
if (double.IsPositiveInfinity(l.Coef))
{
X = l.OrigineX;
Y = Coef * X + OrigineY;
x = l.OrigineX;
y = Coef * x + OrigineY;
}
else
{
X = (OrigineY - l.OrigineY) / (l.Coef - Coef);
Y = l.Coef * X + l.OrigineY;
x = (OrigineY - l.OrigineY) / (l.Coef - Coef);
y = l.Coef * x + l.OrigineY;
}
}

return new Point(X, Y);
return new Point(x, y);
}

public Point? Intersect(Segment s)
public IEnumerable<Point> Intersect(Segment s)
{
Point? p = Intersect(s.Line);
if (p!=null && s.Rect.Contains(p??new Point()))
if (p!=null && s.Rect.Contains(p.Value))
{
return p;
yield return p.Value;
}
return null;
}

public IEnumerable<Point> Intersect(Rect r)
{
Point? p = null;

p = Intersect(r,Side.Left);
if (p != null) yield return p.Value;
p = Intersect(r,Side.Right);
if (p != null) yield return p.Value;
p = Intersect(r,Side.Top);
if (p != null) yield return p.Value;
p = Intersect(r,Side.Bottom);
if (p != null) yield return p.Value;

}

public Point? Intersect(Rect r, Side side)
public IEnumerable<Point> Intersect(Rect rect)
{
switch (side)
{
case Side.Left:
return Intersect(new Segment(r.TopLeft, r.BottomLeft));
case Side.Right:
return Intersect(new Segment(r.TopRight, r.BottomRight));
case Side.Top:
return Intersect(new Segment(r.TopLeft, r.TopRight));
case Side.Bottom:
return Intersect(new Segment(r.BottomLeft, r.BottomRight));
default:
return null;
}
foreach (Point p in Intersect(rect.Segment(Side.Left))) yield return p;
foreach (Point p in Intersect(rect.Segment(Side.Right))) yield return p;
foreach (Point p in Intersect(rect.Segment(Side.Top))) yield return p;
foreach (Point p in Intersect(rect.Segment(Side.Bottom))) yield return p;
}
}


public class Segment
{
Point _a;
Point _b;

Line _line;
// Rect? _rect = null;

public Segment(Point a, Point b)
{
_a = a; _b = b;
A = a; B = b;
}
public Point A { get { return _a; } }
public Point B { get { return _b; } }
public Point A { get; }
public Point B { get; }

public Line Line
{
get
{
if (_line == null) _line = Line.fromSegment(this);
return _line;
}
}
public Rect Rect
{
get
{
return new Rect(A, B);
}
}
public Line Line => _line ?? (_line = Line.fromSegment(this));

public Rect Rect => new Rect(A, B);

public double Size
{
Expand All @@ -203,13 +177,36 @@ public double Size

}

public Point? Intersect(Line l)
{
if (l == null) throw new ArgumentNullException(nameof(l));
Point? p = Line.Intersect(l);
if (p==null) return null;

Point p1 = p.Value;

if (p1.X < Rect.X - Epsilon) return null;
if (p1.Y < Rect.Y - Epsilon) return null;
if (p1.X > Rect.Right + Epsilon) return null;
if (p1.Y > Rect.Bottom + Epsilon) return null;
// && Rect.Contains(p.Value)) return p;
return p1;
}


private const double Epsilon = 0.001;
public Point? Intersect(Segment s)
{
Point? p = Line.Intersect(s.Line);

if (p!=null && Rect.Contains(p??new Point()) && s.Rect.Contains(p??new Point())) return p;
if (p == null) return null;

if (p.Value.X < Rect.X - Epsilon) return null;
if (p.Value.Y < Rect.Y - Epsilon) return null;
if (p.Value.X > Rect.Right + Epsilon) return null;
if (p.Value.Y > Rect.Bottom + Epsilon) return null;

return null;
return p;
}

public IEnumerable<Point> Intersect(Rect r)
Expand All @@ -229,22 +226,15 @@ public IEnumerable<Point> Intersect(Rect r)
if (p != null) yield return p.Value;
}

public Side IntersectSide(Rect r)
public Side IntersectSide(Rect rect)
{
Point? p = null;

p = Intersect(new Segment(r.TopLeft, r.BottomLeft));
if (p != null) return Side.Left;

p = Intersect(new Segment(r.TopRight, r.BottomRight));
if (p != null) return Side.Right;

p = Intersect(new Segment(r.TopLeft, r.TopRight));
if (p != null) return Side.Top;

p = Intersect(new Segment(r.BottomLeft, r.BottomRight));
if (p != null) return Side.Bottom;
Side[] sides = {Side.Left, Side.Right, Side.Top, Side.Bottom};

//return sides.Where(s => Intersect(r.Segment(s)) != null).FirstOrDefault();
foreach (var side in sides)
{
if (Intersect(rect.Segment(side)) != null) return side;
}
return Side.None;
}

Expand All @@ -264,5 +254,6 @@ public static Side OpositeSide(Side side)
return Side.None;
}
}

}
}
Loading

0 comments on commit 76bed50

Please sign in to comment.