Skip to content

Commit

Permalink
CORE: removed unused flags from cvars
Browse files Browse the repository at this point in the history
  • Loading branch information
mgerhardy committed Feb 23, 2025
1 parent 88e4d3a commit 918e591
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 70 deletions.
16 changes: 0 additions & 16 deletions src/modules/core/Var.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,6 @@ bool Var::useHistory(uint32_t historyIndex) {
_currentHistoryPos = historyIndex;

if (_dirty) {
if ((_flags & CV_REPLICATE) != 0u) {
_updateFlags |= NEEDS_REPLICATE;
_visitFlags |= NEEDS_REPLICATE;
}
if ((_flags & CV_BROADCAST) != 0u) {
_updateFlags |= NEEDS_BROADCAST;
_visitFlags |= NEEDS_BROADCAST;
}
if ((_flags & CV_SHADER) != 0u) {
_visitFlags |= NEEDS_SHADERUPDATE;
}
Expand All @@ -268,14 +260,6 @@ bool Var::setVal(const core::String& value) {
if (_dirty) {
addValueToHistory(value);
++_currentHistoryPos;
if ((_flags & CV_REPLICATE) != 0u) {
_updateFlags |= NEEDS_REPLICATE;
_visitFlags |= NEEDS_REPLICATE;
}
if ((_flags & CV_BROADCAST) != 0u) {
_updateFlags |= NEEDS_BROADCAST;
_visitFlags |= NEEDS_BROADCAST;
}
if ((_flags & CV_SHADER) != 0u) {
_visitFlags |= NEEDS_SHADERUPDATE;
}
Expand Down
55 changes: 1 addition & 54 deletions src/modules/core/Var.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,9 @@ const uint32_t CV_READONLY = 1 << 0;
const uint32_t CV_NOPERSIST = 1 << 1;
/** @brief will be put as define in every shader - a change will update the shaders at runtime */
const uint32_t CV_SHADER = 1 << 2;
/** @brief will be broadcasted to all connected clients */
const uint32_t CV_REPLICATE = 1 << 3;
/** @brief user information that will be sent out to all connected clients (e.g. user name) */
const uint32_t CV_BROADCAST = 1 << 4;
/** @brief don't show the value to users, but just ***secure*** it out */
const uint32_t CV_SECRET = 1 << 5;
const uint32_t CV_PRESERVE = (CV_READONLY | CV_NOPERSIST | CV_SHADER | CV_REPLICATE | CV_BROADCAST | CV_SECRET);
const uint32_t CV_PRESERVE = (CV_READONLY | CV_NOPERSIST | CV_SHADER | CV_SECRET);

const uint32_t CV_FROMFILE = 1 << 6;
const uint32_t CV_FROMCOMMANDLINE = 1 << 7;
Expand Down Expand Up @@ -65,8 +61,6 @@ class Var {
const core::String _name;
const char* _help = nullptr;
uint32_t _flags;
static constexpr int NEEDS_REPLICATE = 1 << 0;
static constexpr int NEEDS_BROADCAST = 1 << 1;
static constexpr int NEEDS_SHADERUPDATE = 1 << 2;
static constexpr int NEEDS_SAVING = 1 << 3;
uint8_t _updateFlags = 0u;
Expand Down Expand Up @@ -174,53 +168,6 @@ class Var {
}
}

template<class Functor>
static void visitDirtyBroadcast(Functor&& func) {
if ((_visitFlags & NEEDS_BROADCAST) == 0) {
return;
}
_visitFlags &= ~NEEDS_BROADCAST;

visit([&] (const VarPtr& var) {
if (var->_updateFlags & NEEDS_BROADCAST) {
func(var);
var->_updateFlags &= ~NEEDS_BROADCAST;
}
});
}

template<class Functor>
static void visitBroadcast(Functor&& func) {
visit([&] (const VarPtr& var) {
if (var->_flags & CV_BROADCAST) {
func(var);
}
});
}

template<class Functor>
static void visitDirtyReplicate(Functor&& func) {
if ((_visitFlags & NEEDS_REPLICATE) == 0) {
return;
}
_visitFlags &= ~NEEDS_REPLICATE;
visit([&] (const VarPtr& var) {
if (var->_updateFlags & NEEDS_REPLICATE) {
func(var);
var->_updateFlags &= ~NEEDS_REPLICATE;
}
});
}

template<class Functor>
static void visitReplicate(Functor&& func) {
visit([&] (const VarPtr& var) {
if (var->_flags & CV_REPLICATE) {
func(var);
}
});
}

/**
* @brief Reset the flag after calling it
*/
Expand Down

0 comments on commit 918e591

Please sign in to comment.