ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-27 11:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Alignments in code.

Browse source
This commit is contained in:
Mateos81 2016-03-12 20:05:45 +01:00
parent 3027776243
commit a0e076ce9b
3 changed files with 242 additions and 244 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
radiant/brush.cpp
View file

@ -2224,7 +2224,7 @@ face_t *Brush_Ray( vec3_t origin, vec3_t dir, brush_t *b, float *dist, int nFlag
&& b->owner->model.pSelect && b->owner->model.pSelect
&& !( !IsBrushSelected( b ) && ( g_PrefsDlg.m_nEntityShowState & ENTITY_SELECTED_ONLY ) ) && !( !IsBrushSelected( b ) && ( g_PrefsDlg.m_nEntityShowState & ENTITY_SELECTED_ONLY ) )
&& g_PrefsDlg.m_nEntityShowState != ENTITY_BOX && g_PrefsDlg.m_nEntityShowState != ENTITY_BOX
&& b->owner->model.pRender->IsModelNotNull()) { && b->owner->model.pRender->IsModelNotNull() ) {
ray_t ray_local; ray_t ray_local;
vec_t dist_local = FLT_MAX; vec_t dist_local = FLT_MAX;
ray_construct_for_vec3( &ray_local, origin, dir ); ray_construct_for_vec3( &ray_local, origin, dir );
@ -2261,8 +2261,7 @@ face_t *Brush_Ray( vec3_t origin, vec3_t dir, brush_t *b, float *dist, int nFlag
for ( i = 0 ; i < 3 ; i++ ) for ( i = 0 ; i < 3 ; i++ )
p1[i] = p1[i] + frac * ( p2[i] - p1[i] ); p1[i] = p1[i] + frac * ( p2[i] - p1[i] );
} }
else else {
{
for ( i = 0 ; i < 3 ; i++ ) for ( i = 0 ; i < 3 ; i++ )
p2[i] = p1[i] + frac * ( p2[i] - p1[i] ); p2[i] = p1[i] + frac * ( p2[i] - p1[i] );
} }
@ -2642,8 +2641,9 @@ void Brush_SelectFaceForDragging( brush_t *b, face_t *f, qboolean shear ){
// leave it alone // leave it alone
// //
if ( i != w->numpoints ) { if ( i != w->numpoints ) {
if ( i == 0 ) { // see if the first clockwise point was the // see if the first clockwise point was the
// last point on the winding // last point on the winding
if ( i == 0 ) {
d = DotProduct( w->points[w->numpoints - 1] d = DotProduct( w->points[w->numpoints - 1]
, f->plane.normal ) - f->plane.dist; , f->plane.normal ) - f->plane.dist;
if ( d > -ON_EPSILON && d < ON_EPSILON ) { if ( d > -ON_EPSILON && d < ON_EPSILON ) {
@ -3792,8 +3792,6 @@ void aabb_draw( const aabb_t *aabb, int mode ){
qglEnd(); qglEnd();
/* /*
vec3_t Coords[8]; vec3_t Coords[8];
vec3_t vMin, vMax; vec3_t vMin, vMax;

6
radiant/camwindow.cpp
View file

@ -932,9 +932,9 @@ void CamWnd::Cam_DrawBrush( brush_t *b, int mode ){
// Check model validity // Check model validity
// If the model is NULL or invalid, draw a box instead // If the model is NULL or invalid, draw a box instead
bool temp = b->owner->model.pRender->IsModelNotNull(); bool isModelValid = b->owner->model.pRender->IsModelNotNull();
if ( temp ) { if ( isModelValid ) {
b->owner->model.pRender->Draw(nGLState, DRAW_RF_CAM); b->owner->model.pRender->Draw( nGLState, DRAW_RF_CAM );
} }
else { else {
qglColor4fv( material ); qglColor4fv( material );