Skip to content

Fix Get methods #30

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

Merged
merged 4 commits into from
Aug 1, 2019
Merged

Fix Get methods #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b19bea
Merge pull request #1 from Ultz/glfw-input
john-h-k Aug 1, 2019
3c5cecc
Fix the abominations that were `Get()` methods
john-h-k Aug 1, 2019
a448037
Merge branch 'glfw-input' of https://github.com/johnkellyoxford/Silk.…
john-h-k Aug 1, 2019
b06bd3c
Remove Get methods entirely
john-h-k Aug 1, 2019
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
8 changes: 2 additions & 6 deletions src/Input/Silk.NET.Input.Desktop/Collections/GlfwButtonCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public GlfwButtonCollection(byte* bytes, int count)
public int Count => _count;

public Button this[int index] => index < _count
? new Button ((ButtonName)index, index, Get(_bytes, index) != 0)
? new Button ((ButtonName)index, index, _bytes[index] != 0)
: throw new ArgumentOutOfRangeException();

public IEnumerator<Button> GetEnumerator()
Expand All @@ -34,10 +34,6 @@ IEnumerator IEnumerable.GetEnumerator()
return GetEnumerator();
}

public static byte Get(byte* bytes, int index)
{
return Marshal.ReadByte((IntPtr) bytes, index);
}
private struct Enumerator : IEnumerator<Button>
{
private GlfwButtonCollection _col;
Expand All @@ -58,7 +54,7 @@ public bool MoveNext()
return false;
}

Current = new Button((ButtonName)_current, _current, Get(_col._bytes, _current) != 0);
Current = new Button((ButtonName)_current, _current, _col._bytes[_current] != 0);
_current++;
return true;
}
Expand Down
10 changes: 3 additions & 7 deletions src/Input/Silk.NET.Input.Desktop/Collections/GlfwHatCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Silk.NET.Input.Common;
using Silk.NET.Input.Common;
using System;
using System.Collections;
using System.Collections.Generic;
Expand All @@ -19,7 +19,7 @@ public GlfwHatCollection(Position2D* positions, int count)
}

public Hat this[int index] => index < _count
? new Hat(index, Get(_positions, index))
? new Hat(index, _positions[index])
: throw new ArgumentOutOfRangeException();

public int Count => _count;
Expand All @@ -33,10 +33,6 @@ IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
public static Position2D Get(Position2D* positions, int index)
{
return (Position2D) Marshal.ReadInt32((IntPtr) positions, index * IntPtr.Size);
}

private struct Enumerator : IEnumerator<Hat>
{
Expand All @@ -58,7 +54,7 @@ public bool MoveNext()
return false;
}

Current = new Hat(_current, Get(_col._positions, _current));
Current = new Hat(_current, _col._positions[_current]);
_current++;
return true;
}
Expand Down