diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp index f5e84a6bfa..ceeb5a1ab4 100644 --- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp @@ -31,10 +31,8 @@ void RenderableLineEntityItem::render(RenderArgs* args) { glm::quat rotation = getRotation(); glm::vec4 lineColor(toGlm(getXColor()), getLocalRenderAlpha()); glPushMatrix(); - glLineWidth(getLineWidth()); auto geometryCache = DependencyManager::get(); - if(_lineVerticesID == GeometryCache::UNKNOWN_ID){ _lineVerticesID = geometryCache ->allocateID(); } @@ -42,13 +40,8 @@ void RenderableLineEntityItem::render(RenderArgs* args) { glm::vec3 axis = glm::axis(rotation); glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z); QVector points; - glm::vec3 p1 = {0, 0, 0}; - glm::vec3 p2 = {1, 1, 0}; - points<updateVertices(_lineVerticesID, getLinePoints(), lineColor); -// geometryCache->updateVertices(_lineVerticesID, points, lineColor); - - geometryCache->renderVertices(gpu::LINE_STRIP, _lineVerticesID); + geometryCache->renderVertices(gpu::LINE_STRIP, _lineVerticesID); glPopMatrix(); RenderableDebugableEntityItem::render(this, args); }; diff --git a/libraries/entities/src/LineEntityItem.h b/libraries/entities/src/LineEntityItem.h index afd20a3722..10001a4c71 100644 --- a/libraries/entities/src/LineEntityItem.h +++ b/libraries/entities/src/LineEntityItem.h @@ -59,17 +59,9 @@ class LineEntityItem : public EntityItem { return _lineWidth; } - void setLinePoints(const QVector& points){ qDebug()<<"points " << points; _points = points; -// _points = QVector(0); -// glm::vec3 p1 = { 0,0,0}; -// glm::vec3 p2 = {1, -1,2}; -// glm::vec3 p3 = {4, 0, 0}; -// _points <& getLinePoints() const{ diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp index e3c438a312..f76e2a6d9b 100644 --- a/libraries/octree/src/OctreePacketData.cpp +++ b/libraries/octree/src/OctreePacketData.cpp @@ -362,7 +362,6 @@ bool OctreePacketData::appendValue(float value) { const unsigned char* data = (const unsigned char*)&value; int length = sizeof(value); - qDebug()<<"Line Width Value!**"<& value){ - -// const unsigned char* data = (const unsigned char*)value.data(); -// uint16_t qVecSize = (uint16_t)value.size(); -// -// int length = qVecSize * sizeof(glm::vec3); -// const unsigned char* sizePointer = (const unsigned char*)&qVecSize; -// bool success = append(sizePointer, sizeof(uint16_t)); -// if(success){ -// _bytesOfValues += qVecSize; -// _totalBytesOfValues += qVecSize; -// success = append(data, length); -// if (success){ -// _bytesOfValues += length; -// _totalBytesOfValues += length; -// } -// } -// return success; - -// const unsigned char* data = (const unsigned char*)value.data(); -// int qVecSize = value.size(); -// -// int length = qVecSize * sizeof(glm::vec3); -// -// bool success = append(data, length); -// if (success){ -// _bytesOfValues += length; -// _totalBytesOfValues += length; -// } -// return success; - uint16_t qVecSize = value.size() * sizeof(glm::vec3); - QByteArray myArray; - const char* data = (const char*)value.data(); - - char* sizePointer = (char*)&qVecSize; QByteArray vecSize(sizePointer, sizeof(uint16_t)); myArray.append(vecSize); uint16_t arrayLength; memcpy(&arrayLength, myArray.data(), sizeof(uint16_t)); - qDebug()<<"array length.. shnur"<