Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 4 files). Show all
Unified · Split
| @@ -157,7 +157,8 @@ void MetavoxelSystem::receivedData(const QByteArray& data, const HifiSockAddr& s · 156 unmodified lines | |||
| 157 | MetavoxelSystem::PointVisitor::PointVisitor(QVector<Point>& points) : | 157 | MetavoxelSystem::PointVisitor::PointVisitor(QVector<Point>& points) : |
| 158 | MetavoxelVisitor(QVector<AttributePointer>() << | 158 | MetavoxelVisitor(QVector<AttributePointer>() << |
| 159 | AttributeRegistry::getInstance()->getColorAttribute() << | 159 | AttributeRegistry::getInstance()->getColorAttribute() << |
| 160 | AttributeRegistry::getInstance()->getNormalAttribute()), | 160 | AttributeRegistry::getInstance()->getNormalAttribute(), |
| 161 | QVector<AttributePointer>()), | ||
| 161 | _points(points) { | 162 | _points(points) { |
| 162 | } | 163 | } |
| 163 | 164 | ||
| @@ -165,8 +166,8 @@ bool MetavoxelSystem::PointVisitor::visit(const MetavoxelInfo& info) { · 1 unmodified line | |||
| 165 | if (!info.isLeaf) { | 166 | if (!info.isLeaf) { |
| 166 | return true; | 167 | return true; |
| 167 | } | 168 | } |
| 168 | QRgb color = info.attributeValues.at(0).getInlineValue<QRgb>(); | 169 | QRgb color = info.inputValues.at(0).getInlineValue<QRgb>(); |
| 169 | QRgb normal = info.attributeValues.at(1).getInlineValue<QRgb>(); | 170 | QRgb normal = info.inputValues.at(1).getInlineValue<QRgb>(); |
| 170 | int alpha = qAlpha(color); | 171 | int alpha = qAlpha(color); |
| 171 | if (alpha > 0) { | 172 | if (alpha > 0) { |
| 172 | Point point = { glm::vec4(info.minimum + glm::vec3(info.size, info.size, info.size) * 0.5f, info.size), | 173 | Point point = { glm::vec4(info.minimum + glm::vec3(info.size, info.size, info.size) * 0.5f, info.size), |