17.01.2021
+ WPF-Support + Game Controller System + GameKeybind System + SM_WPF_TEST
This commit is contained in:
parent
af90d617d3
commit
6f23a80f7f
60 changed files with 1536 additions and 143 deletions
|
|
@ -1,21 +1,10 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Drawing;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security.Authentication.ExtendedProtection.Configuration;
|
||||
using OpenTK;
|
||||
using OpenTK.Graphics;
|
||||
using OpenTK.Input;
|
||||
using SM.Base;
|
||||
using SM.Base.Scene;
|
||||
using SM.Base.Textures;
|
||||
using SM.Base.Time;
|
||||
using SM.Utility;
|
||||
using SM.Game.Controls;
|
||||
using SM2D;
|
||||
using SM2D.Drawing;
|
||||
using SM2D.Object;
|
||||
using SM2D.Pipelines;
|
||||
using SM2D.Scene;
|
||||
using Font = SM.Base.Drawing.Text.Font;
|
||||
using Vector2 = OpenTK.Vector2;
|
||||
|
|
@ -36,7 +25,7 @@ namespace SM_TEST
|
|||
|
||||
Log.SetLogFile(compressionFolder:"logs");
|
||||
|
||||
window = new GLWindow2D {Scaling = new Vector2(0, 1000)};
|
||||
window = new GLWindow2D {Scaling = new Vector2(0, 1000), VSync = VSyncMode.Off};
|
||||
//window.GrabCursor();
|
||||
window.SetRenderPipeline(new TestRenderPipeline());
|
||||
window.SetScene(scene = new Scene());
|
||||
|
|
@ -51,10 +40,13 @@ namespace SM_TEST
|
|||
if (Keyboard.GetState()[Key.R])
|
||||
particles.Trigger();
|
||||
//particles.Paused = Keyboard.GetState()[Key.P];
|
||||
|
||||
GameControllerState s1 = new GameController(0).GetState();
|
||||
GameControllerState s2 = new GameController(1).GetState();
|
||||
}
|
||||
|
||||
private static void WindowOnLoad(object sender, EventArgs e)
|
||||
{
|
||||
{
|
||||
scene.ShowAxisHelper = true;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,14 @@
|
|||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="OpenTK, Version=3.2.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OpenTK.3.2.1\lib\net20\OpenTK.dll</HintPath>
|
||||
<Reference Include="OpenTK, Version=3.3.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OpenTK.3.3.1\lib\net20\OpenTK.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SharpDX.XInput, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SharpDX.XInput.4.2.0\lib\net45\SharpDX.XInput.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
|
|
@ -69,6 +75,10 @@
|
|||
<Project>{a4565538-625a-42c6-a330-dd4f1abb3986}</Project>
|
||||
<Name>SM2D</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\SMOptionals\SM.Game\SM.Game.csproj">
|
||||
<Project>{079bab31-3dc4-40da-90c7-efaa8517c647}</Project>
|
||||
<Name>SM.Game</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="OpenTK" version="3.2.1" targetFramework="net452" />
|
||||
<package id="OpenTK" version="3.3.1" targetFramework="net452" />
|
||||
<package id="SharpDX" version="4.2.0" targetFramework="net452" />
|
||||
<package id="SharpDX.XInput" version="4.2.0" targetFramework="net452" />
|
||||
</packages>
|
||||
Loading…
Add table
Add a link
Reference in a new issue