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

cleanup of comments and dead code

Browse source
This commit is contained in:
ericrius1 2015-08-03 09:35:47 -07:00
parent f50c482451
commit b2753507dc
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/images/paintStroke.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

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

@ -108,7 +108,6 @@ void RenderablePolyLineEntityItem::updateGeometry() {
_verticesBuffer->append(sizeof(glm::vec2), (gpu::Byte*)&uv);
vertexIndex++;
uv.y = 1.0;
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_vertices.at(vertexIndex));
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_normals.at(i));
@ -178,7 +177,6 @@ void RenderablePolyLineEntityItem::render(RenderArgs* args) {
batch.setPipeline(_pipeline);
batch.setResourceTexture(PAINTSTROKE_GPU_SLOT, _texture);
batch.setInputFormat(_format);
batch.setInputBuffer(0, _verticesBuffer, 0, _format->getChannels().at(0)._stride);

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

@ -53,13 +53,11 @@ EntityItemProperties PolyLineEntityItem::getProperties() const {
properties._color = getXColor();
properties._colorChanged = false;
COPY_ENTITY_PROPERTY_TO_PROPERTIES(lineWidth, getLineWidth);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(linePoints, getLinePoints);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(normals, getNormals);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(strokeWidths, getStrokeWidths);
properties._glowLevel = getGlowLevel();
properties._glowLevelChanged = false;
return properties;
@ -75,8 +73,6 @@ bool PolyLineEntityItem::setProperties(const EntityItemProperties& properties) {
SET_ENTITY_PROPERTY_FROM_PROPERTIES(linePoints, setLinePoints);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(normals, setNormals);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(strokeWidths, setStrokeWidths);
if (somethingChanged) {
bool wantDebug = false;
@ -89,7 +85,6 @@ bool PolyLineEntityItem::setProperties(const EntityItemProperties& properties) {
setLastEdited(properties._lastEdited);
}
return somethingChanged;
}
bool PolyLineEntityItem::appendPoint(const glm::vec3& point) {
@ -115,7 +110,6 @@ bool PolyLineEntityItem::setStrokeWidths(const QVector<float>& strokeWidths ) {
bool PolyLineEntityItem::setNormals(const QVector<glm::vec3>& normals) {
_normals = normals;
if (_points.size () < 2) {
// qDebug() << "points size is less than 2!";
return false;
}
@ -126,8 +120,7 @@ bool PolyLineEntityItem::setNormals(const QVector<glm::vec3>& normals) {
if (_strokeWidths.size() < minVectorSize) {
minVectorSize = _strokeWidths.size();
}
// int minArraySize = glm::min(_normals.size(), _points.size())
_vertices.clear();
glm::vec3 v1, v2, tangent, binormal, point;
@ -139,6 +132,7 @@ bool PolyLineEntityItem::setNormals(const QVector<glm::vec3>& normals) {
glm::vec3 normal = normals.at(i);
binormal = glm::normalize(glm::cross(tangent, normal)) * width;
//This checks to make sure binormal is not a NAN
assert(binormal.x == binormal.x);
v1 = point + binormal;
v2 = point - binormal;
@ -174,7 +168,6 @@ bool PolyLineEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
return false;
}
for (int i = 0; i < points.size(); i++) {
glm::vec3 point = points.at(i);
glm::vec3 pos = getPosition();
@ -183,11 +176,8 @@ bool PolyLineEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
qDebug() << "Point is outside entity's bounding box";
return false;
}
}
_points = points;
//All our points are valid and at least one point has changed, now create quads from points
return true;
}