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

setNormals refactor

Browse source
This commit is contained in:
ericrius1 2015-07-13 11:32:12 -07:00
parent 0ce6737b34
commit dab31e5e42
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/entities/src/PolyLineEntityItem.cpp
View file

@ -118,21 +118,18 @@ bool PolyLineEntityItem::setStrokeWidths(const QVector<float>& strokeWidths ) {
bool PolyLineEntityItem::setNormals(const QVector<glm::vec3>& normals) {
_normals = normals;
if( _normals.size() != _points.size()) {
qDebug() << "RETURN FALSE";
if( _normals.size() != _points.size() || _normals.size() != _strokeWidths.size()) {
qDebug() << "normals dont equal points!";
return false;
}
if (_points.size () < 2 || _strokeWidths.size() < 2) {
if (_points.size () < 2) {
qDebug() << "points size is less than 2!";
return false;
}
// int minArraySize = glm::min(_normals.size(), _points.size())
_vertices.clear();
//Go through and create vertices for triangle strip based on normalsa
if (_normals.size() != _points.size()) {
return false;
}
glm::vec3 v1, v2, tangent, binormal, point;
for (int i = 0; i < _points.size()-1; i++) {
float width = _strokeWidths.at(i);
@ -197,7 +194,7 @@ bool PolyLineEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
int PolyLineEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
ReadBitstreamToTreeParams& args,
EntityPropertyFlags& propertyFlags, bool overwriteLocalData) {
_quadReadWriteLock.lockForWrite();
QWriteLocker lock(&_quadReadWriteLock);
int bytesRead = 0;
const unsigned char* dataAt = data;
@ -207,7 +204,6 @@ int PolyLineEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* da
READ_ENTITY_PROPERTY(PROP_NORMALS, QVector<glm::vec3>, setNormals);
READ_ENTITY_PROPERTY(PROP_STROKE_WIDTHS, QVector<float>, setStrokeWidths);
_quadReadWriteLock.unlock();
return bytesRead;
}