quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* entity keys: prefer "angles" over "angle", "modelscale_vec" over "modelscale" if both are set

Browse Source
This commit is contained in:
Garux
2021-05-16 21:50:09 +03:00
parent da98f5f9d9
commit 5c3b7d842c
6 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/entity/generic.cpp
View File

@@ -90,10 +90,10 @@ class GenericEntity :
m_keyObservers.insert( "classname", ClassnameFilter::ClassnameChangedCaller( m_filter ) );
m_keyObservers.insert( Static<KeyIsName>::instance().m_nameKey, NamedEntity::IdentifierChangedCaller( m_named ) );
if( m_entity.getEntityClass().has_direction_key )
m_keyObservers.insert( "angle", AnglesKey::GroupAngleChangedCaller( m_anglesKey ) );
m_keyObservers.insert( "angle", m_anglesKey.getGroupAngleChangedCallback() );
else
m_keyObservers.insert( "angle", AnglesKey::AngleChangedCaller( m_anglesKey ) );
m_keyObservers.insert( "angles", AnglesKey::AnglesChangedCaller( m_anglesKey ) );
m_keyObservers.insert( "angle", m_anglesKey.getAngleChangedCallback() );
m_keyObservers.insert( "angles", m_anglesKey.getAnglesChangedCallback() );
m_keyObservers.insert( "origin", OriginKey::OriginChangedCaller( m_originKey ) );
}
@@ -124,7 +124,7 @@ public:
m_entity( eclass ),
m_originKey( OriginChangedCaller( *this ) ),
m_origin( ORIGINKEY_IDENTITY ),
m_anglesKey( AnglesChangedCaller( *this ) ),
m_anglesKey( AnglesChangedCaller( *this ), m_entity ),
m_angles( ANGLESKEY_IDENTITY ),
m_filter( m_entity, node ),
m_named( m_entity ),
@@ -141,7 +141,7 @@ public:
m_entity( other.m_entity ),
m_originKey( OriginChangedCaller( *this ) ),
m_origin( ORIGINKEY_IDENTITY ),
m_anglesKey( AnglesChangedCaller( *this ) ),
m_anglesKey( AnglesChangedCaller( *this ), m_entity ),
m_angles( ANGLESKEY_IDENTITY ),
m_filter( m_entity, node ),
m_named( m_entity ),