Skip to content

Commit a54ba25

Browse files
committed
make base Lib from data.
1 parent 9b55657 commit a54ba25

29 files changed

Lines changed: 108 additions & 78 deletions

Controls/EmulatedKeyList.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:DolphinDynamicInputTextureCreator.Controls"
7-
xmlns:data="clr-namespace:DolphinDynamicInputTextureCreator.Data"
7+
xmlns:data="clr-namespace:DolphinDynamicInputTexture.Data"
88
xmlns:design="clr-namespace:DolphinDynamicInputTextureCreator.Design"
99
xmlns:converters="clr-namespace:DolphinDynamicInputTextureCreator.ValueConverters"
1010
mc:Ignorable="d"

Controls/HostKeyList.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
using DolphinDynamicInputTexture.Data;
2+
using System;
23
using System.Collections.Generic;
34
using System.Text;
45
using System.Windows;
@@ -35,7 +36,7 @@ private void AddHostKey_DragEnter(object sender, DragEventArgs e)
3536
{
3637
if (System.IO.Path.GetExtension(file).ToLower() == ".png")
3738
{
38-
ViewModel.HostDevices.Selected.HostKeys.Add(new Data.HostKey
39+
ViewModel.HostDevices.Selected.HostKeys.Add(new HostKey
3940
{
4041
Name = "",
4142
TexturePath = file

Controls/PanZoom.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:data="clr-namespace:DolphinDynamicInputTextureCreator.Data"
6+
xmlns:data="clr-namespace:DolphinDynamicInputTexture.Data;assembly=DolphinDynamicInputTexture"
77
xmlns:controls="clr-namespace:DolphinDynamicInputTextureCreator.Controls"
88
xmlns:converters="clr-namespace:DolphinDynamicInputTextureCreator.ValueConverters"
99
mc:Ignorable="d"

Controls/TexturePicker.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
using DolphinDynamicInputTexture.Data;
2+
using System;
23
using System.Collections.Generic;
34
using System.Text;
45
using System.Windows;
@@ -40,7 +41,7 @@ private void AddTexture_DragEnter(object sender, DragEventArgs e)
4041
{
4142
if (System.IO.Path.GetExtension(file).ToLower() == ".png")
4243
{
43-
InputPack.Textures.Add(new Data.DynamicInputTexture
44+
InputPack.Textures.Add(new DynamicInputTexture
4445
{
4546
TextureHash = System.IO.Path.GetFileName(file),
4647
TexturePath = file

Design/DesignDynamicInputPack.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using DolphinDynamicInputTextureCreator.Data;
1+
using DolphinDynamicInputTexture.Data;
22
using System;
33
using System.Collections.Generic;
44
using System.Text;

Design/DesignEmulatedDevice.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,68 @@
1-
using System;
1+
using DolphinDynamicInputTexture.Data;
2+
using System;
23
using System.Collections.Generic;
34
using System.Text;
45
using System.Windows.Media;
56

67
namespace DolphinDynamicInputTextureCreator.Design
78
{
8-
public class DesignEmulatedDevice : Data.EmulatedDevice
9+
public class DesignEmulatedDevice : EmulatedDevice
910
{
1011
public static DesignEmulatedDevice Instance => new DesignEmulatedDevice();
1112

1213
public DesignEmulatedDevice()
1314
{
1415
EmulatedKeys.Add(
15-
new Data.EmulatedKey
16+
new EmulatedKey
1617
{
1718
Name = "Buttons/A"
1819
}
1920
);
2021

2122
EmulatedKeys.Add(
22-
new Data.EmulatedKey
23+
new EmulatedKey
2324
{
2425
Name = "Buttons/B"
2526
}
2627
);
2728

2829
EmulatedKeys.Add(
29-
new Data.EmulatedKey
30+
new EmulatedKey
3031
{
3132
Name = "Buttons/C"
3233
}
3334
);
3435

3536
EmulatedKeys.Add(
36-
new Data.EmulatedKey
37+
new EmulatedKey
3738
{
3839
Name = "Buttons/D"
3940
}
4041
);
4142

4243
EmulatedKeys.Add(
43-
new Data.EmulatedKey
44+
new EmulatedKey
4445
{
4546
Name = "Buttons/E"
4647
}
4748
);
4849

4950
EmulatedKeys.Add(
50-
new Data.EmulatedKey
51+
new EmulatedKey
5152
{
5253
Name = "Buttons/F"
5354
}
5455
);
5556

5657
EmulatedKeys.Add(
57-
new Data.EmulatedKey
58+
new EmulatedKey
5859
{
5960
Name = "Buttons/G"
6061
}
6162
);
6263

6364
EmulatedKeys.Add(
64-
new Data.EmulatedKey
65+
new EmulatedKey
6566
{
6667
Name = "Buttons/Z"
6768
}

Design/DesignHostDevice.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
1-
using System;
1+
using DolphinDynamicInputTexture.Data;
2+
using System;
23
using System.Collections.Generic;
34
using System.Text;
45

56
namespace DolphinDynamicInputTextureCreator.Design
67
{
7-
class DesignHostDevice : Data.HostDevice
8+
class DesignHostDevice : HostDevice
89
{
910
public static DesignHostDevice Instance => new DesignHostDevice();
1011

1112
public DesignHostDevice()
1213
{
13-
HostKeys.Add(new Data.HostKey
14+
HostKeys.Add(new HostKey
1415
{
1516
Name = "`Gamepad A`",
1617
TexturePath = "pack://application:,,,/Design/Images/a.png"
1718
});
1819

19-
HostKeys.Add(new Data.HostKey
20+
HostKeys.Add(new HostKey
2021
{
2122
Name = "`Gamepad B`",
2223
TexturePath = "pack://application:,,,/Design/Images/b.png"
2324
});
2425

25-
HostKeys.Add(new Data.HostKey
26+
HostKeys.Add(new HostKey
2627
{
2728
Name = "`Gamepad C`",
2829
TexturePath = "pack://application:,,,/Design/Images/c.png"
2930
});
3031

31-
HostKeys.Add(new Data.HostKey
32+
HostKeys.Add(new HostKey
3233
{
3334
Name = "`Gamepad D`",
3435
TexturePath = "pack://application:,,,/Design/Images/d.png"

Data/DolphinTextureHash.cs renamed to DolphinDynamicInputTexture/Data/DolphinTextureHash.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Text.RegularExpressions;
33

4-
namespace DolphinDynamicInputTextureCreator.Data
4+
namespace DolphinDynamicInputTexture.Data
55
{
66
/// <summary>
77
/// Gives specific information about the Dolphin textures hash.

Data/DynamicInputPack.cs renamed to DolphinDynamicInputTexture/Data/DynamicInputPack.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
using DolphinDynamicInputTextureCreator.Other;
2-
using DolphinDynamicInputTextureCreator.ViewModels.Commands;
3-
using Newtonsoft.Json;
4-
using System;
1+
using Newtonsoft.Json;
52
using System.Collections.Generic;
63
using System.Collections.ObjectModel;
7-
using System.Drawing;
84
using System.IO;
9-
using System.Windows.Input;
10-
using System.Windows.Media;
5+
//using System.Windows.Media;
116

12-
namespace DolphinDynamicInputTextureCreator.Data
7+
namespace DolphinDynamicInputTexture.Data
138
{
149
public class DynamicInputPack : Other.PropertyChangedBase
1510
{

Data/DynamicInputTexture.cs renamed to DolphinDynamicInputTexture/Data/DynamicInputTexture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.IO;
66
using System.Linq;
77

8-
namespace DolphinDynamicInputTextureCreator.Data
8+
namespace DolphinDynamicInputTexture.Data
99
{
1010
[JsonObject(IsReference = true)]
1111
public class DynamicInputTexture : Other.PropertyChangedBase, Interfaces.IImage

0 commit comments

Comments
 (0)