Skip to content

[server] Improve UTIL_CreateScaledPhysObject #105

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[server] Improve UTIL_CreateScaledPhysObject #105

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
19 changes: 6 additions & 13 deletions game/server/props.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5984,7 +5984,7 @@ bool UTIL_CreateScaledPhysObject( CBaseAnimating *pInstance, float flScale )

// Create a container to hold all the convexes we'll create
const int nNumConvex = pQuery->ConvexCount();
CPhysConvex **pConvexes = (CPhysConvex **) stackalloc( sizeof(CPhysConvex *) * nNumConvex );
CPhysPolysoup *pPolySoups = physcollision->PolysoupCreate();

// For each convex, collect the verts and create a convex from it we'll retain for later
for ( int i = 0; i < nNumConvex; i++ )
Expand All @@ -5993,33 +5993,26 @@ bool UTIL_CreateScaledPhysObject( CBaseAnimating *pInstance, float flScale )
int nNumVerts = nNumTris * 3;
// FIXME: Really? stackalloc?
Vector *pVerts = (Vector *) stackalloc( sizeof(Vector) * nNumVerts );
Vector **ppVerts = (Vector **) stackalloc( sizeof(Vector *) * nNumVerts );
for ( int j = 0; j < nNumTris; j++ )
{
// Get all the verts for this triangle and scale them up
pQuery->GetTriangleVerts( i, j, pVerts+(j*3) );
*(pVerts+(j*3)) *= flScale;
*(pVerts+(j*3)+1) *= flScale;
*(pVerts+(j*3)+2) *= flScale;

// Setup our pointers (blech!)
*(ppVerts+(j*3)) = pVerts+(j*3);
*(ppVerts+(j*3)+1) = pVerts+(j*3)+1;
*(ppVerts+(j*3)+2) = pVerts+(j*3)+2;
}

// Convert it back to a convex
pConvexes[i] = physcollision->ConvexFromVerts( ppVerts, nNumVerts );
Assert( pConvexes[i] != NULL );
if ( pConvexes[i] == NULL )
return false;
for ( int j = 0; j < nNumVerts; j += 3 )
{
physcollision->PolysoupAddTriangle( pPolySoups, pVerts[j], pVerts[j + 1], pVerts[j + 2], 0 );
}
}

// Clean up
physcollision->DestroyQueryModel( pQuery );

// Create a collision model from all the convexes
pNewCollide = physcollision->ConvertConvexToCollide( pConvexes, nNumConvex );
pNewCollide = physcollision->ConvertPolysoupToCollide( pPolySoups, true );
if ( pNewCollide == NULL )
return false;
}
Expand Down