Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Wheel can now have multiple detacher groups. #2776

Merged
merged 2 commits into from
Aug 19, 2021
Merged

Wheel can now have multiple detacher groups. #2776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6072a4
:sparkles: Wheels can have multiple detacher groups.
ohlidalp Aug 12, 2021
2923b7c
:sparkles: Beam break diag. mode logs to console (+RoR.log).
ohlidalp Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source/main/physics/Actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ class Actor : public ZeroedMemoryAllocator
std::vector<float> ar_initial_node_masses;
std::vector<Ogre::Vector3> ar_initial_node_positions;
std::vector<std::pair<float, float>> ar_initial_beam_defaults;
std::vector<wheeldetacher_t> ar_wheeldetachers;
std::vector<float> ar_minimass; //!< minimum node mass in Kg
std::vector<std::vector<int>> ar_node_to_node_connections;
std::vector<std::vector<int>> ar_node_to_beam_connections;
Expand Down
25 changes: 16 additions & 9 deletions source/main/physics/ActorForcesEuler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "Buoyance.h"
#include "CmdKeyInertia.h"
#include "Collisions.h"
#include "Console.h"
#include "Differentials.h"
#include "EngineSim.h"
#include "FlexAirfoil.h"
Expand Down Expand Up @@ -1211,7 +1212,7 @@ void Actor::CalcBeams(bool trigger_hooks)
msg << "[RoR|Diag] XXX Support-Beam " << i << " limit extended and broke. "
<< "Length: " << difftoBeamL << " / max. Length: " << (ar_beams[i].L*break_limit) << ". ";
LogBeamNodes(msg, ar_beams[i]);
RoR::Log(msg.ToCStr());
App::GetConsole()->putMessage(Console::CONSOLE_MSGTYPE_ACTOR, Console::CONSOLE_SYSTEM_NOTICE, msg.ToCStr());
}
}
}
Expand Down Expand Up @@ -1317,7 +1318,7 @@ void Actor::CalcBeams(bool trigger_hooks)
RoR::Str<200> msg;
msg << "[RoR|Diag] XXX Beam " << i << " just broke with force " << len << " / " << ar_beams[i].strength << ". ";
LogBeamNodes(msg, ar_beams[i]);
RoR::Log(msg.ToCStr());
App::GetConsole()->putMessage(Console::CONSOLE_MSGTYPE_ACTOR, Console::CONSOLE_SYSTEM_NOTICE, msg.ToCStr());
}

// detachergroup check: beam[i] is already broken, check detacher group# == 0/default skip the check ( performance bypass for beams with default setting )
Expand All @@ -1335,16 +1336,22 @@ void Actor::CalcBeams(bool trigger_hooks)
ar_beams[j].bm_disabled = true;
if (m_beam_break_debug_enabled)
{
LOG("Deleting Detacher BeamID: " + TOSTRING(j) + ", Detacher Group: " + TOSTRING(ar_beams[i].detacher_group)+ ", actor ID: " + TOSTRING(ar_instance_id));
App::GetConsole()->putMessage(Console::CONSOLE_MSGTYPE_ACTOR, Console::CONSOLE_SYSTEM_NOTICE,
"Deleting Detacher BeamID: " + TOSTRING(j) + ", Detacher Group: " + TOSTRING(ar_beams[i].detacher_group)+ ", actor ID: " + TOSTRING(ar_instance_id));
}
}
}
// cycle once through all wheels
for (int j = 0; j < ar_num_wheels; j++)
// cycle once through all wheeldetachers
for (wheeldetacher_t const& wheeldetacher: ar_wheeldetachers)
{
if (ar_wheels[j].wh_detacher_group == ar_beams[i].detacher_group)
if (wheeldetacher.wd_detacher_group == ar_beams[i].detacher_group)
{
ar_wheels[j].wh_is_detached = true;
ar_wheels[wheeldetacher.wd_wheel_id].wh_is_detached = true;
if (m_beam_break_debug_enabled)
{
App::GetConsole()->putMessage(Console::CONSOLE_MSGTYPE_ACTOR, Console::CONSOLE_SYSTEM_NOTICE,
"Detaching wheel ID: " + TOSTRING(wheeldetacher.wd_wheel_id) + ", Detacher Group: " + TOSTRING(ar_beams[i].detacher_group)+ ", actor ID: " + TOSTRING(ar_instance_id));
}
}
}
}
Expand Down Expand Up @@ -1490,9 +1497,9 @@ void Actor::CalcBeamsInterActor()
if (m_beam_break_debug_enabled)
{
RoR::Str<200> msg;
msg << "[RoR|Diag] XXX Beam " << i << " just broke with force " << len << " / " << ar_inter_beams[i]->strength << ". ";
msg << "Beam " << i << " just broke with force " << len << " / " << ar_inter_beams[i]->strength << ". ";
LogBeamNodes(msg, (*ar_inter_beams[i]));
RoR::Log(msg.ToCStr());
App::GetConsole()->putMessage(Console::CONSOLE_MSGTYPE_ACTOR, Console::CONSOLE_SYSTEM_NOTICE, msg.ToCStr());
}
}
else
Expand Down
5 changes: 4 additions & 1 deletion source/main/physics/ActorSpawner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4983,7 +4983,10 @@ void ActorSpawner::ProcessWheelDetacher(RigDef::WheelDetacher & def)
return;
}

m_actor->ar_wheels[def.wheel_id].wh_detacher_group = def.detacher_group;
wheeldetacher_t obj;
obj.wd_wheel_id = def.wheel_id;
obj.wd_detacher_group = def.detacher_group;
m_actor->ar_wheeldetachers.push_back(obj);
};

void ActorSpawner::ProcessTractionControl(RigDef::TractionControl & def)
Expand Down
7 changes: 6 additions & 1 deletion source/main/physics/SimData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ struct wheel_t
Ogre::Real wh_last_retorque; //!< Last external forces (friction, ...)
float wh_net_rp;
float wh_width;
int wh_detacher_group;
bool wh_is_detached;

// Debug
Expand All @@ -396,6 +395,12 @@ struct wheel_t
Ogre::Vector3 debug_scaled_cforce;
};

struct wheeldetacher_t
{
int wd_wheel_id;
int wd_detacher_group;
};

struct hook_t
{
HookState hk_locked;
Expand Down