zhanshi/mekhanoidy-tools
1
0
Fork 0
mirror of https://github.com/aimrebirth/tools.git synced 2026-04-15 01:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix obj_extractor: angle, scale, Towers.

Browse source
This commit is contained in:
lzwdgc 2015-08-01 00:59:06 +03:00
parent 25956640c9
commit 93850b0864
3 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/obj_extractor/obj_extractor.cpp
View file

@ -129,7 +129,8 @@ void write_mmo(string db, const storage &s)
for (auto &seg : s.objects.segments) for (auto &seg : s.objects.segments)
{ {
if (seg->segment_type == SegmentType::SHELL) if (seg->segment_type == SegmentType::SHELL ||
seg->segment_type == SegmentType::TOWER)
{ {
SegmentObjects<Shell> *segment = (SegmentObjects<Shell> *)seg; SegmentObjects<Shell> *segment = (SegmentObjects<Shell> *)seg;
set<string> objs; set<string> objs;
@ -160,13 +161,11 @@ void write_mmo(string db, const storage &s)
mb.x = object.position.x; mb.x = object.position.x;
mb.y = object.position.y; mb.y = object.position.y;
mb.z = object.position.z; mb.z = object.position.z;
mb.roll = atan2(object.m_rotate_z[2].y, object.m_rotate_z[2].z); mb.roll = 0;
mb.pitch = atan2(-object.m_rotate_z[2].x, sqrt(object.m_rotate_z[2].y * object.m_rotate_z[2].y + object.m_rotate_z[2].z * object.m_rotate_z[2].z)); mb.pitch = 0;
mb.yaw = atan2(object.m_rotate_z[1].x, object.m_rotate_z[0].x); mb.yaw = acos(object.m_rotate_z[0].x);
// to grad
RAD2GRAD(mb.roll);
RAD2GRAD(mb.pitch);
RAD2GRAD(mb.yaw); RAD2GRAD(mb.yaw);
mb.scale = object.m_rotate_z[2].z;
auto i = find_if(storage->mapBuildings.begin(), storage->mapBuildings.end(), [&](const decltype(Storage::mapBuildings)::value_type &p) auto i = find_if(storage->mapBuildings.begin(), storage->mapBuildings.end(), [&](const decltype(Storage::mapBuildings)::value_type &p)
{ {
return *p.second.get() == mb; return *p.second.get() == mb;
@ -212,13 +211,11 @@ void write_mmo(string db, const storage &s)
mb.x = object.position.x; mb.x = object.position.x;
mb.y = object.position.y; mb.y = object.position.y;
mb.z = object.position.z; mb.z = object.position.z;
mb.roll = atan2(object.m_rotate_z[2].y, object.m_rotate_z[2].z); mb.roll = 0;
mb.pitch = atan2(-object.m_rotate_z[2].x, sqrt(object.m_rotate_z[2].y * object.m_rotate_z[2].y + object.m_rotate_z[2].z * object.m_rotate_z[2].z)); mb.pitch = 0;
mb.yaw = atan2(object.m_rotate_z[1].x, object.m_rotate_z[0].x); mb.yaw = acos(object.m_rotate_z[0].x);
// to grad
RAD2GRAD(mb.roll);
RAD2GRAD(mb.pitch);
RAD2GRAD(mb.yaw); RAD2GRAD(mb.yaw);
mb.scale = object.m_rotate_z[2].z;
auto i = find_if(storage->mapObjects.begin(), storage->mapObjects.end(), [&](const decltype(Storage::mapObjects)::value_type &p) auto i = find_if(storage->mapObjects.begin(), storage->mapObjects.end(), [&](const decltype(Storage::mapObjects)::value_type &p)
{ {
return *p.second.get() == mb; return *p.second.get() == mb;

6
src/obj_extractor/objects.cpp
View file

@ -53,9 +53,6 @@ Segment *Segment::create_segment(buffer &b)
case SegmentType::SOUND: case SegmentType::SOUND:
segment = new SegmentObjects<Sound>; segment = new SegmentObjects<Sound>;
break; break;
case SegmentType::MUSIC:
segment = new SegmentObjects<Music>;
break;
case SegmentType::ANOMALY: case SegmentType::ANOMALY:
segment = new SegmentObjects<Anomaly>; segment = new SegmentObjects<Anomaly>;
break; break;
@ -68,6 +65,9 @@ Segment *Segment::create_segment(buffer &b)
case SegmentType::GOODS: case SegmentType::GOODS:
segment = new SegmentObjects<Goods>; segment = new SegmentObjects<Goods>;
break; break;
case SegmentType::SOUND_ZONE:
segment = new SegmentObjects<SoundZone>;
break;
case SegmentType::unk1: case SegmentType::unk1:
segment = new SegmentObjects<unk1>; segment = new SegmentObjects<unk1>;
break; break;

11
src/obj_extractor/objects.h
View file

@ -52,9 +52,8 @@ enum class SegmentType : uint32_t
LAMP, LAMP,
COVERING, COVERING,
SOUND, SOUND,
MUSIC,
GOODS, GOODS,
ANOMALY, ANOMALY,
TOWER, TOWER,
BOUNDARY, BOUNDARY,
@ -155,7 +154,7 @@ struct Sound : public Common
}; };
struct Road : public MapObjectWithArray {}; struct Road : public MapObjectWithArray {};
struct Tower : public MapObjectWithArray {}; struct Boundary : public MapObjectWithArray {};
#define KNOWN_OBJECT(name) \ #define KNOWN_OBJECT(name) \
struct name : public MapObject {} struct name : public MapObject {}
@ -166,15 +165,15 @@ KNOWN_OBJECT(Shell);
KNOWN_OBJECT(Stone); KNOWN_OBJECT(Stone);
KNOWN_OBJECT(Explosion); KNOWN_OBJECT(Explosion);
KNOWN_OBJECT(Image); KNOWN_OBJECT(Image);
KNOWN_OBJECT(Music); KNOWN_OBJECT(Goods);
KNOWN_OBJECT(Anomaly); KNOWN_OBJECT(Anomaly);
KNOWN_OBJECT(Boundary); KNOWN_OBJECT(Tower);
KNOWN_OBJECT(SoundZone);
#define UNKNOWN_OBJECT(name) \ #define UNKNOWN_OBJECT(name) \
struct name : public MapObject { void load(buffer &b){ int pos = b.index(); assert(false); } } struct name : public MapObject { void load(buffer &b){ int pos = b.index(); assert(false); } }
UNKNOWN_OBJECT(Building); UNKNOWN_OBJECT(Building);
UNKNOWN_OBJECT(Goods);
UNKNOWN_OBJECT(unk1); UNKNOWN_OBJECT(unk1);
struct Objects struct Objects