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

start interstitial page work

Browse source
This commit is contained in:
Dante Ruiz 2018-07-31 14:10:19 -07:00
parent 09d1964f1d
commit 0b7d6cb720
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -3412,6 +3412,16 @@ bool Application::isServerlessMode() const {
return false; return false;
} }
bool Application::isInterstitialPage() {
return _interstitialMode;
}
void Application::setInterstitialMode(bool interstitialMode) {
if (_interstitialMode != interstitialMode) {
_interstitialMode = interstitialMode;
}
}
void Application::setIsServerlessMode(bool serverlessDomain) { void Application::setIsServerlessMode(bool serverlessDomain) {
auto tree = getEntities()->getTree(); auto tree = getEntities()->getTree();
if (tree) { if (tree) {
@ -5471,6 +5481,8 @@ static bool domainLoadingInProgress = false;
void Application::update(float deltaTime) { void Application::update(float deltaTime) {
PROFILE_RANGE_EX(app, __FUNCTION__, 0xffff0000, (uint64_t)_renderFrameCount + 1); PROFILE_RANGE_EX(app, __FUNCTION__, 0xffff0000, (uint64_t)_renderFrameCount + 1);
auto audioClient = DependencyManager::get<AudioClient>();
audioClient->setMuted(true);
if (!_physicsEnabled) { if (!_physicsEnabled) {
if (!domainLoadingInProgress) { if (!domainLoadingInProgress) {
PROFILE_ASYNC_BEGIN(app, "Scene Loading", ""); PROFILE_ASYNC_BEGIN(app, "Scene Loading", "");

3
interface/src/Application.h
View file

@ -304,6 +304,7 @@ public:
void saveNextPhysicsStats(QString filename); void saveNextPhysicsStats(QString filename);
bool isServerlessMode() const; bool isServerlessMode() const;
bool isInterstitialMode() const;
void replaceDomainContent(const QString& url); void replaceDomainContent(const QString& url);
@ -423,6 +424,7 @@ public slots:
void setPreferredCursor(const QString& cursor); void setPreferredCursor(const QString& cursor);
void setIsServerlessMode(bool serverlessDomain); void setIsServerlessMode(bool serverlessDomain);
void setIsInterstitialMode(bool interstialMode);
void loadServerlessDomain(QUrl domainURL); void loadServerlessDomain(QUrl domainURL);
void updateVerboseLogging(); void updateVerboseLogging();
@ -624,6 +626,7 @@ private:
QSet<int> _keysPressed; QSet<int> _keysPressed;
bool _enableProcessOctreeThread; bool _enableProcessOctreeThread;
bool _interstitialMode { true };
OctreePacketProcessor _octreeProcessor; OctreePacketProcessor _octreeProcessor;
EntityEditPacketSender _entityEditSender; EntityEditPacketSender _entityEditSender;

8
libraries/audio-client/src/AudioClient.cpp
View file

@ -668,7 +668,7 @@ void AudioClient::stop() {
void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer<ReceivedMessage> message) { void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer<ReceivedMessage> message) {
char bitset; /*char bitset;
message->readPrimitive(&bitset); message->readPrimitive(&bitset);
bool hasReverb = oneAtBit(bitset, HAS_REVERB_BIT); bool hasReverb = oneAtBit(bitset, HAS_REVERB_BIT);
@ -680,11 +680,11 @@ void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer<ReceivedMessag
_receivedAudioStream.setReverb(reverbTime, wetLevel); _receivedAudioStream.setReverb(reverbTime, wetLevel);
} else { } else {
_receivedAudioStream.clearReverb(); _receivedAudioStream.clearReverb();
} }*/
} }
void AudioClient::handleAudioDataPacket(QSharedPointer<ReceivedMessage> message) { void AudioClient::handleAudioDataPacket(QSharedPointer<ReceivedMessage> message) {
/*
if (message->getType() == PacketType::SilentAudioFrame) { if (message->getType() == PacketType::SilentAudioFrame) {
_silentInbound.increment(); _silentInbound.increment();
} else { } else {
@ -709,7 +709,7 @@ void AudioClient::handleAudioDataPacket(QSharedPointer<ReceivedMessage> message)
// Audio output must exist and be correctly set up if we're going to process received audio // Audio output must exist and be correctly set up if we're going to process received audio
_receivedAudioStream.parseData(*message); _receivedAudioStream.parseData(*message);
#endif #endif
} }*/
} }
AudioClient::Gate::Gate(AudioClient* audioClient) : AudioClient::Gate::Gate(AudioClient* audioClient) :