Skip to content
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

Jump to bottom

Remove unnecessary code + Fix config_manager.h #155

Merged
merged 2 commits into from
Apr 28, 2022
Merged

Remove unnecessary code + Fix config_manager.h #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a74bb0a
Remove unnecessary code
ShenMian Apr 27, 2022
943bdd5
Fix config_manager.h
ShenMian Apr 27, 2022
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
3 changes: 0 additions & 3 deletions engine/source/runtime/engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ namespace Pilot
void fps(float delta_time);

public:
PilotEngine(const PilotEngine&) = delete;
PilotEngine& operator=(const PilotEngine&) = delete;

void startEngine(const EngineInitParams& param);
void shutdownEngine();

Expand Down
3 changes: 0 additions & 3 deletions engine/source/runtime/function/framework/world/world_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ namespace Pilot
public:
virtual ~WorldManager();

WorldManager(const WorldManager&) = delete;
WorldManager& operator=(const WorldManager&) = delete;

void initialize();
void clear();

Expand Down
4 changes: 0 additions & 4 deletions engine/source/runtime/function/scene/scene_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ namespace Pilot
{
friend class PublicSingleton<SceneManager>;

public:
SceneManager(const SceneManager&) = delete;
SceneManager& operator=(const SceneManager&) = delete;

protected:
SceneManager() = default;
std::shared_ptr<Scene> m_scene = std::make_shared<Scene>();
Expand Down
7 changes: 0 additions & 7 deletions engine/source/runtime/function/scene/scene_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,6 @@ namespace Pilot
GameObjectDesc(size_t go_id, const std::vector<GameObjectComponentDesc>& components) :
m_go_id(go_id), m_components(components)
{}
GameObjectDesc(const GameObjectDesc& t) { *this = t; }
GameObjectDesc& operator=(const GameObjectDesc& t)
{
m_go_id = t.m_go_id;
m_components = t.m_components;
return *this;
}

size_t getId() const { return m_go_id; }
const std::vector<GameObjectComponentDesc>& getComponents() const { return m_components; }
Expand Down
3 changes: 0 additions & 3 deletions engine/source/runtime/function/ui/ui_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ namespace Pilot
friend class PublicSingleton<PUIManager>;

public:
PUIManager(const PUIManager&) = delete;
PUIManager& operator=(const PUIManager&) = delete;

int initialize();
int update();
int clear();
Expand Down
9 changes: 3 additions & 6 deletions engine/source/runtime/resource/config_manager/config_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ namespace Pilot
{
friend class PublicSingleton<ConfigManager>;

public:
ConfigManager(const ConfigManager&) = delete;
ConfigManager& operator=(const ConfigManager&) = delete;
//
ConfigManager() = default;

private:
std::filesystem::path m_root_folder;
std::filesystem::path m_asset_folder;
Expand All @@ -26,6 +20,9 @@ namespace Pilot
std::filesystem::path m_editor_font_path;
std::filesystem::path m_global_rendering_res_path;

protected:
ConfigManager() = default;

public:
void initialize(const EngineInitParams& init_param);

Expand Down