Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Johannes Braun
glare
Commits
bcafcff0
Commit
bcafcff0
authored
May 26, 2017
by
Browse files
Removed legacy global BVH from Raytracer
parent
f247b18f
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/libraries/advanced/Raytracer.cpp
View file @
bcafcff0
...
...
@@ -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
;
...
...
src/libraries/advanced/Raytracer.h
View file @
bcafcff0
...
...
@@ -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
;
...
...
src/libraries/io/ColladaLoader.cpp
View file @
bcafcff0
...
...
@@ -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"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment