Fixed white gate and particles rendering in front of terrain that were supposed to be behind

Author: BuildTools

SphWaterfall/SphWaterfall/src/visualization/Camera.cpp

@@ -84,7 +84,7 @@ Pixel Camera::castDebugRay(Ray& ray, std::vector<DebugObject> particles) {
 
 Pixel Camera::castVolumeRay(Ray& ray, std::vector<ParticleObject> particles, Pixel basePixel) {
 	double bestDistance = std::numeric_limits<float>::max();
-	double waterDepth = 0;
+	double waterDepth = -0.2;
 	ParticleObject hitObject;
 	ParticleObject *hit = &hitObject;
 	hit = nullptr;
@@ -105,17 +105,19 @@ Pixel Camera::castVolumeRay(Ray& ray, std::vector<ParticleObject> particles, Pix
 	waterDepth = waterDepth > 15 ? 15 : waterDepth; //Cap waterDepth at 15
 
 	//Copy the pixel from the base Frame
-	Pixel pixel = Pixel(basePixel.getRedValue(), basePixel.getGreenValue(), basePixel.getRedValue());
+	Pixel pixel = Pixel(basePixel.getRedValue(), basePixel.getGreenValue(), basePixel.getBlueValue());
 
 	if (waterDepth <= 0) {
 		return pixel;
 	}
 
 	Pixel waterColor = Pixel(30, 30, 170); //Color of "pure water"
 	pixel.setShaderUsage(true);
+
 	//Shade the pixel depending on water depth
 	if (hit != nullptr) {
 	//New Shading, should work smiliar to alpha
+		
 		int diffR = waterColor.getRedValue() - pixel.getRedValue();
 		int diffG = waterColor.getGreenValue() - pixel.getGreenValue();
 		int diffB = waterColor.getBlueValue() - pixel.getBlueValue();
@@ -129,6 +131,7 @@ Pixel Camera::castVolumeRay(Ray& ray, std::vector<ParticleObject> particles, Pix
 		pixel.setRed((unsigned short)newR);
 		pixel.setGreen((unsigned short)newG);
 		pixel.setBlue((unsigned short)newB);
+		
 	}
 
 	return pixel;
@@ -157,15 +160,14 @@ Frame Camera::renderFrame(std::vector<ParticleObject> particles, int frameID) {
 
 			//Ray Direction Vector
 			Vector3 vec_s = vec_u * u + vec_v * v + this->direction * d;
-			Ray ray = Ray(vec_s, this->location);
+			Ray ray = Ray(vec_s.normalize(), this->location);
 
 			//Set pixel in Frame
-			frame.setPixel(x, y, castVolumeRay(ray, particles, getCurrentlyUsedBaseFrame(frameID).getPixel(x, y)));
-			
+			frame.setPixel(x, y, castVolumeRay(ray, particles, getCurrentlyUsedBaseFrame(frameID).getPixel(x, y)));	
 		}
 	}
 
-	return Shader::applyGaussianSmoothing(frame, 5, 8);
+	return frame;// Shader::applyGaussianSmoothing(frame, 5, 8);
 }
 
 void Camera::renderGeometryFrames(Terrain terrain, Terrain gate) {
@@ -188,7 +190,7 @@ void Camera::renderGeometryFrames(Terrain terrain, Terrain gate) {
 			double v = t + (b - t) * (y + 0.5f) / this->height;
 
 			Vector3 vec_s = vec_u * u + vec_v * v + this->direction * d;
-			Ray ray = Ray(vec_s, this->location);
+			Ray ray = Ray(vec_s.normalize(), this->location);
 
 			baseFrameOpen.setPixel(x, y, castTerrainRay(ray, terrain));
 		}
@@ -202,7 +204,7 @@ void Camera::renderGeometryFrames(Terrain terrain, Terrain gate) {
 			double v = t + (b - t) * (y + 0.5f) / this->height;
 
 			Vector3 vec_s = vec_u * u + vec_v * v + this->direction * d;
-			Ray ray = Ray(vec_s, this->location);
+			Ray ray = Ray(vec_s.normalize(), this->location);
 
 			baseFrameClosed.setPixel(x, y, castTerrainGateRay(ray, terrain, gate));
 		}
@@ -251,10 +253,11 @@ Pixel Camera::castTerrainRay(Ray& ray, Terrain& terrain) {
 		rad = rad > M_PI ? rad - M_PI : rad;
 
 		//Get a factor between 1 and 0; 90° = 0 ; 0° = 180° = 1
-		double factor = 1 - (rad / (M_PI / 2));
+		double factor = 1 - std::fmax(std::fmin(rad / (M_PI / 2), 1), 0);
 
 		//Darken the pixel based on the factor
 		Pixel p = Pixel(127 * factor, 67 * factor, 67 * factor);
+		p.setBaseDepth(bestDistance);
 
 		return p;
     }
@@ -268,7 +271,7 @@ Pixel Camera::castTerrainGateRay(Ray& ray, Terrain& terrain, Terrain& gate) {
 
 	Pixel initColor = Pixel(200, 200, 200); //Make the background gray
 
-	for (int i = 0; i < terrain.getFaceCount() + gate.getFaceCount(); i++) {
+	for (int i = 0; i <= terrain.getFaceCount() + gate.getFaceCount(); i++) {
 		double currDist = bestDistance;
 
 		if (i >= terrain.getFaceCount()) {
@@ -293,9 +296,17 @@ Pixel Camera::castTerrainGateRay(Ray& ray, Terrain& terrain, Terrain& gate) {
 
 	//Calculate Light to not have just brown everywhere
 	if (hitIndex >= 0) {
+		Vector3 planar1;
+		Vector3 planar2;
 
-		Vector3 planar1 = terrain.getFace(hitIndex).a - terrain.getFace(hitIndex).b;
-		Vector3 planar2 = terrain.getFace(hitIndex).a - terrain.getFace(hitIndex).c;
+		if (hitIndex >= terrain.getFaceCount()) {
+			planar1 = gate.getFace(hitIndex - terrain.getFaceCount()).a - gate.getFace(hitIndex - terrain.getFaceCount()).b;
+			planar2 = gate.getFace(hitIndex - terrain.getFaceCount()).a - gate.getFace(hitIndex - terrain.getFaceCount()).c;
+		}
+		else {
+			planar1 = terrain.getFace(hitIndex).a - terrain.getFace(hitIndex).b;
+			planar2 = terrain.getFace(hitIndex).a - terrain.getFace(hitIndex).c;
+		}
 
 		//Calculate norm vector
 		Vector3 n = planar1.cross(planar2).normalize();
@@ -307,13 +318,14 @@ Pixel Camera::castTerrainGateRay(Ray& ray, Terrain& terrain, Terrain& gate) {
 		double rad = acos(n.dot(lightToHit) / (n.length() * lightToHit.length()));
 
 		//Check if the angle is more than 180°, if so substract 180°
-		rad = rad > M_PI ? rad - M_PI : rad;
+		rad = rad >= M_PI ? rad - M_PI : rad;
 
 		//Get a factor between 1 and 0; 90° = 0 ; 0° = 180° = 1
-		double factor = 1 - (rad / (M_PI / 2));
+		double factor = 1 - std::fmax(std::fmin(rad / (M_PI / 2), 1), 0);
 
 		//Darken the pixel based on the factor
 		Pixel p = Pixel(127 * factor, 67 * factor, 67 * factor);
+		p.setBaseDepth(bestDistance);
 
 		return p;
 	}
@@ -336,14 +348,15 @@ void Camera::shareBaseFrame(int rank)
 		MPI_Comm_size(MPI_COMM_WORLD, &world_size);
 
 		for (int i = 1; i < world_size; i++) {
-			Frame::MpiSendFrame(baseFrameOpen, i);
-			Frame::MpiSendFrame(baseFrameClosed, i);
+			Frame::MpiSendFrame(this->baseFrameOpen, i);
+			Frame::MpiSendFrame(this->baseFrameClosed, i);
 		}
 	}
 	else {
 		this->baseFrameOpen = Frame::MpiReceiveFrame(0);
 		this->baseFrameClosed = Frame::MpiReceiveFrame(0);
-		std::cout << "Base Frames passed to processor" << rank << std::endl;
+		cout << this->baseFrameOpen.getPixel(400, 300).getBaseDepth() << endl;
+		std::cout << "Base Frames passed to processor " << rank << std::endl;
 	}
 }
 

SphWaterfall/SphWaterfall/src/visualization/Frame.cpp

@@ -1,4 +1,6 @@
 #include "Frame.h"
+#include <iostream>
+
 
 Frame::Frame() {
 	this->width = 0;
@@ -13,7 +15,7 @@ Frame::Frame(unsigned int width, unsigned int height) {
 	}
 }
 
-Pixel Frame::getPixel(unsigned int x, unsigned int y) {
+Pixel& Frame::getPixel(unsigned int x, unsigned int y) {
 	if (x >= this->width || y >= this->height) return Pixel(0, 0, 0);
 	return pixels.at(y*width + x);
 }
@@ -43,10 +45,10 @@ void Frame::MpiSendFrame(Frame frame, int dest)
 			unsigned short pixel[3] = {
 				frame.getPixel(x, y).getRedValue(),		//R
 				frame.getPixel(x, y).getGreenValue(),	//G
-				frame.getPixel(x, y).getBlueValue()		//B
+				frame.getPixel(x, y).getBlueValue(),	//B
 			};
 			MPI_Send(pixel, 3, MPI_UNSIGNED_SHORT, dest, 0, MPI_COMM_WORLD);
-
+			
 			double pixel_depth[1] = { frame.getPixel(x, y).getBaseDepth() };
 			MPI_Send(pixel_depth, 1, MPI_DOUBLE, dest, 0, MPI_COMM_WORLD);
 		}
@@ -67,6 +69,7 @@ Frame Frame::MpiReceiveFrame(int source)
 			MPI_Recv(pixel, 3, MPI_UNSIGNED_SHORT, source, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
 			frame.setPixel(x, y, Pixel(pixel[0], pixel[1], pixel[2]));
 
+			
 			double pixel_depth[1];
 			MPI_Recv(pixel_depth, 1, MPI_DOUBLE, source, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
 			frame.getPixel(x, y).setBaseDepth(pixel_depth[0]);

SphWaterfall/SphWaterfall/src/visualization/Frame.h

@@ -8,7 +8,7 @@ class Frame {
 		Frame(); //To genereate placeholder
 		Frame(unsigned int width, unsigned int height);
 
-		Pixel getPixel(unsigned int x, unsigned int y);
+		Pixel& getPixel(unsigned int x, unsigned int y);
 		void setPixel(unsigned int x, unsigned int y, Pixel pixel);
 
 		unsigned int getWidth();

SphWaterfall/SphWaterfall/src/visualization/ParticleObject.cpp

@@ -34,9 +34,25 @@ bool ParticleObject::intersects(Ray &ray, double &distance, double &waterDepth,
 		float t1 = (-1 * b + sqrt((b*b) - 4 * a*c)) / (2 * a);
 		float t2 = (-1 * b - sqrt((b*b) - 4 * a*c)) / (2 * a);
 
-		waterDepth += t1 > t2 ? (t1 > maxDepth ? maxDepth : t1) - (t2 > maxDepth ? maxDepth : t2) : (t2 > maxDepth ? maxDepth : t2) - (t1 > maxDepth ? maxDepth : t1);
+		if (t1 > t2) {
+			if (t1 > maxDepth && t2 < maxDepth) waterDepth += maxDepth - t2;
+			if (t1 < maxDepth) waterDepth += t1 - t2;
+		}
+		else {
+			if (t2 > maxDepth && t1 < maxDepth) waterDepth += maxDepth - t1;
+			if (t2 < maxDepth) waterDepth += t2 - t1;
+		}
+
+		//waterDepth += t1 > t2 ? (t1 > maxDepth ? maxDepth : t1) - (t2 > maxDepth ? maxDepth : t2) : (t2 > maxDepth ? maxDepth : t2) - (t1 > maxDepth ? maxDepth : t1);
 
 		distance = t1 < t2 ? t1 : t2;
+
+		//Vector3 po = ray.origin + ray.direction * distance;
+		if (maxDepth < 20000) {
+			//std::cout << "t1 " << t1 << std::endl << "t2 " << t2 << std::endl << "mD " << maxDepth << std::endl << "Distance: " << distance << std::endl;
+		}
+
+
 	}
 
 	return ((b*b) - 4 * a*c) < 0 ? false : true;

SphWaterfall/SphWaterfall/src/visualization/Pixel.cpp

@@ -5,15 +5,15 @@ Pixel::Pixel() {
 	this->green = 0;
 	this->blue = 0;
 	this->shaderUsage = false;
-	this->baseDepth = std::numeric_limits<unsigned int>::max();
+	this->baseDepth = std::numeric_limits<float>::max();
 }
 
 Pixel::Pixel(unsigned short red, unsigned short green, unsigned short blue) {
 	this->red = red > 255 ? 255 : (red < 0 ? 0 : red);
 	this->green = green > 255 ? 255 : (green < 0 ? 0 : green);
 	this->blue = blue > 255 ? 255 : (blue < 0 ? 0 : blue);
 	this->shaderUsage = false;
-	this->baseDepth = std::numeric_limits<unsigned int>::max();
+	this->baseDepth = std::numeric_limits<float>::max();
 }
 
 void Pixel::setColor(unsigned short red, unsigned short green, unsigned short blue) {

SphWaterfall/SphWaterfall/src/visualization/VisualizationManager.cpp

@@ -103,8 +103,6 @@ void VisualizationManager::renderFramesDistributed(string inputFileName, int ran
 
 		int counter = 0;
 
-		//Here it stops working for some reason..
-
 		for (int i = 0; i < frameCount; i++) {
 			if ((i % (world_size - 1)) + 1 == rank) {
 				if (counter >= frameParticles.size()) continue;

TestConfig.cfg

@@ -1,28 +1,28 @@
 # example config file
 
-print loadMesh -p "D:\Users\Magnus\Documents\Studium\StuPro\Project\StuProWaterfallFinal.obj"
-# loadMesh -p "D:\Users\Magnus\Documents\Studium\StuPro\Project\StuProWaterfallFinal.obj"
-loadMesh -p "D:\Users\Magnus\Documents\Studium\StuPro\Project\StuProCubeTri.obj"
+print loadMesh -p "StuProWaterfallFinal.obj"
+# loadMesh -p "StuProWaterfallFinal.obj"
+loadMesh -p "StuProWaterfallFinal.obj"
 
-print loadShutter -p "D:\Users\Magnus\Documents\Studium\StuPro\Project\StuProWaterfallShutter.obj"
-loadShutter -p "D:\Users\Magnus\Documents\Studium\StuPro\Project\StuProWaterfallShutter.obj"
+print loadShutter -p "StuProWaterfallShutter.obj"
+loadShutter -p "StuProWaterfallShutter.obj"
 
 # 0.0 5.5 10.3
-print addSource -v 0.0 51.5 11
-addSource -v 0.0 30.0 0.5
-# addSource -v 0.0 3.0 0.0
+#print addSource -v 0.0 51.5 11
+#addSource -v 0.0 30.0 0.5
+#addSource -v 0.0 3.0 0.0
 
-print addSink -h 0.0
-addSink -h 0.0
+#print addSink -h 0.0
+#addSink -h 0.0
 
-print particleGen
-particleGen
+#print particleGen
+#particleGen
 
 print moveShutter -t 1
 moveShutter -t 1
 
-print simulate -t 2
-simulate -t 2
+#print simulate -t 2
+#simulate -t 2
 
 # render -v 10 50 -60
 print render -v 10 50 60