Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 20:44:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bug fixes for polyline

Browse source
This commit is contained in:
ericrius1 2015-07-02 10:41:57 -07:00
parent feeba2a029
commit 163c479bd3
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/entities/src/EntityItemProperties.cpp
View file

@ -823,6 +823,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
APPEND_ENTITY_PROPERTY(PROP_LINE_WIDTH, properties.getLineWidth());
APPEND_ENTITY_PROPERTY(PROP_LINE_POINTS, properties.getLinePoints());
APPEND_ENTITY_PROPERTY(PROP_NORMALS, properties.getNormals());
APPEND_ENTITY_PROPERTY(PROP_STROKE_WIDTHS, properties.getStrokeWidths());
}
APPEND_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, properties.getMarketplaceID());

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

@ -116,10 +116,16 @@ 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";
return false;
}
if (_points.size () < 2 || _strokeWidths.size() < 2) {
return false;
}
_normals = normals;
_vertices.clear();
//Go through and create vertices for triangle strip based on normalsa
if (_normals.size() != _points.size()) {
@ -132,11 +138,9 @@ bool PolyLineEntityItem::setNormals(const QVector<glm::vec3>& normals) {
tangent = _points.at(i+1) - point;
glm::vec3 normal = normals.at(i);
binormal = glm::normalize(glm::cross(tangent, normal)) * _lineWidth;
binormal = glm::normalize(glm::cross(tangent, normal)) * width;
if(binormal.x != binormal.x) {
}
assert(binormal.x == binormal.x);
v1 = point + binormal;
v2 = point - binormal;
_vertices << v1 << v2;
@ -213,6 +217,7 @@ EntityPropertyFlags PolyLineEntityItem::getEntityProperties(EncodeBitstreamParam
requestedProperties += PROP_LINE_WIDTH;
requestedProperties += PROP_LINE_POINTS;
requestedProperties += PROP_NORMALS;
requestedProperties += PROP_STROKE_WIDTHS;
return requestedProperties;
}