eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 03:09:18 +02:00
Code Issues 121 Wiki Activity

Merge commit '730ba72516d74b9ec7d01b50f69d96fc99925c4d' into sim

Browse Source
This commit is contained in:
milek7
2020-10-19 02:31:38 +02:00
parent 9b7f10ab57 730ba72516
commit 6862696d8b
20 changed files with 241 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivermode.cpp
View File

@@ -562,7 +562,8 @@ driver_mode::update_camera( double const Deltatime ) {
// uwzględnienie ruchu wywołanego klawiszami
if( false == DebugCameraFlag ) {
// regular camera
if( ( false == FreeFlyModeFlag )
if( ( simulation::Train != nullptr )
&& ( false == FreeFlyModeFlag )
&& ( false == Global.CabWindowOpen ) ) {
// if in cab potentially alter camera placement based on changes in train object
Camera.m_owneroffset = simulation::Train->pMechOffset;
@@ -572,12 +573,14 @@ driver_mode::update_camera( double const Deltatime ) {
Camera.Update();
if( false == FreeFlyModeFlag ) {
if( ( simulation::Train != nullptr )
&& ( false == FreeFlyModeFlag ) ) {
// keep the camera within cab boundaries
Camera.m_owneroffset = simulation::Train->clamp_inside( Camera.m_owneroffset );
}
if( ( false == FreeFlyModeFlag )
if( ( simulation::Train != nullptr )
&& ( false == FreeFlyModeFlag )
&& ( false == Global.CabWindowOpen ) ) {
// cache cab camera in case of view type switch
simulation::Train->pMechViewAngle = { Camera.Angle.x, Camera.Angle.y };