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

KDTree and multiple mesh and primative rendering

Browse Source
This commit is contained in:
Ben Kyd
2019-08-07 05:01:43 +01:00
parent cf142ff5be
commit 17df4e0d09
19 changed files with 395 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/engine/progressiverenderer.cpp
View File

@@ -10,7 +10,6 @@
#include "../util/assetloader.hpp"
#include "../definitions/primatives/primative.hpp"
#include "../definitions/primatives/triangle.hpp"
#include "../definitions/camera.hpp"
#include "../definitions/scene.hpp"
#include "../definitions/ray.hpp"
@@ -25,10 +24,6 @@ void ProgressiveRenderer::Init(DisplayInterface* interface, Scene* scene) {
}
void ProgressiveRenderer::Render() {
m_scene->objects = LoadTrianglesBasic("/home/ben/programming/inferno/resources/cornell.obj");
for (const auto& object : m_scene->objects)
object->Translate({ 0.0f, -1.0f, -3.0f });
int frames = 0;
auto startTime = std::chrono::high_resolution_clock::now();
@@ -49,7 +44,7 @@ void ProgressiveRenderer::Render() {
float t;
Primative* hit = nullptr;
bool didhit = TraceRay(ray, m_scene, t, hit);
bool didhit = TraceRayScene(ray, m_scene, t, hit);
if (!didhit) {
m_interface->SetPixelSafe(x, y, 0x000000);
continue;