Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-05 19:36:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

master -> primary

Browse source
This commit is contained in:
HifiExperiments 2024-08-13 20:50:51 -07:00
parent 74b0754f72
commit 126c325410
35 changed files with 232 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -201,9 +201,9 @@ void AudioMixerClientData::parsePerAvatarGainSet(ReceivedMessage& message, const
float gain = unpackFloatGainFromByte(packedGain);
if (avatarUUID.isNull()) {
// set the MASTER avatar gain
setMasterAvatarGain(gain);
qCDebug(audio) << "Setting MASTER avatar gain for" << uuid << "to" << gain;
// set the PRIMARY avatar gain
setPrimaryAvatarGain(gain);
qCDebug(audio) << "Setting PRIMARY avatar gain for" << uuid << "to" << gain;
} else {
// set the per-source avatar gain
setGainForAvatar(avatarUUID, gain);
@ -218,8 +218,8 @@ void AudioMixerClientData::parseInjectorGainSet(ReceivedMessage& message, const
message.readPrimitive(&packedGain);
float gain = unpackFloatGainFromByte(packedGain);
setMasterInjectorGain(gain);
qCDebug(audio) << "Setting MASTER injector gain for" << uuid << "to" << gain;
setPrimaryInjectorGain(gain);
qCDebug(audio) << "Setting PRIMARY injector gain for" << uuid << "to" << gain;
}
bool setGainInStreams(const QUuid &nodeID, float gain, std::vector<AudioMixerClientData::MixableStream> &streamVector) {

12
assignment-client/src/audio/AudioMixerClientData.h
View file

@ -86,10 +86,10 @@ public:
// uses randomization to have the AudioMixer send a stats packet to this node around every second
bool shouldSendStats(int frameNumber);
float getMasterAvatarGain() const { return _masterAvatarGain; }
void setMasterAvatarGain(float gain) { _masterAvatarGain = gain; }
float getMasterInjectorGain() const { return _masterInjectorGain; }
void setMasterInjectorGain(float gain) { _masterInjectorGain = gain; }
float getPrimaryAvatarGain() const { return _primaryAvatarGain; }
void setPrimaryAvatarGain(float gain) { _primaryAvatarGain = gain; }
float getPrimaryInjectorGain() const { return _primaryInjectorGain; }
void setPrimaryInjectorGain(float gain) { _primaryInjectorGain = gain; }
AudioLimiter audioLimiter;
@ -194,8 +194,8 @@ private:
int _frameToSendStats { 0 };
float _masterAvatarGain { 1.0f }; // per-listener mixing gain, applied only to avatars
float _masterInjectorGain { 1.0f }; // per-listener mixing gain, applied only to injectors
float _primaryAvatarGain { 1.0f }; // per-listener mixing gain, applied only to avatars
float _primaryInjectorGain { 1.0f }; // per-listener mixing gain, applied only to injectors
CodecPluginPointer _codec;
QString _selectedCodecName;

44
assignment-client/src/audio/AudioMixerWorker.cpp
View file

@ -50,7 +50,7 @@ void sendEnvironmentPacket(const SharedNodePointer& node, AudioMixerClientData&
// mix helpers
inline float approximateGain(const AvatarAudioStream& listeningNodeStream, const PositionalAudioStream& streamToAdd);
inline float computeGain(float masterAvatarGain, float masterInjectorGain, const AvatarAudioStream& listeningNodeStream,
inline float computeGain(float primaryAvatarGain, float primaryInjectorGain, const AvatarAudioStream& listeningNodeStream,
const PositionalAudioStream& streamToAdd, const glm::vec3& relativePosition, float distance);
inline float computeAzimuth(const AvatarAudioStream& listeningNodeStream, const PositionalAudioStream& streamToAdd,
const glm::vec3& relativePosition);
@ -338,8 +338,8 @@ bool AudioMixerWorker::prepareMix(const SharedNodePointer& listener) {
}
if (!isThrottling) {
updateHRTFParameters(stream, *listenerAudioStream, listenerData->getMasterAvatarGain(),
listenerData->getMasterInjectorGain());
updateHRTFParameters(stream, *listenerAudioStream, listenerData->getPrimaryAvatarGain(),
listenerData->getPrimaryInjectorGain());
}
return false;
});
@ -363,8 +363,8 @@ bool AudioMixerWorker::prepareMix(const SharedNodePointer& listener) {
}
if (!isThrottling) {
updateHRTFParameters(stream, *listenerAudioStream, listenerData->getMasterAvatarGain(),
listenerData->getMasterInjectorGain());
updateHRTFParameters(stream, *listenerAudioStream, listenerData->getPrimaryAvatarGain(),
listenerData->getPrimaryInjectorGain());
}
return false;
});
@ -387,7 +387,7 @@ bool AudioMixerWorker::prepareMix(const SharedNodePointer& listener) {
return true;
}
addStream(stream, *listenerAudioStream, listenerData->getMasterAvatarGain(), listenerData->getMasterInjectorGain(),
addStream(stream, *listenerAudioStream, listenerData->getPrimaryAvatarGain(), listenerData->getPrimaryInjectorGain(),
isSoloing);
if (shouldBeInactive(stream)) {
@ -423,7 +423,7 @@ bool AudioMixerWorker::prepareMix(const SharedNodePointer& listener) {
return true;
}
addStream(stream, *listenerAudioStream, listenerData->getMasterAvatarGain(), listenerData->getMasterInjectorGain(),
addStream(stream, *listenerAudioStream, listenerData->getPrimaryAvatarGain(), listenerData->getPrimaryInjectorGain(),
isSoloing);
if (shouldBeInactive(stream)) {
@ -491,8 +491,8 @@ bool AudioMixerWorker::prepareMix(const SharedNodePointer& listener) {
void AudioMixerWorker::addStream(AudioMixerClientData::MixableStream& mixableStream,
AvatarAudioStream& listeningNodeStream,
float masterAvatarGain,
float masterInjectorGain,
float primaryAvatarGain,
float primaryInjectorGain,
bool isSoloing) {
++stats.totalMixes;
@ -505,8 +505,8 @@ void AudioMixerWorker::addStream(AudioMixerClientData::MixableStream& mixableStr
float distance = glm::max(glm::length(relativePosition), EPSILON);
float gain = isEcho ? 1.0f
: (isSoloing ? masterAvatarGain
: computeGain(masterAvatarGain, masterInjectorGain, listeningNodeStream, *streamToAdd,
: (isSoloing ? primaryAvatarGain
: computeGain(primaryAvatarGain, primaryInjectorGain, listeningNodeStream, *streamToAdd,
relativePosition, distance));
float azimuth = isEcho ? 0.0f : computeAzimuth(listeningNodeStream, listeningNodeStream, relativePosition);
@ -577,8 +577,8 @@ void AudioMixerWorker::addStream(AudioMixerClientData::MixableStream& mixableStr
void AudioMixerWorker::updateHRTFParameters(AudioMixerClientData::MixableStream& mixableStream,
AvatarAudioStream& listeningNodeStream,
float masterAvatarGain,
float masterInjectorGain) {
float primaryAvatarGain,
float primaryInjectorGain) {
auto streamToAdd = mixableStream.positionalStream;
// check if this is a server echo of a source back to itself
@ -587,7 +587,7 @@ void AudioMixerWorker::updateHRTFParameters(AudioMixerClientData::MixableStream&
glm::vec3 relativePosition = streamToAdd->getPosition() - listeningNodeStream.getPosition();
float distance = glm::max(glm::length(relativePosition), EPSILON);
float gain = isEcho ? 1.0f : computeGain(masterAvatarGain, masterInjectorGain, listeningNodeStream, *streamToAdd,
float gain = isEcho ? 1.0f : computeGain(primaryAvatarGain, primaryInjectorGain, listeningNodeStream, *streamToAdd,
relativePosition, distance);
float azimuth = isEcho ? 0.0f : computeAzimuth(listeningNodeStream, listeningNodeStream, relativePosition);
@ -713,7 +713,7 @@ float approximateGain(const AvatarAudioStream& listeningNodeStream, const Positi
// injector: apply attenuation
if (streamToAdd.getType() == PositionalAudioStream::Injector) {
gain *= reinterpret_cast<const InjectedAudioStream*>(&streamToAdd)->getAttenuationRatio();
// injector: skip master gain
// injector: skip primary gain
}
// avatar: skip attenuation - it is too costly to approximate
@ -723,11 +723,11 @@ float approximateGain(const AvatarAudioStream& listeningNodeStream, const Positi
float distance = glm::length(relativePosition);
return gain / distance;
// avatar: skip master gain
// avatar: skip primary gain
}
float computeGain(float masterAvatarGain,
float masterInjectorGain,
float computeGain(float primaryAvatarGain,
float primaryInjectorGain,
const AvatarAudioStream& listeningNodeStream,
const PositionalAudioStream& streamToAdd,
const glm::vec3& relativePosition,
@ -737,8 +737,8 @@ float computeGain(float masterAvatarGain,
// injector: apply attenuation
if (streamToAdd.getType() == PositionalAudioStream::Injector) {
gain *= reinterpret_cast<const InjectedAudioStream*>(&streamToAdd)->getAttenuationRatio();
// apply master gain
gain *= masterInjectorGain;
// apply primary gain
gain *= primaryInjectorGain;
// avatar: apply fixed off-axis attenuation to make them quieter as they turn away
} else if (streamToAdd.getType() == PositionalAudioStream::Microphone) {
@ -754,8 +754,8 @@ float computeGain(float masterAvatarGain,
gain *= offAxisCoefficient;
// apply master gain
gain *= masterAvatarGain;
// apply primary gain
gain *= primaryAvatarGain;
}
auto& audioZones = AudioMixer::getAudioZones();

8
assignment-client/src/audio/AudioMixerWorker.h
View file

@ -60,13 +60,13 @@ private:
bool prepareMix(const SharedNodePointer& listener);
void addStream(AudioMixerClientData::MixableStream& mixableStream,
AvatarAudioStream& listeningNodeStream,
float masterAvatarGain,
float masterInjectorGain,
float primaryAvatarGain,
float primaryInjectorGain,
bool isSoloing);
void updateHRTFParameters(AudioMixerClientData::MixableStream& mixableStream,
AvatarAudioStream& listeningNodeStream,
float masterAvatarGain,
float masterInjectorGain);
float primaryAvatarGain,
float primaryInjectorGain);
void resetHRTFState(AudioMixerClientData::MixableStream& mixableStream);
void addStreams(Node& listener, AudioMixerClientData& listenerData);

4
interface/resources/qml/hifi/audio/Audio.qml
View file

@ -354,7 +354,7 @@ Rectangle {
font: avatarGainSliderText.font
}
RalewayRegular {
// The slider for my card is special, it controls the master gain
// The slider for my card is special, it controls the primary gain
id: avatarGainSliderText;
text: "People volume";
size: 16;
@ -645,7 +645,7 @@ Rectangle {
font: noiseReductionThresholdSliderText.font
}
RalewayRegular {
// The slider for my card is special, it controls the master gain
// The slider for my card is special, it controls the primary gain
id: noiseReductionThresholdSliderText;
text: "Audio input threshold";
size: 16;

4
interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml
View file

@ -211,7 +211,7 @@ Flickable {
wrapMode: Text.Wrap
Component.onCompleted: {
var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU()));
var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getPrimaryGPU()));
var gpuModel = gpu.model;
if (!gpuModel || gpuModel.length === 0) {
gpuModel = "Unknown";
@ -336,7 +336,7 @@ Flickable {
textToCopy += "# CPU Cores: " + PlatformInfo.getNumLogicalCores() + "\n";
textToCopy += "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB\n";
var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU()));
var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getPrimaryGPU()));
var gpuModel = gpu.model;
if (!gpuModel || gpuModel.length === 0) {
gpuModel = "Unknown";

6
interface/src/PerformanceManager.cpp
View file

@ -75,13 +75,13 @@ void PerformanceManager::applyPerformancePreset(PerformanceManager::PerformanceP
// Ugly case that prevent us to run deferred everywhere...
bool isDeferredCapable = platform::Profiler::isRenderMethodDeferredCapable();
auto masterDisplay = platform::getDisplay(platform::getMasterDisplay());
auto primaryDisplay = platform::getDisplay(platform::getPrimaryDisplay());
// eval recommended PPI and Scale
float recommendedPpiScale = 1.0f;
const float RECOMMENDED_PPI[] = { 200.0f, 200.0f, 120.f, 160.f, 250.f};
if (!masterDisplay.empty() && masterDisplay.count(platform::keys::display::ppi)) {
float ppi = masterDisplay[platform::keys::display::ppi];
if (!primaryDisplay.empty() && primaryDisplay.count(platform::keys::display::ppi)) {
float ppi = primaryDisplay[platform::keys::display::ppi];
// only scale if the actual ppi is higher than the recommended ppi
if (ppi > RECOMMENDED_PPI[preset]) {
// make sure the scale is no less than a quarter

2
interface/src/scripting/Audio.cpp
View file

@ -533,7 +533,7 @@ void Audio::setAvatarGain(float gain) {
}
withWriteLock([&] {
// ask the NodeList to set the master avatar gain
// ask the NodeList to set the primary avatar gain
DependencyManager::get<NodeList>()->setAvatarGain(QUuid(), gain);
});

12
interface/src/scripting/PlatformInfoScriptingInterface.cpp
View file

@ -182,8 +182,8 @@ bool PlatformInfoScriptingInterface::isStandalone() {
int PlatformInfoScriptingInterface::getNumCPUs() {
return platform::getNumCPUs();
}
int PlatformInfoScriptingInterface::getMasterCPU() {
return platform::getMasterCPU();
int PlatformInfoScriptingInterface::getPrimaryCPU() {
return platform::getPrimaryCPU();
}
QString PlatformInfoScriptingInterface::getCPU(int index) {
auto desc = platform::getCPU(index);
@ -193,8 +193,8 @@ QString PlatformInfoScriptingInterface::getCPU(int index) {
int PlatformInfoScriptingInterface::getNumGPUs() {
return platform::getNumGPUs();
}
int PlatformInfoScriptingInterface::getMasterGPU() {
return platform::getMasterGPU();
int PlatformInfoScriptingInterface::getPrimaryGPU() {
return platform::getPrimaryGPU();
}
QString PlatformInfoScriptingInterface::getGPU(int index) {
auto desc = platform::getGPU(index);
@ -204,8 +204,8 @@ QString PlatformInfoScriptingInterface::getGPU(int index) {
int PlatformInfoScriptingInterface::getNumDisplays() {
return platform::getNumDisplays();
}
int PlatformInfoScriptingInterface::getMasterDisplay() {
return platform::getMasterDisplay();
int PlatformInfoScriptingInterface::getPrimaryDisplay() {
return platform::getPrimaryDisplay();
}
QString PlatformInfoScriptingInterface::getDisplay(int index) {
auto desc = platform::getDisplay(index);

28
interface/src/scripting/PlatformInfoScriptingInterface.h
View file

@ -106,8 +106,8 @@ public slots:
* @function PlatformInfo.getGraphicsCardType
* @returns {string} The model of the graphics card currently being used.
* @deprecated This function is deprecated and will be removed.
* Use <code>JSON.parse({@link PlatformInfo.getGPU|PlatformInfo.getGPU(}
* {@link PlatformInfo.getMasterGPU|PlatformInfo.getMasterGPU() )}).model</code>
* Use <code>JSON.parse({@link PlatformInfo.getGPU|PlatformInfo.getGPU(}
* {@link PlatformInfo.getPrimaryGPU|PlatformInfo.getPrimaryGPU() )}).model</code>
* instead.
*/
QString getGraphicsCardType();
@ -149,11 +149,11 @@ public slots:
int getNumCPUs();
/*@jsdoc
* Gets the index number of the master CPU.
* @function PlatformInfo.getMasterCPU
* @returns {number} The index of the master CPU.
* Gets the index number of the primary CPU.
* @function PlatformInfo.getPrimaryCPU
* @returns {number} The index of the primary CPU.
*/
int getMasterCPU();
int getPrimaryCPU();
/*@jsdoc
* Gets the platform description of a CPU.
@ -178,11 +178,11 @@ public slots:
int getNumGPUs();
/*@jsdoc
* Gets the index number of the master GPU.
* @function PlatformInfo.getMasterGPU
* @returns {number} The index of the master GPU.
* Gets the index number of the primary GPU.
* @function PlatformInfo.getPrimaryGPU
* @returns {number} The index of the primary GPU.
*/
int getMasterGPU();
int getPrimaryGPU();
/*@jsdoc
* Gets the platform description of a GPU.
@ -207,11 +207,11 @@ public slots:
int getNumDisplays();
/*@jsdoc
* Gets the index number of the master display.
* @function PlatformInfo.getMasterDisplay
* @returns {number} The index of the master display.
* Gets the index number of the primary display.
* @function PlatformInfo.getPrimaryDisplay
* @returns {number} The index of the primary display.
*/
int getMasterDisplay();
int getPrimaryDisplay();
/*@jsdoc
* Gets the platform description of a display.

20
libraries/audio/src/flump3dec.cpp
View file

@ -4417,9 +4417,9 @@ bs_new ()
bs = (Bit_stream_struc *) calloc(1, sizeof(Bit_stream_struc));
g_return_val_if_fail (bs != NULL, NULL);
bs->master.cur_bit = 8;
bs->master.size = 0;
bs->master.cur_used = 0;
bs->primary.cur_bit = 8;
bs->primary.size = 0;
bs->primary.cur_used = 0;
bs->read.cur_bit = 8;
bs->read.size = 0;
bs->read.cur_used = 0;
@ -4443,11 +4443,11 @@ bs_set_data (Bit_stream_struc * bs, const guint8 * data, gsize size)
g_return_val_if_fail (data != NULL, FALSE);
g_return_val_if_fail (size != 0, FALSE);
bs->master.data = data;
bs->master.cur_byte = (guint8 *) data;
bs->master.size = size;
bs->master.bitpos = 0;
bs->master.cur_used = 0;
bs->primary.data = data;
bs->primary.cur_byte = (guint8 *) data;
bs->primary.size = size;
bs->primary.bitpos = 0;
bs->primary.cur_used = 0;
bs_reset (bs);
return TRUE;
}
@ -4494,7 +4494,7 @@ bs_eat (Bit_stream_struc * bs, BSReader * read, guint32 Nbits)
}
}
/* Advance the master position by Nbits */
/* Advance the primary position by Nbits */
void
bs_consume (Bit_stream_struc * bs, guint32 Nbits)
{
@ -4503,7 +4503,7 @@ bs_consume (Bit_stream_struc * bs, guint32 Nbits)
GST_DEBUG ("%d Consumed %d bits to end at %" G_GUINT64_FORMAT,
n++, Nbits, bs_pos (bs) + Nbits);
#endif
bs_eat (bs, &bs->master, Nbits);
bs_eat (bs, &bs->primary, Nbits);
}
/* Advance the read position by Nbits */

28
libraries/audio/src/flump3dec.h
View file

@ -197,10 +197,10 @@ typedef struct BSReader
typedef struct Bit_stream_struc
{
BSReader master; /* Master tracking position, advanced
BSReader primary; /* Primary tracking position, advanced
* by bs_consume() */
BSReader read; /* Current read position, set back to the
* master by bs_reset() */
* primary by bs_reset() */
} Bit_stream_struc;
/* Create and initialise a new bitstream reader */
@ -209,25 +209,25 @@ Bit_stream_struc *bs_new ();
/* Release a bitstream reader */
void bs_free (Bit_stream_struc * bs);
/* Reset the current read position to the master position */
/* Reset the current read position to the primary position */
static inline void
bs_reset (Bit_stream_struc * bs)
{
memcpy (&bs->read, &bs->master, sizeof (BSReader));
memcpy (&bs->read, &bs->primary, sizeof (BSReader));
}
/* Reset master and read states */
/* Reset primary and read states */
static inline void
bs_flush (Bit_stream_struc * bs)
{
g_return_if_fail (bs != NULL);
bs->master.cur_bit = 8;
bs->master.size = 0;
bs->master.cur_used = 0;
bs->master.cur_byte = NULL;
bs->master.data = NULL;
bs->master.bitpos = 0;
bs->primary.cur_bit = 8;
bs->primary.size = 0;
bs->primary.cur_used = 0;
bs->primary.cur_byte = NULL;
bs->primary.data = NULL;
bs->primary.bitpos = 0;
bs_reset (bs);
}
@ -235,7 +235,7 @@ bs_flush (Bit_stream_struc * bs)
/* Set data as the stream for processing */
gboolean bs_set_data (Bit_stream_struc * bs, const guint8 * data, gsize size);
/* Advance the master position by Nbits */
/* Advance the primary position by Nbits */
void bs_consume (Bit_stream_struc * bs, guint32 Nbits);
/* Number of bits available for reading */
@ -253,14 +253,14 @@ void bs_skipbits (Bit_stream_struc * bs, guint32 N);
/* give number of consumed bytes */
static inline gsize bs_get_consumed (Bit_stream_struc * bs)
{
return bs->master.cur_used;
return bs->primary.cur_used;
}
/* Current bitstream position in bits */
static inline guint64
bs_pos (Bit_stream_struc * bs)
{
return bs->master.bitpos;
return bs->primary.bitpos;
}
/* Current read bitstream position in bits */

2
libraries/avatars/src/AvatarData.h
View file

@ -1704,7 +1704,7 @@ protected:
void unpackSkeletonModelURL(const QByteArray& data);
void unpackSkeletonData(const QByteArray& data);
// isReplicated will be true on downstream Avatar Mixers and their clients, but false on the upstream "master"
// isReplicated will be true on downstream Avatar Mixers and their clients, but false on the upstream "primary"
// Audio Mixer that the replicated avatar is connected to.
bool _isReplicated{ false };

2
libraries/gpu/src/gpu/Shader.h
View file

@ -126,7 +126,7 @@ protected:
const Shaders _shaders;
// The type of the shader, the master key
// The type of the shader, the primary key
const Type _type;
// Number of attempts to compile the shader

2
libraries/gpu/src/gpu/Texture.h
View file

@ -405,7 +405,7 @@ public:
Stamp getDataStamp() const { return _storage->getStamp(); }
// The theoretical size in bytes of data stored in the texture
// For the master (level) first level of mip
// For the primary (level) first level of mip
Size getSize() const override { return _size; }
// Size and format

2
libraries/networking/src/NodeList.cpp
View file

@ -1250,7 +1250,7 @@ void NodeList::setAvatarGain(const QUuid& nodeID, float gain) {
setAvatarGainPacket->writePrimitive(packFloatGainToByte(fastExp2f(gain / 6.02059991f)));
if (nodeID.isNull()) {
qCDebug(networking) << "Sending Set MASTER Avatar Gain packet with Gain:" << gain;
qCDebug(networking) << "Sending Set PRIMARY Avatar Gain packet with Gain:" << gain;
sendPacket(std::move(setAvatarGainPacket), *audioMixer);

6
libraries/platform/src/platform/Platform.h
View file

@ -21,15 +21,15 @@ bool enumeratePlatform();
int getNumCPUs();
json getCPU(int index);
int getMasterCPU();
int getPrimaryCPU();
int getNumGPUs();
json getGPU(int index);
int getMasterGPU();
int getPrimaryGPU();
int getNumDisplays();
json getDisplay(int index);
int getMasterDisplay();
int getPrimaryDisplay();
json getMemory();

6
libraries/platform/src/platform/PlatformKeys.h
View file

@ -20,7 +20,7 @@ namespace platform { namespace keys{
extern const char* model;
extern const char* clockSpeed;
extern const char* numCores;
extern const char* isMaster;
extern const char* isPrimary;
}
namespace gpu {
extern const char* vendor;
@ -32,7 +32,7 @@ namespace platform { namespace keys{
extern const char* videoMemory;
extern const char* driver;
extern const char* displays;
extern const char* isMaster;
extern const char* isPrimary;
}
namespace graphicsAPI {
extern const char* name;
@ -90,7 +90,7 @@ namespace platform { namespace keys{
extern const char* modeRefreshrate;
extern const char* modeWidth;
extern const char* modeHeight;
extern const char* isMaster;
extern const char* isPrimary;
}
namespace memory {
extern const char* memTotal;

8
libraries/platform/src/platform/Profiler.cpp
View file

@ -32,9 +32,9 @@ Profiler::Tier Profiler::profilePlatform() {
return platformTier;
}
// Not filtered yet, let s try to make sense of the master cpu and master gpu info
auto cpuInfo = platform::getCPU(platform::getMasterCPU());
auto gpuInfo = platform::getGPU(platform::getMasterGPU());
// Not filtered yet, let's try to make sense of the primary cpu and primary gpu info
auto cpuInfo = platform::getCPU(platform::getPrimaryCPU());
auto gpuInfo = platform::getGPU(platform::getPrimaryGPU());
if (filterOnProcessors(computerInfo, cpuInfo, gpuInfo, platformTier)) {
return platformTier;
}
@ -62,7 +62,7 @@ bool filterOnComputerMACOS(const platform::json& computer, Profiler::Tier& tier)
// The simple rule for mac is
// if it s an intel gpu then LOW
// else go mid
auto gpu = platform::getGPU(platform::getMasterGPU());
auto gpu = platform::getGPU(platform::getPrimaryGPU());
if (gpu.count(keys::gpu::vendor)) {
std::string gpuVendor = gpu[keys::gpu::vendor].get<std::string>();

6
libraries/platform/src/platform/backend/MACOSPlatform.cpp
View file

@ -67,7 +67,7 @@ void MACOSInstance::enumerateGpusAndDisplays() {
auto displaySizeHeightInches = displaySize.height * MM_TO_IN;
auto displayBounds = CGDisplayBounds(displayID);
auto displayMaster =CGDisplayIsMain(displayID);
auto displayPrimary =CGDisplayIsMain(displayID);
auto displayUnit =CGDisplayUnitNumber(displayID);
auto displayModel =CGDisplayModelNumber(displayID);
@ -112,8 +112,8 @@ void MACOSInstance::enumerateGpusAndDisplays() {
// refreshrate
display[keys::display::modeRefreshrate] = displayRefreshrate;
// Master display ?
display[keys::display::isMaster] = (displayMaster ? true : false);
// Primary display ?
display[keys::display::isPrimary] = (displayPrimary ? true : false);
// Macos specific
display["macos_unit"] = displayUnit;

24
libraries/platform/src/platform/backend/Platform.cpp
View file

@ -30,7 +30,7 @@ namespace platform { namespace keys {
* @property {string} vendor - The CPU vendor (e.g., <code>"Intel"</code> or <code>"AMD"</code>).
* @property {string} model - The CPU model.
* @property {number} numCores - The number of logical cores.
* @property {boolean} isMaster - <code>true</code> if the CPU is the "master" or primary CPU, <code>false</code> or
* @property {boolean} isPrimary - <code>true</code> if the CPU is the primary CPU, <code>false</code> or
* <code>undefined</code> if it isn't.
*/
namespace cpu {
@ -41,7 +41,7 @@ namespace platform { namespace keys {
const char* model = "model";
const char* clockSpeed = "clockSpeed"; // FIXME: Not used.
const char* numCores = "numCores";
const char* isMaster = "isMaster";
const char* isPrimary = "isPrimary";
}
/*@jsdoc
@ -53,7 +53,7 @@ namespace platform { namespace keys {
* @property {number} videoMemory - The size of the GPU's video memory, in MB.
* @property {number[]} displays - The index numbers of the displays currently being driven by the GPU. An empty array if
* the GPU is currently not driving any displays.
* @property {boolean} isMaster - <code>true</code> if the GPU is the "master" or primary GPU, <code>false</code> or
* @property {boolean} isPrimary - <code>true</code> if the GPU is the primary GPU, <code>false</code> or
* <code>undefined</code> if it isn't.
*/
namespace gpu {
@ -66,7 +66,7 @@ namespace platform { namespace keys {
const char* videoMemory = "videoMemory";
const char* driver = "driver";
const char* displays = "displays";
const char* isMaster = "isMaster";
const char* isPrimary = "isPrimary";
}
/*@jsdoc
@ -175,7 +175,7 @@ namespace platform { namespace keys {
* @property {number} modeRefreshrate - The refresh rate of the current display mode, in Hz.
* @property {number} modeWidth - The width of the current display mode, in pixels.
* @property {number} modeHeight - The height of the current display mode, in pixels.
* @property {boolean} isMaster - <code>true</code> if the GPU is the "master" or primary display, <code>false</code> or
* @property {boolean} isPrimary - <code>true</code> if the GPU is the primary display, <code>false</code> or
* <code>undefined</code> if it isn't.
*/
namespace display {
@ -193,7 +193,7 @@ namespace platform { namespace keys {
const char* modeRefreshrate = "modeRefreshrate";
const char* modeWidth = "modeWidth";
const char* modeHeight = "modeHeight";
const char* isMaster = "isMaster";
const char* isPrimary = "isPrimary";
}
/*@jsdoc
@ -300,8 +300,8 @@ json platform::getCPU(int index) {
return _instance->getCPU(index);
}
int platform::getMasterCPU() {
return _instance->getMasterCPU();
int platform::getPrimaryCPU() {
return _instance->getPrimaryCPU();
}
int platform::getNumGPUs() {
@ -312,8 +312,8 @@ json platform::getGPU(int index) {
return _instance->getGPU(index);
}
int platform::getMasterGPU() {
return _instance->getMasterGPU();
int platform::getPrimaryGPU() {
return _instance->getPrimaryGPU();
}
int platform::getNumDisplays() {
@ -324,8 +324,8 @@ json platform::getDisplay(int index) {
return _instance->getDisplay(index);
}
int platform::getMasterDisplay() {
return _instance->getMasterDisplay();
int platform::getPrimaryDisplay() {
return _instance->getPrimaryDisplay();
}
json platform::getMemory() {

50
libraries/platform/src/platform/backend/PlatformInstance.cpp
View file

@ -41,8 +41,8 @@ bool Instance::enumeratePlatform() {
enumerateNics();
enumerateGraphicsApis();
// eval the master index for each platform scopes
updateMasterIndices();
// eval the primary index for each platform scopes
updatePrimaryIndices();
// And profile the platform and put the tier in "computer"
_computer[keys::computer::profileTier] = Profiler::TierNames[Profiler::profilePlatform()];
@ -50,54 +50,54 @@ bool Instance::enumeratePlatform() {
return true;
}
void Instance::updateMasterIndices() {
void Instance::updatePrimaryIndices() {
// We assume a single CPU at the moment:
{
if (!_cpus.empty()) {
_masterCPU = 0;
_cpus[0][keys::cpu::isMaster] = true;
_primaryCPU = 0;
_cpus[0][keys::cpu::isPrimary] = true;
} else {
_masterCPU = NOT_FOUND;
_primaryCPU = NOT_FOUND;
}
}
// Go through the displays list
{
_masterDisplay = NOT_FOUND;
_primaryDisplay = NOT_FOUND;
for (int i = 0; i < (int) _displays.size(); ++i) {
const auto& display = _displays[i];
if (display.count(keys::display::isMaster)) {
if (display[keys::display::isMaster].get<bool>()) {
_masterDisplay = i;
if (display.count(keys::display::isPrimary)) {
if (display[keys::display::isPrimary].get<bool>()) {
_primaryDisplay = i;
break;
}
}
}
// NO master display found, return the first one or NOT_FOUND if no display
if (_masterDisplay == NOT_FOUND) {
// NO primary display found, return the first one or NOT_FOUND if no display
if (_primaryDisplay == NOT_FOUND) {
if (!_displays.empty()) {
_masterDisplay = 0;
_displays[0][keys::display::isMaster] = true;
_primaryDisplay = 0;
_displays[0][keys::display::isPrimary] = true;
}
}
}
// From the master display decide the master gpu
// From the primary display decide the primary gpu
{
_masterGPU = NOT_FOUND;
if (_masterDisplay != NOT_FOUND) {
const auto& display = _displays[_masterDisplay];
// FInd the GPU index of the master display
_primaryGPU = NOT_FOUND;
if (_primaryDisplay != NOT_FOUND) {
const auto& display = _displays[_primaryDisplay];
// FInd the GPU index of the primary display
if (display.count(keys::display::gpu)) {
_masterGPU = display[keys::display::gpu];
_gpus[_masterGPU][keys::gpu::isMaster] = true;
_primaryGPU = display[keys::display::gpu];
_gpus[_primaryGPU][keys::gpu::isPrimary] = true;
}
}
// NO master GPU found from master display, bummer, return the first one or NOT_FOUND if no display
if (_masterGPU == NOT_FOUND) {
// NO primary GPU found from primary display, bummer, return the first one or NOT_FOUND if no display
if (_primaryGPU == NOT_FOUND) {
if (!_gpus.empty()) {
_masterGPU = 0;
_gpus[0][keys::gpu::isMaster] = true;
_primaryGPU = 0;
_gpus[0][keys::gpu::isPrimary] = true;
}
}
}

16
libraries/platform/src/platform/backend/PlatformInstance.h
View file

@ -23,15 +23,15 @@ public:
int getNumCPUs() { return (int)_cpus.size(); }
json getCPU(int index);
int getMasterCPU() const { return _masterCPU; }
int getPrimaryCPU() const { return _primaryCPU; }
int getNumGPUs() { return (int)_gpus.size(); }
json getGPU(int index);
int getMasterGPU() const { return _masterGPU; }
int getPrimaryGPU() const { return _primaryGPU; }
int getNumDisplays() { return (int)_displays.size(); }
json getDisplay(int index);
int getMasterDisplay() const { return _masterDisplay; }
int getPrimaryDisplay() const { return _primaryDisplay; }
json getMemory() { return _memory; }
@ -62,12 +62,12 @@ protected:
json _memory;
json _computer;
int _masterCPU{ -1 };
int _masterGPU{ -1 };
int _masterDisplay{ -1 };
int _primaryCPU{ -1 };
int _primaryGPU{ -1 };
int _primaryDisplay{ -1 };
// Traverse the cpus, gpus and displays to update the "master" index in each domain
void updateMasterIndices();
// Traverse the cpus, gpus and displays to update the "primary" index in each domain
void updatePrimaryIndices();
};

4
libraries/platform/src/platform/backend/WINPlatform.cpp
View file

@ -167,8 +167,8 @@ void WINInstance::enumerateGpusAndDisplays() {
// refreshrate
display[keys::display::modeRefreshrate] = devMode.dmDisplayFrequency;;
// Master display ?
display[keys::display::isMaster] = (bool) (monitorInfo.dwFlags & MONITORINFOF_PRIMARY);
// Primary display ?
display[keys::display::isPrimary] = (bool) (monitorInfo.dwFlags & MONITORINFOF_PRIMARY);
// Add the display index to the list of displays of the gpu
displayIndices.push_back((int) _displays.size());

20
libraries/render/src/render/Scene.cpp
View file

@ -183,7 +183,7 @@ void Transaction::clear() {
Scene::Scene(glm::vec3 origin, float size) :
_masterSpatialTree(origin, size)
_primarySpatialTree(origin, size)
{
_items.push_back(Item()); // add the itemID #0 to nothing
}
@ -306,10 +306,10 @@ void Scene::resetItems(const Transaction::Resets& transactions) {
// Update the item's container
assert((oldKey.isSpatial() == newKey.isSpatial()) || oldKey._flags.none());
if (newKey.isSpatial()) {
auto newCell = _masterSpatialTree.resetItem(oldCell, oldKey, item.getBound(nullptr), itemId, newKey);
auto newCell = _primarySpatialTree.resetItem(oldCell, oldKey, item.getBound(nullptr), itemId, newKey);
item.resetCell(newCell, newKey.isSmall());
} else {
_masterNonspatialSet.insert(itemId);
_primaryNonspatialSet.insert(itemId);
}
}
}
@ -323,9 +323,9 @@ void Scene::removeItems(const Transaction::Removes& transactions) {
// Remove the item
if (oldKey.isSpatial()) {
_masterSpatialTree.removeItem(oldCell, oldKey, removedID);
_primarySpatialTree.removeItem(oldCell, oldKey, removedID);
} else {
_masterNonspatialSet.erase(removedID);
_primaryNonspatialSet.erase(removedID);
}
// Remove the transition to prevent updating it for nothing
@ -362,20 +362,20 @@ void Scene::updateItems(const Transaction::Updates& transactions) {
// Update the item's container
if (oldKey.isSpatial() == newKey.isSpatial()) {
if (newKey.isSpatial()) {
auto newCell = _masterSpatialTree.resetItem(oldCell, oldKey, item.getBound(nullptr), updateID, newKey);
auto newCell = _primarySpatialTree.resetItem(oldCell, oldKey, item.getBound(nullptr), updateID, newKey);
item.resetCell(newCell, newKey.isSmall());
}
} else {
if (newKey.isSpatial()) {
_masterNonspatialSet.erase(updateID);
_primaryNonspatialSet.erase(updateID);
auto newCell = _masterSpatialTree.resetItem(oldCell, oldKey, item.getBound(nullptr), updateID, newKey);
auto newCell = _primarySpatialTree.resetItem(oldCell, oldKey, item.getBound(nullptr), updateID, newKey);
item.resetCell(newCell, newKey.isSmall());
} else {
_masterSpatialTree.removeItem(oldCell, oldKey, updateID);
_primarySpatialTree.removeItem(oldCell, oldKey, updateID);
item.resetCell();
_masterNonspatialSet.insert(updateID);
_primaryNonspatialSet.insert(updateID);
}
}
}

8
libraries/render/src/render/Scene.h
View file

@ -185,10 +185,10 @@ public:
const Item getItemSafe(const ItemID& id) const { if (isAllocatedID(id)) { return _items[id]; } else { return Item(); } }
// Access the spatialized items
const ItemSpatialTree& getSpatialTree() const { return _masterSpatialTree; }
const ItemSpatialTree& getSpatialTree() const { return _primarySpatialTree; }
// Access non-spatialized items (layered objects, backgrounds)
const ItemIDSet& getNonspatialSet() const { return _masterNonspatialSet; }
const ItemIDSet& getNonspatialSet() const { return _primaryNonspatialSet; }
// Access a particular Stage (empty if doesn't exist)
// Thread safe
@ -226,8 +226,8 @@ protected:
// database of items is protected for editing by a mutex
std::mutex _itemsMutex;
Item::Vector _items;
ItemSpatialTree _masterSpatialTree;
ItemIDSet _masterNonspatialSet;
ItemSpatialTree _primarySpatialTree;
ItemIDSet _primaryNonspatialSet;
void resetItems(const Transaction::Resets& transactions);
void resetTransitionFinishedOperator(const Transaction::TransitionFinishedOperators& transactions);

8
libraries/script-engine/src/UsersScriptingInterface.h
View file

@ -110,17 +110,17 @@ public slots:
bool getPersonalMuteStatus(const QUuid& nodeID);
/*@jsdoc
* Sets an avatar's gain (volume) for you and you only, or sets the master gain.
* Sets an avatar's gain (volume) for you and you only, or sets the primary gain.
* @function Users.setAvatarGain
* @param {Uuid} nodeID - The session ID of the avatar to set the gain for, or <code>null</code> to set the master gain.
* @param {Uuid} nodeID - The session ID of the avatar to set the gain for, or <code>null</code> to set the primary gain.
* @param {number} gain - The gain to set, in dB.
*/
void setAvatarGain(const QUuid& nodeID, float gain);
/*@jsdoc
* Gets an avatar's gain (volume) for you and you only, or gets the master gain.
* Gets an avatar's gain (volume) for you and you only, or gets the primary gain.
* @function Users.getAvatarGain
* @param {Uuid} nodeID - The session ID of the avatar to get the gain for, or <code>null</code> to get the master gain.
* @param {Uuid} nodeID - The session ID of the avatar to get the gain for, or <code>null</code> to get the primary gain.
* @returns {number} The gain, in dB.
*/
float getAvatarGain(const QUuid& nodeID);

22
unpublishedScripts/DomainContent/Home/switches/dressingRoomLights.js
View file

@ -63,14 +63,14 @@
});
},
masterLightOn: function(masterLight) {
Entities.editEntity(masterLight, {
primaryLightOn: function(primaryLight) {
Entities.editEntity(primaryLight, {
visible: true
});
},
masterLightOff: function(masterLight) {
Entities.editEntity(masterLight, {
primaryLightOff: function(primaryLight) {
Entities.editEntity(primaryLight, {
visible: false
});
},
@ -99,12 +99,12 @@
return found;
},
findMasterLights: function() {
findPrimaryLights: function() {
var found = [];
var results = Entities.findEntities(this.position, SEARCH_RADIUS);
results.forEach(function(result) {
var properties = Entities.getEntityProperties(result);
if (properties.name === _this.prefix + "light-master") {
if (properties.name === _this.prefix + "light-primary") {
found.push(result);
}
});
@ -131,15 +131,15 @@
});
var glowLights = this.findGlowLights();
var masterLights = this.findMasterLights();
var primaryLights = this.findPrimaryLights();
var emitModels = this.findEmitModels();
if (this._switch.state === 'off') {
glowLights.forEach(function(glowLight) {
_this.glowLightOn(glowLight);
});
masterLights.forEach(function(masterLight) {
_this.masterLightOn(masterLight);
primaryLights.forEach(function(primaryLight) {
_this.primaryLightOn(primaryLight);
});
emitModels.forEach(function(emitModel) {
_this.modelEmitOn(emitModel);
@ -162,8 +162,8 @@
glowLights.forEach(function(glowLight) {
_this.glowLightOff(glowLight);
});
masterLights.forEach(function(masterLight) {
_this.masterLightOff(masterLight);
primaryLights.forEach(function(primaryLight) {
_this.primaryLightOff(primaryLight);
});
emitModels.forEach(function(emitModel) {
_this.modelEmitOff(emitModel);

20
unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js
View file

@ -55,21 +55,21 @@
})
},
masterLightOn: function(masterLight) {
Entities.editEntity(masterLight, {
primaryLightOn: function(primaryLight) {
Entities.editEntity(primaryLight, {
visible: true
});
},
masterLightOff: function(masterLight) {
primaryLightOff: function(primaryLight) {
print("EBL TURN LIGHT OFF");
Entities.editEntity(masterLight, {
Entities.editEntity(primaryLight, {
visible: false
});
},
findMasterLights: function() {
findPrimaryLights: function() {
var found = [];
var results = Entities.findEntities(_this.position, SEARCH_RADIUS);
results.forEach(function(result) {
@ -101,13 +101,13 @@
state: 'off'
});
var masterLights = this.findMasterLights();
var primaryLights = this.findPrimaryLights();
var emitModels = this.findEmitModels();
if (this._switch.state === 'off') {
print("EBL TURN LIGHTS ON");
masterLights.forEach(function(masterLight) {
_this.masterLightOn(masterLight);
primaryLights.forEach(function(primaryLight) {
_this.primaryLightOn(primaryLight);
});
emitModels.forEach(function(emitModel) {
_this.modelEmitOn(emitModel);
@ -118,8 +118,8 @@
} else {
print("EBL TURN LIGHTS OFF");
masterLights.forEach(function(masterLight) {
_this.masterLightOff(masterLight);
primaryLights.forEach(function(primaryLight) {
_this.primaryLightOff(primaryLight);
});
emitModels.forEach(function(emitModel) {
_this.modelEmitOff(emitModel);

22
unpublishedScripts/DomainContent/Home/switches/livingRoomLights.js
View file

@ -59,14 +59,14 @@
})
},
masterLightOn: function(masterLight) {
Entities.editEntity(masterLight, {
primaryLightOn: function(primaryLight) {
Entities.editEntity(primaryLight, {
visible: true
});
},
masterLightOff: function(masterLight) {
Entities.editEntity(masterLight, {
primaryLightOff: function(primaryLight) {
Entities.editEntity(primaryLight, {
visible: false
});
},
@ -95,12 +95,12 @@
return found;
},
findMasterLights: function() {
findPrimaryLights: function() {
var found = [];
var results = Entities.findEntities(this.position, SEARCH_RADIUS);
results.forEach(function(result) {
var properties = Entities.getEntityProperties(result);
if (properties.name === _this.prefix + "light-master") {
if (properties.name === _this.prefix + "light-primary") {
found.push(result);
}
});
@ -126,15 +126,15 @@
});
var glowLights = this.findGlowLights();
var masterLights = this.findMasterLights();
var primaryLights = this.findPrimaryLights();
var emitModels = this.findEmitModels();
if (this._switch.state === 'off') {
glowLights.forEach(function(glowLight) {
_this.glowLightOn(glowLight);
});
masterLights.forEach(function(masterLight) {
_this.masterLightOn(masterLight);
primaryLights.forEach(function(primaryLight) {
_this.primaryLightOn(primaryLight);
});
emitModels.forEach(function(emitModel) {
_this.modelEmitOn(emitModel);
@ -157,8 +157,8 @@
glowLights.forEach(function(glowLight) {
_this.glowLightOff(glowLight);
});
masterLights.forEach(function(masterLight) {
_this.masterLightOff(masterLight);
primaryLights.forEach(function(primaryLight) {
_this.primaryLightOff(primaryLight);
});
emitModels.forEach(function(emitModel) {
_this.modelEmitOff(emitModel);

4
unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js
View file

@ -50,7 +50,7 @@
},
triggerReset: function() {
MasterReset();
PrimaryReset();
},
preload: function(entityID) {
@ -60,7 +60,7 @@
};
MasterReset = function() {
PrimaryReset = function() {
var resetKey = "resetMe";

16
unpublishedScripts/DomainContent/Toybox/immediateClientReset.js
View file

@ -8,17 +8,17 @@
Script.include('libraries/utils.js');
var masterResetScript = Script.resolvePath("masterReset.js");
var primaryResetScript = Script.resolvePath("primaryReset.js");
var hiddenEntityScriptURL = Script.resolvePath("hiddenEntityReset.js");
Script.include(masterResetScript);
Script.include(primaryResetScript);
function createHiddenMasterSwitch() {
function createHiddenPrimarySwitch() {
var resetKey = "resetMe";
var masterSwitch = Entities.addEntity({
var primarySwitch = Entities.addEntity({
type: "Box",
name: "Master Switch",
name: "Primary Switch",
script: hiddenEntityScriptURL,
dimensions: {
x: 0.7,
@ -44,11 +44,11 @@ var entities = Entities.findEntities(MyAvatar.position, 100);
entities.forEach(function(entity) {
var name = Entities.getEntityProperties(entity, "name").name
if (name === "Master Switch") {
if (name === "Primary Switch") {
Entities.deleteEntity(entity);
}
});
createHiddenMasterSwitch();
createHiddenPrimarySwitch();
MasterReset();
PrimaryReset();

4
unpublishedScripts/DomainContent/Toybox/masterReset.js → unpublishedScripts/DomainContent/Toybox/primaryReset.js
View file

@ -1,4 +1,4 @@
// masterReset.js
// primaryReset.js
// Created by Eric Levin on 9/23/2015
// Copyright 2015 High Fidelity, Inc.
//
@ -25,7 +25,7 @@ var basketballResetterScriptURL = Script.resolvePath('basketballsResetter.js');
var targetsResetterScriptURL = Script.resolvePath('targetsResetter.js');
MasterReset = function() {
PrimaryReset = function() {
var resetKey = "resetMe";

32
unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
View file

@ -75,7 +75,7 @@ Rectangle {
}
Switch {
id: masterSwitch;
id: primarySwitch;
focusPolicy: Qt.ClickFocus;
width: 65;
height: 30;
@ -102,14 +102,14 @@ Rectangle {
background: Rectangle {
color: parent.checked ? "#1FC6A6" : hifi.colors.white;
implicitWidth: masterSwitch.width;
implicitHeight: masterSwitch.height;
implicitWidth: primarySwitch.width;
implicitHeight: primarySwitch.height;
radius: height/2;
}
indicator: Rectangle {
id: switchHandle;
implicitWidth: masterSwitch.height - 4;
implicitWidth: primarySwitch.height - 4;
implicitHeight: implicitWidth;
radius: implicitWidth/2;
border.color: "#E3E3E3";
@ -117,7 +117,7 @@ Rectangle {
x: Math.max(4, Math.min(parent.width - width - 4, parent.visualPosition * parent.width - (width / 2) - 4))
y: parent.height / 2 - height / 2;
Behavior on x {
enabled: !masterSwitch.down
enabled: !primarySwitch.down
SmoothedAnimation { velocity: 200 }
}
@ -186,11 +186,11 @@ Rectangle {
anchors.top: parent.top;
anchors.right: parent.right;
height: 250;
color: masterSwitch.checked ? "transparent" : "black";
color: primarySwitch.checked ? "transparent" : "black";
AnimatedImage {
source: "static.gif"
visible: !masterSwitch.checked;
visible: !primarySwitch.checked;
anchors.fill: parent;
opacity: 0.15;
}
@ -201,7 +201,7 @@ Rectangle {
text: "Turn on Spectator Camera for a preview\nof " + (HMD.active ? "what your monitor shows." : "the camera's view.");
size: 16;
color: hifi.colors.white;
visible: !masterSwitch.checked;
visible: !primarySwitch.checked;
anchors.fill: parent;
horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter;
@ -220,13 +220,13 @@ Rectangle {
// Spectator Camera Preview
Hifi.ResourceImageItem {
id: spectatorCameraPreview;
visible: masterSwitch.checked && !root.processing360Snapshot && !root.processingStillSnapshot;
visible: primarySwitch.checked && !root.processing360Snapshot && !root.processingStillSnapshot;
url: showCameraView.checked || !HMD.active ? "resource://spectatorCameraFrame" : "resource://hmdPreviewFrame";
ready: masterSwitch.checked;
ready: primarySwitch.checked;
mirrorVertically: true;
anchors.fill: parent;
onVisibleChanged: {
ready = masterSwitch.checked;
ready = primarySwitch.checked;
update();
}
}
@ -339,7 +339,7 @@ Rectangle {
}
HifiControlsUit.CheckBox {
id: flashCheckBox;
visible: masterSwitch.checked;
visible: primarySwitch.checked;
color: hifi.colors.white;
colorScheme: hifi.colorSchemes.dark;
anchors.right: takeSnapshotButton.left;
@ -352,7 +352,7 @@ Rectangle {
}
HifiControlsUit.Button {
id: takeSnapshotButton;
enabled: masterSwitch.checked;
enabled: primarySwitch.checked;
text: "SNAP PICTURE";
colorScheme: hifi.colorSchemes.light;
color: hifi.buttons.white;
@ -369,7 +369,7 @@ Rectangle {
}
HifiControlsUit.Button {
id: take360SnapshotButton;
enabled: masterSwitch.checked;
enabled: primarySwitch.checked;
text: "SNAP 360";
colorScheme: hifi.colorSchemes.light;
color: hifi.buttons.white;
@ -397,7 +397,7 @@ Rectangle {
Item {
id: fieldOfView;
visible: masterSwitch.checked;
visible: primarySwitch.checked;
anchors.top: parent.top;
anchors.left: parent.left;
anchors.right: parent.right;
@ -622,7 +622,7 @@ Rectangle {
function fromScript(message) {
switch (message.method) {
case 'initializeUI':
masterSwitch.checked = message.masterSwitchOn;
primarySwitch.checked = message.primarySwitchOn;
flashCheckBox.checked = message.flashCheckboxChecked;
showCameraView.checked = message.monitorShowsCamView;
showHmdPreview.checked = !message.monitorShowsCamView;

2
unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
View file

@ -587,7 +587,7 @@
}
function updateSpectatorCameraQML() {
sendToQml({ method: 'initializeUI', masterSwitchOn: !!camera, flashCheckboxChecked: !!flash, monitorShowsCamView: monitorShowsCameraView });
sendToQml({ method: 'initializeUI', primarySwitchOn: !!camera, flashCheckboxChecked: !!flash, monitorShowsCamView: monitorShowsCameraView });
registerButtonMappings();
Menu.setIsOptionChecked("Disable Preview", false);
Menu.setIsOptionChecked("Mono Preview", true);