Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename hair objects to distinguish between the two

Browse source 
ID_HAIR -> SINGLE_BRAID_HAIR
ID_HAIR2 -> DUAL_PIGTAIL_HAIR
This commit is contained in:
Stranger1992 2024-08-16 00:09:13 +01:00
parent 349d7e5cdd
commit e4b3124a68
6 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Documentation/doc/4 enums/Objects.ObjID.html
View file

@ -171,7 +171,8 @@ LARA_PETROL_MESH
LARA_DIRT_MESH
LARA_CROWBAR_ANIM
LARA_TORCH_ANIM
HAIR
SINGLE_BRAID_HAIR
DUAL_PIGTAIL_HAIR
SNOWMOBILE_LARA_ANIMS
SNOWMOBILE
QUAD_LARA_ANIMS

16
TombEngine/Game/effects/hair.cpp
View file

@ -321,25 +321,25 @@ namespace TEN::Effects::Hair
// Initialize hair units.
auto& unit0 = Units[0];
unit0.IsEnabled = Objects[ID_HAIR].loaded;
unit0.IsEnabled = Objects[ID_SINGLE_BRAID_HAIR].loaded;
unit0.IsInitialized = false;
unit0.Segments.resize(Objects[ID_HAIR].nmeshes + 1);
unit0.Segments.resize(Objects[ID_SINGLE_BRAID_HAIR].nmeshes + 1);
// Initialize segments.
for (auto& segment : unit0.Segments)
{
segment.Position = GetJointOffset(ID_HAIR, 0);
segment.Position = GetJointOffset(ID_SINGLE_BRAID_HAIR, 0);
segment.Velocity = Vector3::Zero;
segment.Orientation = DEFAULT_ORIENT.ToQuaternion();
}
auto& unit1 = Units[1];
unit1.IsEnabled = Objects[ID_HAIR_2].loaded && isYoung;
unit1.IsEnabled = Objects[ID_DUAL_PIGTAIL_HAIR].loaded && isYoung;
unit1.IsInitialized = false;
unit1.Segments.resize(Objects[ID_HAIR_2].nmeshes + 1);
unit1.Segments.resize(Objects[ID_DUAL_PIGTAIL_HAIR].nmeshes + 1);
// Initialize segments.
for (auto& segment : unit1.Segments)
{
segment.Position = GetJointOffset(ID_HAIR_2, 0);
segment.Position = GetJointOffset(ID_DUAL_PIGTAIL_HAIR, 0);
segment.Velocity = Vector3::Zero;
segment.Orientation = DEFAULT_ORIENT.ToQuaternion();
}
@ -349,9 +349,9 @@ namespace TEN::Effects::Hair
{
auto& unit0 = Units[0];
if (unit0.IsEnabled)
unit0.Update(item, ID_HAIR, 0);
unit0.Update(item, ID_SINGLE_BRAID_HAIR, 0);
auto& unit1 = Units[1];
if (unit1.IsEnabled)
unit1.Update(item, ID_HAIR_2, 1);
unit1.Update(item, ID_DUAL_PIGTAIL_HAIR, 1);
}
}

4
TombEngine/Objects/game_object_ids.h
View file

@ -40,8 +40,8 @@ enum GAME_OBJECT_ID : short
ID_LARA_DIRT_MESH,
ID_LARA_CROWBAR_ANIM,
ID_LARA_TORCH_ANIM,
ID_HAIR,
ID_HAIR_2,
ID_SINGLE_BRAID_HAIR,
ID_DUAL_PIGTAIL_HAIR,
ID_SNOWMOBILE_LARA_ANIMS = 50,
ID_SNOWMOBILE,

6
TombEngine/Renderer/RendererCompatibility.cpp
View file

