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

Moved some files around and got mapping working a bit, better texture support too

Browse Source
This commit is contained in:
Ben
2019-09-13 00:47:11 +01:00
parent 3385ff54c4
commit 1fbb093dd4
29 changed files with 7785 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/renderengine.cpp
View File

@@ -4,6 +4,7 @@
#include "../util/threadpool.hpp"
#include "../definitions/materials/material.hpp"
#include "../definitions/materials/texture.hpp"
#include "../definitions/materials/random.hpp"
#include "../definitions/primatives/primative.hpp"
@@ -43,7 +44,7 @@ void workerThread(RenderThreadPool* threadpool, ProgressiveRenderer* renderer, i
int depth = 0;
glm::vec3 col = renderer->m_engine->GetColour(ray, depth);
if (renderer->m_engine->Mode == MODE_RENDER_NORMALS || renderer->m_engine->Mode == MODE_RENDER_PATH_LENGTH) {
threadpool->ThreadFrameBuffer->SetPixelSafe(x, y, col, (int)renderer->m_engine->Mode);
} else if (renderer->m_engine->Mode == MODE_RENDER_PATH_BOUNCES) {
@@ -79,7 +80,7 @@ glm::vec3 RenderEngine::GetColour(Ray ray, int& depth) {
if (!didhit) return m_scene->SampleSky(ray);
glm::vec3 hitPoint = ray.origin + ray.direction * t;
glm::vec3 normal = hit->SurfaceNormal(hitPoint);
glm::vec3 normal = hit->Normal(hitPoint);
if (Mode == MODE_RENDER_NORMALS) { return GetNormalColour(normal); }
if (Mode == MODE_RENDER_PATH_LENGTH) { if (t > 255.0f) t = 255.0f; return { (float)t, (float)t, (float)t }; }