eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

TAirCoupler - partial refactor

Browse Source 
- rename private members
 - refactor TAirCoupler::GetStatus()
 - add some English comments

 - add 'doc/' in .gitingore

TODO:
 - rename arguments when refactor other files (as TModel3d, cParser).
This commit is contained in:
Kamil Lewan
2017-10-26 19:50:48 +02:00
parent 7ff873178d
commit 3fe968544a
3 changed files with 68 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
AirCoupler.cpp
View File

@@ -19,60 +19,73 @@ TAirCoupler::~TAirCoupler()
{
}
// zwraca 1, jeśli istnieje model prosty, 2 gdy skośny
/**
* Returns 0 when straight model exists,
* 2 when oblique model exists, and 0 when neither of them exist.
*/
int TAirCoupler::GetStatus()
{ // zwraca 1, jeśli istnieje model prosty, 2 gdy skośny
int x = 0;
if (pModelOn)
x = 1;
if (pModelxOn)
x = 2;
return x;
{
if (ModelOn) return 1;
if (ModelxOn) return 2;
return 0;
}
// zerowanie wskaźników
/**
* Reset pointers.
*/
void TAirCoupler::Clear()
{ // zerowanie wskaźników
pModelOn = NULL;
pModelOff = NULL;
pModelxOn = NULL;
bOn = false;
bxOn = false;
{
ModelOn = NULL;
ModelOff = NULL;
ModelxOn = NULL;
On = false;
xOn = false;
}
void TAirCoupler::Init(std::string const &asName, TModel3d *pModel)
{ // wyszukanie submodeli
if (!pModel)
// wyszukanie submodeli
/**
* Looks for submodels.
*/
void TAirCoupler::Init(std::string const &asName, TModel3d *Model)
{
if (!Model)
return; // nie ma w czym szukać
pModelOn = pModel->GetFromName( asName + "_on" ); // połączony na wprost
pModelOff = pModel->GetFromName( asName + "_off" ); // odwieszony
pModelxOn = pModel->GetFromName( asName + "_xon" ); // połączony na skos
// polaczony na wprost
/** Straight connect. */
ModelOn = Model->GetFromName(asName + "_on");
// odwieszony
/** Not connected. Hung up. */
ModelOff = Model->GetFromName(asName + "_off");
// polaczony na skos
/** Oblique connect. */
ModelxOn = Model->GetFromName(asName + "_xon");
}
void TAirCoupler::Load(cParser *Parser, TModel3d *pModel)
void TAirCoupler::Load(cParser *Parser, TModel3d *Model)
{
std::string name = Parser->getToken<std::string>();
if( pModel ) {
Init( name, pModel );
if(Model)
{
Init(name, Model);
}
else
{
pModelOn = NULL;
pModelxOn = NULL;
pModelOff = NULL;
ModelOn = NULL;
ModelxOn = NULL;
ModelOff = NULL;
}
}
void TAirCoupler::Update()
{
// if ((pModelOn!=NULL) && (pModelOn!=NULL))
// if ((pModelOn!=NULL) && (pModelOn!=NULL)) // legacy bullshitt alert
{
if (pModelOn)
pModelOn->iVisible = bOn;
if (pModelOff)
pModelOff->iVisible = !(bOn || bxOn);
if (pModelxOn)
pModelxOn->iVisible = bxOn;
if (ModelOn)
ModelOn->iVisible = On;
if (ModelOff)
ModelOff->iVisible = !(On || xOn);
if (ModelxOn)
ModelxOn->iVisible = xOn;
}
}
//---------------------------------------------------------------------------