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

More merge fixes.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-02-21 18:32:05 -08:00
parent e470b1c41d
commit 68fea8de1e
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/metavoxels/MetavoxelServer.cpp
View file

@ -88,7 +88,7 @@ void MetavoxelServer::sendDeltas() {
MetavoxelSession::MetavoxelSession(MetavoxelServer* server, const SharedNodePointer& node) : MetavoxelSession::MetavoxelSession(MetavoxelServer* server, const SharedNodePointer& node) :
_server(server), _server(server),
_sequencer(byteArrayWithPopluatedHeader(PacketTypeMetavoxelData)), _sequencer(byteArrayWithPopulatedHeader(PacketTypeMetavoxelData)),
_node(node) { _node(node) {
connect(&_sequencer, SIGNAL(readyToWrite(const QByteArray&)), SLOT(sendData(const QByteArray&))); connect(&_sequencer, SIGNAL(readyToWrite(const QByteArray&)), SLOT(sendData(const QByteArray&)));

7
interface/src/MetavoxelSystem.cpp
View file

@ -168,19 +168,12 @@ bool MetavoxelSystem::SimulateVisitor::visit(MetavoxelInfo& info) {
return false; return false;
} }
<<<<<<< HEAD
MetavoxelSystem::RenderVisitor::RenderVisitor() : MetavoxelSystem::RenderVisitor::RenderVisitor() :
SpannerVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getSpannersAttribute()) { SpannerVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getSpannersAttribute()) {
} }
void MetavoxelSystem::RenderVisitor::visit(Spanner* spanner) { void MetavoxelSystem::RenderVisitor::visit(Spanner* spanner) {
spanner->getRenderer()->render(1.0f); spanner->getRenderer()->render(1.0f);
=======
static QByteArray createDatagramHeader(const QUuid& sessionID) {
QByteArray header = byteArrayWithPopulatedHeader(PacketTypeMetavoxelData);
header += sessionID.toRfc4122();
return header;
>>>>>>> 224f42c366bedfe91546888a9039c917ff6d416c
} }
MetavoxelClient::MetavoxelClient(const SharedNodePointer& node) : MetavoxelClient::MetavoxelClient(const SharedNodePointer& node) :