Browse Source

SceneGraph: prefix private variable with an underscore.

pull/191/head
Vladimír Vondruš 8 years ago
parent
commit
4edb080239
  1. 12
      src/Magnum/SceneGraph/FeatureGroup.h
  2. 4
      src/Magnum/SceneGraph/FeatureGroup.hpp

12
src/Magnum/SceneGraph/FeatureGroup.h

@ -51,7 +51,7 @@ template<UnsignedInt dimensions, class T> class AbstractFeatureGroup {
void add(AbstractFeature<dimensions, T>& feature);
void remove(AbstractFeature<dimensions, T>& feature);
std::vector<std::reference_wrapper<AbstractFeature<dimensions, T>>> features;
std::vector<std::reference_wrapper<AbstractFeature<dimensions, T>>> _features;
};
/**
@ -76,22 +76,22 @@ template<UnsignedInt dimensions, class Feature, class T> class FeatureGroup: pub
/** @brief Whether the group is empty */
bool isEmpty() const {
return AbstractFeatureGroup<dimensions, T>::features.empty();
return AbstractFeatureGroup<dimensions, T>::_features.empty();
}
/** @brief Count of features in the group */
std::size_t size() const {
return AbstractFeatureGroup<dimensions, T>::features.size();
return AbstractFeatureGroup<dimensions, T>::_features.size();
}
/** @brief Feature at given index */
Feature& operator[](std::size_t index) {
return static_cast<Feature&>(AbstractFeatureGroup<dimensions, T>::features[index].get());
return static_cast<Feature&>(AbstractFeatureGroup<dimensions, T>::_features[index].get());
}
/** @overload */
const Feature& operator[](std::size_t index) const {
return static_cast<Feature&>(AbstractFeatureGroup<dimensions, T>::features[index].get());
return static_cast<Feature&>(AbstractFeatureGroup<dimensions, T>::_features[index].get());
}
/**
@ -158,7 +158,7 @@ template<class Feature> using FeatureGroup3D = BasicFeatureGroup3D<Feature, Floa
#endif
template<UnsignedInt dimensions, class Feature, class T> FeatureGroup<dimensions, Feature, T>::~FeatureGroup() {
for(auto i: AbstractFeatureGroup<dimensions, T>::features) static_cast<Feature&>(i.get())._group = nullptr;
for(auto i: AbstractFeatureGroup<dimensions, T>::_features) static_cast<Feature&>(i.get())._group = nullptr;
}
template<UnsignedInt dimensions, class Feature, class T> FeatureGroup<dimensions, Feature, T>& FeatureGroup<dimensions, Feature, T>::add(Feature& feature) {

4
src/Magnum/SceneGraph/FeatureGroup.hpp

@ -39,11 +39,11 @@ template<UnsignedInt dimensions, class T> AbstractFeatureGroup<dimensions, T>::A
template<UnsignedInt dimensions, class T> AbstractFeatureGroup<dimensions, T>::~AbstractFeatureGroup() = default;
template<UnsignedInt dimensions, class T> void AbstractFeatureGroup<dimensions, T>::add(AbstractFeature<dimensions, T>& feature) {
features.push_back(feature);
_features.push_back(feature);
}
template<UnsignedInt dimensions, class T> void AbstractFeatureGroup<dimensions, T>::remove(AbstractFeature<dimensions, T>& feature) {
features.erase(std::find_if(features.begin(), features.end(),
_features.erase(std::find_if(_features.begin(), _features.end(),
[&feature](AbstractFeature<dimensions, T>& f) { return &f == &feature; }));
}

Loading…
Cancel
Save