Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

Commit

Permalink
Add DrawEllipse to CCDrawNode for Tiled test drawing of objects layer.
Browse files Browse the repository at this point in the history 
+  Fix misspelling of DrawEllips -> DrawEllipse in CCDrawPrimitives object.

See issue #154
and prompting issue #153 (comment)
  • Loading branch information
@kjpou1
kjpou1 committed Apr 8, 2015
1 parent aea2e32 commit 5789475
Show file tree
Hide file tree
Showing 4 changed files with 295 additions and 4 deletions.
9 changes: 7 additions & 2 deletions PCL/CocosSharpPCLShared/CocosSharpAPI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,10 +768,10 @@ public static void DrawCircle(CocosSharp.CCPoint center, float radius, float ang
public static void DrawCircle(CocosSharp.CCPoint center, float radius, float angle, int segments, bool drawLineToCenter, float scaleX=1f, float scaleY=1f) { }
public static void DrawCubicBezier(CocosSharp.CCPoint origin, CocosSharp.CCPoint control1, CocosSharp.CCPoint control2, CocosSharp.CCPoint destination, int segments) { }
public static void DrawCubicBezier(CocosSharp.CCPoint origin, CocosSharp.CCPoint control1, CocosSharp.CCPoint control2, CocosSharp.CCPoint destination, int segments, CocosSharp.CCColor4B color) { }
public static void DrawEllips(int x, int y, int width, int height) { }
public static void DrawEllips(int x, int y, int width, int height, CocosSharp.CCColor4B color) { }
public static void DrawEllipse(CocosSharp.CCRect rect) { }
public static void DrawEllipse(CocosSharp.CCRect rect, CocosSharp.CCColor4B color) { }
public static void DrawEllipse(int x, int y, int width, int height) { }
public static void DrawEllipse(int x, int y, int width, int height, CocosSharp.CCColor4B color) { }
public static void DrawLine(CocosSharp.CCPoint origin, CocosSharp.CCPoint destination) { }
public static void DrawLine(CocosSharp.CCPoint origin, CocosSharp.CCPoint destination, CocosSharp.CCColor4B color) { }
public void DrawLineList(CocosSharp.CCV3F_C4B[] verts) { }
Expand Down Expand Up @@ -816,10 +816,15 @@ public void Clear() { }
protected override void Draw() { }
public void DrawCircle(CocosSharp.CCPoint pos, float radius, CocosSharp.CCColor4B color) { }
public void DrawCircle(CocosSharp.CCPoint center, float radius, float angle, int segments, CocosSharp.CCColor4B color) { }
public void DrawCubicBezier(CocosSharp.CCPoint origin, CocosSharp.CCPoint control1, CocosSharp.CCPoint control2, CocosSharp.CCPoint destination, int segments, float lineWidth, CocosSharp.CCColor4B color) { }
public void DrawDot(CocosSharp.CCPoint pos, float radius, CocosSharp.CCColor4F color) { }
public void DrawEllipse(CocosSharp.CCRect rect, float lineWidth, CocosSharp.CCColor4B color) { }
public void DrawEllipse(int x, int y, int width, int height, float lineWidth, CocosSharp.CCColor4B color) { }
public void DrawLine(CocosSharp.CCPoint from, CocosSharp.CCPoint to, float lineWidth, CocosSharp.CCColor4B color) { }
public void DrawLineList(CocosSharp.CCV3F_C4B[] verts) { }
public void DrawPolygon(CocosSharp.CCPoint[] verts, int count, CocosSharp.CCColor4B fillColor, float borderWidth, CocosSharp.CCColor4B borderColor) { }
public void DrawPolygon(CocosSharp.CCPoint[] verts, int count, CocosSharp.CCColor4F fillColor, float borderWidth, CocosSharp.CCColor4F borderColor) { }
public void DrawQuadBezier(CocosSharp.CCPoint origin, CocosSharp.CCPoint control, CocosSharp.CCPoint destination, int segments, float lineWidth, CocosSharp.CCColor4B color) { }
public void DrawRect(CocosSharp.CCRect rect) { }
public void DrawRect(CocosSharp.CCRect rect, CocosSharp.CCColor4B fillColor) { }
public void DrawRect(CocosSharp.CCRect rect, CocosSharp.CCColor4B fillColor, float borderWidth, CocosSharp.CCColor4B borderColor) { }
Expand Down
4 changes: 2 additions & 2 deletions src/CCDrawingPrimitives.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,13 @@ public static void DrawEllipse (CCRect rect, CCColor4B color)
DrawEllipticalArc(rect, 0, 360, false, color);
}

