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.

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

Invert DrawNode application for composability #2314

Merged
merged 20 commits into from
Apr 25, 2019
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Privatise + rename CompositeDrawableDrawNode
  • Loading branch information
smoogipoo committed Apr 2, 2019
commit d9ccb6ff87755b590bb77e8bceb9c6ddf32d8570
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ namespace osu.Framework.Graphics.Containers
{
public partial class BufferedContainer<T>
{
private class BufferedContainerDrawNode : CompositeDrawNode
private class BufferedContainerDrawNode : CompositeDrawableDrawNode
{
private bool drawOriginal;
private Color4 backgroundColour;
257 changes: 0 additions & 257 deletions osu.Framework/Graphics/Containers/CompositeDrawNode.cs

This file was deleted.

4 changes: 2 additions & 2 deletions osu.Framework/Graphics/Containers/CompositeDrawable.cs
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ namespace osu.Framework.Graphics.Containers
/// Additionally, <see cref="CompositeDrawable"/>s support various effects, such as masking, edge effect,
/// padding, and automatic sizing depending on their children.
/// </summary>
public abstract class CompositeDrawable : Drawable
public abstract partial class CompositeDrawable : Drawable
{
#region Contruction and disposal

@@ -936,7 +936,7 @@ public override bool Invalidate(Invalidation invalidation = Invalidation.All, Dr

internal IShader Shader { get; private set; }

protected override DrawNode CreateDrawNode() => new CompositeDrawNode(this);
protected override DrawNode CreateDrawNode() => new CompositeDrawableDrawNode(this);

private bool forceLocalVertexBatch;

Loading