Commit bcafcff0 authored by 's avatar
Browse files

Removed legacy global BVH from Raytracer

parent f247b18f
......@@ -154,11 +154,6 @@ namespace glare
return m_last_height;
}
core::Buffer<gl::BufferType::eShaderStorage>& Raytracer::triangleBuffer() const
{
return *m_bounding_volume_hierarchy->getTrianglesBuffer();
}
core::Buffer<gl::BufferType::eShaderStorage>& Raytracer::traceBuffer() const
{
return *m_trace_buffer;
......@@ -169,11 +164,6 @@ namespace glare
return *m_render_target;
}
const BVH& Raytracer::bvh() const
{
return *m_bounding_volume_hierarchy;
}
std::shared_ptr<MeshSceneCollector> Raytracer::collector() const
{
return m_collector;
......
......@@ -47,8 +47,6 @@ namespace glare
uint32_t height() const;
core::Buffer<gl::BufferType::eShaderStorage>& triangleBuffer() const;
core::Buffer<gl::BufferType::eShaderStorage>& traceBuffer() const;
const core::TextureRGBA_32F& renderTarget() const;
......@@ -96,9 +94,6 @@ namespace glare
private:
uint32_t m_last_width = 0;
uint32_t m_last_height = 0;
bool m_generate_photons = true;
std::unique_ptr<BVH> m_bounding_volume_hierarchy;
unsigned m_current_sample = 0;
unsigned m_max_samples = 80;
......
......@@ -750,7 +750,7 @@ namespace glare
if (auto col_node = phong_sub_node->getFirstChildOfTagTitle("float"))
{
//We have a color here.
mat_effect->transparent = glm::vec4(1-atof(col_node->tag->content.c_str()));
mat_effect->transparent = glm::vec4(1-float(atof(col_node->tag->content.c_str())));
}
}
else if (tag == "shininess")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment