Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-07 03:12:36 +01:00
Code Issues Projects Releases Activity

Re-implement vehicle parts for changed frame interfaces

Browse Source
This commit is contained in:
Daniel Evans 2017-01-04 23:32:31 +00:00
parent ac8d6733cb
commit 729085d08c
2 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,18 +280,23 @@ VehicleObject* GameWorld::createVehicle(const uint16_t id, const glm::vec3& pos,
auto model = vti->getModel(); auto model = vti->getModel();
auto info = data->vehicleInfo.find(vti->handling_); auto info = data->vehicleInfo.find(vti->handling_);
if (model && info != data->vehicleInfo.end()) { if (model && info != data->vehicleInfo.end() &&
if (info->second->wheels.size() == 0 && info->second->wheels.size() == 0 && info->second->seats.size() == 0) {
info->second->seats.size() == 0) { auto root = model->getFrame();
for (const ModelFrame* f : model->frames) { for (const auto& frame : root->getChildren()) {
const std::string& name = f->getName(); const std::string& name = frame->getName();
if (name.size() > 5 && name.substr(0, 5) == "wheel") { if (name.size() > 5 && name.substr(0, 5) == "wheel") {
auto frameTrans = f->getMatrix(); auto frameTrans = frame->getMatrix();
info->second->wheels.push_back({glm::vec3(frameTrans[3])}); info->second->wheels.push_back({glm::vec3(frameTrans[3])});
} }
if (name == "ped_frontseat") {
auto p = f->getDefaultTranslation(); if (name == "chassis_dummy") {
// These are nested within chassis_dummy
auto frontseat = frame->findDescendant("ped_frontseat");
auto backseat = frame->findDescendant("ped_backseat");
if (frontseat) {
auto p = frontseat->getDefaultTranslation();
// Left seat // Left seat
p.x = -p.x; p.x = -p.x;
info->second->seats.front.push_back({p}); info->second->seats.front.push_back({p});
@ -299,10 +304,10 @@ VehicleObject* GameWorld::createVehicle(const uint16_t id, const glm::vec3& pos,
p.x = -p.x; p.x = -p.x;
info->second->seats.front.push_back({p}); info->second->seats.front.push_back({p});
} }
if (name == "ped_backseat") { if (backseat) {
// @todo how does this work for the barracks, ambulance // @todo how does this work for the barracks, ambulance
// or coach? // or coach?
auto p = f->getDefaultTranslation(); auto p = backseat->getDefaultTranslation();
// Left seat // Left seat
p.x = -p.x; p.x = -p.x;
info->second->seats.back.push_back({p}); info->second->seats.back.push_back({p});

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

@ -1,6 +1,6 @@
#include <BulletDynamics/Vehicle/btRaycastVehicle.h> #include <BulletDynamics/Vehicle/btRaycastVehicle.h>
#include <data/CollisionModel.hpp>
#include <data/Clump.hpp> #include <data/Clump.hpp>
#include <data/CollisionModel.hpp>
#include <data/Skeleton.hpp> #include <data/Skeleton.hpp>
#include <dynamics/CollisionInstance.hpp> #include <dynamics/CollisionInstance.hpp>
#include <dynamics/RaycastCallbacks.hpp> #include <dynamics/RaycastCallbacks.hpp>
@ -153,18 +153,13 @@ VehicleObject::VehicleObject(GameWorld* engine, const glm::vec3& pos,
setModel(getVehicle()->getModel()); setModel(getVehicle()->getModel());
for (ModelFrame* frame : getModel()->frames) { // Create meta-data for dummy parts
auto chassisframe = getModel()->findFrame("chassis_dummy");
for (auto& frame : chassisframe->getChildren()) {
auto& name = frame->getName(); auto& name = frame->getName();
bool isDam = name.find("_dam") != name.npos;
bool isLod = name.find("lo") != name.npos;
bool isDum = name.find("_dummy") != name.npos; bool isDum = name.find("_dummy") != name.npos;
/*bool isOk = name.find("_ok") != name.npos;*/
if (isDam || isLod || isDum) {
skeleton->setEnabled(frame, false);
}
if (isDum) { if (isDum) {
registerPart(frame); registerPart(frame.get());
} }
} }
} }
@ -551,13 +546,11 @@ bool VehicleObject::takeDamage(const GameObject::DamageInfo& dmg) {
if (p->normal == nullptr) continue; if (p->normal == nullptr) continue;
if (skeleton->getData(p->normal->getIndex()).enabled) { if (skeleton->getData(p->normal->getIndex()).enabled) {
auto& geom = /// @todo correct logic
getModel()->geometries[p->normal->getGeometries()[0]]; float damageradius = 0.1f;
auto pp = auto center = glm::vec3(p->normal->getMatrix()[3]);
p->normal->getMatrix() * glm::vec4(0.f, 0.f, 0.f, 1.f); float td = glm::distance(center, dpoint);
float td = glm::distance( if (td < damageradius * 1.2f) {
glm::vec3(pp) + geom->geometryBounds.center, dpoint);
if (td < geom->geometryBounds.radius * 1.2f) {
setPartState(p, DAM); setPartState(p, DAM);
} }
/// @todo determine when doors etc. should un-latch /// @todo determine when doors etc. should un-latch
@ -638,20 +631,13 @@ VehicleObject::Part* VehicleObject::getPart(const std::string& name) {
return nullptr; return nullptr;
} }
ModelFrame* findStateFrame(ModelFrame* f, const std::string& state) {
auto it = std::find_if(
f->getChildren().begin(), f->getChildren().end(), [&](ModelFrame* c) {
return c->getName().find(state) != std::string::npos;
});
if (it != f->getChildren().end()) {
return *it;
}
return nullptr;
}
void VehicleObject::registerPart(ModelFrame* mf) { void VehicleObject::registerPart(ModelFrame* mf) {
auto normal = findStateFrame(mf, "_ok"); auto dummynameend = mf->getName().find("_dummy");
auto damage = findStateFrame(mf, "_dam"); RW_CHECK(dummynameend != std::string::npos,
"Can't create part from non-dummy");
auto dummyname = mf->getName().substr(0, dummynameend);
auto normal = mf->findDescendant(dummyname + "_hi_ok");
auto damage = mf->findDescendant(dummyname + "_hi_dam");
if (normal == nullptr && damage == nullptr) { if (normal == nullptr && damage == nullptr) {
// Not actually a useful part, just a dummy. // Not actually a useful part, just a dummy.
@ -672,20 +658,12 @@ void VehicleObject::createObjectHinge(Part* part) {
auto& fn = part->dummy->getName(); auto& fn = part->dummy->getName();
ModelFrame* okframe = part->normal;
if (okframe->getGeometries().size() == 0) return;
auto& geom = getModel()->geometries[okframe->getGeometries()[0]];
auto gbounds = geom->geometryBounds;
if (fn.find("door") != fn.npos) { if (fn.find("door") != fn.npos) {
hingeAxis = {0.f, 0.f, 1.f}; hingeAxis = {0.f, 0.f, 1.f};
// hingePosition = {0.f, 0.2f, 0.f}; // hingePosition = {0.f, 0.2f, 0.f};
boxSize = {0.15f, 0.5f, 0.6f}; boxSize = {0.15f, 0.5f, 0.6f};
// boxOffset = {0.f,-0.2f, gbounds.center.z/2.f}; // boxOffset = {0.f,-0.2f, gbounds.center.z/2.f};
auto tf = gbounds.center; boxOffset = btVector3(0.f, -0.25f, 0.f);
boxOffset = btVector3(tf.x, tf.y, tf.z);
hingePosition = -boxOffset; hingePosition = -boxOffset;
if (sign < 0.f) { if (sign < 0.f) {