refactor: Move color declarations to a separate header

This commit is contained in:
Vsevolod Kremianskii 2020-10-12 07:55:06 +07:00
parent 6061b325e2
commit b295610b4c
11 changed files with 14 additions and 10 deletions

View file

@ -267,6 +267,7 @@ set(GAME_HEADERS
src/game/gui/chargen/portraitselect.h
src/game/gui/chargen/quick.h
src/game/gui/chargen/quickorcustom.h
src/game/gui/colors.h
src/game/gui/container.h
src/game/gui/debugoverlay.h
src/game/gui/dialog.h

View file

@ -23,6 +23,8 @@
#include "../../characters.h"
#include "../../object/creature.h"
#include "../colors.h"
using namespace std;
using namespace reone::gui;

View file

@ -17,7 +17,7 @@
#include "name.h"
#include "../../types.h"
#include "../colors.h"
using namespace std;

View file

@ -20,7 +20,7 @@
#include "../../../core/random.h"
#include "../../../resource/resources.h"
#include "../../types.h"
#include "../colors.h"
using namespace std;

View file

@ -19,7 +19,7 @@
#include <boost/algorithm/string.hpp>
#include "../../types.h"
#include "../colors.h"
using namespace std;

View file

@ -17,7 +17,7 @@
#include "quickorcustom.h"
#include "../../types.h"
#include "../colors.h"
using namespace std;

View file

@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "../types.h"
#include "colors.h"
using namespace reone::resource;

View file

@ -27,7 +27,8 @@
#include "../script/routines.h"
#include "../script/util.h"
#include "../types.h"
#include "colors.h"
using namespace std;

View file

@ -26,6 +26,8 @@
#include "../object/creature.h"
#include "../object/item.h"
#include "colors.h"
using namespace std;
using namespace std::placeholders;

View file

@ -26,6 +26,8 @@
#include "../../gui/scenebuilder.h"
#include "../../resource/resources.h"
#include "colors.h"
using namespace std;
using namespace std::placeholders;

View file

@ -202,10 +202,6 @@ struct CameraStyle {
float viewAngle { 0.0f };
};
glm::vec3 getBaseColor(resource::GameVersion version);
glm::vec3 getHilightColor(resource::GameVersion version);
glm::vec3 getDisabledColor(resource::GameVersion version);
} // namespace game
} // namespace reone