Skip to content

Commit

Permalink
Rename LayerSystem class to LayerManager.
Browse files Browse the repository at this point in the history
  • Loading branch information
@codereader
codereader committed Mar 13, 2020
1 parent 23307e9 commit 848b232
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 65 deletions.
3 changes: 2 additions & 1 deletion radiant/Makefile.am
View file
Expand Up @@ -352,7 +352,8 @@ darkradiant_SOURCES = main.cpp \
textool/TexTool.cpp \
layers/LayerInfoFileModule.cpp \
layers/LayerCommandTarget.cpp \
layers/LayerSystem.cpp \
layers/LayerModule.cpp \
layers/LayerManager.cpp \
layers/LayerUsageBreakdown.cpp \
modulesystem/DynamicLibrary.cpp \
modulesystem/ApplicationContextImpl.cpp \
Expand Down
2 changes: 1 addition & 1 deletion radiant/layers/LayerCommandTarget.cpp
View file
Expand Up @@ -2,7 +2,7 @@

#include "ieventmanager.h"
#include "icommandsystem.h"
#include "LayerSystem.h"
#include "LayerManager.h"
#include "string/string.h"
#include <functional>

Expand Down
93 changes: 47 additions & 46 deletions radiant/layers/LayerSystem.cpp → radiant/layers/LayerManager.cpp
View file
@@ -1,4 +1,4 @@
#include "LayerSystem.h"
#include "LayerManager.h"

#include "iorthocontextmenu.h"
#include "i18n.h"
Expand Down Expand Up @@ -33,11 +33,11 @@ namespace
const int DEFAULT_LAYER = 0;
}

LayerSystem::LayerSystem() :
LayerManager::LayerManager() :
_activeLayer(DEFAULT_LAYER)
{}

int LayerSystem::createLayer(const std::string& name, int layerID)
int LayerManager::createLayer(const std::string& name, int layerID)
{
// Check if the ID already exists
if (_layers.find(layerID) != _layers.end())
Expand Down Expand Up @@ -72,7 +72,7 @@ int LayerSystem::createLayer(const std::string& name, int layerID)
return result.first->first;
}

int LayerSystem::createLayer(const std::string& name)
int LayerManager::createLayer(const std::string& name)
{
// Check if the layer already exists
int existingID = getLayerID(name);
Expand All @@ -90,7 +90,7 @@ int LayerSystem::createLayer(const std::string& name)
return createLayer(name, newID);
}

void LayerSystem::deleteLayer(const std::string& name)
void LayerManager::deleteLayer(const std::string& name)
{
// Check if the layer already exists
int layerID = getLayerID(name);
Expand Down Expand Up @@ -126,15 +126,15 @@ void LayerSystem::deleteLayer(const std::string& name)
onNodeMembershipChanged();
}

void LayerSystem::foreachLayer(const LayerVisitFunc& visitor)
void LayerManager::foreachLayer(const LayerVisitFunc& visitor)
{
for (const LayerMap::value_type& pair : _layers)
{
visitor(pair.first, pair.second);
}
}

void LayerSystem::reset()
void LayerManager::reset()
{
_activeLayer = DEFAULT_LAYER;

Expand All @@ -149,7 +149,7 @@ void LayerSystem::reset()
_layerVisibilityChangedSignal.emit();
}

