Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Canvas.DrawImage (#784) #878

Merged
merged 3 commits into from
Dec 27, 2020
Merged

Added Canvas.DrawImage (#784) #878

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12e62a3
Added Canvas.DrawImage (#784)
SirePi Oct 17, 2020
b1bc4f8
Fixed drawing, added DrawImage(Texture)
SirePi Oct 28, 2020
8e4ca42
Simplified DrawImage implementation footprint and added unit test
ilexp Dec 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 162 additions & 0 deletions Source/Core/Duality/Drawing/Canvas.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,168 @@ public void DrawThickLine(float x, float y, float x2, float y2, float width)
this.DrawThickLine(x, y, 0, x2, y2, 0, width);
}

/// <summary>
/// Draws an image.
/// </summary>
public void DrawImage(ContentRef<Material> material, float x, float y, float z, float w, float h)
ilexp marked this conversation as resolved.
Show resolved Hide resolved
{
this.PushState();

if (w < 0.0f) { x += w; w = -w; }
if (h < 0.0f) { y += h; h = -h; }

Vector3 pos = new Vector3(x, y, z);

Vector2 shapeHandle = pos.Xy;
float offset = this.State.DepthOffset;
ColorRgba shapeColor = material.Res.MainColor;
ilexp marked this conversation as resolved.
Show resolved Hide resolved
VertexC1P3T2[] vertices = this.RentVertices(4);

vertices[0].Pos = new Vector3(pos.X, pos.Y, pos.Z);
vertices[1].Pos = new Vector3(pos.X + w, pos.Y, pos.Z);
vertices[2].Pos = new Vector3(pos.X + w, pos.Y + h, pos.Z);
vertices[3].Pos = new Vector3(pos.X, pos.Y + h, pos.Z);

vertices[0].DepthOffset = offset;
vertices[1].DepthOffset = offset;
vertices[2].DepthOffset = offset;
vertices[3].DepthOffset = offset;

vertices[0].TexCoord = Vector2.Zero;
vertices[1].TexCoord = Vector2.UnitX;
vertices[2].TexCoord = Vector2.One;
vertices[3].TexCoord = Vector2.UnitY;

vertices[0].Color = shapeColor;
vertices[1].Color = shapeColor;
vertices[2].Color = shapeColor;
vertices[3].Color = shapeColor;

this.State.SetMaterial(material);
this.State.TransformVertices(vertices, shapeHandle);
this.device.AddVertices(this.State.MaterialDirect, VertexMode.LineLoop, vertices, 4);
ilexp marked this conversation as resolved.
Show resolved Hide resolved

this.PopState();
}

/// <summary>
/// Draws an image.
/// </summary>
/// <param name="material"></param>
/// <param name="x"></param>
/// <param name="y"></param>
/// <param name="w"></param>
/// <param name="h"></param>
public void DrawImage(ContentRef<Material> material, float x, float y, float w, float h)
{
this.DrawImage(material, x, y, 0, w, h);
}

/// <summary>
/// Draws an image.
/// </summary>
/// <param name="material"></param>
/// <param name="x"></param>
/// <param name="y"></param>
/// <param name="z"></param>
public void DrawImage(ContentRef<Material> material, float x, float y, float z)
{
Texture tx = material.Res.MainTexture.Res;
this.DrawImage(material, x, y, z, tx.ContentWidth, tx.ContentHeight);
}

/// <summary>
/// Draws an image.
/// </summary>
/// <param name="material"></param>
/// <param name="x"></param>
/// <param name="y"></param>
public void DrawImage(ContentRef<Material> material, float x, float y)
{
this.DrawImage(material, x, y, 0);
}

/// <summary>
/// Draws an image.
/// </summary>
public void DrawImage(BatchInfo batch, float x, float y, float z, float w, float h)
ilexp marked this conversation as resolved.
Show resolved Hide resolved
ilexp marked this conversation as resolved.
Show resolved Hide resolved
{
this.PushState();

if (w < 0.0f) { x += w; w = -w; }
if (h < 0.0f) { y += h; h = -h; }

Vector3 pos = new Vector3(x, y, z);

Vector2 shapeHandle = pos.Xy;
float offset = this.State.DepthOffset;
ColorRgba shapeColor = batch.MainColor;
VertexC1P3T2[] vertices = this.RentVertices(4);

vertices[0].Pos = new Vector3(pos.X, pos.Y, pos.Z);
vertices[1].Pos = new Vector3(pos.X + w, pos.Y, pos.Z);
vertices[2].Pos = new Vector3(pos.X + w, pos.Y + h, pos.Z);
vertices[3].Pos = new Vector3(pos.X, pos.Y + h, pos.Z);

vertices[0].DepthOffset = offset;
vertices[1].DepthOffset = offset;
vertices[2].DepthOffset = offset;
vertices[3].DepthOffset = offset;

vertices[0].TexCoord = Vector2.Zero;
vertices[1].TexCoord = Vector2.UnitX;
vertices[2].TexCoord = Vector2.One;
vertices[3].TexCoord = Vector2.UnitY;

vertices[0].Color = shapeColor;
vertices[1].Color = shapeColor;
vertices[2].Color = shapeColor;
vertices[3].Color = shapeColor;

this.State.SetMaterial(batch);
this.State.TransformVertices(vertices, shapeHandle);
this.device.AddVertices(this.State.MaterialDirect, VertexMode.LineLoop, vertices, 4);
ilexp marked this conversation as resolved.
Show resolved Hide resolved

this.PopState();
}

/// <summary>
/// Draws an image.
/// </summary>
/// <param name="batch"></param>
/// <param name="x"></param>
/// <param name="y"></param>
/// <param name="w"></param>
/// <param name="h"></param>
public void DrawImage(BatchInfo batch, float x, float y, float w, float h)
{
this.DrawImage(batch, x, y, 0, w, h);
}

/// <summary>
/// Draws an image.
/// </summary>
/// <param name="batch"></param>
/// <param name="x"></param>
/// <param name="y"></param>
/// <param name="z"></param>
public void DrawImage(BatchInfo batch, float x, float y, float z)
{
Texture tx = batch.MainTexture.Res;
this.DrawImage(batch, x, y, z, tx.ContentWidth, tx.ContentHeight);
}

/// <summary>
/// Draws an image.
/// </summary>
/// <param name="batch"></param>
/// <param name="x"></param>
/// <param name="y"></param>
public void DrawImage(BatchInfo batch, float x, float y)
{
this.DrawImage(batch, x, y, 0);
}

/// <summary>
/// Draws a rectangle.
/// </summary>
Expand Down