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

Radiant:

Browse Source 
binds...
	* shift + m3: apply texture name and alignment to selected primitives and faces (m3 was inconsistent + often required quite deep planning)
	* ctrl + shift + m3: also project tex from face to selection

misc...
	* lazy cursor updates in clipper mode
	* update cursor immediately on clipper mode toggles
	* fixes and optimizations of entity names rendering; for instance: don't prerender textures for unneeded names

	FBO overlay fixes
This commit is contained in:
Garux
2017-08-02 09:53:07 +03:00
parent e14027e117
commit 6eee961fcc
18 changed files with 239 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/entity/group.cpp
View File

@@ -49,6 +49,8 @@
/// The "origin" key directly controls the entity's local-to-parent transform.
const char EXCLUDE_NAME[] = "worldspawn";
class Group
{
EntityKeyValues m_entity;
@@ -84,7 +86,7 @@ Group( EntityClass* eclass, scene::Node& node, const Callback& transformChanged,
m_originKey( OriginChangedCaller( *this ) ),
m_origin( ORIGINKEY_IDENTITY ),
m_name_origin( g_vector3_identity ),
m_renderName( m_named, m_name_origin ),
m_renderName( m_named, m_name_origin, EXCLUDE_NAME ),
m_transformChanged( transformChanged ),
m_evaluateTransform( evaluateTransform ){
construct();
@@ -97,7 +99,7 @@ Group( const Group& other, scene::Node& node, const Callback& transformChanged,
m_originKey( OriginChangedCaller( *this ) ),
m_origin( ORIGINKEY_IDENTITY ),
m_name_origin( g_vector3_identity ),
m_renderName( m_named, m_name_origin ),
m_renderName( m_named, m_name_origin, EXCLUDE_NAME ),
m_transformChanged( transformChanged ),
m_evaluateTransform( evaluateTransform ){
construct();
@@ -150,11 +152,12 @@ void detach( scene::Traversable::Observer* observer ){
void renderSolid( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld, bool selected, bool childSelected, const AABB& childBounds ) const {
renderer.SetState( m_entity.getEntityClass().m_state_wire, Renderer::eWireframeOnly );
if ( selected || childSelected || ( g_showNames && ( volume.fill() || aabb_fits_view( childBounds, volume.GetModelview(), volume.GetViewport(), g_showNamesRatio ) ) ) ) {
if ( m_renderName.excluded_not()
&& ( selected || childSelected || ( g_showNames && ( volume.fill() || aabb_fits_view( childBounds, volume.GetModelview(), volume.GetViewport(), g_showNamesRatio ) ) ) ) ) {
// don't draw the name for worldspawn
if ( !strcmp( m_entity.getEntityClass().name(), "worldspawn" ) ) {
return;
}
// if ( !strcmp( m_entity.getEntityClass().name(), "worldspawn" ) ) {
// return;
// }
// place name in the middle of the "children cloud"
m_name_origin = childBounds.origin;