diff --git a/README.md b/README.md index 10a684a..95ab03a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ A new (basic) implementation of the Todd-Coxeter algorithm for Coxeter groups in --- -Example output with group F4. +![Example render](images/600-slice.png) +![Example render](images/500-multi.png) +![Example render](images/f4-slice.png) +![Example render](images/f4-wire.png) -![Example render](screen.png) - diff --git a/images/500-multi.png b/images/500-multi.png new file mode 100644 index 0000000..9ac35d6 Binary files /dev/null and b/images/500-multi.png differ diff --git a/images/600-slice.png b/images/600-slice.png new file mode 100644 index 0000000..23c88f7 Binary files /dev/null and b/images/600-slice.png differ diff --git a/images/f4-slice.png b/images/f4-slice.png new file mode 100644 index 0000000..850d0ef Binary files /dev/null and b/images/f4-slice.png differ diff --git a/images/f4-wire.png b/images/f4-wire.png new file mode 100644 index 0000000..c30fc83 Binary files /dev/null and b/images/f4-wire.png differ diff --git a/screen.png b/screen.png deleted file mode 100644 index 61a5d8f..0000000 Binary files a/screen.png and /dev/null differ diff --git a/vis/src/main.cpp b/vis/src/main.cpp index 9b5c594..f3739ce 100644 --- a/vis/src/main.cpp +++ b/vis/src/main.cpp @@ -115,7 +115,6 @@ int main(int argc, char *argv[]) { GLuint proj_pipe; glCreateProgramPipelines(1, &proj_pipe); -// GLuint defer, direct_ortho, direct_stereo, slice, curve_stereo, solid; GLuint defer, direct_ortho, direct_stereo; GLuint slice, curve_ortho, curve_stereo; GLuint solid; @@ -131,14 +130,13 @@ int main(int argc, char *argv[]) { solid = utilCreateShaderProgramFile(GL_FRAGMENT_SHADER, {"shaders/solid.fs.glsl"}); - glUseProgramStages(slice_pipe, GL_VERTEX_SHADER_BIT, defer); - glUseProgramStages(slice_pipe, GL_GEOMETRY_SHADER_BIT, slice); - glUseProgramStages(slice_pipe, GL_FRAGMENT_SHADER_BIT, solid); - glUseProgramStages(proj_pipe, GL_VERTEX_SHADER_BIT, direct_stereo); // glUseProgramStages(proj_pipe, GL_GEOMETRY_SHADER_BIT, curve_stereo); glUseProgramStages(proj_pipe, GL_FRAGMENT_SHADER_BIT, solid); + glUseProgramStages(slice_pipe, GL_VERTEX_SHADER_BIT, defer); + glUseProgramStages(slice_pipe, GL_GEOMETRY_SHADER_BIT, slice); + glUseProgramStages(slice_pipe, GL_FRAGMENT_SHADER_BIT, solid); } catch (const gl_error &e) { std::cerr << e.what() << std::endl; glfwTerminate();