ReFuel/Dashboard
ReFuel/Dashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fixes in the command engine components.

Browse Source
This commit is contained in:
H. Utku Maden 2023-06-29 10:31:28 +03:00
parent 5c71afe9c7
commit 46c18d97d2
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Quik/CommandMachine/CommandEngine.cs
View File

@ -16,12 +16,12 @@ namespace Quik.CommandMachine
private Command _customCommandBase = Command.CustomCommandBase; private Command _customCommandBase = Command.CustomCommandBase;
private readonly List<QuikCommandHandler> _customCommands = new List<QuikCommandHandler>(); private readonly List<QuikCommandHandler> _customCommands = new List<QuikCommandHandler>();
public QuikRectangle Viewport { get; } public QuikRectangle Viewport => _viewport;
// TODO: Make a real matrix class. // TODO: Make a real matrix class.
public float[] ActiveTransforms { get; } public float[] ActiveTransforms { get; }
public StyleStack Style { get; } public StyleStack Style { get; } = new StyleStack(new Quik.Style());
protected CommandEngine() protected CommandEngine()
{ {
@ -106,7 +106,7 @@ namespace Quik.CommandMachine
{ {
} }
private void Reset() public virtual void Reset()
{ {
_zIndex = 0; _zIndex = 0;
_zStack.Clear(); _zStack.Clear();

14
Quik/CommandMachine/Frame.cs
View File

@ -27,7 +27,7 @@ namespace Quik.CommandMachine
[FieldOffset(sizeof(FrameType) + 3*sizeof(float))] [FieldOffset(sizeof(FrameType) + 3*sizeof(float))]
private float _f4; private float _f4;
[FieldOffset(sizeof(FrameType))] [FieldOffset(24)]
private object _object; private object _object;
public bool IsCommand => _type == FrameType.Command; public bool IsCommand => _type == FrameType.Command;
@ -37,10 +37,10 @@ namespace Quik.CommandMachine
_type == FrameType.IVec3 || _type == FrameType.IVec3 ||
_type == FrameType.IVec4; _type == FrameType.IVec4;
public bool IsFloat => public bool IsFloat =>
_type == FrameType.IVec1 || _type == FrameType.Vec1 ||
_type == FrameType.IVec2 || _type == FrameType.Vec2 ||
_type == FrameType.IVec3 || _type == FrameType.Vec3 ||
_type == FrameType.IVec4; _type == FrameType.Vec4;
public int VectorSize public int VectorSize
{ {
@ -78,8 +78,10 @@ namespace Quik.CommandMachine
_type = FrameType.None _type = FrameType.None
}; };
public Frame(Command command) : this((int)command) public Frame(Command command) : this()
{ {
_type = FrameType.Command;
_i1 = (int)command;
} }
public Frame(object o) public Frame(object o)

8
Quik/VertexGenerator/VertexCommandEngine.cs
View File

@ -24,6 +24,12 @@ namespace Quik.VertexGenerator
Color = Style.Color ?? QuikColor.White, Color = Style.Color ?? QuikColor.White,
}; };
public override void Reset()
{
base.Reset();
DrawQueue.Clear();
}
protected override void ChildProcessCommand(Command name, CommandQueue queue) protected override void ChildProcessCommand(Command name, CommandQueue queue)
{ {
base.ChildProcessCommand(name, queue); base.ChildProcessCommand(name, queue);
@ -473,7 +479,7 @@ namespace Quik.VertexGenerator
DrawQueue.AddVertex(v); DrawQueue.AddVertex(v);
DrawQueue.AddElement(0); DrawQueue.AddElement(1); DrawQueue.AddElement(2); DrawQueue.AddElement(0); DrawQueue.AddElement(1); DrawQueue.AddElement(2);
DrawQueue.AddElement(1); DrawQueue.AddElement(2); DrawQueue.AddElement(3); DrawQueue.AddElement(0); DrawQueue.AddElement(2); DrawQueue.AddElement(3);
if (radius == 0.0f) if (radius == 0.0f)
return; return;