back to original colors

This commit is contained in:
2020-03-10 01:06:17 -04:00
parent c5ad4597ce
commit 099d26c03a
3 changed files with 24 additions and 10 deletions

View File

@@ -0,0 +1,9 @@
#version 430
in vec4 col;
out vec4 color;
void main() {
color = col;
}

View File

@@ -1,14 +1,12 @@
#version 430 #version 430
//layout(location=2) uniform vec3 c; layout(location=2) uniform vec3 c;
in vec4 pos; in vec4 pos;
in vec4 col;
out vec4 color; out vec4 color;
void main() { void main() {
color = col; float d = smoothstep(-2, 2, pos.z);
// float d = smoothstep(-2, 2, pos.z); color = vec4(c * d, 1);
// color = vec4(c * d, 1);
} }

View File

@@ -129,6 +129,7 @@ void run(GLFWwindow *window) {
auto curve_ortho = cgl::pgm::geom::file("shaders/curve-ortho.gm.glsl"); auto curve_ortho = cgl::pgm::geom::file("shaders/curve-ortho.gm.glsl");
auto solid = cgl::pgm::frag::file("shaders/solid.fs.glsl"); auto solid = cgl::pgm::frag::file("shaders/solid.fs.glsl");
auto diffuse = cgl::pgm::frag::file("shaders/diffuse.fs.glsl");
auto proj_pipe = cgl::pipeline(); auto proj_pipe = cgl::pipeline();
proj_pipe proj_pipe
@@ -139,7 +140,7 @@ void run(GLFWwindow *window) {
slice_pipe slice_pipe
.stage(defer) .stage(defer)
.stage(slice) .stage(slice)
.stage(solid); .stage(diffuse);
//region points //region points
auto group = tc::group::F4(); auto group = tc::group::F4();
@@ -157,11 +158,16 @@ void run(GLFWwindow *window) {
auto wire_data = merge(poly_parts<2>(group)); auto wire_data = merge(poly_parts<2>(group));
DirectMesh<2> wires(GL_LINES, wire_data); DirectMesh<2> wires(GL_LINES, wire_data);
const auto slice_dark = glm::vec3(.5, .3, .7);
const auto slice_light = glm::vec3(.9, .9, .95);
const auto slice_parts = poly_parts<4>(group); const auto slice_parts = poly_parts<4>(group);
auto slice_data = merge(slice_parts); auto slice_data = merge(slice_parts);
auto slice_colors = std::vector<glm::vec4>(slice_data.size()); auto slice_colors = std::vector<glm::vec4>(slice_data.size());
for (int i = 0, k = 0; i < slice_parts.size(); ++i) { for (int i = 0, k = 0; i < slice_parts.size(); ++i) {
glm::vec3 color((float) i / (float) (slice_parts.size() - 1)); auto fac = factor(i, slice_parts.size());
glm::vec3 color = glm::mix(slice_dark, slice_light, fac);
for (int j = 0; j < slice_parts[i].size(); ++j, ++k) { for (int j = 0; j < slice_parts[i].size(); ++j, ++k) {
slice_colors[k] = glm::vec4(color, 1); slice_colors[k] = glm::vec4(color, 1);
} }
@@ -191,9 +197,10 @@ void run(GLFWwindow *window) {
glLineWidth(1.5); glLineWidth(1.5);
// proj_pipe.bound([&]() { glProgramUniform3f(solid, 2, 0.3, 0.3, 0.3);
// wires.draw(); proj_pipe.bound([&]() {
// }); wires.draw();
});
slice_pipe.bound([&]() { slice_pipe.bound([&]() {
slices.draw(); slices.draw();