Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/vsg/utils/ComputeBounds.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ namespace vsg
void apply(const uintArray& array) override;

virtual void applyDraw(uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount);
virtual void applyDrawIndexed(uint32_t firstIndex, uint32_t indexCount, uint32_t firstInstance, uint32_t instanceCount);
virtual void applyDrawIndexed(uint32_t firstIndex, uint32_t indexCount, uint32_t firstInstance, uint32_t instanceCount, uint32_t vertexOffset);

void add(const dbox& bb);
void add(const dsphere& bs);
Expand Down
12 changes: 6 additions & 6 deletions src/vsg/utils/ComputeBounds.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ void ComputeBounds::apply(const vsg::VertexIndexDraw& vid)

if (vid.indices) vid.indices->accept(*this);

applyDrawIndexed(vid.firstIndex, vid.indexCount, vid.firstInstance, vid.instanceCount);
applyDrawIndexed(vid.firstIndex, vid.indexCount, vid.firstInstance, vid.instanceCount, vid.vertexOffset);
}

void ComputeBounds::apply(const vsg::InstanceNode& in)
Expand Down Expand Up @@ -177,7 +177,7 @@ void ComputeBounds::apply(const vsg::InstanceDrawIndexed& idi)
arrayState.apply(idi);

idi.indices->accept(*this);
applyDrawIndexed(idi.firstIndex, idi.indexCount, instanceNode->firstInstance, instanceNode->instanceCount);
applyDrawIndexed(idi.firstIndex, idi.indexCount, instanceNode->firstInstance, instanceNode->instanceCount, idi.vertexOffset);
}

void ComputeBounds::apply(const vsg::BindVertexBuffers& bvb)
Expand Down Expand Up @@ -219,7 +219,7 @@ void ComputeBounds::apply(const Draw& draw)

void ComputeBounds::apply(const DrawIndexed& drawIndexed)
{
applyDrawIndexed(drawIndexed.firstIndex, drawIndexed.indexCount, drawIndexed.firstInstance, drawIndexed.instanceCount);
applyDrawIndexed(drawIndexed.firstIndex, drawIndexed.indexCount, drawIndexed.firstInstance, drawIndexed.instanceCount, drawIndexed.vertexOffset);
};

void ComputeBounds::applyDraw(uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount)
Expand All @@ -242,7 +242,7 @@ void ComputeBounds::applyDraw(uint32_t firstVertex, uint32_t vertexCount, uint32
}
}

void ComputeBounds::applyDrawIndexed(uint32_t firstIndex, uint32_t indexCount, uint32_t firstInstance, uint32_t instanceCount)
void ComputeBounds::applyDrawIndexed(uint32_t firstIndex, uint32_t indexCount, uint32_t firstInstance, uint32_t instanceCount, uint32_t vertexOffset)
{
auto& arrayState = *arrayStateStack.back();
uint32_t lastIndex = instanceCount > 1 ? (firstInstance + instanceCount) : firstInstance + 1;
Expand All @@ -258,7 +258,7 @@ void ComputeBounds::applyDrawIndexed(uint32_t firstIndex, uint32_t indexCount, u
{
for (uint32_t i = firstIndex; i < endIndex; ++i)
{
bounds.add(matrix * dvec3(vertices->at(ushort_indices->at(i))));
bounds.add(matrix * dvec3(vertices->at(ushort_indices->at(i) + vertexOffset)));
}
}
}
Expand All @@ -271,7 +271,7 @@ void ComputeBounds::applyDrawIndexed(uint32_t firstIndex, uint32_t indexCount, u
{
for (uint32_t i = firstIndex; i < endIndex; ++i)
{
bounds.add(matrix * dvec3(vertices->at(uint_indices->at(i))));
bounds.add(matrix * dvec3(vertices->at(uint_indices->at(i) + vertexOffset)));
}
}
}
Expand Down
Loading