mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-21 21:24:58 +01:00
The shake of the cab camera (ShakeState) is stepped by update_shake at a fixed 1/50 s, while the camera read the raw state every frame. At any frame rate other than 50 the shake moved in steps: some frames showed the same state as the one before, others jumped one or two steps at once. Players with 144/165 Hz screens saw the cab jump around the camera. The vehicle now keeps the state from before the last step (ShakeStateBefore), and the camera takes the state between the two at the share of the step the simulation time has reached (shake_between). The offset and the velocity are blended, the angles worked out from the blended velocity. The shake itself is computed as before, with the same fixed step and the same springs; only what the camera shows of it changes. It lags the vehicle by a constant 1/50 s instead of 0 to 1/50 s. Measured with the same build and the blending switched off by a temporary environment variable (not in this commit), the EU07 on td.scn driven by the AI, frames over 30 km/h, two runs of each: - 60 fps: frames with the shake standing still 25% -> 0%, the change in its speed frame to frame 4-5 times smaller for the offset, a third smaller for the angles - ~144 fps: 65% -> 0%, 10-18 times smaller for the offset, 4 times for the angles - no fps limit (~520 fps): 90% -> 0% Co-authored-by: maj00r <maj00r@host>
122 lines
3.9 KiB
C++
122 lines
3.9 KiB
C++
/*
|
|
This Source Code Form is subject to the
|
|
terms of the Mozilla Public License, v.
|
|
2.0. If a copy of the MPL was not
|
|
distributed with this file, You can
|
|
obtain one at
|
|
http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "application/applicationmode.h"
|
|
|
|
#include "input/driverkeyboardinput.h"
|
|
#include "input/drivermouseinput.h"
|
|
#include "input/gamepadinput.h"
|
|
#include "Console.h"
|
|
#include "vehicle/Camera.h"
|
|
#include "utilities/Classes.h"
|
|
#ifdef WITH_UART
|
|
#include "utilities/uart.h"
|
|
#endif
|
|
#ifdef WITH_ZMQ
|
|
#include "input/zmq_input.h"
|
|
#endif
|
|
|
|
class driver_mode : public application_mode {
|
|
|
|
public:
|
|
// constructors
|
|
driver_mode();
|
|
|
|
// methods
|
|
// initializes internal data structures of the mode. returns: true on success, false otherwise
|
|
bool init() override;
|
|
// mode-specific update of simulation data. returns: false on error, true otherwise
|
|
bool update() override;
|
|
// maintenance method, called when the mode is activated
|
|
void enter() override;
|
|
// maintenance method, called when the mode is deactivated
|
|
void exit() override;
|
|
// input handlers
|
|
void on_key( int Key, int Scancode, int Action, int Mods ) override;
|
|
void on_cursor_pos( double Horizontal, double Vertical ) override;
|
|
void on_mouse_button( int Button, int Action, int Mods ) override;
|
|
void on_scroll( double Xoffset, double Yoffset ) override;
|
|
void on_window_resize( int w, int h ) override { ; }
|
|
void on_event_poll() override;
|
|
bool is_command_processor() const override;
|
|
|
|
private:
|
|
// types
|
|
enum view {
|
|
consistfront,
|
|
consistrear,
|
|
bogie,
|
|
driveby,
|
|
count_
|
|
};
|
|
|
|
struct view_config {
|
|
TDynamicObject const *owner { nullptr };
|
|
glm::vec3 offset {};
|
|
glm::vec3 angle {};
|
|
};
|
|
|
|
struct drivermode_input {
|
|
|
|
gamepad_input gamepad;
|
|
drivermouse_input mouse;
|
|
glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode
|
|
driverkeyboard_input keyboard;
|
|
#ifdef _WIN32
|
|
Console console;
|
|
#endif
|
|
#ifdef WITH_UART
|
|
std::unique_ptr<uart_input> uart;
|
|
#endif
|
|
#ifdef WITH_ZMQ
|
|
std::unique_ptr<zmq_input> zmq;
|
|
#endif
|
|
std::unique_ptr<motiontelemetry> telemetry;
|
|
|
|
bool init();
|
|
void poll();
|
|
std::string
|
|
binding_hints( std::pair<user_command, user_command> const &Commands ) const;
|
|
std::pair<user_command, user_command>
|
|
command_fallback( user_command const Command ) const;
|
|
};
|
|
|
|
// methods
|
|
void update_camera( const double Deltatime );
|
|
double shake_fraction() const;
|
|
// handles vehicle change flag
|
|
void OnKeyDown( int cKey );
|
|
void InOutKey();
|
|
void CabView();
|
|
void ExternalView();
|
|
void DistantView( bool const Near = false );
|
|
void set_picking( bool const Picking );
|
|
|
|
// members
|
|
drivermode_input m_input;
|
|
std::array<basic_event *, 10> KeyEvents { nullptr }; // eventy wyzwalane z klawiaury
|
|
TCamera Camera;
|
|
TCamera DebugCamera;
|
|
int m_externalviewmode { view::consistfront }; // selected external view mode
|
|
bool m_externalview { true };
|
|
std::array<view_config, view::count_> m_externalviewconfigs;
|
|
TDynamicObject *pDynamicNearest { nullptr }; // vehicle nearest to the active camera. TODO: move to camera
|
|
double fTime50Hz { 0.0 }; // bufor czasu dla komunikacji z PoKeys
|
|
double const m_primaryupdaterate { 1.0 / 100.0 };
|
|
double const m_secondaryupdaterate { 1.0 / 50.0 };
|
|
double m_primaryupdateaccumulator { m_secondaryupdaterate }; // keeps track of elapsed simulation time, for core fixed step routines
|
|
double m_secondaryupdateaccumulator { m_secondaryupdaterate }; // keeps track of elapsed simulation time, for less important fixed step routines
|
|
int iPause { 0 }; // wykrywanie zmian w zapauzowaniu
|
|
command_relay m_relay;
|
|
std::string change_train; // train name awaiting entering
|
|
bool m_editorpending { false }; // scenery was opened for editing, switch to the editor after the initial update
|
|
};
|