Skip to content

cleanup after modular ships: remove old code duplication, and new temporary stuff #83

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
ccp-intern merged 1 commit into from
Sep 2, 2026
Merged

cleanup after modular ships: remove old code duplication, and new temporary stuff #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion trinity/Eve/SpaceObjectFactory/EveSOF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ IRootPtr EveSOF::BuildFromDNA( const char* dnaString )
if( layoutContainer->m_objects.size() != 0 )
{
newObj->AddToEffectChildrenList( layoutContainer );
newObj->RunDamageLocatorFilter();
}

// EveShip2-specific setups
Expand Down
47 changes: 2 additions & 45 deletions trinity/Resources/TriGrannyRes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1821,49 +1821,6 @@ Tr2CmfContents& TriGrannyRes::GetCMFContents()
return m_cmfContents;
}


bool RayTriangleIntersection( float& dist, float& u, float& v, const Vector3& pos, const Vector3& dir, const Vector3& p0, const Vector3& p1, const Vector3& p2 )
{
Matrix m;
Vector4 vec;

m.m[0][0] = p1.x - p0.x;
m.m[1][0] = p2.x - p0.x;
m.m[2][0] = -dir.x;
m.m[3][0] = 0.0f;
m.m[0][1] = p1.y - p0.y;
m.m[1][1] = p2.y - p0.y;
m.m[2][1] = -dir.y;
m.m[3][1] = 0.0f;
m.m[0][2] = p1.z - p0.z;
m.m[1][2] = p2.z - p0.z;
m.m[2][2] = -dir.z;
m.m[3][2] = 0.0f;
m.m[0][3] = 0.0f;
m.m[1][3] = 0.0f;
m.m[2][3] = 0.0f;
m.m[3][3] = 1.0f;

vec.x = pos.x - p0.x;
vec.y = pos.y - p0.y;
vec.z = pos.z - p0.z;
vec.w = 0.0f;

if( Inverse( m, m ) )
{
vec = Transform( vec, m );
if( ( vec.x >= 0.0f ) && ( vec.y >= 0.0f ) && ( vec.x + vec.y <= 1.0f ) && ( vec.z >= 0.0f ) )
{
u = vec.x;
v = vec.y;
dist = fabs( vec.z );
return true;
}
}

return false;
}

#if WITH_GRANNY
namespace
{
Expand Down Expand Up @@ -1914,7 +1871,7 @@ bool RayTriangleIntersection( float& dist, float& u, float& v, const Vector3& po
Vector3 p1 = ExtractVector3( vertices[1], position );
Vector3 p2 = ExtractVector3( vertices[2], position );

return RayTriangleIntersection( dist, u, v, pos, dir, p0, p1, p2 );
return IntersectTri( p0, p1, p2, pos, dir, u, v, dist );
}

void FillResult( Tr2GrannyIntersectionResult::Result& result, const uint8_t** triangle, const granny_data_type_definition* vertexFormat, float u, float v )
Expand Down Expand Up @@ -2247,7 +2204,7 @@ Tr2GrannyIntersectionResultPtr TriGrannyRes::RayIntersection( const Vector3& pos
Vector3 p2 = positionStream[triangleIndices[2]];

float u, v, dist;
if( RayTriangleIntersection( dist, u, v, pos, dir, p0, p1, p2 ) )
if( IntersectTri( p0, p1, p2, pos, dir, u, v, dist ) )
{
if( dist < closestDist )
{
Expand Down