Merge branch 'Temp' into first_particle_approach

Author: Kennjy

SphWaterfall/SphWaterfall/CMakeLists.txt SphWaterfall/SphWaterfall/src/CMakeLists.txt

@@ -1,4 +1,4 @@
 add_executable(
     SphWaterfall 
         "src/SphWaterfall.cpp"
-)
+)

SphWaterfall/SphWaterfall/src/visualization/CMakeLists.txt

@@ -0,0 +1,39 @@
+#pragma once
+#include "Camera.h"
+
+Camera::Camera(Vector3 location, Vector3 direction, unsigned int width, unsigned int height) {
+	this->width = width;
+	this->height = height;
+
+	this->location = location;
+	this->direction = direction;
+}
+
+void Camera::debugRenderFrame(std::vector<ISphParticle> particles) {
+	//TODO: render frame in debug rendering
+}
+
+void Camera::renderFrame(std::vector<ISphParticle> particles) {
+	//TODO: implement rendering algorithm
+}
+
+void Camera::mergeFramesAndFlushVideo(std::string file) {
+	//TODO: merge all Frames to a video
+}
+
+Vector3 Camera::getLocation() {
+	return this->location;
+}
+
+Vector3 Camera::getDirection() {
+	return this->direction;
+}
+
+Frame Camera::getFrame(unsigned int frameID) {
+	if (frames.size >= frameID) {
+		return;
+	}
+	return frames.at(frameID);
+}
+
+//TODO: Impelement Frame Iterator?

SphWaterfall/SphWaterfall/src/visualization/Camera.cpp

@@ -0,0 +1,29 @@
+#pragma once
+#include "Frame.h"
+#include "Vector3.h"
+#include "ISphParticle.h"
+#include <vector>
+#include <string>
+
+class Camera {
+public:
+	Camera(Vector3 location, Vector3 direction, unsigned int width, unsigned int height);
+
+	void debugRenderFrame(std::vector<ISphParticle> particles);
+
+	void renderFrame(std::vector<ISphParticle> particles); //Vector is only a placeholder here as the data structure isnt decided yet
+
+	void mergeFramesAndFlushVideo(std::string file);
+
+	Vector3 getLocation();
+	Vector3 getDirection();
+
+private:
+	Vector3 location;
+	Vector3 direction;
+	unsigned int width;
+	unsigned int height;
+	std::vector<Frame> frames;
+
+	Frame getFrame(unsigned int frameID);
+};

SphWaterfall/SphWaterfall/src/visualization/Camera.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "Frame.h"
+#include "Pixel.h"
+
+Frame::Frame() {
+	this->width = 0;
+	this->height = 0;
+}
+
+Frame::Frame(unsigned int width, unsigned int height) {
+	this->width = width;
+	this->height = height;
+}
+
+Pixel Frame::getPixel(unsigned int x, unsigned int y) {
+	if (pixels.size >= y*height + x) {
+		return;
+	}
+	return pixels.at(y*height + x);
+}
+

SphWaterfall/SphWaterfall/src/visualization/Dummy.txt

@@ -0,0 +1,16 @@
+#pragma once
+#include "Pixel.h"
+#include <vector>
+
+class Frame {
+	public:
+		Frame(); //To genereate placeholder
+		Frame(unsigned int width, unsigned int height);
+		
+		Pixel getPixel(unsigned int x, unsigned int y);
+				
+	private:
+		unsigned int width;
+		unsigned int height;
+		std::vector<Pixel> pixels;
+};

SphWaterfall/SphWaterfall/src/visualization/Frame.cpp

@@ -0,0 +1,44 @@
+#pragma once
+#include "Pixel.h"
+
+Pixel::Pixel() {
+	this->red = 0;
+	this->green = 0;
+	this->blue = 0;
+}
+
+Pixel::Pixel(unsigned short red, unsigned short green, unsigned short blue) {
+	this->red = red;
+	this->green = green;
+	this->blue = blue;
+}
+
+void Pixel::setColor(unsigned short red, unsigned short green, unsigned short blue) {
+	this->red = red;
+	this->green = green;
+	this->blue = blue;
+}
+
+void Pixel::setRed(unsigned short red) {
+	this->red = red;
+}
+
+void Pixel::setGreen(unsigned short green) {
+	this->green = green;
+}
+
+void Pixel::setBlue(unsigned short blue) {
+	this->blue = blue;
+}
+
+unsigned short Pixel::getRedValue() {
+	return this->red;
+}
+
+unsigned short Pixel::getGreenValue() {
+	return this->green;
+}
+
+unsigned short Pixel::getBlueValue() {
+	return this->blue;
+}

SphWaterfall/SphWaterfall/src/visualization/Frame.h

@@ -0,0 +1,21 @@
+#pragma once
+
+class Pixel {
+public:
+	Pixel();
+	Pixel(unsigned short red, unsigned short green, unsigned short blue);
+
+	unsigned short getRedValue();
+	unsigned short getGreenValue();
+	unsigned short getBlueValue();
+
+	void setColor(unsigned short red, unsigned short green, unsigned short blue);
+	void setRed(unsigned short red);
+	void setGreen(unsigned short green);
+	void setBlue(unsigned short blue);
+
+private:
+	unsigned short red;
+	unsigned short green;
+	unsigned short blue;
+};

SphWaterfall/SphWaterfall/src/visualization/Pixel.cpp

@@ -0,0 +1,12 @@
+#include "Camera.h"
+
+std::vector<Camera> cameras;
+
+void init(Vector3 cameraLocation, Vector3 cameraDirection, unsigned int frameWidth, unsigned int frameHeight) {
+	Camera mainCam = Camera(cameraLocation, cameraDirection, frameWidth, frameHeight);
+	cameras.emplace_back(mainCam);
+}
+
+void debugRenderFrame(std::vector<ISphParticle> particles) {
+	//TODO: implement debug rendering
+}