Skip to content

Add missing includes to header files #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ceeac wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add missing includes to header files #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion include/common/color_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#pragma once
#include <SFML/Graphics.hpp>

#include "common/math.hpp"
#include "common/number_generator.hpp"
#include "common/utils.hpp"

#include <SFML/Graphics.hpp>


struct ColorUtils
Expand Down
3 changes: 3 additions & 0 deletions include/common/double_buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#pragma once

#include <cstdint>


template<typename T>
struct DoubleObject
{
Expand Down
9 changes: 7 additions & 2 deletions include/common/grid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
#pragma once
#include <vector>
#include <list>

#include "common/utils.hpp"

#include <SFML/System.hpp>

#include <cstdint>
#include <list>
#include <vector>


template<typename T>
struct Grid
Expand Down
2 changes: 2 additions & 0 deletions include/common/index_vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#pragma once

#include <cstdint>
#include <vector>


Expand Down
3 changes: 3 additions & 0 deletions include/common/math.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#pragma once

#include <cmath>


struct Math
{
static constexpr float PI = 3.141592653f;
Expand Down
3 changes: 3 additions & 0 deletions include/common/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#pragma once

#include <SFML/Graphics.hpp>

#include <cmath>
#include <memory>
#include <sstream>


Expand Down
5 changes: 4 additions & 1 deletion include/editor/GUI/container.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#pragma once
#include "editor/GUI/item.hpp"

#include "common/color_utils.hpp"

#include "editor/GUI/item.hpp"
#include "editor/GUI/utils.hpp"


namespace GUI
{
Expand Down
2 changes: 2 additions & 0 deletions include/editor/GUI/empty_item.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "item.hpp"


namespace GUI
{
Expand Down
3 changes: 0 additions & 3 deletions include/editor/GUI/item.cpp
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions include/editor/GUI/item.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#pragma once

#include "common/utils.hpp"
#include "common/event_manager.hpp"
#include "simulation/config.hpp"

#include <SFML/Graphics.hpp>
#include <common/event_manager.hpp>
#include "utils.hpp"


namespace GUI
Expand Down
6 changes: 5 additions & 1 deletion include/editor/GUI/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
#pragma once
#include <common/utils.hpp>

#include "common/utils.hpp"

#include <SFML/Graphics.hpp>

#include <functional>


template<typename T>
sf::Vector2f toVector2f(sf::Vector2<T> v)
Expand Down
6 changes: 6 additions & 0 deletions include/editor/colony_creator/colony_stats.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
#pragma once

#include "editor/GUI/named_container.hpp"
#include "editor/control_state.hpp"

#include "common/index_vector.hpp"
#include "common/graph.hpp"

#include "simulation/colony/colony.hpp"


struct ColonyChart : public GUI::Item
{
Expand Down
7 changes: 6 additions & 1 deletion include/editor/colony_creator/colony_tool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
#pragma once

#include "colony_stats.hpp"

#include "editor/GUI/container.hpp"
#include "editor/GUI/button.hpp"
#include "editor/GUI/rounded_rectangle.hpp"
#include "editor/GUI/toggle.hpp"
#include "editor/color_picker/color_picker.hpp"
#include "editor/control_state.hpp"

#include "common/color_utils.hpp"
#include "colony_stats.hpp"



struct ColonyTool : GUI::Container
Expand Down
7 changes: 5 additions & 2 deletions include/editor/color_saver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#pragma once
#include "GUI/item.hpp"
#include "GUI/grid_container.hpp"

#include "GUI/button.hpp"
#include "GUI/container.hpp"
#include "GUI/grid_container.hpp"
#include "GUI/item.hpp"

#include "transition.hpp"


Expand Down
9 changes: 7 additions & 2 deletions include/editor/control_state.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#pragma once
#include <functional>
#include <SFML/Graphics.hpp>

#include "common/viewport_handler.hpp"
#include "editor/transition.hpp"
#include "simulation/simulation.hpp"

#include <SFML/Graphics.hpp>

#include <functional>


struct ControlState
Expand Down
5 changes: 5 additions & 0 deletions include/editor/slider.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#pragma once

#include "GUI/container.hpp"
#include "GUI/item.hpp"
#include "GUI/rounded_rectangle.hpp"
#include "GUI/text_label.hpp"


namespace edtr
Expand Down
6 changes: 5 additions & 1 deletion include/editor/tool_selector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
#pragma once
#include "GUI/container.hpp"

#include "GUI/button.hpp"
#include "GUI/container.hpp"
#include "GUI/named_container.hpp"

#include "control_state.hpp"
#include "simulation/simulation.hpp"

#include <future>


Expand Down
4 changes: 3 additions & 1 deletion include/simulation/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#pragma once

#include <memory>
#include <SFML/Graphics.hpp>

#include <memory>
#include <fstream>


template<typename T>
struct DefaultConf
Expand Down