Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 00:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed a case where _widths = 0 and widths-1 is not valid.

Browse source
This commit is contained in:
amer cerkic 2019-02-26 14:48:34 -08:00
parent 009bc19c5d
commit 4c6bea48b2
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
View file

@ -184,8 +184,11 @@ void PolyLineEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPo
void PolyLineEntityRenderer::updateGeometry() { void PolyLineEntityRenderer::updateGeometry() {
int maxNumVertices = std::min(_points.length(), _normals.length()); int maxNumVertices = std::min(_points.length(), _normals.length());
qDebug()<<"QQQ_ widths size: "<< _widths.size();
qDebug()<<"QQQ_ MaxNumbVertices: "<<maxNumVertices;
bool doesStrokeWidthVary = false; bool doesStrokeWidthVary = false;
if (_widths.size() >= 0) { if (_widths.size() > 0) {
for (int i = 1; i < maxNumVertices; i++) { for (int i = 1; i < maxNumVertices; i++) {
float width = PolyLineEntityItem::DEFAULT_LINE_WIDTH; float width = PolyLineEntityItem::DEFAULT_LINE_WIDTH;
if (i < _widths.length()) { if (i < _widths.length()) {
@ -206,12 +209,15 @@ void PolyLineEntityRenderer::updateGeometry() {
std::vector<PolylineVertex> vertices; std::vector<PolylineVertex> vertices;
vertices.reserve(maxNumVertices); vertices.reserve(maxNumVertices);
for (int i = 0; i < maxNumVertices; i++) { for (int i = 0; i < maxNumVertices; i++) {
// Position // Position
glm::vec3 point = _points[i]; glm::vec3 point = _points[i];
// uCoord float width=PolyLineEntityItem::DEFAULT_LINE_WIDTH;
float width = i < _widths.size() ? _widths[i] : PolyLineEntityItem::DEFAULT_LINE_WIDTH; if(_widths.size()>0 && i < _widths.size())
width = _widths[i];
if (i > 0) { // First uCoord is 0.0f if (i > 0) { // First uCoord is 0.0f
if (!_isUVModeStretch) { if (!_isUVModeStretch) {
accumulatedDistance += glm::distance(point, _points[i - 1]); accumulatedDistance += glm::distance(point, _points[i - 1]);