Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 47 files). Show all
Unified · Split
| @@ -168,12 +168,19 @@ bool MetavoxelSystem::SimulateVisitor::visit(MetavoxelInfo& info) { · 167 unmodified lines | |||
| 168 | return false; | 168 | return false; |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | <<<<<<< HEAD | ||
| 171 | MetavoxelSystem::RenderVisitor::RenderVisitor() : | 172 | MetavoxelSystem::RenderVisitor::RenderVisitor() : |
| 172 | SpannerVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getSpannersAttribute()) { | 173 | SpannerVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getSpannersAttribute()) { |
| 173 | } | 174 | } |
| 174 | 175 | ||
| 175 | void MetavoxelSystem::RenderVisitor::visit(Spanner* spanner) { | 176 | void MetavoxelSystem::RenderVisitor::visit(Spanner* spanner) { |
| 176 | spanner->getRenderer()->render(1.0f); | 177 | spanner->getRenderer()->render(1.0f); |
| 178 | ======= | ||
| 179 | static QByteArray createDatagramHeader(const QUuid& sessionID) { | ||
| 180 | QByteArray header = byteArrayWithPopulatedHeader(PacketTypeMetavoxelData); | ||
| 181 | header += sessionID.toRfc4122(); | ||
| 182 | return header; | ||
| 183 | >>>>>>> 224f42c366bedfe91546888a9039c917ff6d416c | ||
| 177 | } | 184 | } |
| 178 | 185 | ||
| 179 | MetavoxelClient::MetavoxelClient(const SharedNodePointer& node) : | 186 | MetavoxelClient::MetavoxelClient(const SharedNodePointer& node) : |