AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Athena YAML refactor

Browse Source
This commit is contained in:
Jack Andersen
2016-08-21 17:47:48 -10:00
parent bf049843e1
commit f8fb72250a
36 changed files with 124 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Editor/ProjectManager.cpp
View File

@@ -96,34 +96,30 @@ bool ProjectManager::openProject(const hecl::SystemString& path)
}
hecl::ProjectPath urdeSpacesPath(*m_proj, _S(".hecl/urde_spaces.yaml"));
FILE* fp = hecl::Fopen(urdeSpacesPath.getAbsolutePath().c_str(), _S("r"));
athena::io::FileReader reader(urdeSpacesPath.getAbsolutePath());
bool needsSave = false;
athena::io::YAMLDocReader r;
if (!fp)
if (!reader.isOpen())
{
needsSave = true;
goto makeProj;
}
yaml_parser_set_input_file(r.getParser(), fp);
yaml_parser_set_input(r.getParser(), (yaml_read_handler_t*)athena::io::YAMLAthenaReader, &reader);
if (!r.ValidateClassType("UrdeSpacesState"))
{
needsSave = true;
fclose(fp);
goto makeProj;
}
r.reset();
fseek(fp, 0, SEEK_SET);
yaml_parser_set_input_file(r.getParser(), fp);
if (!r.parse())
reader.seek(0, athena::Begin);
if (!r.parse(&reader))
{
needsSave = true;
fclose(fp);
goto makeProj;
}
fclose(fp);
makeProj:
m_vm.ProjectChanged(*m_proj);
@@ -163,19 +159,14 @@ bool ProjectManager::saveProject()
return false;
hecl::ProjectPath oldSpacesPath(*m_proj, _S(".hecl/~urde_spaces.yaml"));
FILE* fp = hecl::Fopen(oldSpacesPath.getAbsolutePath().c_str(), _S("w"));
if (!fp)
athena::io::FileWriter writer(oldSpacesPath.getAbsolutePath());
if (!writer.isOpen())
return false;
athena::io::YAMLDocWriter w("UrdeSpacesState");
yaml_emitter_set_output_file(w.getEmitter(), fp);
m_vm.SaveEditorView(w);
if (!w.finish())
{
fclose(fp);
if (!w.finish(&writer))
return false;
}
fclose(fp);
hecl::ProjectPath newSpacesPath(*m_proj, _S(".hecl/urde_spaces.yaml"));