Major cleanup.
Moved to namespace Cleanup includes
This commit is contained in:
@@ -6,33 +6,36 @@
|
||||
#include "../Resource/Serializable.h"
|
||||
#include <src/Scene/Systems/QuakeMapBuilder.h>
|
||||
|
||||
class QuakeMapComponent {
|
||||
private:
|
||||
|
||||
public:
|
||||
std::vector<Ref<Mesh>> m_Meshes;
|
||||
Ref<TrenchbroomMap> Map;
|
||||
std::string Path;
|
||||
bool HasCollisions = false;
|
||||
void Load(std::string path, bool collisions);
|
||||
|
||||
void Draw();
|
||||
void DrawEditor();
|
||||
|
||||
json Serialize()
|
||||
namespace Nuake {
|
||||
class QuakeMapComponent
|
||||
{
|
||||
BEGIN_SERIALIZE();
|
||||
SERIALIZE_VAL(HasCollisions);
|
||||
SERIALIZE_VAL(Path);
|
||||
END_SERIALIZE();
|
||||
}
|
||||
private:
|
||||
|
||||
bool Deserialize(std::string str)
|
||||
{
|
||||
BEGIN_DESERIALIZE();
|
||||
this->Path = j["Path"];
|
||||
this->HasCollisions = j["HasCollisions"];
|
||||
public:
|
||||
std::vector<Ref<Mesh>> m_Meshes;
|
||||
Ref<TrenchbroomMap> Map;
|
||||
std::string Path;
|
||||
bool HasCollisions = false;
|
||||
void Load(std::string path, bool collisions);
|
||||
|
||||
return true;
|
||||
}
|
||||
};
|
||||
void Draw();
|
||||
void DrawEditor();
|
||||
|
||||
json Serialize()
|
||||
{
|
||||
BEGIN_SERIALIZE();
|
||||
SERIALIZE_VAL(HasCollisions);
|
||||
SERIALIZE_VAL(Path);
|
||||
END_SERIALIZE();
|
||||
}
|
||||
|
||||
bool Deserialize(std::string str)
|
||||
{
|
||||
BEGIN_DESERIALIZE();
|
||||
this->Path = j["Path"];
|
||||
this->HasCollisions = j["HasCollisions"];
|
||||
|
||||
return true;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user