Merge commit maybe

(And added posibility to set resolution)

Author: SpechtMagnus

README.txt

@@ -18,7 +18,8 @@ Flags:
       | simulate: simulation time
       | moveshutter: time at which the shutter is moved
    -v | followed by 3 numbers x y z, who stand for the coordinates of a point in 3D space
-   -h | for addsink which determines the sink height
+   -h | for addsink which determines the sink height or for render sets the height of the output image
+   -w | for render sets the width of the output image
 
 Commands:
 	print
@@ -45,10 +46,10 @@ Commands:
 	addsink -h
 		Add a sink at a given height.
 
-	simulate -t
+	simulate [-t]
 		Start a sph-simulation. Simulated time can be set with '-t' parameter.
 
-	render -v
+	render [-v] [-w -h]
 		Start the rendering process. The camera can be set with '-v' parameter. Camera is looking roughly towards (0,0,0)
 
 	help

SphWaterfall/SphWaterfall/src/cui/CUI.cpp

@@ -40,6 +40,7 @@ void CUI::parseCommand(std::string input_line) {
 
 	while (command_token_stream >> command) {
 		if (!first_loop_done) {
+			// Reads the name of the command
 			std::transform(command.begin(), command.end(), command.begin(), ::tolower);
 			current_command = CUICommand(command, input_line);
 			first_loop_done = true;
@@ -49,25 +50,32 @@ void CUI::parseCommand(std::string input_line) {
 		// is new parameter when string starts with '-' and there are no numbers in it
 		bool isNewParameter = ((command.front() == '-') && (command.find_first_of("0123456789") == std::string::npos));
 
-		if (!isNewParameter) {
-			if (!last_read_parameter_value.isNull()) {
-				last_read_parameter_value.set(last_read_parameter_value.getInternal() + " " + command);
-			}
-			else {
-				last_read_parameter_value.set(command);
-			}
-		}
 
-		if ((command_token_stream.rdbuf()->in_avail() == 0) || (!last_read_parameter_name.isNull() && isNewParameter)) {
-			current_command.addParameter(CUICommandParameter(last_read_parameter_name.getInternal(), trimQuotemarks(last_read_parameter_value.getInternal())));
-			last_read_parameter_name.reset();
-			last_read_parameter_value.reset();
-		}
 		if (isNewParameter) {
+			// Are we reding a new parameter...
+			if (!last_read_parameter_name.isNull()) {
+				current_command.addParameter(
+					CUICommandParameter(last_read_parameter_name.getInternal(), trimQuotemarks(last_read_parameter_value.getInternal()))
+				);
+			}
+
 			last_read_parameter_name.set(command);
 			last_read_parameter_value.reset();
+		} else {
+			// ...or a value for the current parameter
+			last_read_parameter_value.set(
+				(last_read_parameter_value.isNull()) ?
+				command :
+				last_read_parameter_value.getInternal() + " " + command
+			);
 		}
 	}
+
+	if (!last_read_parameter_name.isNull()) {
+		current_command.addParameter(
+			CUICommandParameter(last_read_parameter_name.getInternal(), trimQuotemarks(last_read_parameter_value.getInternal()))
+		);
+	}
 }
 
 void CUI::cleanAndExecuteCommand(bool is_config_execution, bool& exit_program) {
@@ -196,7 +204,8 @@ void CUI::showHelp() {
 		<< "      | simulate: simulation time" << endl
 		<< "      | moveshutter: time at which the shutter is moved" << endl
 		<< "   -v | followed by 3 numbers x y z, who stand for the coordinates of a point in 3D space" << endl
-		<< "   -h | for addsink which determines the sink height" << endl << endl
+		<< "   -h | for addsink which determines the sink height or for render sets the height of the output image" << endl << endl
+		<< "   -w | for render sets the width of the output image" << endl << endl
 
 		<< "Commands:" << endl
 		<< "   print" << endl
@@ -223,11 +232,11 @@ void CUI::showHelp() {
 		<< "   addsink -h" << endl
 		<< "      Add a senk at a given height" << endl << endl
 
-		<< "   simulate -t" << endl
+		<< "   simulate [-t]" << endl
 		<< "      Start a sph-simulation. Time can be set with '-t' parameter." << endl << endl
 
-		<< "   render -v" << endl
-		<< "      Start the rendering process. The camera position can be set with '-v' parameter. Camera is looking roughly towards (0,0,0)." << endl << endl
+		<< "   render [-v] [-w -h]" << endl
+		<< "      Start the rendering process. The camera position can be set with '-v' parameter. Camera is looking roughly towards (0,0,0). -w and -h can be used to set the reolution of the output images." << endl << endl
 
 		<< "   help" << endl
 		<< "      Show help" << endl << endl
@@ -410,6 +419,13 @@ bool CUI::cleanRender()
 				hasOnlyValidParameters = false;
 			}
 		}
+		else if (parameter.getParameterName() == "-w" || parameter.getParameterName() == "-h"){
+			std::string resolution_value = parameter.getValue();
+			if (resolution_value.find_first_not_of("+-,.0123456789") != std::string::npos) {
+				hasOnlyValidParameters = false;
+				std::cout << "'" << resolution_value << "' is not a number" << std::endl;
+			}
+		}
 		else {
 			current_command.removeParameter(parameter);
 		}

SphWaterfall/SphWaterfall/src/cui/CUICommand.cpp

@@ -58,6 +58,17 @@ CUICommandParameter CUICommand::getParameter(int index) const {
 	return parameter_list.at(index);
 }
 
+int CUICommand::getParameterIndex(std::string parameter_name)
+{
+	for (int i = 0; i < parameter_list.size(); i++) {
+		CUICommandParameter& parameter = parameter_list.at(i);
+		if (parameter.getParameterName() == parameter_name) {
+			return i;
+		}
+	}
+	return -1;
+}
+
 void CUICommand::addParameter(CUICommandParameter parameter) {
 	parameter_list.push_back(parameter);
 }

SphWaterfall/SphWaterfall/src/cui/CUICommand.h

@@ -33,6 +33,7 @@ class CUICommand {
 		std::string getCommandName() const;
 		std::vector<CUICommandParameter> getParameterList() const;
 		CUICommandParameter getParameter(int index) const;
+		int getParameterIndex(std::string parameter_name);
 		void addParameter(CUICommandParameter parameter);
 		bool removeParameter(CUICommandParameter parameter);
 		bool removeParameter(std::string parameter_name);

SphWaterfall/SphWaterfall/src/cui/CommandHandler.cpp

@@ -138,6 +138,7 @@ void CommandHandler::executeCommand(CUICommand& cui_command) {
 	std::string file_path, time_for_move, source_position, sink_height;
 	int simulation_timesteps;
 	Vector3 camera_position = Vector3(0, 5, -5);
+	unsigned int width = 800, height = 600;
 
 	switch (cui_command.getCommand()) {
 		case CUICommand::LOAD_MESH:
@@ -205,10 +206,15 @@ void CommandHandler::executeCommand(CUICommand& cui_command) {
 			break;
 		case CUICommand::RENDER:
 			if (cui_command.hasParameter("-v")) {
-				camera_position = parseToVector3(cui_command.getParameter(0).getValue());
+				camera_position = parseToVector3(cui_command.getParameter(cui_command.getParameterIndex("-v")).getValue());
 			}
 
-			render(loaded_mesh, loaded_shutter, 0, camera_position);
+			if (cui_command.hasParameter("-w") && cui_command.hasParameter("-h")) {
+				width = parseToUInteger(cui_command.getParameter(cui_command.getParameterIndex("-w")).getValue());
+				height = parseToUInteger(cui_command.getParameter(cui_command.getParameterIndex("-h")).getValue());
+			}
+
+			render(loaded_mesh, loaded_shutter, 0, camera_position, width, height);
 			MPI_Barrier(MPI_COMM_WORLD);
 
 			// console feedback
@@ -245,13 +251,19 @@ void CommandHandler::executeCommand(CUICommand& cui_command) {
 	}
 }
 
+
 int CommandHandler::parseToInteger(std::string input) {
 	std::istringstream input_parse_stream(input);
 	int output;
 	input_parse_stream >> output;
 	return output;
 }
 
+unsigned int CommandHandler::parseToUInteger(std::string input) {
+	int result = this->parseToInteger(input);
+	return (result > 0) ? result : 0;
+}
+
 double CommandHandler::parseToDouble(std::string input) {
 	std::istringstream input_parse_stream(input);
 	double output;
@@ -363,14 +375,28 @@ void CommandHandler::simulate(int simulation_timesteps) {
 	sph_manager.simulate(simulation_timesteps);
 }
 
-void CommandHandler::render(Terrain loaded_mesh, Terrain loaded_shutter, int shutter_time, Vector3 cameraPosition) {
-	if (mpi_rank == 0) {
-		cout << "Rendering in progress..." << endl;
-	}
+void CommandHandler::render(Terrain loaded_mesh, Terrain loaded_shutter, int shutter_time, Vector3 cameraPosition, unsigned int width, unsigned int height) {
+	int worldSize;
+	MPI_Comm_size(MPI_COMM_WORLD, &worldSize);
+	
 	VisualizationManager::importTerrain(loaded_mesh, false);
 	VisualizationManager::importTerrain(loaded_shutter, true);
 
-	VisualizationManager::init(cameraPosition, 800, 600, mpi_rank);
+	if (mpi_rank == 0) {
+
+		for (int i = 1; i < worldSize; i++) {
+			MPI_Send(&width, 1, MPI_UNSIGNED, i, 0, MPI_COMM_WORLD);
+			MPI_Send(&height, 1, MPI_UNSIGNED, i, 0, MPI_COMM_WORLD);
+		}
+
+		cout << "Rendering in progress with (" << width << " * " << height << ") ..." << endl;
+	}
+	else {
+		MPI_Recv(&width, 1, MPI_UNSIGNED, 0, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+		MPI_Recv(&height, 1, MPI_UNSIGNED, 0, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+	}
+
+	VisualizationManager::init(cameraPosition, width, height, mpi_rank);
 	//VisualizationManager::renderFrames("sph.ptcl");
 	VisualizationManager::renderFramesDistributed("sph.ptcl", mpi_rank);
 

SphWaterfall/SphWaterfall/src/cui/CommandHandler.h

@@ -32,6 +32,7 @@ class CommandHandler {
 		void executeCommand(CUICommand&);
 
 		int parseToInteger(std::string);
+		unsigned int parseToUInteger(std::string);
 		double parseToDouble(std::string);
 		Vector3 parseToVector3(std::string);
 
@@ -40,7 +41,7 @@ class CommandHandler {
 		void createExport(int simulation_timesteps);
 		void moveShutter(std::string);
 		void simulate(int simulation_timesteps);
-		void render(Terrain, Terrain, int, Vector3);
+		void render(Terrain, Terrain, int, Vector3, unsigned int, unsigned int);
 		void addSource(std::string);
 		void addSink(std::string);
 };