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

adding inlines

Browse source
This commit is contained in:
Wayne Chen 2018-09-10 17:10:13 -07:00
parent e5a87aa58c
commit c194c236f1
6 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -3493,10 +3493,6 @@ bool Application::isServerlessMode() const {
return false; return false;
} }
bool Application::isInterstitialMode() const {
return _interstitialMode;
}
void Application::setIsInterstitialMode(bool interstitialMode) { void Application::setIsInterstitialMode(bool interstitialMode) {
if (_interstitialMode != interstitialMode) { if (_interstitialMode != interstitialMode) {
_interstitialMode = interstitialMode; _interstitialMode = interstitialMode;

2
interface/src/Application.h
View file

@ -310,7 +310,7 @@ public:
void saveNextPhysicsStats(QString filename); void saveNextPhysicsStats(QString filename);
bool isServerlessMode() const; bool isServerlessMode() const;
bool isInterstitialMode() const; bool isInterstitialMode() const { return _interstitialMode; }
void replaceDomainContent(const QString& url); void replaceDomainContent(const QString& url);

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

@ -137,11 +137,3 @@ void OctreePacketProcessor::startEntitySequence() {
bool OctreePacketProcessor::isLoadSequenceComplete() const { bool OctreePacketProcessor::isLoadSequenceComplete() const {
return _safeLanding->isLoadSequenceComplete(); return _safeLanding->isLoadSequenceComplete();
} }
bool OctreePacketProcessor::isEntitiesRenderReady() const {
return _safeLanding->entitiesRenderReady();
}
float OctreePacketProcessor::domainLoadingProgress() {
return _safeLanding->loadingProgressPercentage();
}

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

@ -27,8 +27,8 @@ public:
void startEntitySequence(); void startEntitySequence();
bool isLoadSequenceComplete() const; bool isLoadSequenceComplete() const;
bool isEntitiesRenderReady() const; bool isEntitiesRenderReady() const { return _safeLanding->entitiesRenderReady(); }
float domainLoadingProgress(); float domainLoadingProgress() { return _safeLanding->loadingProgressPercentage(); }
signals: signals:
void packetVersionMismatch(); void packetVersionMismatch();

4
libraries/networking/src/AddressManager.cpp
View file

@ -48,7 +48,6 @@ QString AddressManager::getProtocol() const {
QUrl AddressManager::currentAddress(bool domainOnly) const { QUrl AddressManager::currentAddress(bool domainOnly) const {
QUrl hifiURL = _domainURL; QUrl hifiURL = _domainURL;
if (!domainOnly && hifiURL.scheme() == URL_SCHEME_HIFI) { if (!domainOnly && hifiURL.scheme() == URL_SCHEME_HIFI) {
hifiURL.setPath(currentPath()); hifiURL.setPath(currentPath());
} }
@ -155,7 +154,8 @@ void AddressManager::goForward() {
void AddressManager::goToLastAddress() { void AddressManager::goToLastAddress() {
// this should always return something as long as the URL isn't empty. // this should always return something as long as the URL isn't empty.
handleUrl(_lastVisitedURL, LookupTrigger::AttemptedRefresh); handleUrl(_lastVisitedURL,
LookupTrigger::AttemptedRefresh);
} }
void AddressManager::storeCurrentAddress() { void AddressManager::storeCurrentAddress() {

1
libraries/networking/src/AddressManager.h
View file

@ -149,7 +149,6 @@ public:
UserInput, UserInput,
Back, Back,
Forward, Forward,
//Retry,
StartupFromSettings, StartupFromSettings,
DomainPathResponse, DomainPathResponse,
Internal, Internal,