From 9ce36e420aaae797deb4f59105f44d9d1c6452b6 Mon Sep 17 00:00:00 2001
From: Robert Beckebans <robert.beckebans@gmail.com>
Date: Sat, 27 Mar 2021 18:36:50 +0100
Subject: [PATCH] Support angles keyword again for TrenchBroom

---
 neo/d3xp/Entity.cpp | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/neo/d3xp/Entity.cpp b/neo/d3xp/Entity.cpp
index 00e17184..060d1f49 100644
--- a/neo/d3xp/Entity.cpp
+++ b/neo/d3xp/Entity.cpp
@@ -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;