drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[nostalgia] Move from old Serialization API to new Model API

Browse Source
This commit is contained in:
Gary Talent
2019-03-17 13:43:00 -05:00
parent d139eb9729
commit 94afbd4f60
9 changed files with 93 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nostalgia/world/world.hpp
View File

@@ -25,11 +25,11 @@ struct Tile {
};
template<typename T>
ox::Error ioOpRead(T *io, Tile *obj) {
ox::Error modelRead(T *io, Tile *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::world::Tile", Tile::Fields);
err |= io->op("bgTile", &obj->bgTile);
err |= io->op("type", &obj->type);
err |= io->field("bgTile", &obj->bgTile);
err |= io->field("type", &obj->type);
return err;
}
@@ -37,10 +37,10 @@ ox::Error ioOpRead(T *io, Tile *obj) {
struct Zone {
template<typename T>
friend ox::Error ioOpRead(T*, Zone*);
friend ox::Error modelRead(T*, Zone*);
template<typename T>
friend ox::Error ioOpWrite(T*, Zone*);
friend ox::Error modelWrite(T*, Zone*);
protected:
static constexpr auto Fields = 2;
@@ -61,18 +61,18 @@ struct Zone {
};
template<typename T>
ox::Error ioOpRead(T *io, Zone *obj) {
ox::Error modelRead(T *io, Zone *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::world::Zone", Zone::Fields);
err |= io->op("bounds", &obj->m_bounds);
err |= io->field("bounds", &obj->m_bounds);
return err;
}
template<typename T>
ox::Error ioOpWrite(T *io, Zone *obj) {
ox::Error modelWrite(T *io, Zone *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::world::Zone", Zone::Fields);
err |= io->op("bounds", &obj->m_bounds);
err |= io->field("bounds", &obj->m_bounds);
return err;
}
@@ -80,10 +80,10 @@ ox::Error ioOpWrite(T *io, Zone *obj) {
struct Region {
template<typename T>
friend ox::Error ioOpRead(T*, Region*);
friend ox::Error modelRead(T*, Region*);
template<typename T>
friend ox::Error ioOpWrite(T*, Region*);
friend ox::Error modelWrite(T*, Region*);
protected:
static constexpr auto Fields = 1;
@@ -94,14 +94,14 @@ struct Region {
};
template<typename T>
ox::Error ioOpRead(T *io, Region *obj) {
ox::Error modelRead(T *io, Region *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::World::Region", Region::Fields);
return err;
}
template<typename T>
ox::Error ioOpWrite(T *io, Region *obj) {
ox::Error modelWrite(T *io, Region *obj) {
ox::Error err = 0;
io->setTypeInfo("nostalgia::World::Region", Region::Fields);
return err;