allemang.d/toddcox-visualize
1
0
Fork 0
mirror of https://github.com/allemangD/toddcox-visualize.git synced 2025-11-10 12:02:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

ENH: Remove wireframe renderering

Browse Source
This commit is contained in:
David Allemang
2023-02-04 21:11:13 -05:00
parent c8025b29db
commit 7ecaad653b
1 changed files with 17 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
vis/src/main.cpp
View File

@@ -196,65 +196,6 @@ struct SliceRenderer : public Renderer<N> {
}; };
template<unsigned N>
struct DirectRenderer : public Renderer<N> {
cgl::pipeline pipe;
cgl::pgm::frag solid = cgl::pgm::frag(shaders::solid_fs_glsl);
DirectRenderer() {
pipe.stage(solid);
};
DirectRenderer(DirectRenderer &) = delete;
DirectRenderer(DirectRenderer &&) noexcept = default;
void bound(const std::function<void()> &action) const override {
pipe.bound(action);
}
void _draw(const Prop<N> &prop) const override {
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, prop.vbo);
glProgramUniform3fv(solid, 2, 1, prop.color.data());
prop.vao.bound([&]() {
prop.ibo.bound(GL_ELEMENT_ARRAY_BUFFER, [&]() {
glDrawElements(GL_LINES, prop.ibo.count() * N, GL_UNSIGNED_INT, nullptr);
});
});
}
};
struct WireframeProp : public Prop<2> {
WireframeProp(vec3 color) : Prop<2>() {
this->color = color;
}
WireframeProp(WireframeProp &) = delete;
WireframeProp(WireframeProp &&) noexcept = default;
template<class T, class C>
static WireframeProp build(const tc::Group<> &g,
const C &coords,
bool curve,
bool ortho,
vec3 color,
T all_sg_gens,
const std::vector<std::vector<size_t>> &exclude
) {
WireframeProp res(color);
auto pts = points(g, coords);
res.vbo.put(pts.begin(), pts.end());
auto inds = merge<2>(hull<2>(g, all_sg_gens, exclude));
res.ibo.put(inds.begin(), inds.end());
return res;
}
};
void run(const std::string &config_file, GLFWwindow* window) { void run(const std::string &config_file, GLFWwindow* window) {
#ifndef NDEBUG #ifndef NDEBUG
glEnable(GL_DEBUG_OUTPUT); glEnable(GL_DEBUG_OUTPUT);
@@ -268,130 +209,31 @@ void run(const std::string &config_file, GLFWwindow* window) {
SliceRenderer<4> sRen{}; SliceRenderer<4> sRen{};
cgl::pgm::vert o = cgl::pgm::vert(shaders::direct_ortho_vs_glsl);
cgl::pgm::vert s = cgl::pgm::vert(shaders::direct_stereo_vs_glsl);
cgl::pgm::geom co = cgl::pgm::geom(shaders::curve_ortho_gm_glsl);
cgl::pgm::geom cs = cgl::pgm::geom(shaders::curve_stereo_gm_glsl);
DirectRenderer<2> woRen{};
woRen.pipe.stage(o);
DirectRenderer<2> wocRen{};
wocRen.pipe.stage(o);
wocRen.pipe.stage(co);
DirectRenderer<2> wsRen{};
wsRen.pipe.stage(s);
DirectRenderer<2> wscRen{};
wscRen.pipe.stage(s);
wscRen.pipe.stage(cs);
auto scene = YAML::LoadFile(config_file);
State state{}; State state{};
glfwSetWindowUserPointer(window, &state); glfwSetWindowUserPointer(window, &state);
state.dimension = scene["dimension"].as<size_t>(); std::cout << "building..." << std::endl;
{
for (const auto &group_info: scene["groups"]) { auto group = tc::schlafli({5, 3, 3, 2});
auto symbol = group_info["symbol"].as<std::vector<unsigned int>>();
auto group = tc::schlafli(symbol);
auto gens = generators(group); auto gens = generators(group);
if (group_info["slices"].IsDefined()) {
for (const auto &slice_info: group_info["slices"]) {
auto root_arr = slice_info["root"].as<std::array<float, 5>>();
auto color_arr = slice_info["color"].as<std::array<float, 3>>();
vec5 root; vec5 root;
std::copy(root_arr.begin(), root_arr.end(), root.begin()); root << 0.80, 0.09, 0.09, 0.09, 0.04;
vec3 color; vec3 color;
std::copy(color_arr.begin(), color_arr.end(), color.begin()); color << 0.90, 0.90, 0.90;
auto exclude = std::vector<std::vector<size_t>>(); std::vector<std::vector<size_t>> exclude{
{0, 1, 2},
};
if (slice_info["exclude"].IsDefined()) {
exclude = slice_info["exclude"].as<std::vector<std::vector<size_t>>>();
}
if (slice_info["subgroups"].IsDefined()) {
auto subgroups = slice_info["subgroups"].as<std::vector<std::vector<size_t>>>();
sRen.props.push_back(SliceProp<4>::build(
group, root, color, subgroups, exclude
));
} else {
auto combos = combinations(gens, 3); auto combos = combinations(gens, 3);
sRen.props.push_back(SliceProp<4>::build( sRen.props.push_back(SliceProp<4>::build(
group, root, color, combos, exclude group, root, color, combos, exclude
)); ));
} }
} std::cout << "built" << std::endl;
}
if (group_info["wires"].IsDefined()) { state.dimension = 4;
for (const auto &wire_info: group_info["wires"]) {
auto root_arr = wire_info["root"].as<std::array<float, 5>>();
auto color_arr = wire_info["color"].as<std::array<float, 3>>();
vec5 root;
std::copy(root_arr.begin(), root_arr.end(), root.begin());
vec3 color;
std::copy(color_arr.begin(), color_arr.end(), color.begin());
auto exclude = std::vector<std::vector<size_t>>();
auto curve = wire_info["curve"].IsDefined() && wire_info["curve"].as<bool>();
auto ortho = wire_info["ortho"].IsDefined() && wire_info["ortho"].as<bool>();
if (wire_info["exclude"].IsDefined()) {
exclude = wire_info["exclude"].as<std::vector<std::vector<size_t>>>();
}
if (wire_info["subgroups"].IsDefined()) {
auto subgroups = wire_info["subgroups"].as<std::vector<std::vector<size_t>>>();
if (ortho && curve) {
wocRen.props.push_back(WireframeProp::build(
group, root, curve, ortho, color, subgroups, exclude
));
} else if (ortho) {
woRen.props.push_back(WireframeProp::build(
group, root, curve, ortho, color, subgroups, exclude
));
} else if (curve) {
wscRen.props.push_back(WireframeProp::build(
group, root, curve, ortho, color, subgroups, exclude
));
} else {
wsRen.props.push_back(WireframeProp::build(
group, root, curve, ortho, color, subgroups, exclude
));
}
} else {
auto combos = combinations(gens, 1);
if (ortho && curve) {
wocRen.props.push_back(WireframeProp::build(
group, root, curve, ortho, color, combos, exclude
));
} else if (ortho) {
woRen.props.push_back(WireframeProp::build(
group, root, curve, ortho, color, combos, exclude
));
} else if (curve) {
wscRen.props.push_back(WireframeProp::build(
group, root, curve, ortho, color, combos, exclude
));
} else {
wsRen.props.push_back(WireframeProp::build(
group, root, curve, ortho, color, combos, exclude
));
}
}
}
}
}
auto ubo = cgl::Buffer<Matrices>(); auto ubo = cgl::Buffer<Matrices>();
glBindBufferBase(GL_UNIFORM_BUFFER, 1, ubo); glBindBufferBase(GL_UNIFORM_BUFFER, 1, ubo);
@@ -412,11 +254,6 @@ void run(const std::string &config_file, GLFWwindow* window) {
glLineWidth(1.5); glLineWidth(1.5);
woRen.render();
wsRen.render();
wocRen.render();
wscRen.render();
sRen.render(); sRen.render();
glfwSwapInterval(2); glfwSwapInterval(2);