adrien/netradiant-custom
1
Fork 0
mirror of https://github.com/Garux/netradiant-custom.git synced 2026-09-28 00:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

unify angles key reading

Browse Source
This commit is contained in:
Garux
2021-11-08 21:39:38 +03:00
parent 484c63ae4a
commit 76017a8ce3
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/quake3/q3map2/model.cpp
+3 -5
View File
@@ -1327,11 +1327,9 @@ void AddTriangleModels( entity_t& eparent ){
scale[1] = scale[2] = scale[0];
/* get "angle" (yaw) or "angles" (pitch yaw roll), store as (roll pitch yaw) */
const char *value;
Vector3 angles( 0 );
if ( !e.read_keyvalue( value, "angles" ) ||
3 != sscanf( value, "%f %f %f", &angles[ 1 ], &angles[ 2 ], &angles[ 0 ] ) )
e.read_keyvalue( angles[ 2 ], "angle" );
if ( e.read_keyvalue( angles, "angles" ) || e.read_keyvalue( angles.y(), "angle" ) )
angles = angles_pyr2rpy( angles );
/* set transform matrix (thanks spog) */
Matrix4 transform( g_matrix4_identity );
@@ -1378,7 +1376,7 @@ void AddTriangleModels( entity_t& eparent ){
/* ydnar: cel shader support */
shaderInfo_t *celShader;
if( e.read_keyvalue( value, "_celshader" ) ||
if( const char *value; e.read_keyvalue( value, "_celshader" ) ||
entities[ 0 ].read_keyvalue( value, "_celshader" ) ){
celShader = ShaderInfoForShader( String64()( "textures/", value ) );
}