WallyHackenslacker/PhotonMF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed arg parsing.

Browse Source
This commit is contained in:
Wally Hackenslacker
2016-12-25 21:53:26 -04:00
parent 54bf4d4822
commit 876ecc14cc
2 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main.cpp
View File

@@ -45,33 +45,33 @@ int main(int argc, char ** argv) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
input_file = argv[2]; input_file = argv[1];
if(argc >= 4) { if(argc >= 5) {
g_h = atoi(argv[2]); g_h = atoi(argv[3]);
if (g_h <= 0) { if (g_h <= 0) {
cerr << "USAGE: " << argv[0] << " IN FILE [OUT FILE [HEIGHT WIDTH [SAMPLES [FIELD OF VIEW]]]]" << endl; cerr << "USAGE: " << argv[0] << " IN FILE [OUT FILE [HEIGHT WIDTH [SAMPLES [FIELD OF VIEW]]]]" << endl;
cerr << "HEIGHT must be positive" << endl; cerr << "HEIGHT must be positive" << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
g_w = atoi(argv[3]); g_w = atoi(argv[4]);
if (g_w <= 0) { if (g_w <= 0) {
cerr << "USAGE: " << argv[0] << " IN FILE [OUT FILE [HEIGHT WIDTH [SAMPLES [FIELD OF VIEW]]]]" << endl; cerr << "USAGE: " << argv[0] << " IN FILE [OUT FILE [HEIGHT WIDTH [SAMPLES [FIELD OF VIEW]]]]" << endl;
cerr << "WIDTH must be positive" << endl; cerr << "WIDTH must be positive" << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if(argc >= 5) { if(argc >= 6) {
g_samples = atoi(argv[4]); g_samples = atoi(argv[5]);
if (g_samples <= 0) { if (g_samples <= 0) {
cerr << "USAGE: " << argv[0] << " IN FILE [OUT FILE [HEIGHT WIDTH [SAMPLES [FIELD OF VIEW]]]]" << endl; cerr << "USAGE: " << argv[0] << " IN FILE [OUT FILE [HEIGHT WIDTH [SAMPLES [FIELD OF VIEW]]]]" << endl;
cerr << "SAMPLES must be greater than 1" << endl; cerr << "SAMPLES must be greater than 1" << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if(argc >= 6) { if(argc >= 7) {
g_fov = atof(argv[5]); g_fov = atof(argv[6]);
if (g_fov <= 0) { if (g_fov <= 0) {
cerr << "USAGE: " << argv[0] << " IN FILE [OUT FILE [HEIGHT WIDTH [SAMPLES [FIELD OF VIEW]]]]" << endl; cerr << "USAGE: " << argv[0] << " IN FILE [OUT FILE [HEIGHT WIDTH [SAMPLES [FIELD OF VIEW]]]]" << endl;
cerr << "FIELD OF VIEW must be greater than 1.0" << endl; cerr << "FIELD OF VIEW must be greater than 1.0" << endl;
@@ -81,7 +81,7 @@ int main(int argc, char ** argv) {
} }
} }
out = fopen(argc >= 2 ? argv[1] : OUT_FILE, "wb"); out = fopen(argc >= 3 ? argv[2] : OUT_FILE, "wb");
image = new vec3*[g_h]; image = new vec3*[g_h];
for (int i = 0; i < g_h; i++) { for (int i = 0; i < g_h; i++) {

50
output.ppm
View File

File diff suppressed because one or more lines are too long