mirror of
https://github.com/Garux/netradiant-custom.git
synced 2026-09-28 00:00:03 +02:00
remove odd newlines
This commit is contained in:
Garux
@@ -77,7 +77,6 @@ int DBrush::BuildPoints(){
|
||||
|
||||
if ( faceList.size() <= 3 ) { // if less than 3 faces, there can be no points
|
||||
return 0; // with only 3 faces u can't have a bounded soild
|
||||
|
||||
}
|
||||
for ( std::list<DPlane *>::const_iterator p1 = faceList.begin(); p1 != faceList.end(); ++p1 )
|
||||
{
|
||||
@@ -448,13 +447,11 @@ bool DBrush::IntersectsWith( DBrush *chkBrush ){
|
||||
if ( pointList.size() == 0 ) {
|
||||
if ( BuildPoints() == 0 ) {
|
||||
return false; // invalid brush!!!!
|
||||
|
||||
}
|
||||
}
|
||||
if ( chkBrush->pointList.size() == 0 ) {
|
||||
if ( chkBrush->BuildPoints() == 0 ) {
|
||||
return false; // invalid brush!!!!
|
||||
|
||||
}
|
||||
}
|
||||
if ( !BBoxCollision( chkBrush ) ) {
|
||||
@@ -645,7 +642,6 @@ bool DBrush::HasTexture( const char *textureName ){
|
||||
if ( strstr( plane->m_shader.c_str(), textureName ) ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -656,7 +652,6 @@ bool DBrush::IsDetail(){
|
||||
if ( plane->texInfo.contents & FACE_DETAIL ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -851,7 +846,6 @@ int DBrush::FindPointsForPlane( DPlane* plane, DPoint** pnts, int maxpnts ) {
|
||||
if ( numpnts >= maxpnts ) {
|
||||
return numpnts;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -455,7 +455,6 @@ void DEntity::LoadEPairList( Entity *epl ){
|
||||
m_entity->AddEPair( key, value );
|
||||
}
|
||||
}
|
||||
|
||||
} load_epairs( this );
|
||||
|
||||
epl->forEachKeyValue( load_epairs );
|
||||
|
||||
@@ -104,7 +104,6 @@ void DTrainDrawer::render( RenderStateFlags state ) const {
|
||||
gl().glVertex3fv( v._pnt );
|
||||
}
|
||||
gl().glEnd();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -88,7 +88,6 @@ SignalHandlerResult DTreePlanter::mouseDown( const WindowVector& position, Butto
|
||||
e2.RemoveFromRadiant();
|
||||
e2.BuildInRadiant( false );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if ( m_setAngles ) {
|
||||
|
||||
@@ -211,7 +211,6 @@ void DVisDrawer::ui_create(){
|
||||
QObject::connect( butt, &QPushButton::clicked, []( bool ){ DoVisAnalyse(); } );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void DVisDrawer::ui_leaf_add( int leafnum, int nleafs, int nsurfs, int nshaders ){
|
||||
|
||||
@@ -203,7 +203,6 @@ void DoPolygons(){
|
||||
else{
|
||||
poly.BuildRegularPrism( vMin, vMax, rs.nSides, rs.bAlignTop );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
poly.Commit();
|
||||
|
||||
@@ -318,7 +318,6 @@ bool ExportDataAsWavefront::WriteToFile( const std::string& path, collapsemode m
|
||||
}
|
||||
outMtl << "Kd " << clr.x() << ' ' << clr.y() << ' ' << clr.z() << '\n';
|
||||
outMtl << "map_Kd " << str.c_str() << '\n';
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -121,7 +121,6 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
|
||||
CreateApplyButtonCallback( buttons->addButton( QDialogButtonBox::StandardButton::Apply ) );
|
||||
CreateCancelButtonCallback( buttons->addButton( QDialogButtonBox::StandardButton::Cancel ) );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -174,7 +174,6 @@ void CPortals::Load(){
|
||||
GETLINE; //clusters count
|
||||
GETLINE; //portals count
|
||||
sscanf( buf, "%u", &portal_count );
|
||||
|
||||
}
|
||||
break;
|
||||
case PRT1AM:
|
||||
|
||||
@@ -169,7 +169,6 @@ public:
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -156,7 +156,6 @@ public:
|
||||
void onChanged(){
|
||||
int bleh = 0;
|
||||
}
|
||||
|
||||
} int_observer;
|
||||
IntPreference int1( int_observer );
|
||||
int1.importString( "23" );
|
||||
@@ -166,7 +165,6 @@ public:
|
||||
|
||||
LoadPrefs( preferences, "test.pref" );
|
||||
SavePrefs( preferences, "test.pref" );
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -150,7 +150,6 @@ struct _QERFuncTable_1
|
||||
PFN_QERAPP_DIRDIALOG m_pfnDirDialog;
|
||||
PFN_QERAPP_COLORDIALOG m_pfnColorDialog;
|
||||
PFN_QERAPP_NEWICON m_pfnNewIcon;
|
||||
|
||||
};
|
||||
|
||||
#include "modulesystem.h"
|
||||
|
||||
@@ -379,7 +379,6 @@ static void DDSDecodeAlphaExplicit( unsigned int *pixel, ddsAlphaBlockExplicit_t
|
||||
*pixel |= *( (unsigned int*) &color );
|
||||
word >>= 4; /* move next bits to lowest 4 */
|
||||
pixel++; /* move to next pixel in the row */
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -264,7 +264,6 @@ public:
|
||||
else
|
||||
assign_plane( plane2 );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -305,7 +304,6 @@ public:
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
AABB evaluateResize( const Vector3& translation ) const {
|
||||
|
||||
@@ -110,7 +110,6 @@ public:
|
||||
}
|
||||
return filetype_pair_t();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
static QByteArray g_file_dialog_file;
|
||||
|
||||
@@ -197,7 +197,6 @@ public:
|
||||
row -= bitmap.width;
|
||||
for( unsigned int i = 0; i < bitmap.width; ++i )
|
||||
*t++ = rgb | ( ( guint32 ) row[i] );
|
||||
|
||||
} while( row != row_end );
|
||||
} else
|
||||
{
|
||||
|
||||
@@ -270,7 +270,6 @@ void m4x4_rotation_for_vec3( m4x4_t matrix, const vec3_t euler, eulerOrder_t ord
|
||||
|
||||
#endif
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -236,7 +236,6 @@ private:
|
||||
globalOutputStream() << "texname: " << texname.C_Str() << '\n';
|
||||
#endif
|
||||
m_shader = StringStream<64>( PathCleaned( PathExtensionless( texname.C_Str() ) ) );
|
||||
|
||||
}
|
||||
else{
|
||||
m_shader = StringStream<64>( PathCleaned( PathExtensionless( matname.C_Str() ) ) );
|
||||
|
||||
@@ -362,7 +362,6 @@ public:
|
||||
if( getRotation() != c_quaternion_identity ){
|
||||
m_contained.rotate( getRotation() );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
void applyTransform(){
|
||||
|
||||
@@ -444,7 +444,6 @@ void sphere_construct_wire( Vector3 radiiPoints[SPHERE_WIRE_POINTS] ){
|
||||
static_cast<float>( ds )
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void sphere_draw_wire( const Vector3& origin, float radius, const Vector3 radiiPoints[SPHERE_WIRE_POINTS] ){
|
||||
@@ -670,7 +669,6 @@ void light_draw( const AABB& aabb_light, RenderStateFlags state ){
|
||||
gl().glVertex3fv( e->origin );
|
||||
gl().glVertex3fv( vTemp );
|
||||
gl().glEnd();
|
||||
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -75,7 +75,6 @@ void Entity_ExportTokens( const Entity& entity, TokenWriter& writer ){
|
||||
m_writer.writeString( value );
|
||||
m_writer.nextLine();
|
||||
}
|
||||
|
||||
} visitor( writer );
|
||||
|
||||
entity.forEachKeyValue( visitor );
|
||||
|
||||
@@ -144,7 +144,6 @@ typedef struct
|
||||
int ofs_frames; // offset for first md2Frame_t
|
||||
int ofs_glcmds;
|
||||
int ofs_end; // end of file
|
||||
|
||||
} md2Header_t;
|
||||
|
||||
void istream_read_md2Header( PointerInputStream& inputStream, md2Header_t& header ){
|
||||
|
||||
@@ -47,7 +47,6 @@ void LoadSpriteModel( entity_interfaces_t *interfaces, const char *name ){
|
||||
interfaces->pSelect = NULL;
|
||||
interfaces->pEdit = NULL;
|
||||
model->DecRef();
|
||||
|
||||
}
|
||||
|
||||
void CSpriteModel::Construct( IShader *pShader ){
|
||||
|
||||
@@ -205,7 +205,6 @@ void Brush::buildBRep(){
|
||||
m_uniqueEdgePoints[i] = pointvertex_for_windingpoint( edge, colour_vertex );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1121,7 +1121,6 @@ EMessageBoxReturn BuildMenuDialog_construct( ProjectList& projectList ){
|
||||
table->setItem( table->rowCount() - 1, 0, new QTableWidgetItem( icon, '[' + QString( name.c_str() ) + ']' ) );
|
||||
table->setItem( table->rowCount() - 1, 1, new QTableWidgetItem( var.c_str() ) );
|
||||
}
|
||||
|
||||
}
|
||||
build_init_tools();
|
||||
{ // mutable 'Tool' variables
|
||||
|
||||
@@ -224,7 +224,6 @@ void create_colours_menu( QMenu *menu ){
|
||||
load_colors_theme( path.c_str() );
|
||||
} );
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
theme_construct_menu( menu );
|
||||
|
||||
@@ -537,7 +537,6 @@ void ScanFile( EntityClassCollector& collector, const char *filename ){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
#include "modulesystem/singletonmodule.h"
|
||||
|
||||
@@ -767,7 +767,6 @@ public:
|
||||
void visit( const char* key, const char* value ) override {
|
||||
m_keyvalues.insert( KeyValues::value_type( CopiedString( key ), CopiedString( value ) ) );
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
void Entity_GetKeyValues( const Entity& entity, KeyValues& keyvalues, KeyValues& defaultValues ){
|
||||
|
||||
@@ -81,6 +81,7 @@ static bool g_bFindActive = true;
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
void FindTextureDialog_apply(){
|
||||
const auto find = StringStream<64>( "textures/", g_FindTextureDialog.m_strFind );
|
||||
const auto replace = StringStream<64>( "textures/", PathCleaned( g_FindTextureDialog.m_strReplace.c_str() ) );
|
||||
|
||||
@@ -268,7 +268,6 @@ public:
|
||||
}
|
||||
};
|
||||
menu->installEventFilter( new Filter( menu ) );
|
||||
|
||||
}
|
||||
void push_back( ToolbarItem&& item ){
|
||||
m_toolbarItems.push_back( std::move( item ) );
|
||||
|
||||
@@ -408,7 +408,6 @@ void Paths_constructPage( PreferenceGroup& group ){
|
||||
StringImportCallback( EnginePathImportCaller( extraPath ) ),
|
||||
StringExportCallback( StringExportCaller( extraPath ) )
|
||||
);
|
||||
|
||||
}
|
||||
void Paths_registerPreferencesPage(){
|
||||
PreferencesDialog_addGamePage( makeCallbackF( Paths_constructPage ) );
|
||||
@@ -1534,7 +1533,6 @@ void MainFrame::SetActiveXY( XYWnd* p ){
|
||||
if ( m_pActiveXY ) {
|
||||
m_pActiveXY->SetActive( true );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
@@ -166,7 +166,6 @@ public:
|
||||
void clear(){
|
||||
DeleteSubgraph( root() );
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
/* specialized copy of class TraversableNodeSet */
|
||||
|
||||
@@ -2240,7 +2240,6 @@ void Patch::TesselateSubMatrix( const BezierCurveTree *BX, const BezierCurveTree
|
||||
bTranspose );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void Patch::BuildTesselationCurves( EMatrixMajor major ){
|
||||
@@ -2621,7 +2620,6 @@ void Patch::BuildVertexArray(){
|
||||
// reverse because radiant uses CULL_FRONT
|
||||
//m_tess.m_indices[( j * m_tess.m_lenStrips ) + i * 2 + 1] = RenderIndex( ( ( m_tess.m_nArrayHeight - 1 ) - i ) * m_tess.m_nArrayWidth + j );
|
||||
//m_tess.m_indices[( j * m_tess.m_lenStrips ) + i * 2 ] = RenderIndex( ( ( m_tess.m_nArrayHeight - 1 ) - i ) * m_tess.m_nArrayWidth + j + 1 );
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3110,7 +3108,6 @@ void Patch::createThickenedOpposite( const Patch& sourcePatch,
|
||||
}
|
||||
if( vector3_length_squared( rowTangent[0] ) == 0 || vector3_length_squared( colTangent[0] ) == 0 ){
|
||||
normal = extrudeAxis;
|
||||
|
||||
}
|
||||
else{
|
||||
// If two column + two row tangents are available, take the length-corrected average
|
||||
@@ -3126,7 +3123,6 @@ void Patch::createThickenedOpposite( const Patch& sourcePatch,
|
||||
globalOutputStream() << normal1 << '\n';
|
||||
globalOutputStream() << normal2 << '\n';
|
||||
globalOutputStream() << normal << '\n';*/
|
||||
|
||||
}
|
||||
// If two column tangents are available, take the length-corrected average
|
||||
else if ( ( fabs( colTangent[1][0] ) + fabs( colTangent[1][1] ) + fabs( colTangent[1][2] ) ) > 0)
|
||||
@@ -3140,7 +3136,6 @@ void Patch::createThickenedOpposite( const Patch& sourcePatch,
|
||||
globalOutputStream() << normal1 << '\n';
|
||||
globalOutputStream() << normal2 << '\n';
|
||||
globalOutputStream() << normal << '\n';*/
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3159,7 +3154,6 @@ void Patch::createThickenedOpposite( const Patch& sourcePatch,
|
||||
globalOutputStream() << normal1 << '\n';
|
||||
globalOutputStream() << normal2 << '\n';
|
||||
globalOutputStream() << normal << '\n';*/
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -230,7 +230,6 @@ public:
|
||||
}
|
||||
|
||||
n += ( m_tess.m_arrayHeight[i] * m_tess.m_nArrayWidth );
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -729,7 +728,6 @@ public:
|
||||
default:
|
||||
ERROR_MESSAGE( "parse error" );
|
||||
}
|
||||
|
||||
}
|
||||
void popElement( const char* name ) override {
|
||||
switch ( m_xml_state.back().state() )
|
||||
|
||||
@@ -171,7 +171,6 @@ void Scene_PatchDeform( scene::Graph& graph, const int deform, const int axis )
|
||||
{
|
||||
Patch_deform( *Node_getPatch( i->path().top() ), *i, deform, axis );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void Patch_thicken( Patch& patch, scene::Instance& instance, const float thickness, bool seams, const int axis ){
|
||||
@@ -246,7 +245,6 @@ void Scene_PatchThicken( scene::Graph& graph, const int thickness, bool seams, c
|
||||
{
|
||||
Patch_thicken( *Node_getPatch( i->path().top() ), *i, thickness, seams, axis );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Patch* Scene_GetUltimateSelectedVisiblePatch(){
|
||||
@@ -809,7 +807,6 @@ void Patch_constructMenu( QMenu* menu ){
|
||||
create_menu_item_with_mnemonic( submenu, "Naturalize", "NaturalizePatch" );
|
||||
create_menu_item_with_mnemonic( submenu, "Invert X", "InvertCurveTextureX" );
|
||||
create_menu_item_with_mnemonic( submenu, "Invert Y", "InvertCurveTextureY" );
|
||||
|
||||
}
|
||||
// menu->addSeparator();
|
||||
// { //unfinished
|
||||
@@ -1187,7 +1184,6 @@ void Patch_SetTexdef( const float* hShift, const float* vShift, const float* hSc
|
||||
Scene_PatchScaleTexture_Selected( GlobalSceneGraph(), 0, *vScale > 0? .5 : -.5 );
|
||||
if( rotation )
|
||||
Scene_PatchRotateTexture_Selected( GlobalSceneGraph(), *rotation > 0? 15 : -15 );
|
||||
|
||||
}
|
||||
Patch_textureChanged();
|
||||
} );
|
||||
|
||||
@@ -102,7 +102,6 @@ void PluginToolbar_populate(){
|
||||
PlugInToolbar_AddButton( m_toolbar, table.m_pfnGetToolbarButton( i ), name );
|
||||
}
|
||||
}
|
||||
|
||||
} visitor( g_plugin_toolbar );
|
||||
|
||||
Radiant_getToolbarModules().foreachModule( visitor );
|
||||
|
||||
@@ -290,7 +290,6 @@ void Pointfile_Parse( CPointfile& pointfile ){
|
||||
|
||||
while ( *data && *data != '\n' )
|
||||
data++;
|
||||
|
||||
}
|
||||
while ( *data == '\n' )
|
||||
{
|
||||
|
||||
@@ -247,7 +247,6 @@ public:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
void popElement( const char* name ) override {
|
||||
if ( m_xml_stack.back().m_tag == xml_state_t::tag_epair ) {
|
||||
|
||||
@@ -51,7 +51,6 @@ typedef struct
|
||||
cache for m_userEnginePath + mod subdirectory.
|
||||
*/
|
||||
CopiedString m_userGamePath;
|
||||
|
||||
} QEGlobals_t;
|
||||
|
||||
extern QEGlobals_t g_qeglobals;
|
||||
|
||||
@@ -1101,7 +1101,6 @@ void Selection_RotateAnticlockwise(){
|
||||
Select_RotateAxis( 0, 90 );
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -4512,7 +4512,6 @@ public:
|
||||
};
|
||||
Scene_forEachVisibleSelectedPlaneselectable( gatherPolygonsByPlane );
|
||||
}
|
||||
|
||||
}
|
||||
else{ // alt vertices drag
|
||||
SelectionIntersection intersection;
|
||||
@@ -5581,7 +5580,6 @@ private:
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
||||
}
|
||||
public:
|
||||
void render( Renderer& renderer, const VolumeTest& volume, const Matrix4& pivot2world ) override {
|
||||
|
||||
@@ -227,7 +227,6 @@ void write_stack_trace( PCONTEXT pContext, TextOutputStream& outputStream ){
|
||||
|
||||
if ( 0 == sf.AddrFrame.Offset ) { // Basic sanity check to make sure
|
||||
break; // the frame is OK. Bail if not.
|
||||
|
||||
}
|
||||
// Get the name of the function for this stack frame entry
|
||||
BYTE symbolBuffer[ sizeof( SYMBOL_INFO ) + max_sym_name ];
|
||||
|
||||
@@ -1429,7 +1429,6 @@ void Face_setTexture( Face& face, const char* shader, const FaceTexture& clipboa
|
||||
CopiedString dummy;
|
||||
Face_getTexture( face, dummy, g_faceTextureClipboard );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
typedef Function<void(Face&, const char*, const FaceTexture&, EPasteMode, bool), Face_setTexture> FaceSetTexture;
|
||||
|
||||
@@ -207,7 +207,6 @@ public:
|
||||
}
|
||||
}
|
||||
return QVariant();
|
||||
|
||||
}
|
||||
Qt::ItemFlags flags( const QModelIndex &index ) const override {
|
||||
if ( !index.isValid() )
|
||||
|
||||
@@ -118,7 +118,6 @@ fail:
|
||||
globalWarningStream() << windingTestInfinity_planeOuttaWorld << " windingTestInfinity_planeOuttaWorld\n";
|
||||
globalWarningStream() << windingTestInfinity_OK << " windingTestInfinity_OK\n";
|
||||
globalWarningStream() << windingTestInfinity_FAIL << " windingTestInfinity_FAIL\n";
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -201,7 +201,6 @@ struct FixedWinding
|
||||
//ASSERT_MESSAGE( index < MAX_POINTS_ON_WINDING, "winding: index out of bounds" );
|
||||
return points[index];
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -270,7 +270,6 @@ void XYWnd::FocusOnBounds( const AABB& bounds ){
|
||||
NDIM1NDIM2( m_viewType )
|
||||
SetScale( std::min( Width() / ( 3.f * std::max( 128.f, bounds.extents[ nDim1 ] ) ),
|
||||
Height() / ( 3.f * std::max( 128.f, bounds.extents[ nDim2 ] ) ) ) );
|
||||
|
||||
}
|
||||
|
||||
VIEWTYPE GlobalXYWnd_getCurrentViewType(){
|
||||
@@ -1441,7 +1440,6 @@ void XYWnd::XY_DrawGrid() {
|
||||
sprintf( text, "%g", y );
|
||||
GlobalOpenGL().drawString( text );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if ( g_xywindow_globals_private.show_axis ){
|
||||
|
||||
@@ -580,7 +580,6 @@ void ChopWindingInPlace( winding_t& inout, const Plane3f& plane, float epsilon )
|
||||
}
|
||||
if ( !counts[eSideBack] ) {
|
||||
return; // inout stays the same
|
||||
|
||||
}
|
||||
|
||||
winding_t f = AllocWinding( in.size() + 4 ); // cant use counts[0]+2 because of fp grouping errors
|
||||
|
||||
@@ -171,10 +171,8 @@ byte *LBMRLEDecompress( byte *source, byte *unpacked, int bpwidth ){
|
||||
}
|
||||
else{
|
||||
rept = 0; // rept of 0x80 is NOP
|
||||
|
||||
}
|
||||
count += rept;
|
||||
|
||||
} while ( count < bpwidth );
|
||||
|
||||
if ( count > bpwidth ) {
|
||||
@@ -279,7 +277,6 @@ void LoadLBM( const char *filename, byte **picture, byte **palette ){
|
||||
body_p += Align( bmhd.w );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -367,7 +364,6 @@ void WriteLBMfile( const char *filename, byte *data,
|
||||
*bmhdlength = BigLong( length );
|
||||
if ( length & 1 ) {
|
||||
*lbmptr++ = 0; // pad chunk to even offset
|
||||
|
||||
}
|
||||
//
|
||||
// write CMAP
|
||||
@@ -387,7 +383,6 @@ void WriteLBMfile( const char *filename, byte *data,
|
||||
*cmaplength = BigLong( length );
|
||||
if ( length & 1 ) {
|
||||
*lbmptr++ = 0; // pad chunk to even offset
|
||||
|
||||
}
|
||||
//
|
||||
// write BODY
|
||||
@@ -407,7 +402,6 @@ void WriteLBMfile( const char *filename, byte *data,
|
||||
*bodylength = BigLong( length );
|
||||
if ( length & 1 ) {
|
||||
*lbmptr++ = 0; // pad chunk to even offset
|
||||
|
||||
}
|
||||
//
|
||||
// done
|
||||
@@ -416,7 +410,6 @@ void WriteLBMfile( const char *filename, byte *data,
|
||||
*formlength = BigLong( length );
|
||||
if ( length & 1 ) {
|
||||
*lbmptr++ = 0; // pad chunk to even offset
|
||||
|
||||
}
|
||||
//
|
||||
// write output file
|
||||
|
||||
@@ -204,7 +204,6 @@ struct Exclusions
|
||||
Sys_Printf( "\n\tExVideos....%zu\n", videos.size() );
|
||||
for ( const auto& s : videos )
|
||||
Sys_Printf( "%s\n", s.c_str() );
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -429,7 +429,6 @@ void WriteBSPBrushMap( const char *name, const brushlist_t& list ){
|
||||
fprintf( f, "}\n" );
|
||||
|
||||
fclose( f );
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -611,7 +611,6 @@ int ShiftBSPMain( Args& args ){
|
||||
sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
|
||||
e.setKeyValue( "origin", str );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* shift models */
|
||||
|
||||
@@ -393,7 +393,6 @@ struct game_wolf : game_default
|
||||
{ "monsterslickeast", 0, 0, W_SURF_MONSLICK_E, 0, C_TRANSLUCENT, 0 },
|
||||
{ "monsterslicksouth", 0, 0, W_SURF_MONSLICK_S, 0, C_TRANSLUCENT, 0 },
|
||||
{ "monsterslickwest", 0, 0, W_SURF_MONSLICK_W, 0, C_TRANSLUCENT, 0 },
|
||||
|
||||
} );
|
||||
brushBevelsSurfaceFlagsMask |= ( W_SURF_CERAMIC | W_SURF_METAL | W_SURF_WOOD | W_SURF_GRASS | W_SURF_GRAVEL | W_SURF_GLASS | W_SURF_SNOW | W_SURF_ROOF | W_SURF_RUBBLE | W_SURF_CARPET | W_SURF_MONSTERSLICK | W_SURF_MONSLICK_W | W_SURF_MONSLICK_N | W_SURF_MONSLICK_E | W_SURF_MONSLICK_S );
|
||||
}
|
||||
|
||||
@@ -467,7 +467,6 @@ static void HelpCommon()
|
||||
};
|
||||
|
||||
HelpOptions( "Common Options", 0, 80, options );
|
||||
|
||||
}
|
||||
|
||||
void HelpGames(){
|
||||
|
||||
@@ -220,7 +220,6 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in
|
||||
/* clean up */
|
||||
free( rowPointers );
|
||||
png_destroy_read_struct( &png, &info, &end );
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -2899,7 +2899,6 @@ int LightMain( Args& args ){
|
||||
{
|
||||
Sys_Warning( "Unknown argument \"%s\"\n", args.takeFront() );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* fix up falloff tolerance for sRGB */
|
||||
|
||||
@@ -552,7 +552,6 @@ static void RadSubdivideDiffuseLight( int lightmapNum, bspDrawSurface_t *ds, raw
|
||||
// splash.flags |= LightFlags::Twosided;
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -905,7 +905,6 @@ struct CompareSurfaceInfo
|
||||
else if ( aInfo.plane->dist() > bInfo.plane->dist() ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* then position in world */
|
||||
@@ -3276,7 +3275,6 @@ void StoreSurfaceLightmaps( bool fastAllocate, bool storeForReal ){
|
||||
rgbGen,
|
||||
alphaGen,
|
||||
lmxy.x(), lmxy.y() );
|
||||
|
||||
}
|
||||
|
||||
/* concatenate */
|
||||
|
||||
@@ -352,7 +352,6 @@ mesh_t *SubdivideMesh( mesh_t in, float maxError, float minLength ){
|
||||
|
||||
// back up and recheck this set again, it may need more subdivision
|
||||
j -= 2;
|
||||
|
||||
}
|
||||
|
||||
// vertical subdivisions
|
||||
@@ -396,7 +395,6 @@ mesh_t *SubdivideMesh( mesh_t in, float maxError, float minLength ){
|
||||
|
||||
// back up and recheck this set again, it may need more subdivision
|
||||
j -= 2;
|
||||
|
||||
}
|
||||
|
||||
// collapse the verts
|
||||
@@ -476,7 +474,6 @@ mesh_t *SubdivideMesh2( mesh_t in, int iterations ){
|
||||
expand[ i ][ j + 1 ] = LerpDrawVert( expand[ i ][ j + 0 ], expand[ i ][ j + 1 ] );
|
||||
expand[ i ][ j + 2 ] = LerpDrawVert( expand[ i ][ j + 1 ], expand[ i ][ j + 3 ] );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* vertical subdivisions */
|
||||
|
||||
@@ -213,7 +213,6 @@ struct AssModel
|
||||
Sys_Printf( "texname: %s\n", texname.C_Str() );
|
||||
#endif
|
||||
m_shader = StringStream<64>( PathCleaned( PathExtensionless( texname.C_Str() ) ) );
|
||||
|
||||
}
|
||||
else{
|
||||
m_shader = StringStream<64>( PathCleaned( PathExtensionless( matname.C_Str() ) ) );
|
||||
|
||||
@@ -359,7 +359,6 @@ void InitPaths( Args& args ){
|
||||
while ( args.takeArg( "-fs_pakpath" ) ) {
|
||||
insert_unique( pakPaths, stream( DirectoryCleaned( args.takeNext() ) ) );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* add standard game path */
|
||||
|
||||
@@ -251,7 +251,6 @@ static void MakeNodePortal( node_t *node ){
|
||||
else{
|
||||
Error( "CutNodePortals_r: mislinked portal" );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if ( w.empty() ) {
|
||||
@@ -784,7 +783,6 @@ static void FillOutside_r( node_t *node ){
|
||||
else {
|
||||
c_inside++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -1675,17 +1675,14 @@ static void ParseShaderFile( const char *filename ){
|
||||
/* q3map_vertexshadows */
|
||||
else if ( striEqual( token, "q3map_vertexShadows" ) ) {
|
||||
si.vertexShadows = true; /* ydnar */
|
||||
|
||||
}
|
||||
/* q3map_novertexshadows */
|
||||
else if ( striEqual( token, "q3map_noVertexShadows" ) ) {
|
||||
si.vertexShadows = false; /* ydnar */
|
||||
|
||||
}
|
||||
/* q3map_splotchfix (filter dark lightmap luxels on lightmapped models) */
|
||||
else if ( striEqual( token, "q3map_splotchfix" ) ) {
|
||||
si.splotchFix = true; /* ydnar */
|
||||
|
||||
}
|
||||
/* q3map_forcesunlight */
|
||||
else if ( striEqual( token, "q3map_forceSunlight" ) ) {
|
||||
|
||||
@@ -529,7 +529,6 @@ void ClassifySurfaces( int numSurfs, mapDrawSurface_t *ds ){
|
||||
}
|
||||
else if ( ds->sampleSize <= 0 ) { /* may contain the entity asigned value */
|
||||
ds->sampleSize = sampleSize; /* otherwise use global default */
|
||||
|
||||
}
|
||||
if ( ds->lightmapScale > 0.0f ) { /* apply surface lightmap scaling factor */
|
||||
ds->sampleSize = ds->lightmapScale * (float)ds->sampleSize;
|
||||
|
||||
@@ -408,7 +408,6 @@ static void FixSurfaceJunctions( mapDrawSurface_t& ds ) {
|
||||
else {
|
||||
// just rotate the vertexes
|
||||
c_rotate++;
|
||||
|
||||
}
|
||||
|
||||
free( ds.verts );
|
||||
|
||||
@@ -183,7 +183,6 @@ static void CalcPortalVis(){
|
||||
#else
|
||||
RunThreadsOnIndividual( numportals * 2, true, PortalFlow );
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -549,7 +548,6 @@ static fixedWinding_t *TryMergeWinding( fixedWinding_t *f1, fixedWinding_t *f2,
|
||||
|
||||
if ( i == f1->numpoints ) {
|
||||
return nullptr; // no matching edges
|
||||
|
||||
}
|
||||
//
|
||||
// check slope of connected lines
|
||||
|
||||
@@ -100,7 +100,6 @@ static void FreeStackWinding( fixedWinding_t *w, pstack_t *stack ){
|
||||
|
||||
if ( i < 0 || i > 2 ) {
|
||||
return; // not from local
|
||||
|
||||
}
|
||||
if ( stack->freewindings[i] ) {
|
||||
Error( "FreeStackWinding: already free" );
|
||||
@@ -144,7 +143,6 @@ static fixedWinding_t *VisChopWinding( fixedWinding_t *in, pstack_t *stack, con
|
||||
|
||||
if ( !counts[1] ) {
|
||||
return in; // completely on front side
|
||||
|
||||
}
|
||||
if ( !counts[0] ) {
|
||||
FreeStackWinding( in, stack );
|
||||
@@ -311,7 +309,6 @@ static fixedWinding_t *ClipToSeperators( fixedWinding_t *source, fixedWinding_t
|
||||
}
|
||||
if ( k != pass->numpoints ) {
|
||||
continue; // points on negative side, not a separating plane
|
||||
|
||||
}
|
||||
if ( !counts[0] ) {
|
||||
continue; // planar with separating plane
|
||||
@@ -358,7 +355,6 @@ static fixedWinding_t *ClipToSeperators( fixedWinding_t *source, fixedWinding_t
|
||||
target = VisChopWinding( target, stack, plane );
|
||||
if ( !target ) {
|
||||
return nullptr; // target is not visible
|
||||
|
||||
}
|
||||
break; // optimization by Antony Suter
|
||||
}
|
||||
@@ -797,7 +793,6 @@ static void RecursivePassagePortalFlow( vportal_t *portal, threaddata_t *thread,
|
||||
|
||||
if ( !bit_is_enabled( prevstack->mightsee, pnum ) ) {
|
||||
continue; // can't possibly see it
|
||||
|
||||
}
|
||||
prevmight = (long *)prevstack->mightsee;
|
||||
cansee = (long *)passage->cansee;
|
||||
@@ -1029,7 +1024,6 @@ static fixedWinding_t *PassageChopWinding( fixedWinding_t *in, fixedWinding_t *o
|
||||
|
||||
if ( !counts[1] ) {
|
||||
return in; // completely on front side
|
||||
|
||||
}
|
||||
if ( !counts[0] ) {
|
||||
return nullptr;
|
||||
@@ -1179,7 +1173,6 @@ static int AddSeperators( const fixedWinding_t *source, const fixedWinding_t *pa
|
||||
}
|
||||
if ( k != pass->numpoints ) {
|
||||
continue; // points on negative side, not a separating plane
|
||||
|
||||
}
|
||||
if ( !counts[0] ) {
|
||||
continue; // planar with separating plane
|
||||
@@ -1488,7 +1481,6 @@ void BasePortalVis( int portalnum ){
|
||||
if ( vector3_length( p->origin - tp->origin ) - p->radius - tp->radius > farPlaneDist )
|
||||
continue;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1501,7 +1493,6 @@ void BasePortalVis( int portalnum ){
|
||||
}
|
||||
if ( k == w->numpoints ) {
|
||||
continue; // no points on front
|
||||
|
||||
}
|
||||
w = p->winding;
|
||||
for ( k = 0; k < w->numpoints; ++k )
|
||||
@@ -1512,7 +1503,6 @@ void BasePortalVis( int portalnum ){
|
||||
}
|
||||
if ( k == w->numpoints ) {
|
||||
continue; // no points on front
|
||||
|
||||
}
|
||||
bit_enable( p->portalfront, j );
|
||||
}
|
||||
@@ -1573,7 +1563,6 @@ static void RecursiveLeafBitFlow( int leafnum, byte *mightsee, byte *cansee ){
|
||||
|
||||
if ( !more ) {
|
||||
continue; // can't see anything new
|
||||
|
||||
}
|
||||
bit_enable( cansee, pnum );
|
||||
|
||||
|
||||
@@ -214,7 +214,6 @@ void SetModelNumbers(){
|
||||
entities[i].setKeyValue( "model", value );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user