Added method renderGeometryFrame

Author: BuildTools

SphWaterfall/SphWaterfall/src/visualization/Camera.cpp

@@ -53,6 +53,7 @@ Pixel Camera::castDebugRay(Ray ray, std::vector<DebugObject> particles) {
 	DebugObject *hit = &hitObject;
 	hit = nullptr;
 
+	//Calculate hit for every object
 	for (int i = 0; i < particles.size(); i++) {
 		DebugObject &obj = particles.at(i);
 		double currDist = bestDistance;
@@ -119,6 +120,7 @@ Frame Camera::renderFrame(std::vector<ParticleObject> particles, int frameID) {
 	Vector3 vec_u = findSkalarVectorWithYZero(this->direction).normalize();
 	Vector3 vec_v = findUpVector(this->direction, vec_u).normalize();
 
+	//Cast ray for every pixel
 	for (int x = 0; x < this->width; x++) {
 		for (int y = 0; y < this->height; y++) {
 			double u = l + (r - l) * (x + 0.5f) / this->width;
@@ -127,14 +129,23 @@ Frame Camera::renderFrame(std::vector<ParticleObject> particles, int frameID) {
 			Vector3 vec_s = vec_u * u + vec_v * v + this->direction * d;
 			Ray ray = Ray(vec_s, this->location);
 
-
+			//Set pixel color in Frame
 			frame.setPixel(x, y, castVolumeRay(ray, particles));
 		}
 	}
 
 	return frame;
 }
 
+void Camera::renderGeometryFrame(Terrain t) {
+	//TODO: implement rendering of the base Frame. See renderFrame(...) and castDebugRay(...)
+	Frame frame;
+
+
+
+	this->baseFrame = frame;
+}
+
 void Camera::outputDebugFrame(Frame f, const char* fileName) {
 	writeFrameToBitmap(f, fileName, this->width, this->height);
 }

SphWaterfall/SphWaterfall/src/visualization/Camera.h

@@ -6,6 +6,7 @@
 #include "ParticleObject.h"
 #include <vector>
 #include <string>
+#include "../geometry/Terrain.h"
 
 class Camera {
 public:
@@ -14,6 +15,7 @@ class Camera {
 	void debugRenderFrame(std::vector<DebugObject> particles, int frameID);
 
 	Frame renderFrame(std::vector<ParticleObject> particles, int frameID); //Vector is only a placeholder here as the data structure isnt decided yet
+	void renderGeometryFrame(Terrain t);
 
 	void outputDebugFrame(Frame f, const char* fileName);
 
@@ -25,6 +27,7 @@ class Camera {
 	Pixel castDebugRay(Ray ray, std::vector<DebugObject> particles);
 	Pixel castVolumeRay(Ray ray, std::vector<ParticleObject> particles);
 
+	Frame baseFrame;
 	Vector3 location;
 	Vector3 direction;
 	unsigned int width;