List of naval units without defined target bones

[Basilisk3]

Describe the issue

Some naval units have too few TargetBones, which can cause other units to aim too high because the target’s CollisionOffsetY is not taken into account when calculating its center. Example: #7056. Defining a target bone in the middle of the unit's above‑water hitbox (or adding one if none exists) fixes the problem.

Affected naval units:

• UAS0202 (Infinity Class: T2 Cruiser)
• URS0305 (Flood XR: T3 Sonar Platform)
• XAS0204 (Vesper: T2 Submarine Hunter)
• UAS0201 (Exodus Class: T2 Destroyer)
• XES0205 (Bulwark: T2 Shield Boat)
• XSB3202 (Shou-esel: T2 Sonar System)
• XSS0202 (Ithalua: T2 Cruiser)
• XSS0303 (Iavish: T3 Aircraft Carrier)
• UAB0103 (Aeon T1 Naval Factory)
• UAB0203 (Aeon T2 Naval Factory HQ)
• UAB0303 (Aeon T3 Naval Factory HQ)
• ZAB9503 (Aeon T2 Naval Factory)
• ZAB9603 (Aeon T3 Naval Factory)

Not all of these are problematic, e.g., the factories are fine.

[speed2CZ]

Is this smth that the engine bois could fix?

[Basilisk3]

@4z0t A unit's CollisionOffsetY is not taken into account when calculating its center when no target bones are defined in the bp. Is it possible to fix this in the engine?

[4z0t]

Can you please make a testing setup where I can clearly see the change.

[4z0t]

As I can see Entity's class takes into account collision offset, meanwhile Unit's seems like not.

Moho::VTransform *__thiscall Moho::Entity::GetBoneWorldTransform(
        Moho::Entity *this,
        Moho::VTransform *a2,
        int boneIndex)
{
  Moho::VTransform *v4; // eax
  Moho::REntityBlueprint *blueprint; // eax
  Moho::VTransform *p_curTransform; // edi
  Wm3::Vector3f *v8; // eax
  float v9; // xmm0_4
  float v10; // xmm1_4
  float v11; // xmm2_4
  Wm3::Vector3f v12; // [esp+8h] [ebp-34h] BYREF
  Wm3::Vector3f v13; // [esp+14h] [ebp-28h] BYREF
  char v14[28]; // [esp+20h] [ebp-1Ch] BYREF

  if ( boneIndex < 0 )
  {
    if ( boneIndex == -1 && (blueprint = this->blueprint) != 0 )
    {
      v12.x = blueprint->CollisionOffsetX;
      p_curTransform = &this->sstiData.curTransform;
      v12.y = (blueprint->SizeY * 0.5) + blueprint->CollisionOffsetY;
      v12.z = blueprint->CollisionOffsetZ;
      v8 = func_MultQuadVec(&v13, &v12, &this->sstiData.curTransform.orient);
      v9 = p_curTransform->pos.x + v8->x;
      v10 = p_curTransform->pos.y + v8->y;
      v11 = p_curTransform->pos.z + v8->z;
      a2->orient = p_curTransform->orient;
      a2->pos.x = v9;
      a2->pos.y = v10;
      a2->pos.z = v11;
      return a2;
    }
    else
    {
      *a2 = this->sstiData.curTransform;
      return a2;
    }
  }
  else
  {
    v4 = this->Moho::Entity_vtable::vtable->GetBoneLocalTransform(this, v14, boneIndex);
    Moho::VTransform::Compose(v4, a2, &this->sstiData.curTransform);
    return a2;
  }
}

Moho::VTransform *__thiscall Moho::Unit::GetBoneWorldTransform(
        Moho::Entity *__shifted(Moho::Unit,8) this,
        Moho::VTransform *out,
        unsigned int index)
{
  Moho::CAniPose *px; // edi
  Moho::CAniPoseBone *v5; // ecx
  Moho::VTransform v7; // [esp+8h] [ebp-38h] BYREF
  Moho::VTransform lastTrans; // [esp+24h] [ebp-1Ch] BYREF

  // ((Moho::Unit*)this)->cAniActor->pose
  px = ADJ(this)->cAniActor->pose.px;
  if ( index < px->boneEnd - px->boneStart && (v5 = &px->boneStart[index]) != 0 )
  {
    *out = *Moho::CAniPoseBone::GetCompositeTransform(v5);
    return out;
  }
  else
  {
    v7.orient.x = 1.0;
    memset(&v7.orient.y, 0, 24);
    if ( index == -1 )
      // ((Moho::Unit*)this)->vtable->IsUnit()->curTransform.pos.y
      v7.pos.y = ADJ(this)->iunit_vtable->GetBlueprint(ADJ(this))->SizeY * 0.5;
    lastTrans = ADJ(this)->lastTrans;
    Moho::VTransform::Compose(&lastTrans, out, &v7);
    return out;
  }
}

Which is used to get target point when aiming

Wm3::Vector3f *__usercall Moho::Unit::GetTargetPoint@<eax>(int a1@<eax>, Moho::Unit *a2@<ecx>, Wm3::Vector3f *a3@<esi>)
{
  int v3; // ebx
  Moho::VTransform *v5; // eax
  Moho::RUnitBlueprint *v6; // eax
  int **start; // edx
  gpg::fastvector *p_TargetBones; // eax
  int v9; // eax
  int v10; // eax
  std::string *v11; // eax
  const char *Buf; // eax
  Moho::Entity *v13; // edi
  int v14; // eax
  double x; // st7
  Wm3::Vector3f *p_pos; // eax
  _BYTE v18[28]; // [esp+8h] [ebp-1Ch] BYREF

  v3 = a1;
  if ( a1 >= 0 )
  {
    v6 = a2->iunit_vtable->GetBlueprint(a2);
    start = v6->AI.TargetBones.start;
    p_TargetBones = &v6->AI.TargetBones;
    if ( start )
      v9 = (p_TargetBones->finish - start) / 28;
    else
      v9 = 0;
    v10 = v9 - 1;
    if ( v3 >= v10 )
      v3 = v10;
    v11 = &a2->iunit_vtable->GetBlueprint(a2)->AI.TargetBones.start[7 * v3];
    if ( v11->_Myres < 0x10 )
      Buf = v11->_Bx._Buf;
    else
      Buf = v11->_Bx._Ptr;
    v13 = &a2->Moho::Unit_base_Entity;
    v14 = Moho::Entity::ResolveBoneIndex(v13, Buf);
    v5 = v13->Moho::Entity_vtable::vtable->GetBoneWorldTransform(v13, v18, v14);
  }
  else
  {
    v5 = a2->Moho::Unit_base_Entity::Moho::Entity::Moho::Entity_vtable::vtable->GetBoneWorldTransform(
           &a2->Moho::Unit_base_Entity,
           v18,
           -1);
  }
  x = v5->pos.x;
  p_pos = &v5->pos;
  a3->x = x;
  a3->y = p_pos->y;
  a3->z = p_pos->z;
  return a3;
}

[4z0t]

@lL1l1 this one should be easy if you want to practice

[4z0t]

FAForever/FA-Binary-Patches#145