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

Texturing and commenting all code

Browse Source
This commit is contained in:
Ben Kyd
2019-09-13 17:22:16 +01:00
parent 1fbb093dd4
commit 31230ecad9
7 changed files with 72 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/main.cpp
View File

@@ -2,8 +2,8 @@
#include "../src/inferno.hpp"
static const int width = 1010;
static const int height = 1010;
static const int width = 600;
static const int height = 600;
int main(int argc, char** argv) {
InfernoEngine inferno;
@@ -19,14 +19,19 @@ int main(int argc, char** argv) {
Scene* scene = new Scene(width, height);
scene->camera = new Camera(width, height);
Sphere sphere1({ 1.3f, -0.8f, -5.0f }, 0.2f, new Material({ 0.817f, 0.374, 0.574 }));
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");
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("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)));