forked from Mirrorlandia_minetest/minetest
Move util/serialize.h out from staticobject.h for smaller header dependencies
This commit is contained in:
parent
2f5686ca48
commit
eca1c96412
@ -203,6 +203,7 @@ set(common_SRCS
|
|||||||
base64.cpp
|
base64.cpp
|
||||||
ban.cpp
|
ban.cpp
|
||||||
clientserver.cpp
|
clientserver.cpp
|
||||||
|
staticobject.cpp
|
||||||
util/serialize.cpp
|
util/serialize.cpp
|
||||||
util/directiontables.cpp
|
util/directiontables.cpp
|
||||||
util/numeric.cpp
|
util/numeric.cpp
|
||||||
|
@ -42,6 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "util/string.h"
|
#include "util/string.h"
|
||||||
#include "hex.h"
|
#include "hex.h"
|
||||||
#include "IMeshCache.h"
|
#include "IMeshCache.h"
|
||||||
|
#include "util/serialize.h"
|
||||||
|
|
||||||
static std::string getMediaCacheDir()
|
static std::string getMediaCacheDir()
|
||||||
{
|
{
|
||||||
|
@ -43,6 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#endif
|
#endif
|
||||||
#include "daynightratio.h"
|
#include "daynightratio.h"
|
||||||
#include "map.h"
|
#include "map.h"
|
||||||
|
#include "util/serialize.h"
|
||||||
|
|
||||||
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
|
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
|
||||||
|
|
||||||
|
@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "mapblock_mesh.h"
|
#include "mapblock_mesh.h"
|
||||||
#endif
|
#endif
|
||||||
#include "util/string.h"
|
#include "util/string.h"
|
||||||
|
#include "util/serialize.h"
|
||||||
|
|
||||||
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
|
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
|
||||||
|
|
||||||
|
@ -54,6 +54,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "util/pointedthing.h"
|
#include "util/pointedthing.h"
|
||||||
#include "util/mathconstants.h"
|
#include "util/mathconstants.h"
|
||||||
#include "rollback.h"
|
#include "rollback.h"
|
||||||
|
#include "util/serialize.h"
|
||||||
|
|
||||||
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
|
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
|
||||||
|
|
||||||
|
92
src/staticobject.cpp
Normal file
92
src/staticobject.cpp
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
/*
|
||||||
|
Minetest-c55
|
||||||
|
Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2.1 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "staticobject.h"
|
||||||
|
#include "util/serialize.h"
|
||||||
|
|
||||||
|
void StaticObject::serialize(std::ostream &os)
|
||||||
|
{
|
||||||
|
char buf[12];
|
||||||
|
// type
|
||||||
|
buf[0] = type;
|
||||||
|
os.write(buf, 1);
|
||||||
|
// pos
|
||||||
|
writeV3S32((u8*)buf, v3s32(pos.X*1000,pos.Y*1000,pos.Z*1000));
|
||||||
|
os.write(buf, 12);
|
||||||
|
// data
|
||||||
|
os<<serializeString(data);
|
||||||
|
}
|
||||||
|
void StaticObject::deSerialize(std::istream &is, u8 version)
|
||||||
|
{
|
||||||
|
char buf[12];
|
||||||
|
// type
|
||||||
|
is.read(buf, 1);
|
||||||
|
type = buf[0];
|
||||||
|
// pos
|
||||||
|
is.read(buf, 12);
|
||||||
|
v3s32 intp = readV3S32((u8*)buf);
|
||||||
|
pos.X = (f32)intp.X/1000;
|
||||||
|
pos.Y = (f32)intp.Y/1000;
|
||||||
|
pos.Z = (f32)intp.Z/1000;
|
||||||
|
// data
|
||||||
|
data = deSerializeString(is);
|
||||||
|
}
|
||||||
|
|
||||||
|
void StaticObjectList::serialize(std::ostream &os)
|
||||||
|
{
|
||||||
|
char buf[12];
|
||||||
|
// version
|
||||||
|
buf[0] = 0;
|
||||||
|
os.write(buf, 1);
|
||||||
|
// count
|
||||||
|
u16 count = m_stored.size() + m_active.size();
|
||||||
|
writeU16((u8*)buf, count);
|
||||||
|
os.write(buf, 2);
|
||||||
|
for(core::list<StaticObject>::Iterator
|
||||||
|
i = m_stored.begin();
|
||||||
|
i != m_stored.end(); i++)
|
||||||
|
{
|
||||||
|
StaticObject &s_obj = *i;
|
||||||
|
s_obj.serialize(os);
|
||||||
|
}
|
||||||
|
for(core::map<u16, StaticObject>::Iterator
|
||||||
|
i = m_active.getIterator();
|
||||||
|
i.atEnd()==false; i++)
|
||||||
|
{
|
||||||
|
StaticObject s_obj = i.getNode()->getValue();
|
||||||
|
s_obj.serialize(os);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void StaticObjectList::deSerialize(std::istream &is)
|
||||||
|
{
|
||||||
|
char buf[12];
|
||||||
|
// version
|
||||||
|
is.read(buf, 1);
|
||||||
|
u8 version = buf[0];
|
||||||
|
// count
|
||||||
|
is.read(buf, 2);
|
||||||
|
u16 count = readU16((u8*)buf);
|
||||||
|
for(u16 i=0; i<count; i++)
|
||||||
|
{
|
||||||
|
StaticObject s_obj;
|
||||||
|
s_obj.deSerialize(is, version);
|
||||||
|
m_stored.push_back(s_obj);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "irrlichttypes_bloated.h"
|
#include "irrlichttypes_bloated.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include "util/serialize.h"
|
#include "debug.h"
|
||||||
|
|
||||||
struct StaticObject
|
struct StaticObject
|
||||||
{
|
{
|
||||||
@ -43,33 +43,8 @@ struct StaticObject
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void serialize(std::ostream &os)
|
void serialize(std::ostream &os);
|
||||||
{
|
void deSerialize(std::istream &is, u8 version);
|
||||||
char buf[12];
|
|
||||||
// type
|
|
||||||
buf[0] = type;
|
|
||||||
os.write(buf, 1);
|
|
||||||
// pos
|
|
||||||
writeV3S32((u8*)buf, v3s32(pos.X*1000,pos.Y*1000,pos.Z*1000));
|
|
||||||
os.write(buf, 12);
|
|
||||||
// data
|
|
||||||
os<<serializeString(data);
|
|
||||||
}
|
|
||||||
void deSerialize(std::istream &is, u8 version)
|
|
||||||
{
|
|
||||||
char buf[12];
|
|
||||||
// type
|
|
||||||
is.read(buf, 1);
|
|
||||||
type = buf[0];
|
|
||||||
// pos
|
|
||||||
is.read(buf, 12);
|
|
||||||
v3s32 intp = readV3S32((u8*)buf);
|
|
||||||
pos.X = (f32)intp.X/1000;
|
|
||||||
pos.Y = (f32)intp.Y/1000;
|
|
||||||
pos.Z = (f32)intp.Z/1000;
|
|
||||||
// data
|
|
||||||
data = deSerializeString(is);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class StaticObjectList
|
class StaticObjectList
|
||||||
@ -110,47 +85,8 @@ public:
|
|||||||
m_active.remove(id);
|
m_active.remove(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
void serialize(std::ostream &os)
|
void serialize(std::ostream &os);
|
||||||
{
|
void deSerialize(std::istream &is);
|
||||||
char buf[12];
|
|
||||||
// version
|
|
||||||
buf[0] = 0;
|
|
||||||
os.write(buf, 1);
|
|
||||||
// count
|
|
||||||
u16 count = m_stored.size() + m_active.size();
|
|
||||||
writeU16((u8*)buf, count);
|
|
||||||
os.write(buf, 2);
|
|
||||||
for(core::list<StaticObject>::Iterator
|
|
||||||
i = m_stored.begin();
|
|
||||||
i != m_stored.end(); i++)
|
|
||||||
{
|
|
||||||
StaticObject &s_obj = *i;
|
|
||||||
s_obj.serialize(os);
|
|
||||||
}
|
|
||||||
for(core::map<u16, StaticObject>::Iterator
|
|
||||||
i = m_active.getIterator();
|
|
||||||
i.atEnd()==false; i++)
|
|
||||||
{
|
|
||||||
StaticObject s_obj = i.getNode()->getValue();
|
|
||||||
s_obj.serialize(os);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
void deSerialize(std::istream &is)
|
|
||||||
{
|
|
||||||
char buf[12];
|
|
||||||
// version
|
|
||||||
is.read(buf, 1);
|
|
||||||
u8 version = buf[0];
|
|
||||||
// count
|
|
||||||
is.read(buf, 2);
|
|
||||||
u16 count = readU16((u8*)buf);
|
|
||||||
for(u16 i=0; i<count; i++)
|
|
||||||
{
|
|
||||||
StaticObject s_obj;
|
|
||||||
s_obj.deSerialize(is, version);
|
|
||||||
m_stored.push_back(s_obj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
NOTE: When an object is transformed to active, it is removed
|
NOTE: When an object is transformed to active, it is removed
|
||||||
|
Loading…
Reference in New Issue
Block a user