@ -516,7 +516,7 @@ namespace TEN::Renderer
&moveable,
&g_Level.Meshes[obj->meshIndex + j],
j, MoveablesIds[i] == ID_LARA_SKIN_JOINTS,
MoveablesIds[i] == ID_HAIR || MoveablesIds[i] == ID_HAIR_2, &lastVertex, &lastIndex);
MoveablesIds[i] == ID_SINGLE_BRAID_HAIR || MoveablesIds[i] == ID_DUAL_PIGTAIL_HAIR, &lastVertex, &lastIndex);
moveable.ObjectMeshes.push_back(mesh);
_meshes.push_back(mesh);
@ -687,7 +687,7 @@ namespace TEN::Renderer
}
}
}
else if (MoveablesIds[i] == ID_HAIR && isSkinPresent)
else if (MoveablesIds[i] == ID_SINGLE_BRAID_HAIR && isSkinPresent)
{
for (int j = 0; j < obj->nmeshes; j++)
{
@ -779,7 +779,7 @@ namespace TEN::Renderer
}
}
}
else if (MoveablesIds[i] == ID_HAIR_2 && isSkinPresent)
else if (MoveablesIds[i] == ID_DUAL_PIGTAIL_HAIR && isSkinPresent)
{
for (int j = 0; j < obj->nmeshes; j++)
{

8
TombEngine/Renderer/RendererLara.cpp
View file

@ -328,10 +328,10 @@ void TEN::Renderer::Renderer::DrawLara(RenderView& view, RendererPass rendererPa
void Renderer::DrawLaraHair(RendererItem* itemToDraw, RendererRoom* room, RenderView& view, RendererPass rendererPass)
{
if (!Objects[ID_HAIR].loaded)
if (!Objects[ID_SINGLE_BRAID_HAIR].loaded)
return;
const auto& hairObject = *_moveableObjects[ID_HAIR];
const auto& hairObject = *_moveableObjects[ID_SINGLE_BRAID_HAIR];
const auto& unit = HairEffect.Units[0];
if (unit.IsEnabled)
{
@ -355,10 +355,10 @@ void Renderer::DrawLaraHair(RendererItem* itemToDraw, RendererRoom* room, Render
}
}
if (!Objects[ID_HAIR_2].loaded)
if (!Objects[ID_DUAL_PIGTAIL_HAIR].loaded)
return;
const auto& hair2Object = *_moveableObjects[ID_HAIR_2];
const auto& hair2Object = *_moveableObjects[ID_DUAL_PIGTAIL_HAIR];
const auto& unit2 = HairEffect.Units[1];
if (unit2.IsEnabled)
{

7
TombEngine/Scripting/Internal/TEN/Objects/ObjectIDs.h
View file

@ -53,7 +53,8 @@ The following constants are inside ObjID.
LARA_DIRT_MESH
LARA_CROWBAR_ANIM
LARA_TORCH_ANIM
HAIR
SINGLE_BRAID_HAIR
DUAL_PIGTAIL_HAIR
SNOWMOBILE_LARA_ANIMS
SNOWMOBILE
QUAD_LARA_ANIMS
@ -1230,8 +1231,8 @@ static const std::unordered_map<std::string, GAME_OBJECT_ID> kObjIDs {
{ "LARA_DIRT_MESH", ID_LARA_DIRT_MESH },
{ "LARA_CROWBAR_ANIM", ID_LARA_CROWBAR_ANIM },
{ "LARA_TORCH_ANIM", ID_LARA_TORCH_ANIM },
{ "HAIR", ID_HAIR },
{ "HAIR_2", ID_HAIR_2 },
{ "SINGLE_BRAID_HAIR", ID_SINGLE_BRAID_HAIR },
{ "DUAL_PIGTAIL_HAIR", ID_DUAL_PIGTAIL_HAIR },
{ "SNOWMOBILE_LARA_ANIMS", ID_SNOWMOBILE_LARA_ANIMS },
{ "SNOWMOBILE", ID_SNOWMOBILE },
{ "QUAD_LARA_ANIMS", ID_QUAD_LARA_ANIMS },