diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/drawable_lines.h b/vclib/render/include/vclib/bgfx/drawable/lines/drawable_lines.h index b579fd329..d8dcab8f9 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/drawable_lines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/drawable_lines.h @@ -86,9 +86,9 @@ class DrawableLines : public vcl::DrawableObject LineSettings& settings() { return mLines.settings(); } - void update(const std::vector& points) + void setPoints(const std::vector& points) { - mLines.update(points); + mLines.setPoints(points); } // DrawableObject interface diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/drawable_polylines.h b/vclib/render/include/vclib/bgfx/drawable/lines/drawable_polylines.h index 03a82c340..d7a5c1720 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/drawable_polylines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/drawable_polylines.h @@ -88,10 +88,10 @@ class DrawablePolylines : public vcl::DrawableObject return mPolylines.settings(); } - void update(const std::vector& points) + void setPoints(const std::vector& points) { mPoints = points; - mPolylines.update(points); + mPolylines.setPoints(points); } // DrawableObject interface diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/lines/cpu_generated_lines.h b/vclib/render/include/vclib/bgfx/drawable/lines/lines/cpu_generated_lines.h index 7ff619b34..dd41d35b7 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/lines/cpu_generated_lines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/lines/cpu_generated_lines.h @@ -47,7 +47,7 @@ class CPUGeneratedLines : public Lines friend void swap(CPUGeneratedLines& a, CPUGeneratedLines& b) { a.swap(b); } - void update(const std::vector& points); + void setPoints(const std::vector& points); void draw(uint viewId) const; }; diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/lines/gpu_generated_lines.h b/vclib/render/include/vclib/bgfx/drawable/lines/lines/gpu_generated_lines.h index 17f15cb29..1213181d1 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/lines/gpu_generated_lines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/lines/gpu_generated_lines.h @@ -60,7 +60,7 @@ class GPUGeneratedLines : public Lines void draw(uint viewId) const; - void update(const std::vector& points); + void setPoints(const std::vector& points); private: void checkCaps() const diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/lines/indirect_based_lines.h b/vclib/render/include/vclib/bgfx/drawable/lines/lines/indirect_based_lines.h index 697e4450e..71f11ea06 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/lines/indirect_based_lines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/lines/indirect_based_lines.h @@ -65,7 +65,7 @@ class IndirectBasedLines : public Lines void draw(uint viewId) const; - void update(const std::vector& points); + void setPoints(const std::vector& points); private: void checkCaps() const diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/lines/instancing_based_lines.h b/vclib/render/include/vclib/bgfx/drawable/lines/lines/instancing_based_lines.h index 9339e422a..1ec216072 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/lines/instancing_based_lines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/lines/instancing_based_lines.h @@ -55,7 +55,7 @@ class InstancingBasedLines : public Lines void draw(uint viewId) const; - void update(const std::vector& points); + void setPoints(const std::vector& points); private: void checkCaps() const diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/lines/texture_based_lines.h b/vclib/render/include/vclib/bgfx/drawable/lines/lines/texture_based_lines.h index 8652d2816..828280e44 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/lines/texture_based_lines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/lines/texture_based_lines.h @@ -64,7 +64,7 @@ class TextureBasedLines : public Lines void draw(uint viewId) const; - void update(const std::vector& points); + void setPoints(const std::vector& points); private: void checkCaps() const diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/cpu_generated_polylines.h b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/cpu_generated_polylines.h index c4edca3d9..41e632fd9 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/cpu_generated_polylines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/cpu_generated_polylines.h @@ -46,7 +46,7 @@ class CPUGeneratedPolylines : public Lines void swap(CPUGeneratedPolylines& other); - void update(const std::vector& points); + void setPoints(const std::vector& points); void draw(uint viewId) const; }; diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/gpu_generated_polylines.h b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/gpu_generated_polylines.h index c4c1ceff6..013bc8933 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/gpu_generated_polylines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/gpu_generated_polylines.h @@ -68,7 +68,7 @@ class GPUGeneratedPolylines : public Lines void draw(uint viewId) const; - void update(const std::vector& points); + void setPoints(const std::vector& points); private: void checkCaps() const diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/indirect_based_polylines.h b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/indirect_based_polylines.h index f6edec0e5..96ed74fc7 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/indirect_based_polylines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/indirect_based_polylines.h @@ -70,7 +70,7 @@ class IndirectBasedPolylines : public Lines void draw(uint viewId) const; - void update(const std::vector& points); + void setPoints(const std::vector& points); private: void checkCaps() const diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/instancing_based_polylines.h b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/instancing_based_polylines.h index d915d1e29..9774467d1 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/instancing_based_polylines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/instancing_based_polylines.h @@ -60,7 +60,7 @@ class InstancingBasedPolylines : public Lines void draw(uint viewId) const; - void update(const std::vector& points); + void setPoints(const std::vector& points); private: void checkCaps() const diff --git a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/texture_based_polylines.h b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/texture_based_polylines.h index 8e842d558..e7dff56aa 100644 --- a/vclib/render/include/vclib/bgfx/drawable/lines/polylines/texture_based_polylines.h +++ b/vclib/render/include/vclib/bgfx/drawable/lines/polylines/texture_based_polylines.h @@ -74,7 +74,7 @@ class TextureBasedPolylines : public Lines void draw(uint viewId) const; - void update(const std::vector& points); + void setPoints(const std::vector& points); private: void checkCaps() const diff --git a/vclib/render/include/vclib/bgfx/drawable/mesh/mesh_render_buffers.h b/vclib/render/include/vclib/bgfx/drawable/mesh/mesh_render_buffers.h index 96a3c11d2..b336b943f 100644 --- a/vclib/render/include/vclib/bgfx/drawable/mesh/mesh_render_buffers.h +++ b/vclib/render/include/vclib/bgfx/drawable/mesh/mesh_render_buffers.h @@ -634,7 +634,7 @@ class MeshRenderBuffers } } // wireframe index buffer - mWireframeBH.update(wireframe); + mWireframeBH.setPoints(wireframe); // TODO: Should Be: // const uint NUM_EDGES = diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/lines/cpu_generated_lines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/lines/cpu_generated_lines.cpp index c4b385ca4..4eec427ee 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/lines/cpu_generated_lines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/lines/cpu_generated_lines.cpp @@ -28,7 +28,7 @@ namespace vcl { CPUGeneratedLines::CPUGeneratedLines(const std::vector& points) { - update(points); + setPoints(points); } void CPUGeneratedLines::swap(CPUGeneratedLines& other) @@ -41,7 +41,7 @@ void CPUGeneratedLines::swap(CPUGeneratedLines& other) swap(mIndices, other.mIndices); } -void CPUGeneratedLines::update(const std::vector& points) +void CPUGeneratedLines::setPoints(const std::vector& points) { if (points.size() > 1) { // generate memory buffers diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/lines/gpu_generated_lines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/lines/gpu_generated_lines.cpp index bf47968a7..ba9b10505 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/lines/gpu_generated_lines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/lines/gpu_generated_lines.cpp @@ -31,7 +31,7 @@ GPUGeneratedLines::GPUGeneratedLines(const std::vector& points) checkCaps(); assert(bgfx::isValid(mComputeVerticesPH)); - update(points); + setPoints(points); } void GPUGeneratedLines::swap(GPUGeneratedLines& other) @@ -54,7 +54,7 @@ void GPUGeneratedLines::draw(uint viewId) const bgfx::submit(viewId, mLinesPH); } -void GPUGeneratedLines::update(const std::vector& points) +void GPUGeneratedLines::setPoints(const std::vector& points) { if (points.size() > 1) { allocateAndSetPointsBuffer(points); diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/lines/indirect_based_lines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/lines/indirect_based_lines.cpp index 1aaf4bdac..ef3420ddd 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/lines/indirect_based_lines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/lines/indirect_based_lines.cpp @@ -46,7 +46,7 @@ IndirectBasedLines::IndirectBasedLines() IndirectBasedLines::IndirectBasedLines(const std::vector& points) : IndirectBasedLines() { - update(points); + setPoints(points); } void IndirectBasedLines::swap(IndirectBasedLines& other) @@ -75,7 +75,7 @@ void IndirectBasedLines::draw(uint viewId) const bgfx::submit(viewId, mLinesPH, mIndirect.handle(), 0); } -void IndirectBasedLines::update(const std::vector& points) +void IndirectBasedLines::setPoints(const std::vector& points) { generateIndirectBuffer(points.size()); allocateAndSetPointsBuffer(points); diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/lines/instancing_based_lines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/lines/instancing_based_lines.cpp index 82bb45695..5331311d6 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/lines/instancing_based_lines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/lines/instancing_based_lines.cpp @@ -41,7 +41,7 @@ InstancingBasedLines::InstancingBasedLines() InstancingBasedLines::InstancingBasedLines( const std::vector& points) : InstancingBasedLines() { - update(points); + setPoints(points); } void InstancingBasedLines::swap(InstancingBasedLines& other) @@ -73,7 +73,7 @@ void InstancingBasedLines::draw(uint viewId) const } } -void InstancingBasedLines::update(const std::vector& points) +void InstancingBasedLines::setPoints(const std::vector& points) { mPoints = points; } diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/lines/texture_based_lines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/lines/texture_based_lines.cpp index 5f341ec10..058d96905 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/lines/texture_based_lines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/lines/texture_based_lines.cpp @@ -44,7 +44,7 @@ TextureBasedLines::TextureBasedLines() TextureBasedLines::TextureBasedLines(const std::vector& points) : TextureBasedLines() { - update(points); + setPoints(points); } void TextureBasedLines::swap(TextureBasedLines& other) @@ -73,7 +73,7 @@ void TextureBasedLines::draw(uint viewId) const bgfx::submit(viewId, mLinesPH, mIndirect.handle(), 0); } -void TextureBasedLines::update(const std::vector& points) +void TextureBasedLines::setPoints(const std::vector& points) { allocateAndSetPointsBuffer(points); allocateAndGenerateTextureBuffer(points.size()); diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/cpu_generated_polylines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/cpu_generated_polylines.cpp index 8e20a9961..70b81ede9 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/cpu_generated_polylines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/cpu_generated_polylines.cpp @@ -28,7 +28,7 @@ CPUGeneratedPolylines::CPUGeneratedPolylines( const std::vector& points) { assert(bgfx::isValid(mLinesPH)); - update(points); + setPoints(points); } void CPUGeneratedPolylines::swap(CPUGeneratedPolylines& other) @@ -42,7 +42,7 @@ void CPUGeneratedPolylines::swap(CPUGeneratedPolylines& other) swap(mJointIndices, other.mJointIndices); } -void CPUGeneratedPolylines::update(const std::vector& points) +void CPUGeneratedPolylines::setPoints(const std::vector& points) { if (points.size() > 1) { uint bufferVertsSize = (points.size() - 1) * 4 * 15; diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/gpu_generated_polylines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/gpu_generated_polylines.cpp index 770aa285d..76799840d 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/gpu_generated_polylines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/gpu_generated_polylines.cpp @@ -33,7 +33,7 @@ GPUGeneratedPolylines::GPUGeneratedPolylines() GPUGeneratedPolylines::GPUGeneratedPolylines( const std::vector& points) : Lines() { - update(points); + setPoints(points); } void GPUGeneratedPolylines::swap(GPUGeneratedPolylines& other) @@ -69,7 +69,7 @@ void GPUGeneratedPolylines::draw(uint viewId) const } } -void GPUGeneratedPolylines::update(const std::vector& points) +void GPUGeneratedPolylines::setPoints(const std::vector& points) { if (points.size() > 1) { allocateAndSetPointsBuffer(points); diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/indirect_based_polylines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/indirect_based_polylines.cpp index 90bfeff63..67601ce08 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/indirect_based_polylines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/indirect_based_polylines.cpp @@ -46,7 +46,7 @@ IndirectBasedPolylines::IndirectBasedPolylines() IndirectBasedPolylines::IndirectBasedPolylines( const std::vector& points) : IndirectBasedPolylines() { - update(points); + setPoints(points); } void IndirectBasedPolylines::swap(IndirectBasedPolylines& other) @@ -84,7 +84,7 @@ void IndirectBasedPolylines::draw(uint viewId) const } } -void IndirectBasedPolylines::update(const std::vector& points) +void IndirectBasedPolylines::setPoints(const std::vector& points) { generateIndirectBuffers(points.size()); allocateAndSetPointsBuffer(points); diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/instancing_based_polylines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/instancing_based_polylines.cpp index 83683bb6e..a33e3a25f 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/instancing_based_polylines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/instancing_based_polylines.cpp @@ -42,7 +42,7 @@ InstancingBasedPolylines::InstancingBasedPolylines() InstancingBasedPolylines::InstancingBasedPolylines( const std::vector& points) : InstancingBasedPolylines() { - update(points); + setPoints(points); } void InstancingBasedPolylines::swap(InstancingBasedPolylines& other) @@ -82,7 +82,7 @@ void InstancingBasedPolylines::draw(uint viewId) const } } -void InstancingBasedPolylines::update(const std::vector& points) +void InstancingBasedPolylines::setPoints(const std::vector& points) { mPoints = points; } diff --git a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/texture_based_polylines.cpp b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/texture_based_polylines.cpp index eefe8f5d4..9eb27cce8 100644 --- a/vclib/render/src/vclib/bgfx/drawable/lines/polylines/texture_based_polylines.cpp +++ b/vclib/render/src/vclib/bgfx/drawable/lines/polylines/texture_based_polylines.cpp @@ -46,7 +46,7 @@ TextureBasedPolylines::TextureBasedPolylines() TextureBasedPolylines::TextureBasedPolylines( const std::vector& points) : TextureBasedPolylines() { - update(points); + setPoints(points); } void TextureBasedPolylines::swap(TextureBasedPolylines& other) @@ -90,7 +90,7 @@ void TextureBasedPolylines::draw(uint viewId) const } } -void TextureBasedPolylines::update(const std::vector& points) +void TextureBasedPolylines::setPoints(const std::vector& points) { if (points.size() > 1) { allocateAndSetPointsBuffer(points);