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
b9801e52
Commit
b9801e52
authored
Jun 20, 2017
by
unknown
Browse files
It's all broken! LS Stuff that is.
parent
0ff587f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
assets/shaders/raytracer/mesh_bvh.glh
View file @
b9801e52
...
...
@@ -134,26 +134,14 @@ bool bvh__nearestIntersection(const in Ray ray, inout Hit hit)
#ifdef USE_LS
bool ls_hits = false;
float distance = FLT_MAX;
//mesh id != 0 crashes.... ._.
ls_hits = bool(int(ls_hits) | int(linespace__traverse(0, ray, hit, distance)));
// ls_hits = bool(int(ls_hits) | int(linespace__traverse(1, ray, hit, distance)));
// ls_hits = bool(int(ls_hits) | int(linespace__traverse(2, ray, hit, distance)));
// ls_hits = bool(int(ls_hits) | int(linespace__traverse(3, ray, hit, distance)));
// ls_hits = bool(int(ls_hits) | int(linespace__traverse(4, ray, hit, distance)));
// for(int mesh_id = 0; mesh_id < 5; ++mesh_id){
// ls_hits = linespace__traverse(mesh_id, ray, hit);
// //ls_hits = bool(int(ls_hits) | int(linespace__traverse(mesh_id, ray, hit)));
// }
return ls_hits;
//return linespace__traverse(4, ray, hit);
//bool hits = false;
//for (int i = 0; i < b_meshes.length(); ++i)
//{
// hits = bool(int(hits) | int(linespace__traverse(i, ray, hit)));
// //current_t = min_t;
//}
//return hits;
#else
float current_t = FLT_MAX;
...
...
src/libraries/advanced/tracer/Raytracer.cpp
View file @
b9801e52
...
...
@@ -98,7 +98,7 @@ namespace glare
core
::
ClockGL
::
instance
().
start
();
m_render_shader
->
dispatchCompute2D
(
width
,
4
,
height
,
4
);
++
m_current_sample
;
}
...
...
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