Removed CC-Functions dependency

This commit is contained in:
CreepyCrafter24 2019-10-12 10:37:20 +02:00
parent a0da4df4e3
commit 739a35d00f
6 changed files with 12 additions and 23 deletions

View File

@ -53,12 +53,6 @@
<Compile Include="Rect.cs" />
<Compile Include="Vector2.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\CC-Functions\W32\W32.csproj">
<Project>{23DE4AE0-5075-4CCC-8440-4D131CA0FBBA}</Project>
<Name>W32</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>

View File

@ -1,5 +1,4 @@
using CC_Functions.W32;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
@ -12,6 +11,8 @@ namespace Base
{
public static class Input
{
[DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
static extern short GetKeyState(int keyCode);
/// <summary>
/// Check whether the Key is pressed
/// </summary>
@ -21,7 +22,13 @@ namespace Base
{
try
{
return KeyboardReader.IsKeyDown(key);
int state = 0;
short retVal = GetKeyState((int)key);
if ((retVal & 0x8000) == 0x8000)
state |= 1;
if ((retVal & 1) == 1)
state |= 2;
return 1 == (state & 1);
}
catch (Exception e)
{

View File

@ -60,8 +60,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LevelTest", "LevelTest\Leve
{DFA2FB97-D676-4B0D-B281-2685F85781EE} = {DFA2FB97-D676-4B0D-B281-2685F85781EE}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W32", "..\CC-Functions\W32\W32.csproj", "{23DE4AE0-5075-4CCC-8440-4D131CA0FBBA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -116,10 +114,6 @@ Global
{DFD89655-00A7-4DF8-8B2E-17F5BEFE5090}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DFD89655-00A7-4DF8-8B2E-17F5BEFE5090}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DFD89655-00A7-4DF8-8B2E-17F5BEFE5090}.Release|Any CPU.Build.0 = Release|Any CPU
{23DE4AE0-5075-4CCC-8440-4D131CA0FBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23DE4AE0-5075-4CCC-8440-4D131CA0FBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23DE4AE0-5075-4CCC-8440-4D131CA0FBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23DE4AE0-5075-4CCC-8440-4D131CA0FBBA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -123,10 +123,6 @@
<None Include="Resources\pcoptimizerpro.jpeg" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\CC-Functions\W32\W32.csproj">
<Project>{23de4ae0-5075-4ccc-8440-4d131ca0fbba}</Project>
<Name>W32</Name>
</ProjectReference>
<ProjectReference Include="..\Base\Base.csproj">
<Project>{9a9561a7-dd5f-43a5-a3f5-a95f35da204d}</Project>
<Name>Base</Name>

View File

@ -1,5 +1,4 @@
using CC_Functions.W32;
using LaptopSimulator2015.Properties;
using LaptopSimulator2015.Properties;
using System;
using System.Drawing;
using System.IO;
@ -25,7 +24,6 @@ namespace LaptopSimulator2015
Console.Title = "LaptopSimulator2015";
splash = new Splash();
splash.Show();
Wnd32.fromForm(splash).MakeOverlay();
Thread.Sleep(2000);
#if !DEBUG
FileStream filestream = new FileStream(".log", FileMode.Create);

View File

@ -1,4 +1,4 @@
Maybe Linux builds? (P/Invoke would need to be interchangable, needs to be researched)
Maybe Linux builds? (Possible with #if, need a function to check whether a key is down in Linux (see Base/Input))
Ideas for content:
- Goals: