Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated time command to support timeline of times #4

Merged
merged 4 commits into from
Jul 17, 2021
Merged

Updated time command to support timeline of times #4

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8df77d
wip
Fank Jul 17, 2021
dc0450e
back
Fank Jul 17, 2021
f7ca72c
Revert "back"
Fank Jul 17, 2021
aac1ef2
fixed naming
Fank Jul 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions OcapReplaySaver2/OcapReplaySaver2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
#define COMMAND_CHECK_INPUT_PARAMETERS2(N,M) if(args.size()!=N && args.size()!=M){LOG(WARNING) << "Expected " << N << " or " << M << " arguments";ERROR_THROW("Unexpected number of given arguments!"); }
#define COMMAND_CHECK_INPUT_PARAMETERS3(N,M,O) if(args.size()!=N&&args.size()!=M&&args.size()!=O){LOG(WARNING) << "Expected " << N << " or " << M << " or " << O << " arguments";ERROR_THROW("Unexpected number of given arguments!"); }
#define COMMAND_CHECK_INPUT_PARAMETERS4(N,M,O,P) if(args.size()!=N&&args.size()!=M&&args.size()!=O&&args.size()!=P){LOG(WARNING) << "Expected " << N << " or " << M << " or " << O << " or " << P << " arguments";ERROR_THROW("Unexpected number of given arguments!"); }
#define COMMAND_CHECK_INPUT_PARAMETERS_N(N,M) if(args.size()<N || args.size()>M){LOG(WARNING) << "Expected between " << N << " and " << M << " arguments";ERROR_THROW("Unexpected number of given arguments!"); }
#define COMMAND_CHECK_WRITING_STATE if(!is_writing.load()) {ERROR_THROW("Is not writing state!")}

#define JSON_STR_FROM_ARG(N) (json::string_t(filterSqfString(args[N])))
Expand Down Expand Up @@ -1013,10 +1014,8 @@ void commandFired(const vector<string>& args)
}

// START: 4:["Woodland_ACR"::"RBC_194_Psy_woiny_13a"::"[TF]Shatun63"::1.23]
// START: 5:["Woodland_ACR"::"RBC_194_Psy_woiny_13a"::"[TF]Shatun63"::1.23::"2000-12-31T23:59:59.000"]
// START: 6:["Woodland_ACR"::"RBC_194_Psy_woiny_13a"::"[TF]Shatun63"::1.23::"2000-12-31T23:59:59.000"::"2000-12-31T23:59:59.000"]
void commandStart(const vector<string>& args) {
COMMAND_CHECK_INPUT_PARAMETERS3(4,5,6);
COMMAND_CHECK_INPUT_PARAMETERS(4);

if (is_writing) {
LOG(WARNING) << ":START: while writing mission. Clearing old data.";
Expand All @@ -1041,25 +1040,26 @@ void commandStart(const vector<string>& args) {
j["missionName"] = JSON_STR_FROM_ARG(1);
j["missionAuthor"] = JSON_STR_FROM_ARG(2);
j["captureDelay"] = JSON_FLOAT_FROM_ARG(3);
if (args.size() > 4) {
j["systemTimeUTC"] = JSON_STR_FROM_ARG(4);
}
if (args.size() > 5) {
j["gameStartTime"] = JSON_STR_FROM_ARG(5);
}

mission_type = config.newServerGameType;

LOG(INFO) << "Starting record." << args[0] << args[1] << args[2] << args[3];
CLOG(INFO, "ext") << "Starting record." << args[0] << args[1] << args[2] << args[3];
}

// TIME: 1:["2000-12-31T23:59:59.000"]
// TIME: 5:[0,"2000-12-31T23:59:59.000"::"2000-12-31T23:59:59.000"::1.0::120.203]
void commandTime(const vector<string>& args) {
COMMAND_CHECK_INPUT_PARAMETERS(1);
COMMAND_CHECK_INPUT_PARAMETERS(5);
COMMAND_CHECK_WRITING_STATE;

j["systemTimeUTC"] = JSON_STR_FROM_ARG(0);
json time{
{ "frameNum", JSON_INT_FROM_ARG(0) },
{ "systemTimeUTC", JSON_STR_FROM_ARG(1) },
{ "date", JSON_STR_FROM_ARG(2) },
{ "timeMultiplier", JSON_FLOAT_FROM_ARG(3) },
{ "time", JSON_FLOAT_FROM_ARG(4) }
};
j["times"].push_back(time);
}

// :NEW:UNIT: 6:[0::0::"|UN|Capt.Farid"::"Alpha 1-1"::"EAST"::1]
Expand Down