Camera position now changable

Author: SpechtMagnus

SphWaterfall/SphWaterfall/src/cui/CUI.cpp

@@ -127,8 +127,10 @@ void CUI::cleanAndExecuteCommand(bool is_config_execution, bool& exit_program) {
 	}
 	else if (command == "render")
 	{
-		current_command.setCommand(CUICommand::RENDER);
-		command_handler.handleCUICommand(current_command);
+		if (cleanRender()) {
+			current_command.setCommand(CUICommand::RENDER);
+			command_handler.handleCUICommand(current_command);
+		}
 		printInputMessage();
 	}
 	else if (command == "loadconfig")
@@ -216,8 +218,8 @@ void CUI::showHelp() {
 		<< "   simulate -t" << endl
 		<< "      start a sph simulation, time can be set with '-t' parameter." << endl << endl
 
-		<< "   render" << endl
-		<< "      start the rendering process." << endl << endl
+		<< "   render -v" << endl
+		<< "      start the rendering process, the camera can be set with '-v' parameter." << endl << endl
 
 		<< "   addsource -v" << endl
 		<< "      add a water source at a given point." << endl << endl
@@ -298,7 +300,7 @@ bool CUI::cleanMoveShutter() {
 		else {
 			current_command.removeParameter(parameter);
 			hasOnlyValidParameters = false;
-			std::cout << "Missing path parameter '-t'" << std::endl;
+			std::cout << "Missing time parameter '-t'" << std::endl;
 		}
 	}
 
@@ -333,7 +335,7 @@ bool CUI::cleanAddSource() {
 		else {
 			current_command.removeParameter(parameter);
 			hasOnlyValidParameters = false;
-			std::cout << "Missing path parameter '-v'" << std::endl;
+			std::cout << "Missing vector parameter '-v'" << std::endl;
 		}
 	}
 
@@ -355,7 +357,7 @@ bool CUI::cleanAddSink() {
 		{
 			current_command.removeParameter(parameter);
 			hasOnlyValidParameters = false;
-			std::cout << "Missing path parameter '-h'" << std::endl;
+			std::cout << "Missing height parameter '-h'" << std::endl;
 		}
 	}
 
@@ -380,4 +382,37 @@ bool CUI::cleanSimulate() {
 
 	return hasOnlyValidParameters;
 }
+bool CUI::cleanRender()
+{
+	bool hasOnlyValidParameters = true;
+
+	for (CUICommandParameter& parameter : current_command.getParameterList()) {
+		if (parameter.getParameterName() == "-v") {
+			std::string source_position = parameter.getValue();
+
+			if (source_position.find_first_not_of("+-,.0123456789 ") != std::string::npos)
+			{
+				std::cout << "'" << source_position << "' is not a valid input" << std::endl;
+				hasOnlyValidParameters = false;
+			}
+
+			int spaces = 0;
+			for (char character : source_position) {
+				if (character == ' ') {
+					spaces++;
+				}
+			}
+
+			if (spaces != 2) {
+				std::cout << "'" << source_position << "' is not a valid input" << std::endl;
+				hasOnlyValidParameters = false;
+			}
+		}
+		else {
+			current_command.removeParameter(parameter);
+		}
+	}
+
+	return hasOnlyValidParameters;
+}
 /* -_-_-_Commands End_-_-_- */

SphWaterfall/SphWaterfall/src/cui/CUI.h

@@ -35,4 +35,5 @@ class CUI {
 		bool cleanAddSource();
 		bool cleanAddSink();
 		bool cleanSimulate();
+		bool cleanRender();
 };

SphWaterfall/SphWaterfall/src/cui/CommandHandler.cpp

@@ -137,6 +137,7 @@ void CommandHandler::sendCommand(CUICommand& cui_command) {
 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);
 
 	switch (cui_command.getCommand()) {
 		case CUICommand::LOAD_MESH:
@@ -203,7 +204,11 @@ void CommandHandler::executeCommand(CUICommand& cui_command) {
 			}
 			break;
 		case CUICommand::RENDER:
-			render(loaded_mesh, loaded_shutter, 0);
+			if (cui_command.hasParameter("-v")) {
+				camera_position = parseToVector3(cui_command.getParameter(0).getValue());
+			}
+
+			render(loaded_mesh, loaded_shutter, 0, camera_position);
 			MPI_Barrier(MPI_COMM_WORLD);
 
 			// console feedback
@@ -326,27 +331,27 @@ void CommandHandler::simulate(int simulation_timesteps) {
 	if (mpi_rank == 1) {
 		std::vector<SphParticle> particles;
 
-		for (int i = 0; i < 20; i++) {
-			for (int j = 0; j < 20; j++) {
-				for (int k = 0; k < 20; k++) {
-					particles.push_back(SphParticle(Vector3(3.0 + i, 3.0 + j, 3.0 + k)));
+		/*for (int i = 0; i < 1; i++) {
+			for (int j = 1; j < 2; j++) {
+				for (int k = 0; k < 1; k++) {
+					particles.push_back(SphParticle(Vector3(i, j, k)));
 				}
 			}
-		}
+		}*/
 
 		sph_manager.add_particles(particles);
 	}
 	sph_manager.simulate(simulation_timesteps);
 }
 
-void CommandHandler::render(Terrain loaded_mesh, Terrain loaded_shutter, int shutter_time) {
+void CommandHandler::render(Terrain loaded_mesh, Terrain loaded_shutter, int shutter_time, Vector3 cameraPosition) {
 	if (mpi_rank == 0) {
 		cout << "Rendering in progress..." << endl;
 	}
 	VisualizationManager::importTerrain(loaded_mesh, false);
 	VisualizationManager::importTerrain(loaded_shutter, true);
 
-	VisualizationManager::init(Vector3(10, 5, -20), 200, 200, 10*5);
+	VisualizationManager::init(cameraPosition, 800, 600, 10*5);
 	//VisualizationManager::renderFrames("sph.ptcl");
 	VisualizationManager::renderFramesDistributed("sph.ptcl", mpi_rank);
 
@@ -360,6 +365,11 @@ void CommandHandler::render(Terrain loaded_mesh, Terrain loaded_shutter, int shu
 void CommandHandler::addSource(std::string source_position_string) {
 	Vector3 source_position = parseToVector3(source_position_string);
 	//sph_manager.setSource(source_position);
+	if (mpi_rank == 1) {
+		std::vector<SphParticle> particles;
+		particles.push_back(SphParticle(source_position));
+		sph_manager.add_particles(particles);
+	}
 	std::cout << "New source: " << source_position << std::endl;
 }
 

SphWaterfall/SphWaterfall/src/cui/CommandHandler.h

@@ -40,7 +40,7 @@ class CommandHandler {
 		void createExport(int simulation_timesteps);
 		void moveShutter(std::string);
 		void simulate(int simulation_timesteps);
-		void render(Terrain, Terrain, int);
+		void render(Terrain, Terrain, int, Vector3);
 		void addSource(std::string);
 		void addSink(std::string);
 };

SphWaterfall/SphWaterfall/src/visualization/VisualizationManager.cpp

@@ -6,6 +6,10 @@ void VisualizationManager::init(Vector3 cameraLocation, unsigned int frameWidth,
 	camera = Camera(cameraLocation, cameraDir.normalize(), frameWidth, frameHeight);
 	if (terrain.getVertexCount() > 0 && gate.getVertexCount() > 0) {
 		camera.renderGeometryFrames(terrain, gate);
+		std::cout << "Terrain rendered" << std::endl;
+	}
+	else {
+		std::cout << "No terrain found" << std::endl;
 	}
 	initilaized = true;
 }
@@ -102,6 +106,7 @@ void VisualizationManager::renderFramesDistributed(string inputFileName, int ran
 				Frame f = camera.renderFrame(frame, i);
 
 				writeFrameToBitmap(f, (("output/frame_" + std::to_string(i)) + ".bmp").c_str(), f.getWidth(), f.getHeight());
+				std::cout << "Frame " << i+1 << "/" << frameCount << " finished on Processor " << rank << "." << std::endl;
 				counter++;
 			}
 		}

SphWaterfall/SphWaterfall/src/visualization/util.h

@@ -19,7 +19,7 @@ const int infoHeaderSize = 40;
 
 
 static Vector3 findRightSkalar(Vector3 vec, Vector3 right) {
-	Vector3 left = Vector3(right.x * -1, right.y * -1, right.z * -1);
+	Vector3 left = right * -1;
 
 	if (vec.x >= 0) {
 		if ((vec.z > 0 && right.x < 0) || (vec.z < 0 && right.x > 0) || (vec.z == 0 && right.z > 0)) return left;