Implemented Input Functions via C# #358
|
@ -9682,6 +9682,7 @@
|
||||||
aimingLength: 1
|
aimingLength: 1
|
||||||
throwItem: false
|
throwItem: false
|
||||||
rayDistance: 0.75
|
rayDistance: 0.75
|
||||||
|
rayHeight: 0.100000001
|
||||||
- EID: 3
|
- EID: 3
|
||||||
Name: HoldingPoint
|
Name: HoldingPoint
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
|
|
@ -14,6 +14,9 @@
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include "SHInputManager.h"
|
#include "SHInputManager.h"
|
||||||
#include "../Tools/SHException.h"
|
#include "../Tools/SHException.h"
|
||||||
|
#include <Graphics/Windowing/SHWindow.h>
|
||||||
|
#include <Graphics/MiddleEnd/Interface/SHGraphicsSystem.h>
|
||||||
|
#include <Graphics/MiddleEnd/Interface/SHGraphicsSystemInterface.h>
|
||||||
|
|
||||||
namespace SHADE
|
namespace SHADE
|
||||||
{
|
{
|
||||||
|
@ -801,6 +804,23 @@ namespace SHADE
|
||||||
mouseVelocityX = static_cast<double>(mouseScreenX - mouseScreenXLast) / dt;
|
mouseVelocityX = static_cast<double>(mouseScreenX - mouseScreenXLast) / dt;
|
||||||
mouseVelocityY = static_cast<double>(mouseScreenY - mouseScreenYLast) / dt;
|
mouseVelocityY = static_cast<double>(mouseScreenY - mouseScreenYLast) / dt;
|
||||||
|
|
||||||
|
|
||||||
|
//Mouse Centering
|
||||||
|
if (GetKey(SH_KEYCODE::Q))
|
||||||
|
{
|
||||||
|
uint32_t width = SHADE::SHGraphicsSystemInterface::GetWindowWidth();
|
||||||
|
uint32_t height = SHADE::SHGraphicsSystemInterface::GetWindowHeight();
|
||||||
|
SetMouseWindowPosition(width / 2, height / 2);
|
||||||
|
|
||||||
|
//This four lines help a lot
|
||||||
|
POINT p;
|
||||||
|
GetCursorPos(&p);
|
||||||
|
|
||||||
|
mouseVelocityX -= static_cast<double>(p.x - mouseScreenX) / dt;
|
||||||
|
mouseVelocityY -= static_cast<double>(p.y - mouseScreenY) / dt;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//Mouse wheel vertical delta updating
|
//Mouse wheel vertical delta updating
|
||||||
mouseWheelVerticalDelta = 0;
|
mouseWheelVerticalDelta = 0;
|
||||||
mouseWheelVerticalDelta = mouseWheelVerticalDeltaPoll;
|
mouseWheelVerticalDelta = mouseWheelVerticalDeltaPoll;
|
||||||
|
|
|
@ -181,7 +181,6 @@ namespace SHADE
|
||||||
//Break
|
//Break
|
||||||
//Menu
|
//Menu
|
||||||
//Mouse buttons use mouse codes, which are enums declared later
|
//Mouse buttons use mouse codes, which are enums declared later
|
||||||
//TODO Controller input
|
|
||||||
#if 0
|
#if 0
|
||||||
Space = static_cast<int>(SHInputManager::SH_KEYCODE::SPACE),
|
Space = static_cast<int>(SHInputManager::SH_KEYCODE::SPACE),
|
||||||
//Apostrophe = static_cast<int>(SHInputManager::SH_KEYCODE::APOSTROPHE),
|
//Apostrophe = static_cast<int>(SHInputManager::SH_KEYCODE::APOSTROPHE),
|
||||||
|
@ -355,6 +354,27 @@ namespace SHADE
|
||||||
Button3 = static_cast<int>(SHInputManager::SH_KEYCODE::XMB1),
|
Button3 = static_cast<int>(SHInputManager::SH_KEYCODE::XMB1),
|
||||||
Button4 = static_cast<int>(SHInputManager::SH_KEYCODE::XMB2)
|
Button4 = static_cast<int>(SHInputManager::SH_KEYCODE::XMB2)
|
||||||
};
|
};
|
||||||
|
enum class ControllerCode : int
|
||||||
|
{
|
||||||
|
DpadUp = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::DPAD_UP),
|
||||||
|
DpadDown = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::DPAD_DOWN),
|
||||||
|
DpadLeft = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::DPAD_LEFT),
|
||||||
|
DpadRight = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::DPAD_RIGHT),
|
||||||
|
Start = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::START),
|
||||||
|
Back = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::BACK),
|
||||||
|
LeftThumbstickButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_THUMBSTICK),
|
||||||
|
RightThumbstickButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::RIGHT_THUMBSTICK),
|
||||||
|
LeftShoulder = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_SHOULDER),
|
||||||
|
RightShoulder = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::RIGHT_SHOULDER),
|
||||||
|
AButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::A),
|
||||||
|
BButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::B),
|
||||||
|
XButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::X),
|
||||||
|
YButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::Y),
|
||||||
|
LeftTrigger = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_TRIGGER),
|
||||||
|
RightTrigger = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::RIGHT_TRIGGER),
|
||||||
|
LeftThumbStickX = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_THUMBSTICK_X),
|
||||||
|
LeftThumbStickY = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_THUMBSTICK_Y)
|
||||||
|
};
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
/* Properites */
|
/* Properites */
|
||||||
|
|
Loading…
Reference in New Issue