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

random holes

Browse Source
This commit is contained in:
David Allemang
2020-03-11 20:11:03 -04:00
parent e6ba81a424
commit 2c2b6ef96b
2 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vis/include/geometry.hpp
View File

@@ -182,7 +182,7 @@ std::vector<Primitive<N>> merge(const std::vector<std::vector<Primitive<N>>> &me
template<unsigned N> template<unsigned N>
[[nodiscard]] [[nodiscard]]
std::vector<Primitive<N>> tile( std::vector<std::vector<Primitive<N>>> each_tile(
std::vector<Primitive<N>> prims, std::vector<Primitive<N>> prims,
const tc::Group &context, const tc::Group &context,
const std::vector<int> &g_gens, const std::vector<int> &g_gens,
@@ -200,6 +200,19 @@ std::vector<Primitive<N>> tile(
return apply(from, table, gen); return apply(from, table, gen);
}); });
return res;
}
template<unsigned N>
[[nodiscard]]
std::vector<Primitive<N>> tile(
std::vector<Primitive<N>> prims,
const tc::Group &context,
const std::vector<int> &g_gens,
const std::vector<int> &sg_gens
) {
auto res = each_tile<N>(prims, context, g_gens, sg_gens);
return merge(res); return merge(res);
} }

51
vis/src/main.cpp
View File

@@ -14,6 +14,9 @@
#include <cgl/vertexarray.hpp> #include <cgl/vertexarray.hpp>
#include <cgl/shaderprogram.hpp> #include <cgl/shaderprogram.hpp>
#include <cgl/pipeline.hpp> #include <cgl/pipeline.hpp>
#include <random>
#include <chrono>
#ifdef _WIN32 #ifdef _WIN32
extern "C" { extern "C" {
@@ -84,19 +87,21 @@ Matrices build(GLFWwindow *window, float st) {
} }
template<unsigned N, class T> template<unsigned N, class T>
std::vector<Primitive<N>> hull(const tc::Group &group, T all_sg_gens) { auto hull(const tc::Group &group, T all_sg_gens) {
std::vector<std::vector<Primitive<N>>> parts; std::vector<std::vector<Primitive<N>>> parts;
auto g_gens = gens(group); auto g_gens = gens(group);
for (const auto &sg_gens : all_sg_gens) { for (const auto &sg_gens : all_sg_gens) {
const auto &base = triangulate<N>(group, sg_gens); const auto &base = triangulate<N>(group, sg_gens);
const auto &all = tile(base, group, g_gens, sg_gens); const auto &tiles = each_tile(base, group, g_gens, sg_gens);
parts.push_back(all); for (const auto &tile : tiles) {
parts.push_back(tile);
} }
return merge<N>(parts); }
return parts;
} }
template<unsigned N> template<unsigned N>
std::vector<Primitive<N>> full_hull(const tc::Group &group) { auto full_hull(const tc::Group &group) {
auto g_gens = gens(group); auto g_gens = gens(group);
const Combos<int> &combos = Combos(g_gens, N - 1); const Combos<int> &combos = Combos(g_gens, N - 1);
return hull<N, Combos<int>>(group, combos); return hull<N, Combos<int>>(group, combos);
@@ -163,13 +168,18 @@ void run(GLFWwindow *window) {
auto group = tc::schlafli({5, 3, 3, 2}); auto group = tc::schlafli({5, 3, 3, 2});
auto wire_data = full_hull<2>(group); // auto wire_data = full_hull<2>(group);
// slice_parts.erase(slice_parts.end() - 1, slice_parts.end()); // slice_parts.erase(slice_parts.end() - 1, slice_parts.end());
auto slice_face_data = hull<4>(group, (std::vector<std::vector<int>>) { auto slice_faces = hull<4>(group, (std::vector<std::vector<int>>) {
{0, 1, 2}, {0, 1, 2},
}); });
auto slice_edge_data = hull<4>(group, (std::vector<std::vector<int>>) { unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
std::default_random_engine rand(seed);
std::shuffle(slice_faces.begin(), slice_faces.end(), rand);
slice_faces.erase(slice_faces.begin(), slice_faces.begin() + slice_faces.size() / 2);
auto slice_face_data = merge<4>(slice_faces);
auto slice_edges = hull<4>(group, (std::vector<std::vector<int>>) {
{0, 1, 3}, {0, 1, 3},
{0, 1, 4}, {0, 1, 4},
{0, 2, 3}, {0, 2, 3},
@@ -178,20 +188,21 @@ void run(GLFWwindow *window) {
{1, 2, 4}, {1, 2, 4},
{1, 3, 4}, {1, 3, 4},
}); });
auto slice_edge_data = merge<4>(slice_edges);
Drawable<2> wires(GL_LINES); // Drawable<2> wires(GL_LINES);
wires.ibo.put(wire_data); // wires.ibo.put(wire_data);
Drawable<4> slice_edges(GL_POINTS); Drawable<4> edges(GL_POINTS);
slice_edges.ibo.put(slice_edge_data); edges.ibo.put(slice_edge_data);
slice_edges.vao.ipointer(0, slice_edges.ibo, 4, GL_UNSIGNED_INT); edges.vao.ipointer(0, edges.ibo, 4, GL_UNSIGNED_INT);
Drawable<4> slice_faces(GL_POINTS); Drawable<4> faces(GL_POINTS);
slice_faces.ibo.put(slice_face_data); faces.ibo.put(slice_face_data);
slice_faces.vao.ipointer(0, slice_faces.ibo, 4, GL_UNSIGNED_INT); faces.vao.ipointer(0, faces.ibo, 4, GL_UNSIGNED_INT);
auto pbo_thick = cgl::Buffer<vec4>(points(group, {1.0f, 0.2f, 0.1f, 0.05f, 0.25f})); auto pbo_thick = cgl::Buffer<vec4>(points(group, {1.0f, 0.2f, 0.1f, 0.05f, 0.025f}));
auto pbo_thin = cgl::Buffer<vec4>(points(group, {1.0f, 0.2f, 0.1f, 0.05f, 0.0125f})); auto pbo_thin = cgl::Buffer<vec4>(points(group, {1.0f, 0.2f, 0.1f, 0.05f, 0.025f}));
auto ubo = cgl::Buffer<Matrices>(); auto ubo = cgl::Buffer<Matrices>();
glBindBufferBase(GL_UNIFORM_BUFFER, 1, ubo); glBindBufferBase(GL_UNIFORM_BUFFER, 1, ubo);
@@ -212,11 +223,11 @@ void run(GLFWwindow *window) {
slice_pipe.bound([&]() { slice_pipe.bound([&]() {
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, pbo_thick); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, pbo_thick);
glProgramUniform4f(sh.solid, 2, 1.0, 1.0, 1.0, 1.0); glProgramUniform4f(sh.solid, 2, 1.0, 1.0, 1.0, 1.0);
slice_edges.draw_deferred(); edges.draw_deferred();
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, pbo_thin); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, pbo_thin);
glProgramUniform4f(sh.solid, 2, 0.7, 0.7, 0.7, 1.0); glProgramUniform4f(sh.solid, 2, 0.7, 0.7, 0.7, 1.0);
slice_faces.draw_deferred(); faces.draw_deferred();
}); });
// proj_pipe.bound([&]() { // proj_pipe.bound([&]() {