mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-07 07:11:26 +00:00
Code Issues Releases Wiki Activity

still resolving

Browse source
This commit is contained in:
greye 2012-08-17 16:42:42 +04:00
parent 83356d5505
commit 14f293882c
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -45,6 +45,7 @@ namespace MWInput
, mUISensitivity (Settings::Manager::getFloat("ui sensitivity", "Input")) , mUISensitivity (Settings::Manager::getFloat("ui sensitivity", "Input"))
, mCameraYMultiplier (Settings::Manager::getFloat("camera y multiplier", "Input")) , mCameraYMultiplier (Settings::Manager::getFloat("camera y multiplier", "Input"))
, mUIYMultiplier (Settings::Manager::getFloat("ui y multiplier", "Input")) , mUIYMultiplier (Settings::Manager::getFloat("ui y multiplier", "Input"))
, mPreviewPOVDelay(0.f)
{ {
Ogre::RenderWindow* window = ogre.getWindow (); Ogre::RenderWindow* window = ogre.getWindow ();
size_t windowHnd; size_t windowHnd;
@ -243,12 +244,12 @@ namespace MWInput
else if (actionIsActive(A_Crouch)) else if (actionIsActive(A_Crouch))
mPlayer.setUpDown (-1); mPlayer.setUpDown (-1);
else else
player.setUpDown (0); mPlayer.setUpDown (0);
if (mControlSwitch["playerviewswitch"]) { if (mControlSwitch["playerviewswitch"]) {
if (poller.isDown(A_TogglePOV)) { if (actionIsActive(A_TogglePOV)) {
if (mPreviewPOVDelay <= 0.5 && if (mPreviewPOVDelay <= 0.5 &&
(mPreviewPOVDelay += duration) > 0.5) (mPreviewPOVDelay += dt) > 0.5)
{ {
mPreviewPOVDelay = 1.f; mPreviewPOVDelay = 1.f;
MWBase::Environment::get().getWorld()->togglePreviewMode(true); MWBase::Environment::get().getWorld()->togglePreviewMode(true);
@ -258,7 +259,7 @@ namespace MWInput
//disable preview mode //disable preview mode
MWBase::Environment::get().getWorld()->togglePreviewMode(false); MWBase::Environment::get().getWorld()->togglePreviewMode(false);
} else if (mPreviewPOVDelay > 0.f) { } else if (mPreviewPOVDelay > 0.f) {
togglePOV(); MWBase::Environment::get().getWorld()->togglePOV();
} }
mPreviewPOVDelay = 0.f; mPreviewPOVDelay = 0.f;
} }
@ -329,7 +330,7 @@ namespace MWInput
mPlayer.setUpDown(0); mPlayer.setUpDown(0);
} else if (sw == "playerjumping" && !value) { } else if (sw == "playerjumping" && !value) {
/// \fixme maybe crouching at this time /// \fixme maybe crouching at this time
player.setUpDown(0); mPlayer.setUpDown(0);
} else if (sw == "vanitymode") { } else if (sw == "vanitymode") {
MWBase::Environment::get().getWorld()->allowVanityMode(value); MWBase::Environment::get().getWorld()->allowVanityMode(value);
} else if (sw == "playerlooking") { } else if (sw == "playerlooking") {
@ -552,6 +553,7 @@ namespace MWInput
defaultKeyBindings[A_Journal] = OIS::KC_J; defaultKeyBindings[A_Journal] = OIS::KC_J;
defaultKeyBindings[A_Rest] = OIS::KC_T; defaultKeyBindings[A_Rest] = OIS::KC_T;
defaultKeyBindings[A_GameMenu] = OIS::KC_ESCAPE; defaultKeyBindings[A_GameMenu] = OIS::KC_ESCAPE;
defaultKeyBindings[A_TogglePOV] = OIS::KC_TAB;
std::map<int, int> defaultMouseButtonBindings; std::map<int, int> defaultMouseButtonBindings;
defaultMouseButtonBindings[A_Inventory] = OIS::MB_Right; defaultMouseButtonBindings[A_Inventory] = OIS::MB_Right;
@ -601,6 +603,7 @@ namespace MWInput
descriptions[A_Journal] = "sJournal"; descriptions[A_Journal] = "sJournal";
descriptions[A_Rest] = "sRestKey"; descriptions[A_Rest] = "sRestKey";
descriptions[A_Inventory] = "sInventory"; descriptions[A_Inventory] = "sInventory";
descriptions[A_TogglePOV] = "Toggle POV";
if (descriptions[action] == "") if (descriptions[action] == "")
return ""; // not configurable return ""; // not configurable
@ -631,6 +634,7 @@ namespace MWInput
ret.push_back(A_MoveLeft); ret.push_back(A_MoveLeft);
ret.push_back(A_MoveRight); ret.push_back(A_MoveRight);
ret.push_back(A_Crouch); ret.push_back(A_Crouch);
ret.push_back(A_TogglePOV);
ret.push_back(A_Activate); ret.push_back(A_Activate);
ret.push_back(A_ToggleWeapon); ret.push_back(A_ToggleWeapon);
ret.push_back(A_ToggleSpell); ret.push_back(A_ToggleSpell);

3
apps/openmw/mwinput/inputmanagerimp.hpp
View file

@ -139,6 +139,7 @@ namespace MWInput
float mUISensitivity; float mUISensitivity;
float mCameraYMultiplier; float mCameraYMultiplier;
float mUIYMultiplier; float mUIYMultiplier;
float mPreviewPOVDelay;
bool mMouseLookEnabled; bool mMouseLookEnabled;
bool mGuiCursorEnabled; bool mGuiCursorEnabled;
@ -207,6 +208,8 @@ namespace MWInput
A_ToggleWalk, //Toggle Walking/Running A_ToggleWalk, //Toggle Walking/Running
A_Crouch, A_Crouch,
A_TogglePOV,
A_QuickSave, A_QuickSave,
A_QuickLoad, A_QuickLoad,
A_QuickMenu, A_QuickMenu,