public static void DrawEllips (int x, int y, int width, int height)
public static void DrawEllipse (int x, int y, int width, int height)
{
DrawEllipticalArc(x,y,width,height,0,360,false, DrawColor);

}

public static void DrawEllips (int x, int y, int width, int height, CCColor4B color)
public static void DrawEllipse (int x, int y, int width, int height, CCColor4B color)
{
DrawEllipticalArc(x,y,width,height,0,360,false, color);

Expand Down
266 changes: 266 additions & 0 deletions src/misc_nodes/CCDrawNode.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,35 @@ public void DrawSegment(CCPoint from, CCPoint to, float radius, CCColor4F color)
dirty = true;
}

public void DrawLine(CCPoint from, CCPoint to, float lineWidth, CCColor4B color)
{
var cl = color;

var a = from;
var b = to;

var n = CCPoint.Normalize(CCPoint.PerpendicularCCW(a - b));

var lww = lineWidth;
var nw = n * lww;
var v0 = b - nw;
var v1 = b + nw;
var v2 = a - nw;
var v3 = a + nw;

// Triangles from beginning to end
AddTriangleVertex(new CCV3F_C4B(v1, cl));
AddTriangleVertex(new CCV3F_C4B(v2, cl));
AddTriangleVertex(new CCV3F_C4B(v0, cl));

AddTriangleVertex(new CCV3F_C4B(v1, cl));
AddTriangleVertex(new CCV3F_C4B(v2, cl));
AddTriangleVertex(new CCV3F_C4B(v3, cl));

dirty = true;
}


