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

turn FaceTexdef_importTokens / exportTokens: bad texdef assertions to console warning, as in practice it does more annoyance, than use, for end user

Browse Source
This commit is contained in:
Garux 2019-03-07 00:50:25 +03:00
parent 7a2084b405
commit 6d080c01e0
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
radiant/brushtokens.h
View File

@ -42,7 +42,9 @@ inline bool FaceTexdef_importTokens( FaceTexdef& texdef, Tokeniser& tokeniser ){
RETURN_FALSE_IF_FAIL( Tokeniser_getFloat( tokeniser, texdef.m_projection.m_texdef.scale[0] ) ); RETURN_FALSE_IF_FAIL( Tokeniser_getFloat( tokeniser, texdef.m_projection.m_texdef.scale[0] ) );
RETURN_FALSE_IF_FAIL( Tokeniser_getFloat( tokeniser, texdef.m_projection.m_texdef.scale[1] ) ); RETURN_FALSE_IF_FAIL( Tokeniser_getFloat( tokeniser, texdef.m_projection.m_texdef.scale[1] ) );
ASSERT_MESSAGE( texdef_sane( texdef.m_projection.m_texdef ), "FaceTexdef_importTokens: bad texdef" ); if( !texdef_sane( texdef.m_projection.m_texdef ) )
globalWarningStream() << "FaceTexdef_importTokens: bad texdef\n";
return true; return true;
} }
@ -87,7 +89,9 @@ inline bool FaceTexdef_Valve220_importTokens( FaceTexdef& texdef, Tokeniser& tok
texdef.m_projection.m_texdef.rotate = -texdef.m_projection.m_texdef.rotate; texdef.m_projection.m_texdef.rotate = -texdef.m_projection.m_texdef.rotate;
ASSERT_MESSAGE( texdef_sane( texdef.m_projection.m_texdef ), "FaceTexdef_importTokens: bad texdef" ); if( !texdef_sane( texdef.m_projection.m_texdef ) )
globalWarningStream() << "FaceTexdef_Valve220_importTokens: bad texdef\n";
return true; return true;
} }
@ -351,7 +355,8 @@ inline void FaceTexdef_BP_exportTokens( const FaceTexdef& faceTexdef, TokenWrite
} }
inline void FaceTexdef_exportTokens( const FaceTexdef& faceTexdef, TokenWriter& writer ){ inline void FaceTexdef_exportTokens( const FaceTexdef& faceTexdef, TokenWriter& writer ){
ASSERT_MESSAGE( texdef_sane( faceTexdef.m_projection.m_texdef ), "FaceTexdef_exportTokens: bad texdef" ); if( !texdef_sane( faceTexdef.m_projection.m_texdef ) )
globalWarningStream() << "FaceTexdef_exportTokens: bad texdef\n";
// write texdef // write texdef
writer.writeFloat( faceTexdef.m_projection.m_texdef.shift[0] ); writer.writeFloat( faceTexdef.m_projection.m_texdef.shift[0] );
writer.writeFloat( faceTexdef.m_projection.m_texdef.shift[1] ); writer.writeFloat( faceTexdef.m_projection.m_texdef.shift[1] );
@ -360,8 +365,9 @@ inline void FaceTexdef_exportTokens( const FaceTexdef& faceTexdef, TokenWriter&
writer.writeFloat( faceTexdef.m_projection.m_texdef.scale[1] ); writer.writeFloat( faceTexdef.m_projection.m_texdef.scale[1] );
} }
inline void FaceTexdef_HalfLife_exportTokens( const FaceTexdef& faceTexdef, TokenWriter& writer ){ inline void FaceTexdef_Valve220_exportTokens( const FaceTexdef& faceTexdef, TokenWriter& writer ){
ASSERT_MESSAGE( texdef_sane( faceTexdef.m_projection.m_texdef ), "FaceTexdef_exportTokens: bad texdef" ); if( !texdef_sane( faceTexdef.m_projection.m_texdef ) )
globalWarningStream() << "FaceTexdef_Valve220_exportTokens: bad texdef\n";
// write texdef // write texdef
writer.writeToken( "[" ); writer.writeToken( "[" );
writer.writeFloat( faceTexdef.m_projection.m_basis_s.x() ); writer.writeFloat( faceTexdef.m_projection.m_basis_s.x() );
@ -508,7 +514,7 @@ Valve220FaceTokenExporter( const Face& face ) : m_face( face ){
void exportTokens( TokenWriter& writer ) const { void exportTokens( TokenWriter& writer ) const {
FacePlane_exportTokens( m_face.getPlane(), writer ); FacePlane_exportTokens( m_face.getPlane(), writer );
FaceShader_exportTokens( m_face.getShader(), writer ); FaceShader_exportTokens( m_face.getShader(), writer );
FaceTexdef_HalfLife_exportTokens( m_face.getTexdef(), writer ); FaceTexdef_Valve220_exportTokens( m_face.getTexdef(), writer );
writer.nextLine(); writer.nextLine();
} }
}; };
@ -522,7 +528,7 @@ Quake3Valve220FaceTokenExporter( const Face& face ) : m_face( face ){
void exportTokens( TokenWriter& writer ) const { void exportTokens( TokenWriter& writer ) const {
FacePlane_exportTokens( m_face.getPlane(), writer ); FacePlane_exportTokens( m_face.getPlane(), writer );
FaceShader_exportTokens( m_face.getShader(), writer ); FaceShader_exportTokens( m_face.getShader(), writer );
FaceTexdef_HalfLife_exportTokens( m_face.getTexdef(), writer ); FaceTexdef_Valve220_exportTokens( m_face.getTexdef(), writer );
FaceShader_ContentsFlagsValue_exportTokens( m_face.getShader(), writer ); FaceShader_ContentsFlagsValue_exportTokens( m_face.getShader(), writer );
writer.nextLine(); writer.nextLine();
} }