From 10911f60f2e4882024d8182c0d73a90b4ee8224a Mon Sep 17 00:00:00 2001 From: benkyd Date: Fri, 18 Nov 2022 16:49:40 +0000 Subject: [PATCH] what da ray source? --- src/inferno.cpp | 24 ++++++++++++------------ src/renderer/ray_source.hpp | 17 +++++++++++++++++ src/renderer/renderer.hpp | 2 +- 3 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 src/renderer/ray_source.hpp diff --git a/src/inferno.cpp b/src/inferno.cpp index 724d1c4..8533953 100644 --- a/src/inferno.cpp +++ b/src/inferno.cpp @@ -127,25 +127,25 @@ int Inferno::run() moduleDirectory.discoverModules("./hart/", true); Camera camera; - Mesh cornell; - cornell.loadOBJ("res/cornell-box.obj"); - cornell.ready(); - - // Mesh dragon; - // dragon.loadOBJ("res/dragon-cornell-size.obj"); - // dragon.ready(); + mScene->setCamera(&camera); Material basicMaterial("basic"); Shader basicShader; - basicShader.load("res/shaders/basic.glsl")->link(); basicMaterial.setGlShader(&basicShader); + basicShader.load("res/shaders/basic.glsl")->link(); + + Mesh cornell; + cornell.loadOBJ("res/cornell-box.obj"); + cornell.ready(); cornell.setMaterial(&basicMaterial); - // dragon.setMaterial(&basicMaterial); - mScene->addMesh(&cornell); - // mScene->addMesh(&dragon); - mScene->setCamera(&camera); + Mesh dragon; + dragon.loadOBJ("res/dragon-cornell-size.obj"); + dragon.ready(); + dragon.setMaterial(&basicMaterial); + mScene->addMesh(&dragon); + mRasterRenderer->setScene(mScene); mRayRenderer->setScene(mScene); diff --git a/src/renderer/ray_source.hpp b/src/renderer/ray_source.hpp new file mode 100644 index 0000000..8ca5bf7 --- /dev/null +++ b/src/renderer/ray_source.hpp @@ -0,0 +1,17 @@ +#pragma once + +#include + +namespace inferno { + +class RaySource +{ +public: + RaySource(); + ~RaySource(); + + void setCast + +}; + +} diff --git a/src/renderer/renderer.hpp b/src/renderer/renderer.hpp index 6c01b21..2ba47e7 100644 --- a/src/renderer/renderer.hpp +++ b/src/renderer/renderer.hpp @@ -26,7 +26,7 @@ private: GLuint mRenderTargetTexture = 0; Colour* mTarget; - glm::ivec2 mRenderTargetSize = {1920, 1080}; + glm::ivec2 mRenderTargetSize = {300, 300}; Scene* mCurrentScene; };