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

adding back inlines

Browse source
This commit is contained in:
Wayne Chen 2018-09-10 17:40:35 -07:00
parent 0290ea4bdc
commit 28c3afca9d
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/octree/OctreePacketProcessor.cpp
View file

@ -16,7 +16,6 @@
#include "Application.h" #include "Application.h"
#include "Menu.h" #include "Menu.h"
#include "SceneScriptingInterface.h" #include "SceneScriptingInterface.h"
#include "SafeLanding.h"
OctreePacketProcessor::OctreePacketProcessor(): OctreePacketProcessor::OctreePacketProcessor():
_safeLanding(new SafeLanding()) _safeLanding(new SafeLanding())
@ -132,16 +131,4 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
void OctreePacketProcessor::startEntitySequence() { void OctreePacketProcessor::startEntitySequence() {
_safeLanding->startEntitySequence(qApp->getEntities()); _safeLanding->startEntitySequence(qApp->getEntities());
} }
bool OctreePacketProcessor::isLoadSequenceComplete() const {
return _safeLanding->isLoadSequenceComplete();
}
bool OctreePacketProcessor::isEntitiesRenderReady() const {
return _safeLanding->entitiesRenderReady();
}
float OctreePacketProcessor::domainLoadingProgress() {
return _safeLanding->loadingProgressPercentage();
}

11
interface/src/octree/OctreePacketProcessor.h
View file

@ -15,7 +15,7 @@
#include <ReceivedPacketProcessor.h> #include <ReceivedPacketProcessor.h>
#include <ReceivedMessage.h> #include <ReceivedMessage.h>
class SafeLanding; #include "SafeLanding.h"
/// Handles processing of incoming voxel packets for the interface application. As with other ReceivedPacketProcessor classes /// Handles processing of incoming voxel packets for the interface application. As with other ReceivedPacketProcessor classes
/// the user is responsible for reading inbound packets and adding them to the processing queue by calling queueReceivedPacket() /// the user is responsible for reading inbound packets and adding them to the processing queue by calling queueReceivedPacket()
@ -26,10 +26,9 @@ public:
~OctreePacketProcessor(); ~OctreePacketProcessor();
void startEntitySequence(); void startEntitySequence();
bool isLoadSequenceComplete() const; bool isLoadSequenceComplete() const { return _safeLanding->isLoadSequenceComplete(); }
bool isEntitiesRenderReady() const; bool isEntitiesRenderReady() const { return _safeLanding->entitiesRenderReady(); }
float domainLoadingProgress(); float domainLoadingProgress() { return _safeLanding->loadingProgressPercentage(); }
signals: signals:
void packetVersionMismatch(); void packetVersionMismatch();
@ -42,4 +41,4 @@ private slots:
private: private:
std::unique_ptr<SafeLanding> _safeLanding; std::unique_ptr<SafeLanding> _safeLanding;
}; };
#endif // hifi_OctreePacketProcessor_h #endif // hifi_OctreePacketProcessor_h