benkyd/inferno-cpu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asd

Browse Source
This commit is contained in:
Ben
2019-09-13 23:18:47 +01:00
parent 31230ecad9
commit c14ac13292
7 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/definitions/primatives/plane.cpp
View File

@@ -14,6 +14,10 @@ bool Plane::Intersect(Ray& ray, float& t) {
return false;
}
glm::vec3 Plane::SurfaceTangent(glm::vec3 normal) {
return {};
}
glm::vec3 Plane::SurfaceNormal(glm::vec3 hitPoint) {
return -normal;
}

1
src/definitions/primatives/plane.hpp
View File

@@ -10,6 +10,7 @@ public:
bool Intersect(Ray& ray, float& t) override;
glm::vec3 SurfaceNormal(glm::vec3 hitPoint) override;
glm::vec3 SurfaceTangent(glm::vec3 normal) override;
glm::vec2 TexCoords(glm::vec3 hitPoint) override;
void Translate(glm::vec3 trans) override;
};

4
src/definitions/primatives/sphere.cpp
View File

@@ -23,6 +23,10 @@ glm::vec3 Sphere::SurfaceNormal(glm::vec3 hitPoint) {
return glm::normalize(hitPoint - center);
}
glm::vec3 Sphere::SurfaceTangent(glm::vec3 normal) {
return {};
}
glm::vec2 Sphere::TexCoords(glm::vec3 hitPoint) {
glm::vec3 hit = hitPoint - center;
return { (1.0f + atan2(hit.z, hit.x) / PI) * 0.5f,

1
src/definitions/primatives/sphere.hpp
View File

@@ -10,6 +10,7 @@ public:
bool Intersect(Ray& ray, float& t) override;
glm::vec3 SurfaceNormal(glm::vec3 hitPoint) override;
glm::vec3 SurfaceTangent(glm::vec3 normal) override;
glm::vec2 TexCoords(glm::vec3 hitPoint) override;
void Translate(glm::vec3 trans) override;
};

4
src/definitions/primatives/triangle.cpp
View File

@@ -30,6 +30,10 @@ bool Triangle::Intersect(Ray& ray, float& t) {
return false;
}
glm::vec3 Triangle::SurfaceTangent(glm::vec3 normal) {
return {};
}
glm::vec3 Triangle::SurfaceNormal(glm::vec3 hitPoint) {
return ((normals[0] + normals[1] + normals[2]) / 3.0f);
}

2
src/definitions/primatives/triangle.hpp
View File

@@ -10,8 +10,10 @@ public:
bool Intersect(Ray& ray, float& t) override;
glm::vec3 SurfaceNormal(glm::vec3 hitPoint) override;
glm::vec3 SurfaceTangent(glm::vec3 normal) override;
glm::vec2 TexCoords(glm::vec3 hitPoint) override;
void Translate(glm::vec3 trans) override;
glm::vec3 Midpoint();
};

11
test/main.cpp
View File

@@ -2,8 +2,8 @@
#include "../src/inferno.hpp"
static const int width = 600;
static const int height = 600;
static const int width = 1000;
static const int height = 1000;
int main(int argc, char** argv) {
InfernoEngine inferno;
@@ -23,15 +23,16 @@ int main(int argc, char** argv) {
scene->objects.push_back(&sphere1);
Sphere sphere({ 0.0f, 0.0f, -5.0f }, 1.0f, new Material({ 0.817f, 0.374, 0.574 }));
sphere.material->NormalTexture = new Texture("/home/ben/programming/inferno/resources/textures/dirt-normal.jpg");
sphere.material->NormalTexture = new Texture("E:/Projects/Inferno/resources/textures/dirt-normal.jpg");
// sphere.material->NormalTexture = new Texture("/home/ben/programming/inferno/resources/textures/dirt-normal.jpg");
scene->objects.push_back(&sphere);
Sphere light({ 35.0f, 56.0f, 25.0f }, 35.0f, new Material({ 1.0f, 1.0f, 1.0f }, 0.0f, 5.0f));
scene->objects.push_back(&light);
Plane plane({ 0.0f,-1.0f, 0.0f }, { 0.0f, -1.0f, 0.0f }, new Material({ 0.9f, 0.9f, 0.9f }, 0.2f));
// plane.material->NormalTexture = new Texture("E:/Projects/Inferno/resources/textures/normals.png");
plane.material->NormalTexture = new Texture("/home/ben/programming/inferno/resources/textures/normals.png");
plane.material->NormalTexture = new Texture("E:/Projects/Inferno/resources/textures/normals.png");
// plane.material->NormalTexture = new Texture("/home/ben/programming/inferno/resources/textures/normals.png");
scene->objects.push_back(&plane);
//scene->objects.push_back(new Sphere({ 35.0f, 26.0f, 25.0f }, 15.0f, new Material({ 1.0f, 1.0f, 1.0f }, 0.0f, 5.0f)));