id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 07:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support angles keyword again for TrenchBroom

Browse source
This commit is contained in:
Robert Beckebans 2021-03-27 18:36:50 +01:00
parent 8ad90449d6
commit 9ce36e420a
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
neo/d3xp/Entity.cpp
View file

@ -284,15 +284,34 @@ void idGameEdit::ParseSpawnArgsToRenderEntity( const idDict* args, renderEntity_
// get the rotation matrix in either full form, or single angle form
if( !args->GetMatrix( "rotation", "1 0 0 0 1 0 0 0 1", renderEntity->axis ) )
{
angle = args->GetFloat( "angle" );
if( angle != 0.0f )
// RB: TrenchBroom interop
// support "angles" like in Quake 3
idAngles angles;
if( args->GetAngles( "angles", "0 0 0", angles ) )
{
renderEntity->axis = idAngles( 0.0f, angle, 0.0f ).ToMat3();
if( angles.pitch != 0.0f || angles.yaw != 0.0f || angles.roll != 0.0f )
{
renderEntity->axis = angles.ToMat3();
}
else
{
renderEntity->axis.Identity();
}
}
else
{
renderEntity->axis.Identity();
angle = args->GetFloat( "angle" );
if( angle != 0.0f )
{
renderEntity->axis = idAngles( 0.0f, angle, 0.0f ).ToMat3();
}
else
{
renderEntity->axis.Identity();
}
}
// RB end
}
renderEntity->referenceSound = NULL;