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

multiple vbos for each prop

Browse Source
This commit is contained in:
David Allemang
2020-06-27 22:37:55 -04:00
parent 18abe824d2
commit 465f863687
3 changed files with 7 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vis/include/cgl/buffer.hpp
View File

@@ -24,7 +24,7 @@ namespace cgl {
put(data, usage); put(data, usage);
} }
Buffer(Buffer &) = delete; Buffer(const Buffer &) = delete;
Buffer(Buffer &&o) noexcept { Buffer(Buffer &&o) noexcept {
id = std::exchange(o.id, 0); id = std::exchange(o.id, 0);

150
vis/include/rendering.hpp
View File

@@ -5,10 +5,12 @@
#include <cgl/pipeline.hpp> #include <cgl/pipeline.hpp>
#include <geometry.hpp> #include <geometry.hpp>
template<unsigned N, class T> #include <tuple>
template<unsigned N, class... T>
struct Prop { struct Prop {
cgl::VertexArray vao; cgl::VertexArray vao;
cgl::Buffer<T> vbo; std::tuple<cgl::Buffer<T>...> vbos;
cgl::Buffer<Primitive<N>> ibo; cgl::Buffer<Primitive<N>> ibo;
}; };
@@ -38,7 +40,7 @@ struct SliceRenderer : public Renderer<N, T> {
void draw(const Prop<N, T> &prop) const override { void draw(const Prop<N, T> &prop) const override {
pipe.bound([&]() { pipe.bound([&]() {
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, prop.vbo); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, std::get<0>(prop.vbos));
//// glProgramUniform3fv(solid, 2, 1, &prop.color.front()); //// glProgramUniform3fv(solid, 2, 1, &prop.color.front());
glProgramUniform3f(solid, 2, 1.f, 1.f, 1.f); glProgramUniform3f(solid, 2, 1.f, 1.f, 1.f);
prop.vao.bound([&]() { prop.vao.bound([&]() {
@@ -47,145 +49,3 @@ struct SliceRenderer : public Renderer<N, T> {
}); });
} }
}; };
//template<unsigned N, class T>
//struct Prop {
// cgl::VertexArray vao;
// cgl::Buffer<T> vbo;
// cgl::Buffer<Primitive<N>> ibo;
//
// Prop() : vao(), vbo(), ibo() {}
//};
//
//template<unsigned N, class T>
//struct Renderer {
// std::vector<Prop<N, T>> props;
//
// virtual void bound(const std::function<void()> &action) const = 0;
//
// virtual void _draw(const Prop<N, T> &) const = 0;
//
// void render() const {
// bound([&]() {
// for (const auto &prop : props) {
// _draw(prop);
// }
// });
// }
//};
//
//template<unsigned N, class T>
//struct SliceProp : public Prop<N, T> {
// vec3 color;
//
// SliceProp(vec3 color) : Prop<N, T>(), color(color) {}
//
// SliceProp(SliceProp &) = delete;
//
// SliceProp(SliceProp &&) noexcept = default;
//
// template<class T, class C>
// static SliceProp<N> build(
// const tc::Group &g,
// const C &coords,
// vec3 color,
// T all_sg_gens,
// const std::vector<std::vector<int>> &exclude
// ) {
// SliceProp<N> res(color);
//
// res.vbo.put(points(g, coords));
// res.ibo.put(merge<N>(hull<N>(g, all_sg_gens, exclude)));
// res.vao.ipointer(0, res.ibo, 4, GL_UNSIGNED_INT);
//
// return res;
// }
//};
//
//template<unsigned N>
//struct SliceRenderer : public Renderer<N> {
// cgl::pgm::vert defer = cgl::pgm::vert::file(
// "shaders/slice/deferred.vs.glsl");
// cgl::pgm::geom slice = cgl::pgm::geom::file(
// "shaders/slice/slice.gm.glsl");
// cgl::pgm::frag solid = cgl::pgm::frag::file(
// "shaders/solid.fs.glsl");
//
// cgl::pipeline pipe;
//
// SliceRenderer() {
// pipe.stage(defer);
// pipe.stage(slice);
// pipe.stage(solid);
// }
//
// SliceRenderer(SliceRenderer &) = delete;
//
// SliceRenderer(SliceRenderer &&) 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.front());
// glProgramUniform3f(solid, 2, 1.f, 1.f, 1.f);
// prop.vao.bound([&]() {
// glDrawArrays(GL_POINTS, 0, prop.ibo.count() * N);
// });
// }
//};
//
//
//template<unsigned N>
//struct DirectRenderer : public Renderer<N> {
// cgl::pipeline pipe;
//
// DirectRenderer() = default;
//
// 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(sh.solid, 2, 1, &wire.color.front());
// 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> {
// vec3 color;
//
// WireframeProp(vec3 color) : Prop<2>(), 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<int>> &exclude
// ) {
// WireframeProp res(color);
//
// res.vbo.put(points(g, coords));
// res.ibo.put(merge<2>(hull<2>(g, all_sg_gens, exclude)));
//
// return res;
// }
//};

2
vis/src/main.cpp
View File

@@ -142,7 +142,7 @@ void run(const std::string &config_file, GLFWwindow *window) {
glLineWidth(1.5); glLineWidth(1.5);
prop.vbo.put(points(group, root, time)); std::get<0>(prop.vbos).put(points(group, root, time));
Matrices mats{}; Matrices mats{};