-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #52 from hotstreams/ref/instanced
Ref/instanced
- Loading branch information
Showing
8 changed files
with
137 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| #include <limitless/instances/instanced_instance.hpp> | ||
|
|
||
| using namespace Limitless; | ||
|
|
||
| InstancedInstance::InstancedInstance() | ||
| : Instance {InstanceType::Instanced, glm::vec3{0.0f}} | ||
| , buffer {Buffer::builder() | ||
| .target(Buffer::Type::ShaderStorage) | ||
| .usage(Buffer::Usage::DynamicDraw) | ||
| .access(Buffer::MutableAccess::WriteOrphaning) | ||
| .data(nullptr) | ||
| .size(sizeof(glm::mat4) * 1) | ||
| .build("model_buffer", *ContextState::getState(glfwGetCurrentContext()))} { | ||
| } | ||
|
|
||
| InstancedInstance::InstancedInstance(const InstancedInstance& rhs) | ||
| : Instance(rhs) | ||
| , buffer {Buffer::builder() | ||
| .target(Buffer::Type::ShaderStorage) | ||
| .usage(Buffer::Usage::DynamicDraw) | ||
| .access(Buffer::MutableAccess::WriteOrphaning) | ||
| .data(nullptr) | ||
| .size(sizeof(glm::mat4) * 1) | ||
| .build("model_buffer", *ContextState::getState(glfwGetCurrentContext()))} { | ||
| for (const auto& instance : rhs.instances) { | ||
| instances.emplace_back((ModelInstance*)instance->clone().release()); | ||
| } | ||
| } | ||
|
|
||
| void InstancedInstance::updateBoundingBox() noexcept { | ||
|
|
||
| } | ||
|
|
||
| std::unique_ptr<Instance> InstancedInstance::clone() noexcept { | ||
| return std::make_unique<InstancedInstance>(*this); | ||
| } | ||
|
|
||
| void InstancedInstance::add(const std::shared_ptr<ModelInstance>& instance) { | ||
| instances.emplace_back(instance); | ||
| } | ||
|
|
||
| void InstancedInstance::remove(uint64_t id){ | ||
| std::remove_if(instances.begin(), instances.end(), [&] (auto& i) { return i->getId() == id; }); | ||
| } | ||
|
|
||
| void InstancedInstance::updateBuffer() { | ||
| std::vector<glm::mat4> new_data; | ||
| new_data.reserve(instances.size()); | ||
|
|
||
| for (const auto& instance : instances) { | ||
| if (instance->isHidden()) { | ||
| continue; | ||
| } | ||
|
|
||
| new_data.emplace_back(instance->getFinalMatrix()); | ||
| } | ||
|
|
||
| // if update is needed | ||
| if (new_data != current_data) { | ||
| // ensure buffer size | ||
| auto size = sizeof(glm::mat4) * new_data.size(); | ||
| if (buffer->getSize() < size) { | ||
| buffer->resize(size); | ||
| } | ||
|
|
||
| buffer->mapData(new_data.data(), size); | ||
|
|
||
| current_data = new_data; | ||
| } | ||
| } | ||
|
|
||
| void InstancedInstance::update(Context& context, const Camera& camera) { | ||
| if (instances.empty()) { | ||
| return; | ||
| } | ||
|
|
||
| Instance::update(context, camera); | ||
|
|
||
| for (const auto& instance : instances) { | ||
| instance->update(context, camera); | ||
| } | ||
|
|
||
| updateBuffer(); | ||
| } | ||
|
|
||
| void InstancedInstance::draw(Context& ctx, const Assets& assets, ShaderType pass, ms::Blending blending, const UniformSetter& uniform_set) { | ||
| if (hidden || instances.empty()) { | ||
| return; | ||
| } | ||
|
|
||
| buffer->bindBase(ctx.getIndexedBuffers().getBindingPoint(IndexedBuffer::Type::ShaderStorage, "model_buffer")); | ||
|
|
||
| // iterates over all meshes | ||
| for (auto& [name, mesh] : instances[0]->getMeshes()) { | ||
| mesh.draw_instanced(ctx, assets, pass, shader_type, model_matrix, blending, uniform_set, instances.size()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters