ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-24 18:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

misc - having a look at brush primitives stuff

Browse source
This commit is contained in:
Timothee Besset 2013-09-08 13:28:08 +01:00
parent 5aa744b026
commit 64332fb43d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
radiant/bp_dlg.cpp
View file

@ -53,7 +53,6 @@ gint BP_dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer dat
// ret: 0 = abort, 1 = load and convert, 2 = changed project settings, load and don't convert // ret: 0 = abort, 1 = load and convert, 2 = changed project settings, load and don't convert
// the user might decide to switch the BP mode in project settings // the user might decide to switch the BP mode in project settings
// status: 0 = loading regular, got conflict 1 = loading BP, got conflict // status: 0 = loading regular, got conflict 1 = loading BP, got conflict
// int WINAPI gtk_MessageBox (GtkWidget *parent, const char* lpText, const char* lpCaption, guint32 uType)
int BP_MessageBox( int status ){ int BP_MessageBox( int status ){
GtkWidget *window, *w, *vbox, *hbox; GtkWidget *window, *w, *vbox, *hbox;
GtkAccelGroup *accel; GtkAccelGroup *accel;

7
radiant/brush.cpp
View file

@ -97,9 +97,9 @@ vec3_t baseaxis[18] =
{0,-1,0}, {1,0,0}, {0,0,-1} // north wall {0,-1,0}, {1,0,0}, {0,0,-1} // north wall
}; };
void TextureAxisFromPlane( plane_t *pln, vec3_t xv, vec3_t yv ){ void TextureAxisFromPlane( plane_t *pln, vec3_t xv, vec3_t yv ) {
int bestaxis; int bestaxis;
float dot,best; float dot, best;
int i; int i;
best = 0; best = 0;
@ -108,7 +108,8 @@ void TextureAxisFromPlane( plane_t *pln, vec3_t xv, vec3_t yv ){
for ( i = 0 ; i < 6 ; i++ ) for ( i = 0 ; i < 6 ; i++ )
{ {
dot = DotProduct( pln->normal, baseaxis[i * 3] ); dot = DotProduct( pln->normal, baseaxis[i * 3] );
if ( g_PrefsDlg.m_bQ3Map2Texturing && dot > best + 0.0001f || dot > best ) { // see q3map2 source - added () for clarity
if ( ( g_PrefsDlg.m_bQ3Map2Texturing && dot > best + 0.0001f ) || dot > best ) {
best = dot; best = dot;
bestaxis = i; bestaxis = i;
} }