eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 11:39:19 +02:00
Code Issues 123 Wiki Activity

apply lerp also to walk speed

Browse Source
This commit is contained in:
milek7
2019-01-27 13:00:24 +01:00
parent 1760d8b377
commit 5f4ec676a6
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Camera.cpp
View File

@@ -73,10 +73,14 @@ TCamera::OnCommand( command_data const &Command ) {
30.0 : 30.0 :
1.0 ); 1.0 );
// threshold position on stick between walk lerp and walk/run lerp
auto const stickthreshold = 2.0 / 3.0;
// left-right // left-right
auto const movexparam { Command.param1 }; auto const movexparam { Command.param1 };
// 2/3rd of the stick range enables walk speed, past that we lerp between walk and run speed // 2/3rd of the stick range lerps walk speed, past that we lerp between max walk and run speed
auto const movex { walkspeed + ( std::max( 0.0, std::abs( movexparam ) - 0.65 ) / 0.35 ) * std::max( 0.0, movespeed - walkspeed ) }; auto const movex { walkspeed * std::min(std::abs(movexparam) * (1.0 / stickthreshold), 1.0)
+ ( std::max( 0.0, std::abs( movexparam ) - stickthreshold ) / (1.0 - stickthreshold) ) * std::max( 0.0, movespeed - walkspeed ) };
m_moverate.x = ( m_moverate.x = (
movexparam > 0.0 ? movex * speedmultiplier : movexparam > 0.0 ? movex * speedmultiplier :
@@ -85,7 +89,9 @@ TCamera::OnCommand( command_data const &Command ) {
// forward-back // forward-back
double const movezparam { Command.param2 }; double const movezparam { Command.param2 };
auto const movez { walkspeed + ( std::max( 0.0, std::abs( movezparam ) - 0.65 ) / 0.35 ) * std::max( 0.0, movespeed - walkspeed ) }; auto const movez { walkspeed * std::min(std::abs(movezparam) * (1.0 / stickthreshold), 1.0)
+ ( std::max( 0.0, std::abs( movezparam ) - stickthreshold ) / (1.0 - stickthreshold) ) * std::max( 0.0, movespeed - walkspeed ) };
// NOTE: z-axis is flipped given world coordinate system // NOTE: z-axis is flipped given world coordinate system
m_moverate.z = ( m_moverate.z = (
movezparam > 0.0 ? -movez * speedmultiplier : movezparam > 0.0 ? -movez * speedmultiplier :

6
keyboardinput.cpp
View File

@@ -228,12 +228,12 @@ keyboard_input::poll() {
glm::vec2 const movementhorizontal { glm::vec2 const movementhorizontal {
// x-axis // x-axis
( Global.shiftState ? 1.f : 0.5f ) * ( Global.shiftState ? 1.f : (2.0f / 3.0f) ) *
( input::keys[ m_bindingscache.left ] != GLFW_RELEASE ? -1.f : ( input::keys[ m_bindingscache.left ] != GLFW_RELEASE ? -1.f :
input::keys[ m_bindingscache.right ] != GLFW_RELEASE ? 1.f : input::keys[ m_bindingscache.right ] != GLFW_RELEASE ? 1.f :
0.f ), 0.f ),
// z-axis // z-axis
( Global.shiftState ? 1.f : 0.5f ) * ( Global.shiftState ? 1.f : (2.0f / 3.0f) ) *
( input::keys[ m_bindingscache.forward ] != GLFW_RELEASE ? 1.f : ( input::keys[ m_bindingscache.forward ] != GLFW_RELEASE ? 1.f :
input::keys[ m_bindingscache.back ] != GLFW_RELEASE ? -1.f : input::keys[ m_bindingscache.back ] != GLFW_RELEASE ? -1.f :
0.f ) }; 0.f ) };
@@ -254,7 +254,7 @@ keyboard_input::poll() {
float const movementvertical { float const movementvertical {
// y-axis // y-axis
( Global.shiftState ? 1.f : 0.5f ) * ( Global.shiftState ? 1.f : (2.0f / 3.0f) ) *
( input::keys[ m_bindingscache.up ] != GLFW_RELEASE ? 1.f : ( input::keys[ m_bindingscache.up ] != GLFW_RELEASE ? 1.f :
input::keys[ m_bindingscache.down ] != GLFW_RELEASE ? -1.f : input::keys[ m_bindingscache.down ] != GLFW_RELEASE ? -1.f :
0.f ) }; 0.f ) };