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

do not render light radii in doom3 mode

Browse Source
This commit is contained in:
Garux 2018-03-01 14:52:13 +03:00
parent 74e101c7ba
commit c182b48fee
2 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/entity/light.cpp
View File

@ -1418,7 +1418,9 @@ void renderSolid( Renderer& renderer, const VolumeTest& volume, const Matrix4& l
renderer.SetState( m_colour.state(), Renderer::eFullMaterials ); renderer.SetState( m_colour.state(), Renderer::eFullMaterials );
renderer.addRenderable( *this, localToWorld ); renderer.addRenderable( *this, localToWorld );
if ( selected && g_lightRadii && string_empty( m_entity.getKeyValue( "target" ) ) ) { if( selected ){
if ( g_lightType != LIGHTTYPE_DOOM3 ) {
if ( g_lightRadii && string_empty( m_entity.getKeyValue( "target" ) ) ) {
if ( renderer.getStyle() == Renderer::eFullMaterials ) { if ( renderer.getStyle() == Renderer::eFullMaterials ) {
renderer.SetState( m_colour.state_additive(), Renderer::eFullMaterials ); renderer.SetState( m_colour.state_additive(), Renderer::eFullMaterials );
renderer.Highlight( Renderer::ePrimitive, false ); renderer.Highlight( Renderer::ePrimitive, false );
@ -1431,10 +1433,9 @@ void renderSolid( Renderer& renderer, const VolumeTest& volume, const Matrix4& l
renderer.addRenderable( m_radii_wire, localToWorld ); renderer.addRenderable( m_radii_wire, localToWorld );
} }
} }
}
else{
renderer.SetState( m_entity.getEntityClass().m_state_wire, Renderer::eFullMaterials ); renderer.SetState( m_entity.getEntityClass().m_state_wire, Renderer::eFullMaterials );
if ( g_lightType == LIGHTTYPE_DOOM3 && selected ) {
if ( isProjected() ) { if ( isProjected() ) {
projection(); projection();
m_projectionOrientation = rotation(); m_projectionOrientation = rotation();
@ -1456,6 +1457,7 @@ void renderSolid( Renderer& renderer, const VolumeTest& volume, const Matrix4& l
renderer.addRenderable( m_render_center, localToWorld ); renderer.addRenderable( m_render_center, localToWorld );
} }
} }
}
if ( m_renderName.excluded_not() if ( m_renderName.excluded_not()
&& ( selected || ( g_showNames && ( volume.fill() || aabb_fits_view( m_aabb_light, volume.GetModelview(), volume.GetViewport(), g_showNamesRatio ) ) ) ) ) { && ( selected || ( g_showNames && ( volume.fill() || aabb_fits_view( m_aabb_light, volume.GetModelview(), volume.GetViewport(), g_showNamesRatio ) ) ) ) ) {