Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-23 02:42:39 +01:00
Code Issues Projects Releases Activity

Refactor seat storage, fixes entering wrong seat

Browse Source
This commit is contained in:
Jannik Vogel 2016-08-12 16:39:29 +02:00
parent f0ce45a75a
commit b0a2e79599
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rwengine/src/engine/GameWorld.cpp
View File

@ -382,12 +382,24 @@ VehicleObject *GameWorld::createVehicle(const uint16_t id, const glm::vec3& pos,
auto frameTrans = f->getMatrix();
info->second->wheels.push_back({glm::vec3(frameTrans[3])});
}
if(name.size() > 3 && name.substr(0, 3) == "ped" && name.substr(name.size()-4) == "seat") {
if(name == "ped_frontseat") {
auto p = f->getDefaultTranslation();
p.x = p.x * -1.f;
info->second->seats.push_back({p});
p.x = p.x * -1.f;
info->second->seats.push_back({p});
// Left seat
p.x = -p.x;
info->second->seats.front.push_back({p});
// Right seat
p.x = -p.x;
info->second->seats.front.push_back({p});
}
if(name == "ped_backseat") {
// @todo how does this work for the barracks, ambulance or coach?
auto p = f->getDefaultTranslation();
// Left seat
p.x = -p.x;
info->second->seats.back.push_back({p});
// Right seat
p.x = -p.x;
info->second->seats.back.push_back({p});
}
}
}

21
rwengine/src/objects/VehicleInfo.hpp
View File

@ -92,8 +92,25 @@ struct VehicleInfo {
/** Value for caching wheel information */
std::vector<WheelInfo> wheels;
/** Value for caching seat information */
std::vector<SeatInfo> seats;
/** Struct for caching seat information */
struct {
std::vector<SeatInfo> front;
std::vector<SeatInfo> back;
SeatInfo operator[](size_t index) const {
// Try front seats first
if (index < front.size()) {
return front[index];
}
index -= front.size();
// Get back seat
return back[index];
}
size_t size() const {
return front.size() + back.size();
}
} seats;
};
typedef std::shared_ptr<VehicleInfo> VehicleInfoHandle;

2
rwengine/src/objects/VehicleObject.cpp
View File

@ -533,7 +533,7 @@ bool VehicleObject::isOccupantDriver(size_t seat) const
VehicleObject::Part* VehicleObject::getSeatEntryDoor(size_t seat)
{
auto pos = info->seats.at(seat).offset + glm::vec3(0.f, 0.5f, 0.f);
auto pos = info->seats[seat].offset + glm::vec3(0.f, 0.5f, 0.f);
Part* nearestDoor = nullptr;
float d = std::numeric_limits<float>::max();
for(auto& p : dynamicParts)