Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[IGameWorldSp] Finish GameWorldSp interface

Browse Source
This commit is contained in:
momo5502 2016-12-24 20:32:06 +01:00
parent fb17f5ec90
commit b61b8e8f8d
3 changed files with 129 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/Components/Modules/AssetInterfaces/IGameWorldSp.cpp
View File

@ -43,6 +43,8 @@ namespace Assets
Game::pathnode_tree_t** destChildNodeTreePtr = &destNodeTree->u.child[i]; Game::pathnode_tree_t** destChildNodeTreePtr = &destNodeTree->u.child[i];
Game::pathnode_tree_t** childNodeTreePtr = &nodeTree->u.child[i]; Game::pathnode_tree_t** childNodeTreePtr = &nodeTree->u.child[i];
if (*childNodeTreePtr)
{
if (builder->hasPointer(*childNodeTreePtr)) if (builder->hasPointer(*childNodeTreePtr))
{ {
*destChildNodeTreePtr = builder->getPointer(*childNodeTreePtr); *destChildNodeTreePtr = builder->getPointer(*childNodeTreePtr);
@ -55,12 +57,95 @@ namespace Assets
Game::pathnode_tree_t* destChildNodeTree = buffer->dest<Game::pathnode_tree_t>(); Game::pathnode_tree_t* destChildNodeTree = buffer->dest<Game::pathnode_tree_t>();
buffer->save(*childNodeTreePtr); buffer->save(*childNodeTreePtr);
IGameWorldSp::savepathnode_tree_info_t(*childNodeTreePtr, destChildNodeTree, builder); this->savepathnode_tree_info_t(*childNodeTreePtr, destChildNodeTree, builder);
Utils::Stream::ClearPointer(destChildNodeTreePtr); Utils::Stream::ClearPointer(destChildNodeTreePtr);
} }
} }
} }
} }
}
void IGameWorldSp::saveVehicleTrackSegment_ptrArray(Game::VehicleTrackSegment** trackSegmentPtrs, int count, Components::ZoneBuilder::Zone* builder)
{
Utils::Stream* buffer = builder->getBuffer();
Game::VehicleTrackSegment** destTrackSegmentPtrs = buffer->dest<Game::VehicleTrackSegment*>();
buffer->saveArray(trackSegmentPtrs, count);
for (int i = 0; i < count; ++i)
{
Game::VehicleTrackSegment** destTrackSegmentPtr = &destTrackSegmentPtrs[i];
Game::VehicleTrackSegment** trackSegmentPtr = &trackSegmentPtrs[i];
if (*trackSegmentPtr)
{
if (builder->hasPointer(*trackSegmentPtr))
{
*destTrackSegmentPtr = builder->getPointer(*trackSegmentPtr);
}
else
{
buffer->align(Utils::Stream::ALIGN_4);
builder->storePointer(*trackSegmentPtr);
Game::VehicleTrackSegment* destTrackSegment = buffer->dest<Game::VehicleTrackSegment>();
buffer->save(*trackSegmentPtr);
this->saveVehicleTrackSegment(*trackSegmentPtr, destTrackSegment, builder);
Utils::Stream::ClearPointer(destTrackSegmentPtr);
}
}
}
}
void IGameWorldSp::saveVehicleTrackSegment(Game::VehicleTrackSegment* trackSegment, Game::VehicleTrackSegment* destTrackSegment, Components::ZoneBuilder::Zone* builder)
{
Utils::Stream* buffer = builder->getBuffer();
if (trackSegment->name)
{
buffer->saveString(trackSegment->name);
Utils::Stream::ClearPointer(&destTrackSegment->name);
}
if (trackSegment->trackSectors)
{
AssertSize(Game::VehicleTrackSector, 60);
buffer->align(Utils::Stream::ALIGN_4);
Game::VehicleTrackSector* destTrackSectors = buffer->dest<Game::VehicleTrackSector>();
buffer->saveArray(trackSegment->trackSectors, trackSegment->trackSectorCount);
for (int i = 0; i < trackSegment->trackSectorCount; ++i)
{
Game::VehicleTrackSector* destTrackSector = &destTrackSectors[i];
Game::VehicleTrackSector* trackSector = &trackSegment->trackSectors[i];
if (trackSector->trackObstacles)
{
AssertSize(Game::VehicleTrackObstacle, 12);
buffer->align(Utils::Stream::ALIGN_4);
buffer->saveArray(trackSector->trackObstacles, trackSector->trackObstacleCount);
Utils::Stream::ClearPointer(&destTrackSector->trackObstacles);
}
}
}
if (trackSegment->trackSegments1)
{
buffer->align(Utils::Stream::ALIGN_4);
this->saveVehicleTrackSegment_ptrArray(trackSegment->trackSegments1, trackSegment->trackSegmentCount1, builder);
Utils::Stream::ClearPointer(&destTrackSegment->trackSegments1);
}
if (trackSegment->trackSegments2)
{
buffer->align(Utils::Stream::ALIGN_4);
this->saveVehicleTrackSegment_ptrArray(trackSegment->trackSegments2, trackSegment->trackSegmentCount2, builder);
Utils::Stream::ClearPointer(&destTrackSegment->trackSegments2);
}
}
void IGameWorldSp::save(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder) void IGameWorldSp::save(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder)
{ {
@ -156,12 +241,12 @@ namespace Assets
Game::pathnode_tree_t* destNodeTrees = buffer->dest<Game::pathnode_tree_t>(); Game::pathnode_tree_t* destNodeTrees = buffer->dest<Game::pathnode_tree_t>();
buffer->saveArray(asset->pathData.nodeTree, asset->pathData.nodeTreeCount); buffer->saveArray(asset->pathData.nodeTree, asset->pathData.nodeTreeCount);
for (unsigned int i = 0; i < asset->pathData.nodeCount; ++i) for (int i = 0; i < asset->pathData.nodeTreeCount; ++i)
{ {
Game::pathnode_tree_t* destNodeTree = &destNodeTrees[i]; Game::pathnode_tree_t* destNodeTree = &destNodeTrees[i];
Game::pathnode_tree_t* nodeTree = &asset->pathData.nodeTree[i]; Game::pathnode_tree_t* nodeTree = &asset->pathData.nodeTree[i];
IGameWorldSp::savepathnode_tree_info_t(nodeTree, destNodeTree, builder); this->savepathnode_tree_info_t(nodeTree, destNodeTree, builder);
} }
Utils::Stream::ClearPointer(&dest->pathData.nodeTree); Utils::Stream::ClearPointer(&dest->pathData.nodeTree);
@ -170,10 +255,38 @@ namespace Assets
// Save_VehicleTrack // Save_VehicleTrack
{ {
// TODO: Finish that!
AssertSize(Game::VehicleTrack, 8); AssertSize(Game::VehicleTrack, 8);
dest->vehicleTrack.trackSegments = 0;
dest->vehicleTrack.trackSegmentCount = 0; if (asset->vehicleTrack.trackSegments)
{
if (builder->hasPointer(asset->vehicleTrack.trackSegments))
{
dest->vehicleTrack.trackSegments = builder->getPointer(asset->vehicleTrack.trackSegments);
}
else
{
AssertSize(Game::VehicleTrackSegment, 44);
buffer->align(Utils::Stream::ALIGN_4);
Game::VehicleTrackSegment* destTrackSegments = buffer->dest<Game::VehicleTrackSegment>();
for (int i = 0; i < asset->vehicleTrack.trackSegmentCount; ++i)
{
builder->storePointer(&asset->vehicleTrack.trackSegments[i]);
buffer->save(&asset->vehicleTrack.trackSegments[i]);
}
for (int i = 0; i < asset->vehicleTrack.trackSegmentCount; ++i)
{
Game::VehicleTrackSegment* destTrackSegment = &destTrackSegments[i];
Game::VehicleTrackSegment* trackSegment = &asset->vehicleTrack.trackSegments[i];
this->saveVehicleTrackSegment(trackSegment, destTrackSegment, builder);
}
Utils::Stream::ClearPointer(&dest->vehicleTrack.trackSegments);
}
}
} }
if (asset->data) if (asset->data)

2
src/Components/Modules/AssetInterfaces/IGameWorldSp.hpp
View File

@ -10,5 +10,7 @@ namespace Assets
private: private:
void savepathnode_tree_info_t(Game::pathnode_tree_t* nodeTree, Game::pathnode_tree_t* destNodeTree, Components::ZoneBuilder::Zone* builder); void savepathnode_tree_info_t(Game::pathnode_tree_t* nodeTree, Game::pathnode_tree_t* destNodeTree, Components::ZoneBuilder::Zone* builder);
void saveVehicleTrackSegment(Game::VehicleTrackSegment* trackSegment, Game::VehicleTrackSegment* destTrackSegment, Components::ZoneBuilder::Zone* builder);
void saveVehicleTrackSegment_ptrArray(Game::VehicleTrackSegment** trackSegmentPtrs, int count, Components::ZoneBuilder::Zone* builder);
}; };
} }

2
src/Game/Structs.hpp
View File

@ -2649,7 +2649,7 @@ namespace Game
int trackSegmentCount1; int trackSegmentCount1;
VehicleTrackSegment** trackSegments2; VehicleTrackSegment** trackSegments2;
int trackSegmentCount2; int trackSegmentCount2;
int pad; int pad[4];
}; };
struct VehicleTrack struct VehicleTrack