eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-11 15:44:35 +01:00
Code Issues 139 Wiki Activity

Merge branch 'master' into feat/renderers-cleanup

Browse Source
This commit is contained in:
Hirek
2026-11-07 16:44:51 +01:00
parent b151898071 939e42b611
commit d4120ea5db
177 changed files with 11657 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vehicle/DynObj.h
View File

@@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/.
#include "interfaces/ITexture.h"
#include "audio/sound.h"
#include "world/Spring.h"
#include "vehicle/mirrors.h"
#include <vector>
@@ -392,6 +393,13 @@ private:
side placement {};
};
struct mirror_sounds {
sound_source unfold { sound_placement::general };
sound_source fold { sound_placement::general };
side placement {};
int end {}; // of the vehicle, the mirror moves with the cab at this end occupied
};
struct exchange_sounds {
sound_source loading { sound_placement::general };
sound_source unloading { sound_placement::general };
@@ -404,7 +412,7 @@ private:
bool atjoints { false }; // distance comes from TTrack::rail_phase
};
// whether the axle has just passed a rail joint. On a track with dipping joints it goes by them, elsewhere the axle counts a rail off itself
bool axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction );
bool axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction ) const;
struct powertrain_sounds {
sound_source inverter { sound_placement::engine };
@@ -569,6 +577,8 @@ private:
std::vector<pantograph_sounds> m_pantographsounds; // typically 2 but can be less (or more?)
std::vector<door_sounds> m_doorsounds; // can expect symmetrical arrangement, but don't count on it
bool m_doorlocks { false }; // sound helper, current state of door locks
std::vector<mirror_sounds> m_mirrorsounds;
std::array<mirror_moves::motion, 2> m_mirrormotion; // indexed by side: right, left
sound_source sHorn1 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE };
sound_source sHorn2 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE };
sound_source sHorn3 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE };
@@ -707,6 +717,8 @@ private:
void Move(double fDistance);
void FastMove(double fDistance);
void RenderSounds();
// plays the sounds of the mirrors on the Side, of the occupied cab, starting the Event
void play_mirror_sounds( side const Side, mirror_moves::event const Event );
inline glm::dvec3 GetPosition() const {
return vPosition; };
// converts location from vehicle coordinates frame to world frame
@@ -819,7 +831,9 @@ private:
void ParamSet(int what, int into);
// zapytanie do AI, po którym segmencie skrzyżowania jechać
int RouteWish(TTrack *tr);
void DestinationSet(std::string to, std::string numer);
void DestinationSet(std::string const &to, std::string const &numer);
// blanks electronic destination sign at the end of the service; physical signs stay until changed
void DestinationClear();
material_handle DestinationFind( std::string Destination );
void OverheadTrack(float o);
glm::dvec3 get_future_movement() const;