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

build 190116. minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2019-01-16 15:04:32 +01:00
parent 6f48a6e55d
commit cfc35ee32e
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
McZapkie/Mover.cpp
View File

@@ -3173,18 +3173,7 @@ bool TMoverParameters::DecBrakePress(double &brake, double PressLimit, double dp
bool TMoverParameters::BrakeDelaySwitch(int BDS) bool TMoverParameters::BrakeDelaySwitch(int BDS)
{ {
bool rBDS; bool rBDS;
// if (BrakeCtrlPosNo > 0) if (Hamulec->SetBDF(BDS))
if (BrakeHandle == TBrakeHandle::MHZ_EN57)
{
if ((BDS != BrakeOpModeFlag) && ((BDS & BrakeOpModes) > 0))
{
BrakeOpModeFlag = BDS;
rBDS = true;
}
else
rBDS = false;
}
else if (Hamulec->SetBDF(BDS))
{ {
BrakeDelayFlag = BDS; BrakeDelayFlag = BDS;
rBDS = true; rBDS = true;

2
scene.cpp
View File

@@ -762,7 +762,7 @@ basic_section::insert( shape_node Shape ) {
// re-calculate section radius, in case shape geometry extends outside the section's boundaries // re-calculate section radius, in case shape geometry extends outside the section's boundaries
m_area.radius = std::max<float>( m_area.radius = std::max<float>(
m_area.radius, m_area.radius,
static_cast<float>( glm::length( m_area.center - shapedata.area.center ) + shapedata.area.radius ) ); static_cast<float>( glm::length( m_area.center - shapedata.area.center ) + Shape.radius() ) );
if( ( true == shapedata.translucent ) if( ( true == shapedata.translucent )
|| ( shapedata.rangesquared_max <= 90000.0 ) || ( shapedata.rangesquared_max <= 90000.0 )

1
scenenode.h
View File

@@ -140,6 +140,7 @@ public:
shapenode_data const & shapenode_data const &
data() const; data() const;
// get bounding radius // get bounding radius
// NOTE: use this method instead of direct access to the data member, due to lazy radius evaluation
float radius(); float radius();
private: private:

2
version.h
View File

@@ -1,5 +1,5 @@
#pragma once #pragma once
#define VERSION_MAJOR 19 #define VERSION_MAJOR 19
#define VERSION_MINOR 103 #define VERSION_MINOR 116
#define VERSION_REVISION 0 #define VERSION_REVISION 0