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

use std::next instead of std::advance

Browse Source
This commit is contained in:
Garux 2020-03-10 05:09:32 +03:00
parent 7acdf92d50
commit 5fb3d587a4
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
radiant/csg.cpp
View File

@ -224,9 +224,7 @@ void brush_extrudeDiag( const Brush& brush0, const Brush& brush2, brush_vector_t
for( Brush::const_iterator i0 = brush0.begin(); i0 != brush0.end(); ++i0 ){ for( Brush::const_iterator i0 = brush0.begin(); i0 != brush0.end(); ++i0 ){
const Face& face0 = *( *i0 ); const Face& face0 = *( *i0 );
Brush::const_iterator i2 = brush2.begin(); const Face& face2 = *( *std::next( brush2.begin(), std::distance( brush0.begin(), i0 ) ) );
std::advance( i2, std::distance( brush0.begin(), i0 ) );
const Face& face2 = *( *i2 );
if( !m_settings.faceExcluded( face0 ) ) { if( !m_settings.faceExcluded( face0 ) ) {
if( face0.contributes() ) { if( face0.contributes() ) {
m_out.push_back( new Brush( brush0 ) ); m_out.push_back( new Brush( brush0 ) );

16
radiant/selection.cpp
View File

@ -865,9 +865,7 @@ void Construct( const Matrix4& device2manip, const float x, const float y, const
for( const WindingVertex& vertex : face->getWinding() ){ for( const WindingVertex& vertex : face->getWinding() ){
if( vertex.adjacent != c_brush_maxFaces ){ if( vertex.adjacent != c_brush_maxFaces ){
Brush::const_iterator faceIt = source.m_brushInstance->getBrush().begin(); f = brush->addFace( **std::next( source.m_brushInstance->getBrush().begin(), vertex.adjacent ) );
std::advance( faceIt, vertex.adjacent );
f = brush->addFace( **faceIt );
const DoubleVector3 cross = vector3_cross( f->plane3_().normal(), face->plane3_().normal() ); const DoubleVector3 cross = vector3_cross( f->plane3_().normal(), face->plane3_().normal() );
f->getPlane().copy( vertex.vertex, vertex.vertex + cross * 64, vertex.vertex + face->plane3_().normal() * 64 ); f->getPlane().copy( vertex.vertex, vertex.vertex + cross * 64, vertex.vertex + face->plane3_().normal() * 64 );
@ -926,9 +924,7 @@ void Transform( const Matrix4& manip2object, const Matrix4& device2manip, const
for( const WindingVertex& vertex : face->getWinding() ){ for( const WindingVertex& vertex : face->getWinding() ){
if( vertex.adjacent != c_brush_maxFaces ){ if( vertex.adjacent != c_brush_maxFaces ){
Brush::const_iterator faceIt = brush0.begin(); brush->addFace( **std::next( brush0.begin(), vertex.adjacent ) );
std::advance( faceIt, vertex.adjacent );
brush->addFace( **faceIt );
} }
} }
} }
@ -993,9 +989,7 @@ void offsetFaces( const ExtrudeSource& source, Brush& brush, const float offset
for( Brush::const_iterator i0 = brush0.begin(); i0 != brush0.end(); ++i0 ){ for( Brush::const_iterator i0 = brush0.begin(); i0 != brush0.end(); ++i0 ){
const Face& face0 = *( *i0 ); const Face& face0 = *( *i0 );
if( !source.faceExcluded( &face0 ) ){ if( !source.faceExcluded( &face0 ) ){
Brush::const_iterator i = brush.begin(); Face& face = *( *std::next( brush.begin(), std::distance( brush0.begin(), i0 ) ) );
std::advance( i, std::distance( brush0.begin(), i0 ) );
Face& face = *( *i );
face.getPlane().offset( offset ); face.getPlane().offset( offset );
face.planeChanged(); face.planeChanged();
} }
@ -1009,9 +1003,7 @@ void brush_extrudeDiag( const Brush& brush0, const Brush& brush2, ExtrudeSource&
for( Brush::const_iterator i0 = brush0.begin(); i0 != brush0.end(); ++i0 ){ for( Brush::const_iterator i0 = brush0.begin(); i0 != brush0.end(); ++i0 ){
const Face& face0 = *( *i0 ); const Face& face0 = *( *i0 );
Brush::const_iterator i2 = brush2.begin(); const Face& face2 = *( *std::next( brush2.begin(), std::distance( brush0.begin(), i0 ) ) );
std::advance( i2, std::distance( brush0.begin(), i0 ) );
const Face& face2 = *( *i2 );
auto infaceoutbrush_iter = source.faceFind( &face0 ); // brush0 = source.m_brushInstance->getBrush() auto infaceoutbrush_iter = source.faceFind( &face0 ); // brush0 = source.m_brushInstance->getBrush()
if( infaceoutbrush_iter != source.m_faces.end() ) { if( infaceoutbrush_iter != source.m_faces.end() ) {

4
radiant/treemodel.cpp
View File

@ -961,9 +961,7 @@ static gboolean graph_tree_model_iter_nth_child( GtkTreeModel *tree_model, GtkTr
ASSERT_MESSAGE( tree_model != 0, "RUNTIME ERROR" ); ASSERT_MESSAGE( tree_model != 0, "RUNTIME ERROR" );
GraphTreeNode& node = ( parent == 0 ) ? *GRAPH_TREE_MODEL( tree_model )->m_graph : *( *graph_iterator_read_tree_iter( parent ) ).second; GraphTreeNode& node = ( parent == 0 ) ? *GRAPH_TREE_MODEL( tree_model )->m_graph : *( *graph_iterator_read_tree_iter( parent ) ).second;
if ( static_cast<std::size_t>( n ) < node.size() ) { if ( static_cast<std::size_t>( n ) < node.size() ) {
GraphTreeNode::iterator i = node.begin(); graph_iterator_write_tree_iter( std::next( node.begin(), n ), iter );
std::advance( i, n );
graph_iterator_write_tree_iter( i, iter );
return TRUE; return TRUE;
} }