public void DrawCircle(CCPoint center, float radius, float angle, int segments, CCColor4B color)
{
float increment = MathHelper.Pi * 2.0f / segments;
Expand Down Expand Up @@ -452,6 +481,88 @@ public void DrawRect(CCRect rect, CCColor4B fillColor, float borderWidth,
DrawPolygon(pt, 4, cf, borderWidth, bc);
}

public void DrawEllipse (CCRect rect, float lineWidth, CCColor4B color)
{
DrawEllipticalArc(rect, 0, 360, false, lineWidth, color);
}

public void DrawEllipse (int x, int y, int width, int height, float lineWidth, CCColor4B color)
{
DrawEllipticalArc(x,y,width,height,0,360,false, lineWidth, color);

}

internal void DrawEllipticalArc(CCRect arcRect, double lambda1, double lambda2,
bool isPieSlice, float lineWidth, CCColor4B color)
{
make_arcs(
arcRect.Origin.X, arcRect.Origin.Y, arcRect.Size.Width, arcRect.Size.Height,
(float)lambda1, (float)lambda2,
false, true, isPieSlice, lineWidth, color);
}

internal void DrawEllipticalArc(float x, float y, float width, float height, double lambda1, double lambda2,
bool isPieSlice, float lineWidth, CCColor4B color)
{
make_arcs(
x, y, width, height,
(float)lambda1, (float)lambda2,
false, true, isPieSlice, lineWidth, color);
}


/// <summary>
/// draws a cubic bezier path
/// @since v0.8
/// </summary>
public void DrawCubicBezier(CCPoint origin, CCPoint control1, CCPoint control2, CCPoint destination, int segments, float lineWidth, CCColor4B color)
{

float t = 0;
float increment = 1.0f / segments;

var vertices = new CCPoint[segments];

vertices[0] = origin;

for (int i = 1; i < segments; ++i, t+= increment)
{
vertices[i].X = CCSplineMath.CubicBezier(origin.X, control1.X, control2.X, destination.X, t);
vertices[i].Y = CCSplineMath.CubicBezier(origin.Y, control1.Y, control2.Y, destination.Y, t);
}

vertices[segments - 1] = destination;

for (int i = 0; i < vertices.Length - 1; i++)
{
DrawLine(vertices[i], vertices[i + 1], lineWidth, color);
}

//DrawPolygon(vertices, vertices.Length, color, 0, CCColor4B.Transparent);
}

public void DrawQuadBezier(CCPoint origin, CCPoint control, CCPoint destination, int segments, float lineWidth, CCColor4B color)
{
float t = 0;
float increment = 1.0f / segments;

var vertices = new CCPoint[segments];

vertices[0] = origin;

for (int i = 1; i < segments; ++i, t+= increment)
{
vertices[i].X = CCSplineMath.QuadBezier(origin.X, control.X, destination.X, t);
vertices[i].Y = CCSplineMath.QuadBezier(origin.Y, control.Y, destination.Y, t);
}

vertices[segments-1] = destination;

DrawPolygon(vertices, vertices.Length, CCColor4B.Transparent, lineWidth, color);
}



public void DrawPolygon(CCPoint[] verts, int count, CCColor4B fillColor, float borderWidth,
CCColor4B borderColor)
{
Expand Down Expand Up @@ -637,5 +748,160 @@ void DrawStrings()

}

static CCPoint startPoint = CCPoint.Zero;
static CCPoint destinationPoint = CCPoint.Zero;
static CCPoint controlPoint1 = CCPoint.Zero;
static CCPoint controlPoint2 = CCPoint.Zero;

const int SEGMENTS = 50;

/*
* Based on the algorithm described in
* http://www.stillhq.com/ctpfaq/2002/03/c1088.html#AEN1212
*/
void
make_arc(bool start, float x, float y, float width,
float height, float startAngle, float endAngle, bool antialiasing, bool isPieSlice, float lineWidth, CCColor4B color)
{
float delta, bcp;
double sin_alpha, sin_beta, cos_alpha, cos_beta;
float PI = (float)Math.PI;

float rx = width / 2;
float ry = height / 2;

/* center */
float cx = x + rx;
float cy = y + ry;

/* angles in radians */
float alpha = startAngle * PI / 180;
float beta = endAngle * PI / 180;

/* adjust angles for ellipses */
alpha = (float)Math.Atan2(rx * Math.Sin(alpha), ry * Math.Cos(alpha));
beta = (float)Math.Atan2(rx * Math.Sin(beta), ry * Math.Cos(beta));

if (Math.Abs(beta - alpha) > PI)
{
if (beta > alpha)
beta -= 2 * PI;
else
alpha -= 2 * PI;
}

delta = beta - alpha;
bcp = (float)(4.0 / 3.0 * (1 - Math.Cos(delta / 2)) / Math.Sin(delta / 2));

sin_alpha = Math.Sin(alpha);
sin_beta = Math.Sin(beta);
cos_alpha = Math.Cos(alpha);
cos_beta = Math.Cos(beta);

/* don't move to starting point if we're continuing an existing curve */
if (start)
{
/* starting point */
double sx = cx + rx * cos_alpha;
double sy = cy + ry * sin_alpha;
if (isPieSlice)
{
destinationPoint.X = (float)sx;
destinationPoint.Y = (float)sy;

DrawPolygon(new CCPoint[] {startPoint,destinationPoint}, 2, CCColor4B.Transparent, lineWidth, color);
}

startPoint.X = (float)sx;
startPoint.Y = (float)sy;
}

destinationPoint.X = cx + rx * (float)cos_beta;
destinationPoint.Y = cy + ry * (float)sin_beta;

controlPoint1.X = cx + rx * (float)(cos_alpha - bcp * sin_alpha);
controlPoint1.Y = cy + ry * (float)(sin_alpha + bcp * cos_alpha);

controlPoint2.X = cx + rx * (float)(cos_beta + bcp * sin_beta);
controlPoint2.Y = cy + ry * (float)(sin_beta - bcp * cos_beta);


DrawCubicBezier(startPoint, controlPoint1, controlPoint2, destinationPoint, SEGMENTS, lineWidth, color);

startPoint.X = destinationPoint.X;
startPoint.Y = destinationPoint.Y;
}


void
make_arcs(float x, float y, float width, float height, float startAngle, float sweepAngle,
bool convert_units, bool antialiasing, bool isPieSlice, float lineWidth, CCColor4B color)
{
int i;
float drawn = 0;
float endAngle;
bool enough = false;

endAngle = startAngle + sweepAngle;
/* if we end before the start then reverse positions (to keep increment positive) */
if (endAngle < startAngle)
{
var temp = endAngle;
endAngle = startAngle;
startAngle = temp;
}

if (isPieSlice) {
startPoint.X = x + (width / 2);
startPoint.Y = y + (height / 2);
}

/* i is the number of sub-arcs drawn, each sub-arc can be at most 90 degrees.*/
/* there can be no more then 4 subarcs, ie. 90 + 90 + 90 + (something less than 90) */
for (i = 0; i < 4; i++)
{
float current = startAngle + drawn;
float additional;

if (enough)
{
if (isPieSlice)
{
startPoint.X = x + (width / 2);
startPoint.Y = y + (height / 2);
DrawPolygon(new CCPoint[] {destinationPoint, startPoint}, 2, CCColor4B.Transparent, lineWidth, color);
}
return;
}

additional = endAngle - current; /* otherwise, add the remainder */
if (additional > 90)
{
additional = 90.0f;
}
else
{
/* a near zero value will introduce bad artefact in the drawing (#78999) */
if (( additional >= -0.0001f) && (additional <= 0.0001f))
return;
enough = true;
}

make_arc((i == 0), /* only move to the starting pt in the 1st iteration */
x, y, width, height, /* bounding rectangle */
current, current + additional, antialiasing, isPieSlice, lineWidth, color);

drawn += additional;

}

if (isPieSlice) {
startPoint.X = x + (width / 2);
startPoint.Y = y + (height / 2);
DrawPolygon (new CCPoint[] { destinationPoint, startPoint}, 2, CCColor4B.Transparent, lineWidth, color);
}

}

}
}
20 changes: 20 additions & 0 deletions tests/tests/classes/tests/DrawPrimitivesTest/DrawPrimitivesTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,26 @@ public override void OnEnter()

draw.DrawSegment(new CCPoint(10, windowSize.Height / 2), new CCPoint(windowSize.Width / 2, windowSize.Height / 2), 40,
new CCColor4F(1, 0, 1, 0.5f));

CCSize size = Layer.VisibleBoundsWorldspace.Size;

var visibleRect = VisibleBoundsWorldspace;

// draw quad bezier path
draw.DrawQuadBezier(new CCPoint(0, size.Height),
visibleRect.Center,
(CCPoint)visibleRect.Size,
50, 3,
new CCColor4B(255, 0, 255, 255));

// draw cubic bezier path
draw.DrawCubicBezier(visibleRect.Center,
new CCPoint(size.Width / 2 + 30, size.Height / 2 + 50),
new CCPoint(size.Width / 2 + 60, size.Height / 2 - 50),
new CCPoint(size.Width, size.Height / 2), 100, 2, CCColor4B.Green);

// draw an ellipse within rectangular region
draw.DrawEllipse(new CCRect(100, 300, 100, 200), 2, CCColor4B.AliceBlue);
}

#endregion Setup content
Expand Down

0 comments on commit 5789475

Please sign in to comment.