From 5f9b4b9c5dab70fd70be2872653e9fe6a7aced5a Mon Sep 17 00:00:00 2001 From: Ian C Date: Mon, 7 May 2012 15:26:30 +0000 Subject: Changed keyboard --- wpspec/wpspec/GamePage.xaml.cs | 2 +- wpspec/wpspec/Resources/Spectrum.keyboard | Bin 920 -> 921 bytes wpspec/wpspec/Spectrum/Emulation.cs | 22 +--------------------- wpspec/wpspecLibContent/keyboard.png | Bin 114056 -> 41620 bytes 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/wpspec/wpspec/GamePage.xaml.cs b/wpspec/wpspec/GamePage.xaml.cs index 96c690a..a6bfd29 100644 --- a/wpspec/wpspec/GamePage.xaml.cs +++ b/wpspec/wpspec/GamePage.xaml.cs @@ -107,7 +107,7 @@ namespace wpspec keyboard = new KeyboardDriver (SharedGraphicsDeviceManager.Current.GraphicsDevice, keyboardImage, - new Vector2(0, 600), + new Vector2(0, 560), Shared.SpectrumKeyboard); keyboard.KeyEvent += HandleKeyboardEvent; diff --git a/wpspec/wpspec/Resources/Spectrum.keyboard b/wpspec/wpspec/Resources/Spectrum.keyboard index 853129a..3e94ca1 100644 Binary files a/wpspec/wpspec/Resources/Spectrum.keyboard and b/wpspec/wpspec/Resources/Spectrum.keyboard differ diff --git a/wpspec/wpspec/Spectrum/Emulation.cs b/wpspec/wpspec/Spectrum/Emulation.cs index 563e23a..113a500 100644 --- a/wpspec/wpspec/Spectrum/Emulation.cs +++ b/wpspec/wpspec/Spectrum/Emulation.cs @@ -63,26 +63,6 @@ namespace wpspec.Spectrum private readonly int[] screenAccel = new int[192]; private readonly int[] attrAccel = new int[192]; - //private readonly uint[] colours = new uint[16] - //{ - // new Color(0x00, 0x00, 0x00).PackedValue, // BLACK - // new Color(0x00, 0x00, 0xe6).PackedValue, // BLUE - // new Color(0xe6, 0x00, 0x00).PackedValue, // RED - // new Color(0xe6, 0x00, 0xe6).PackedValue, // MAGENTA - // new Color(0x00, 0xe6, 0x00).PackedValue, // GREEN - // new Color(0x00, 0xe6, 0xe6).PackedValue, // CYAN - // new Color(0xe6, 0xe6, 0x00).PackedValue, // YELLOW - // new Color(0xe6, 0xe6, 0xe6).PackedValue, // WHITE - // new Color(0x00, 0x00, 0x00).PackedValue, // BLACK (BRIGHT) - // new Color(0x00, 0x00, 0xff).PackedValue, // BLUE (BRIGHT) - // new Color(0xff, 0x00, 0x00).PackedValue, // RED (BRIGHT) - // new Color(0xff, 0x00, 0xff).PackedValue, // MAGENTA (BRIGHT) - // new Color(0x00, 0xff, 0x00).PackedValue, // GREEN (BRIGHT) - // new Color(0x00, 0xff, 0xff).PackedValue, // CYAN (BRIGHT) - // new Color(0xff, 0xff, 0x00).PackedValue, // YELLOW (BRIGHT) - // new Color(0xff, 0xff, 0xff).PackedValue // WHITE (BRIGHT) - //}; - private readonly ushort[] colours = new ushort[16] { GetColour(0x00, 0x00, 0x00), // BLACK @@ -518,7 +498,7 @@ namespace wpspec.Spectrum matrixLookup[SpectrumKeySymbol.KeyL] = new KeyMatrix(6, 0x02); matrixLookup[SpectrumKeySymbol.KeyEnter] = new KeyMatrix(6, 0x01); - matrixLookup[SpectrumKeySymbol.KeyCapsLock] = new KeyMatrix(0, 0x01); + matrixLookup[SpectrumKeySymbol.KeyCapsShift] = new KeyMatrix(0, 0x01); matrixLookup[SpectrumKeySymbol.KeyZ] = new KeyMatrix(0, 0x02); matrixLookup[SpectrumKeySymbol.KeyX] = new KeyMatrix(0, 0x04); matrixLookup[SpectrumKeySymbol.KeyC] = new KeyMatrix(0, 0x08); diff --git a/wpspec/wpspecLibContent/keyboard.png b/wpspec/wpspecLibContent/keyboard.png index a607364..d07908c 100644 Binary files a/wpspec/wpspecLibContent/keyboard.png and b/wpspec/wpspecLibContent/keyboard.png differ -- cgit v1.2.3