bool LayerSystem::renameLayer(int layerID, const std::string& newLayerName)
bool LayerManager::renameLayer(int layerID, const std::string& newLayerName)
{
// Check sanity
if (newLayerName.empty() || newLayerName == _(DEFAULT_LAYER_NAME)) {
Expand All @@ -171,7 +171,7 @@ bool LayerSystem::renameLayer(int layerID, const std::string& newLayerName)
return true;
}

int LayerSystem::getFirstVisibleLayer() const
int LayerManager::getFirstVisibleLayer() const
{
// Iterate over all IDs and check the visibility status, return the first visible
for (LayerMap::const_iterator i = _layers.begin(); i != _layers.end(); ++i)
Expand All @@ -186,12 +186,12 @@ int LayerSystem::getFirstVisibleLayer() const
return DEFAULT_LAYER;
}

int LayerSystem::getActiveLayer() const
int LayerManager::getActiveLayer() const
{
return _activeLayer;
}

void LayerSystem::setActiveLayer(int layerID)
void LayerManager::setActiveLayer(int layerID)
{
LayerMap::iterator i = _layers.find(layerID);

Expand All @@ -204,7 +204,7 @@ void LayerSystem::setActiveLayer(int layerID)
_activeLayer = layerID;
}

bool LayerSystem::layerIsVisible(const std::string& layerName)
bool LayerManager::layerIsVisible(const std::string& layerName)
{
// Check if the layer already exists
int layerID = getLayerID(layerName);
Expand All @@ -218,7 +218,7 @@ bool LayerSystem::layerIsVisible(const std::string& layerName)
return _layerVisibility[layerID];
}

bool LayerSystem::layerIsVisible(int layerID) {
bool LayerManager::layerIsVisible(int layerID) {
// Sanity check
if (layerID < 0 || layerID >= static_cast<int>(_layerVisibility.size())) {
rMessage() << "LayerSystem: Querying invalid layer ID: " << layerID << std::endl;
Expand All @@ -228,7 +228,7 @@ bool LayerSystem::layerIsVisible(int layerID) {
return _layerVisibility[layerID];
}

void LayerSystem::setLayerVisibility(int layerID, bool visible)
void LayerManager::setLayerVisibility(int layerID, bool visible)
{
// Sanity check
if (layerID < 0 || layerID >= static_cast<int>(_layerVisibility.size()))
Expand Down Expand Up @@ -260,7 +260,7 @@ void LayerSystem::setLayerVisibility(int layerID, bool visible)
onLayerVisibilityChanged();
}

void LayerSystem::setLayerVisibility(const std::string& layerName, bool visible) {
void LayerManager::setLayerVisibility(const std::string& layerName, bool visible) {
// Check if the layer already exists
int layerID = getLayerID(layerName);

Expand All @@ -274,7 +274,7 @@ void LayerSystem::setLayerVisibility(const std::string& layerName, bool visible)
setLayerVisibility(layerID, visible);
}

void LayerSystem::updateSceneGraphVisibility()
void LayerManager::updateSceneGraphVisibility()
{
UpdateNodeVisibilityWalker walker;
GlobalSceneGraph().root()->traverseChildren(walker);
Expand All @@ -283,19 +283,19 @@ void LayerSystem::updateSceneGraphVisibility()
SceneChangeNotify();
}

void LayerSystem::onLayersChanged()
void LayerManager::onLayersChanged()
{
_layersChangedSignal.emit();
}

void LayerSystem::onNodeMembershipChanged()
void LayerManager::onNodeMembershipChanged()
{
_nodeMembershipChangedSignal.emit();

updateSceneGraphVisibility();
}

void LayerSystem::onLayerVisibilityChanged()
void LayerManager::onLayerVisibilityChanged()
{
// Update all nodes and views
updateSceneGraphVisibility();
Expand All @@ -304,7 +304,7 @@ void LayerSystem::onLayerVisibilityChanged()
_layerVisibilityChangedSignal.emit();
}

void LayerSystem::addSelectionToLayer(int layerID) {
void LayerManager::addSelectionToLayer(int layerID) {
// Check if the layer ID exists
if (_layers.find(layerID) == _layers.end()) {
return;
Expand All @@ -317,7 +317,7 @@ void LayerSystem::addSelectionToLayer(int layerID) {
onNodeMembershipChanged();
}

void LayerSystem::addSelectionToLayer(const std::string& layerName) {
void LayerManager::addSelectionToLayer(const std::string& layerName) {
// Check if the layer already exists
int layerID = getLayerID(layerName);

Expand All @@ -331,7 +331,7 @@ void LayerSystem::addSelectionToLayer(const std::string& layerName) {
addSelectionToLayer(layerID);
}

void LayerSystem::moveSelectionToLayer(const std::string& layerName) {
void LayerManager::moveSelectionToLayer(const std::string& layerName) {
// Check if the layer already exists
int layerID = getLayerID(layerName);

Expand All @@ -345,7 +345,7 @@ void LayerSystem::moveSelectionToLayer(const std::string& layerName) {
moveSelectionToLayer(layerID);
}

void LayerSystem::moveSelectionToLayer(int layerID) {
void LayerManager::moveSelectionToLayer(int layerID) {
// Check if the layer ID exists
if (_layers.find(layerID) == _layers.end()) {
return;
Expand All @@ -358,7 +358,7 @@ void LayerSystem::moveSelectionToLayer(int layerID) {
onNodeMembershipChanged();
}

void LayerSystem::removeSelectionFromLayer(const std::string& layerName) {
void LayerManager::removeSelectionFromLayer(const std::string& layerName) {
// Check if the layer already exists
int layerID = getLayerID(layerName);

Expand All @@ -372,7 +372,7 @@ void LayerSystem::removeSelectionFromLayer(const std::string& layerName) {
removeSelectionFromLayer(layerID);
}

void LayerSystem::removeSelectionFromLayer(int layerID) {
void LayerManager::removeSelectionFromLayer(int layerID) {
// Check if the layer ID exists
if (_layers.find(layerID) == _layers.end()) {
return;
Expand All @@ -385,7 +385,7 @@ void LayerSystem::removeSelectionFromLayer(int layerID) {
onNodeMembershipChanged();
}

bool LayerSystem::updateNodeVisibility(const scene::INodePtr& node)
bool LayerManager::updateNodeVisibility(const scene::INodePtr& node)
{
// Get the list of layers the node is associated with
const auto& layers = node->getLayers();
Expand All @@ -409,7 +409,7 @@ bool LayerSystem::updateNodeVisibility(const scene::INodePtr& node)
return false;
}

void LayerSystem::setSelected(int layerID, bool selected)
void LayerManager::setSelected(int layerID, bool selected)
{
SetLayerSelectedWalker walker(layerID, selected);

Expand All @@ -419,22 +419,22 @@ void LayerSystem::setSelected(int layerID, bool selected)
}
}

sigc::signal<void> LayerSystem::signal_layersChanged()
sigc::signal<void> LayerManager::signal_layersChanged()
{
return _layersChangedSignal;
}

sigc::signal<void> LayerSystem::signal_layerVisibilityChanged()
sigc::signal<void> LayerManager::signal_layerVisibilityChanged()
{
return _layerVisibilityChangedSignal;
}

sigc::signal<void> LayerSystem::signal_nodeMembershipChanged()
sigc::signal<void> LayerManager::signal_nodeMembershipChanged()
{
return _nodeMembershipChangedSignal;
}

int LayerSystem::getLayerID(const std::string& name) const
int LayerManager::getLayerID(const std::string& name) const
{
for (LayerMap::const_iterator i = _layers.begin(); i != _layers.end(); i++) {
if (i->second == name) {
Expand All @@ -446,7 +446,7 @@ int LayerSystem::getLayerID(const std::string& name) const
return -1;
}

std::string LayerSystem::getLayerName(int layerID) const
std::string LayerManager::getLayerName(int layerID) const
{
LayerMap::const_iterator found = _layers.find(layerID);

Expand All @@ -458,12 +458,12 @@ std::string LayerSystem::getLayerName(int layerID) const
return "";
}

bool LayerSystem::layerExists(int layerID) const
bool LayerManager::layerExists(int layerID) const
{
return _layers.find(layerID) != _layers.end();
}

int LayerSystem::getHighestLayerID() const
int LayerManager::getHighestLayerID() const
{
if (_layers.size() == 0) {
// Empty layer map, just return DEFAULT_LAYER
Expand All @@ -474,7 +474,7 @@ int LayerSystem::getHighestLayerID() const
return _layers.rbegin()->first;
}

int LayerSystem::getLowestUnusedLayerID()
int LayerManager::getLowestUnusedLayerID()
{
for (int i = 0; i < INT_MAX; i++) {
if (_layers.find(i) == _layers.end()) {
Expand All @@ -487,13 +487,13 @@ int LayerSystem::getLowestUnusedLayerID()
}

// RegisterableModule implementation
const std::string& LayerSystem::getName() const
const std::string& LayerManager::getName() const
{
static std::string _name(MODULE_LAYERSYSTEM);
return _name;
}

const StringSet& LayerSystem::getDependencies() const
const StringSet& LayerManager::getDependencies() const
{
static StringSet _dependencies;

Expand All @@ -507,7 +507,7 @@ const StringSet& LayerSystem::getDependencies() const
return _dependencies;
}

void LayerSystem::initialiseModule(const ApplicationContext& ctx)
void LayerManager::initialiseModule(const ApplicationContext& ctx)
{
rMessage() << getName() << "::initialiseModule called." << std::endl;

Expand All @@ -522,20 +522,20 @@ void LayerSystem::initialiseModule(const ApplicationContext& ctx)

// Register the "create layer" command
GlobalCommandSystem().addCommand("CreateNewLayer",
std::bind(&LayerSystem::createLayerCmd, this, std::placeholders::_1),
std::bind(&LayerManager::createLayerCmd, this, std::placeholders::_1),
{ cmd::ARGTYPE_STRING | cmd::ARGTYPE_OPTIONAL });
IEventPtr ev = GlobalEventManager().addCommand("CreateNewLayer", "CreateNewLayer");

GlobalMapModule().signal_mapEvent().connect(
sigc::mem_fun(*this, &LayerSystem::onMapEvent)
sigc::mem_fun(*this, &LayerManager::onMapEvent)
);

GlobalMapInfoFileManager().registerInfoFileModule(
std::make_shared<LayerInfoFileModule>()
);
}

void LayerSystem::createLayerCmd(const cmd::ArgumentList& args)
void LayerManager::createLayerCmd(const cmd::ArgumentList& args)
{
#if 0
std::string initialName = !args.empty() ? args[0].getString() : "";
Expand Down Expand Up @@ -589,7 +589,7 @@ void LayerSystem::createLayerCmd(const cmd::ArgumentList& args)
#endif
}

void LayerSystem::onMapEvent(IMap::MapEvent ev)
void LayerManager::onMapEvent(IMap::MapEvent ev)
{
if (ev == IMap::MapUnloaded || ev == IMap::MapLoading)
{
Expand All @@ -598,12 +598,13 @@ void LayerSystem::onMapEvent(IMap::MapEvent ev)
}
}

// Define the static LayerSystem module
module::StaticModule<LayerSystem> layerSystemModule;
// Define the static LayerManager module
module::StaticModule<LayerManager> layerManagerModule;

// Internal accessor method
LayerSystem& getLayerSystem() {
return *layerSystemModule.getModule();
LayerManager& getLayerSystem()
{
return *layerManagerModule.getModule();
}

} // namespace scene

0 comments on commit 848b232

Please sign in to comment.