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

oneshot eventlauncher magic changed to -10000

Browse Source
This commit is contained in:
milek7
2019-04-26 01:08:22 +02:00
parent 2ffd2e569c
commit 633addfd5c
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
EvLaunch.cpp
View File

@@ -68,7 +68,7 @@ bool TEventLauncher::Load(cParser *parser)
}
parser->getTokens();
*parser >> DeltaTime;
if (DeltaTime <= 0)
if (DeltaTime < 0.0)
DeltaTime = -DeltaTime; // dla ujemnego zmieniamy na dodatni
else if (DeltaTime > 0)
{ // wartość dodatnia oznacza wyzwalanie o określonej godzinie
@@ -157,7 +157,7 @@ bool TEventLauncher::check_activation() {
auto bCond { false };
if (DeltaTime == 0.0) {
if (DeltaTime == 10000.0) {
if (UpdatedTime == 0.0)
bCond = true;
UpdatedTime = 1.0;
@@ -260,10 +260,7 @@ TEventLauncher::export_as_text_( std::ostream &Output ) const {
Output << "none ";
}
// activation interval or hour
if (DeltaTime == 0.0) {
Output << "0 ";
}
else if( DeltaTime < 0.0 ) {
if( DeltaTime != 0.0 ) {
// cyclical launcher
Output << -DeltaTime << ' ';
}

2
simulation.cpp
View File

@@ -190,7 +190,7 @@ void state_manager::process_commands() {
TAnimModel *model = simulation::State.create_model(data, name, commanddata.location);
simulation::State.create_eventlauncher("node -1 0 launcher eventlauncher 0 0 0 " + std::to_string(model->radius())
+ " none 0.0 obstacle_collision end", name + "_snd", commanddata.location);
+ " none -10000.0 obstacle_collision end", name + "_snd", commanddata.location);
}
if (commanddata.command == user_command::deletemodel) {