update readme images, tweak shader initialization order

This commit is contained in:
2020-01-30 18:51:06 -05:00
parent e953f0e13d
commit 75ba1af437
7 changed files with 7 additions and 8 deletions

View File

@@ -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](screen.png) ![Example render](images/f4-slice.png)
![Example render](images/f4-wire.png)

BIN
images/500-multi.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 661 KiB

BIN
images/600-slice.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 KiB

BIN
images/f4-slice.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

BIN
images/f4-wire.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 KiB

View File

@@ -115,7 +115,6 @@ int main(int argc, char *argv[]) {
GLuint proj_pipe; GLuint proj_pipe;
glCreateProgramPipelines(1, &proj_pipe); glCreateProgramPipelines(1, &proj_pipe);
// GLuint defer, direct_ortho, direct_stereo, slice, curve_stereo, solid;
GLuint defer, direct_ortho, direct_stereo; GLuint defer, direct_ortho, direct_stereo;
GLuint slice, curve_ortho, curve_stereo; GLuint slice, curve_ortho, curve_stereo;
GLuint solid; GLuint solid;
@@ -131,14 +130,13 @@ int main(int argc, char *argv[]) {
solid = utilCreateShaderProgramFile(GL_FRAGMENT_SHADER, {"shaders/solid.fs.glsl"}); 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_VERTEX_SHADER_BIT, direct_stereo);
// glUseProgramStages(proj_pipe, GL_GEOMETRY_SHADER_BIT, curve_stereo); // glUseProgramStages(proj_pipe, GL_GEOMETRY_SHADER_BIT, curve_stereo);
glUseProgramStages(proj_pipe, GL_FRAGMENT_SHADER_BIT, solid); 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) { } catch (const gl_error &e) {
std::cerr << e.what() << std::endl; std::cerr << e.what() << std::endl;
glfwTerminate(); glfwTerminate();