Changeset 301

Timestamp:

07/10/08 03:30:47 (3 months ago)

Author:

mattn

Message:

* divVerent's patch for the brush primitives surface dialog (fixed segfault due to NULL pointer)
* Quote http://zerowing.idsoftware.com/pipermail/gtkradiant/2008-July/011094.html : Attached to this message is a patch for a "somewhat working" brush
primitives surface dialog. It is an ugly hack, as it converts between
fake texdef notations and brush primitives whenever values are needed.
Had to fix an accuracy bug: the surface dialog rounded all rotation
values to integer angles, which SEVERELY broke things for me (changed
the Gtk spin object to use 4 digits, which is enough for me).

Also, I changed the fake texdef / brush primitives conversions to use
long double internally, as float's roundoff errors were quite visible to
me when testing.

Hope the remaining roundoff errors from converting back and forth won't
kill me, but it worked for a simple map example.

Also, I had to separate out "Snap to grid" and "Don't clamp" into two
separare options. They now mean:

- Snap to grid: snaps drag/etc. actions to the grid
- Don't clamp: disable brush point snapping during many operations, like

merely shifting brushes, editing texturing parameters, map loading,
etc.

The reason is that I do need the grid, but I don't want to get my
objects messed up by the snapping in my map. As I am using free
rotations, this DOES change quite much.

The config.py change is needed for compilation on Debian stable;
Debian's scons does not use the CFLAGS variable, but just CCFLAGS and
CXXFLAGS. In newer scons versions, CFLAGS is _shared_ flags for C and
C++, so if you want to require these, you don't need to include the
CFLAGS in CXXFLAGS too.

Files:

• GtkRadiant/trunk/config.py (modified) (1 diff)
• GtkRadiant/trunk/include/isurfaceplugin.h (modified) (1 diff)
• GtkRadiant/trunk/plugins/surface/surfacedialog.cpp (modified) (3 diffs)
• GtkRadiant/trunk/radiant/brush_primit.cpp (modified) (3 diffs)
• GtkRadiant/trunk/radiant/drag.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/mainframe.cpp (modified) (3 diffs)
• GtkRadiant/trunk/radiant/preferences.cpp (modified) (4 diffs)
• GtkRadiant/trunk/radiant/preferences.h (modified) (1 diff)
• GtkRadiant/trunk/radiant/select.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/surfaceplugin.cpp (modified) (9 diffs)
• GtkRadiant/trunk/radiant/xywindow.cpp (modified) (2 diffs)

GtkRadiant/trunk/config.py

@@ -237 +237 @@
-                        env.Append( LIBS = 'z' )
-
-
+C
-                env.Append( CXXFLAGS = baseflags + [ '-fpermissive', '-fvisibility-inlines-hidden' ] )
-                env.Append( CPPPATH = [ 'include', 'libs' ] )

GtkRadiant/trunk/include/isurfaceplugin.h

@@ -63 +63 @@
-  texdef_t texdef;  // Working texdef
-  texdef_t orig_texdef;  // Original, for baselining changes
+  brushprimit_texdef_t orig_bp_texdef; // Original, for undo
-};
-

GtkRadiant/trunk/plugins/surface/surfacedialog.cpp

@@ -1028 +1028 @@
-
-  rotate_value_spinbutton_adj = gtk_adjustment_new (0.0, -360.0, 360.0, 1.0, 10.0, 10.0);
-0
+4
-  gtk_widget_show (rotate_value_spinbutton);
-  gtk_table_attach (GTK_TABLE (table1), rotate_value_spinbutton, 1, 2, 10, 11,
@@ -1079 +1079 @@
-
-  rotate_offset_spinbutton_adj = gtk_adjustment_new (0.0, -360.0, 360.0, 1.0, 10.0, 10.0);
-2
+4
-  gtk_widget_show (rotate_offset_spinbutton);
-  gtk_table_attach (GTK_TABLE (table1), rotate_offset_spinbutton, 2, 3, 10, 11,
@@ -1122 +1122 @@
-
-  rotate_step_spinbutton_adj = gtk_adjustment_new (0.0, -360.0, 360.0, 1.0, 10.0, 10.0);
-2
+4
-  gtk_widget_show (rotate_step_spinbutton);
-  gtk_table_attach (GTK_TABLE (table1), rotate_step_spinbutton, 3, 4, 10, 11,

GtkRadiant/trunk/radiant/brush_primit.cpp

@@ -187 +187 @@
-#ifdef DBG_BP
-        // check this matrix is orthogonal
-texMat[0][1]+texMat[1][0]
+1.0L*texMat[0][1]+texMat[1][0]*1.0L
-                Sys_Printf("Warning : non orthogonal texture matrix in TexMatToFakeTexCoords\n");
-#endif
-texMat[0][0]+texMat[1][0]
-texMat[0][1]+texMat[1][1]
+1.0L*texMat[0][0]+texMat[1][0]*1.0L
+1.0L*texMat[0][1]+texMat[1][1]*1.0L
-#ifdef DBG_BP
-        if (scale[0]<ZERO_EPSILON || scale[1]<ZERO_EPSILON)
@@ -211 +211 @@
-        }
-        else
-, texMat[0][0]
+*1.0L, texMat[0][0]*1.0L
-        shift[0] = -texMat[0][2];
-        shift[1] = texMat[1][2];
@@ -220 +220 @@
-void FakeTexCoordsToTexMat( float shift[2], float rot, float scale[2], vec_t texMat[2][3] )
-{
- cos( DEG2RAD( 
- sin( DEG2RAD( 
-1.0f * scale[1] * sin( DEG2RAD( 
- cos( DEG2RAD( 
+1.0L* cos( DEG2RAD( 1.0L*
+1.0L* sin( DEG2RAD( 1.0L*
+scale[1] *1.0L* sin( DEG2RAD( 1.0L*
+1.0L* cos( DEG2RAD( 1.0L*
-        texMat[0][2] = -shift[0];
-        texMat[1][2] = shift[1];

GtkRadiant/trunk/radiant/drag.cpp

@@ -771 +771 @@
-                {
-                        move[i] = drag_xvec[i]*(x - pressx)     + drag_yvec[i]*(y - pressy);
-!g_PrefsDlg.m_bNoClam
+g_PrefsDlg.m_bSna
-                        {
-                                move[i] = floor(move[i]/g_qeglobals.d_gridsize+0.5)*g_qeglobals.d_gridsize;

GtkRadiant/trunk/radiant/mainframe.cpp

@@ -3825 +3825 @@
-  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), (g_PrefsDlg.m_bGLLighting) ? TRUE : FALSE);
-  item  = GTK_WIDGET (g_object_get_data (G_OBJECT (m_pWidget), "menu_snaptogrid"));
-!g_PrefsDlg.m_bNoClam
+g_PrefsDlg.m_bSna
-
-  item = GTK_WIDGET (g_object_get_data (G_OBJECT (m_pWidget), "tb_view_cubicclipping"));
@@ -4659 +4659 @@
-    g_bIgnoreCommands++;
-    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
-!g_PrefsDlg.m_bNoClam
+g_PrefsDlg.m_bSna
-    g_bIgnoreCommands--;
-  }
@@ -5687 +5687 @@
-void MainFrame::OnSnaptogrid()
-{
-NoClam
+Sna
-  g_PrefsDlg.SavePrefs ();
-
-  GtkWidget *item = GTK_WIDGET (g_object_get_data (G_OBJECT (m_pWidget), "menu_snaptogrid"));
-  g_bIgnoreCommands++;
-NoClamp ? FALSE : TRU
+Snap ? TRUE : FALS
-  g_bIgnoreCommands--;
-}

GtkRadiant/trunk/radiant/preferences.cpp

@@ -97 +97 @@
-#define PLUGINTOOLBAR_KEY "PluginToolBar"
-#define NOCLAMP_KEY             "NoClamp"
+#define SNAP_KEY                "Snap"
-#define PREFAB_KEY              "PrefabPath"
-#define USERINI_KEY             "UserINIPath"
@@ -636 +637 @@
-  m_bPluginToolbar = TRUE;
-  m_bNoClamp = FALSE;
+  m_bSnap = TRUE;
-  m_strUserPath = "";
-  m_nRotation = 0;
@@ -2337 +2339 @@
-  AddDialogData (check, &m_bNoClamp, DLG_CHECK_BOOL);
-
+  // Snap to grid
+  check = gtk_check_button_new_with_label (_("Snap to grid"));
+  gtk_widget_show (check);
+  gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 0);
+  AddDialogData (check, &m_bSnap, DLG_CHECK_BOOL);
+
-  // Select patch by bounding box
-  check = gtk_check_button_new_with_label (_("Select patches by bounding box"));
@@ -2907 +2915 @@
-
-  mLocalPrefs.GetPref(NOCLAMP_KEY,            &m_bNoClamp,                    FALSE);
+  mLocalPrefs.GetPref(SNAP_KEY,               &m_bSnap,                       TRUE);
-  mLocalPrefs.GetPref(USERINI_KEY,            &m_strUserPath,                 "");
-  mLocalPrefs.GetPref(ROTATION_KEY,           &m_nRotation,                   45);

GtkRadiant/trunk/radiant/preferences.h

@@ -580 +580 @@
-  bool  m_bNoClamp;
-        //++timo this is most likely broken, I don't know what it's supposed to do
+  bool  m_bSnap;
-  Str   m_strUserPath;
-  int   m_nRotation;

GtkRadiant/trunk/radiant/select.cpp

@@ -736 +736 @@
-        int             i;
-
-g_PrefsDlg.m_bNoClam
+!g_PrefsDlg.m_bSna
-  {
-    Select_GetTrueMid(mid);

GtkRadiant/trunk/radiant/surfaceplugin.cpp

@@ -74 +74 @@
-  brush_t       *b;
-  texdef_to_face_t *position, *prev_pos;
+  brushprimit_texdef_t bp;
-
-  if(selected_brushes.next != &selected_brushes)
@@ -86 +87 @@
-            position->face = f;
-            position->brush = b;
-
-
+
+
+
+
+
+
+
+
-            prev_pos->next = position;
-            prev_pos = position;
@@ -104 +111 @@
-    position->brush = b;
-    position->texdef = f->texdef;
-
+
+
+
+
+
+
+
-    prev_pos = position;
-    for(i=1; i<g_ptrSelectedFaces.GetSize(); i++)
@@ -114 +127 @@
-      position->brush = b;
-      position->texdef = f->texdef;
-
+
+
+
+
+
+
+
-      prev_pos->next = position;
-      prev_pos = position;
@@ -188 +207 @@
-        SetFaceTexdef_Q2(texdef_to_face->face, &texdef_to_face->orig_texdef, bFit_to_Scale);
-      else
-NULL
+&texdef_to_face->orig_bp_texdef, bFit_to_Scale
-
-      Undo_Start("set facelist texdefs");
@@ -205 +224 @@
-      SetFaceTexdef_Q2(texdef_to_face->face, &texdef_to_face->texdef,  bFit_to_Scale);
-    else
-
+
+
+
+
+
-    Brush_Build(texdef_to_face->brush);
-    if(bFit_to_Scale)
@@ -223 +246 @@
-        // Over-write the orig_texdef list, cementing the change.
-        for(texdef_to_face = texdef_face_list; texdef_to_face; texdef_to_face = texdef_to_face->next)
+        {
-          texdef_to_face->orig_texdef = texdef_to_face->texdef;
+          texdef_to_face->orig_bp_texdef = texdef_to_face->face->brushprimit_texdef;
+        }
-      }
-  }
@@ -233 +259 @@
-{
-  texdef_to_face_t* temp_texdef_face_list;
+  brushprimit_texdef_t bp;
-
-  if (!si_texdef_face_list)
@@ -242 +269 @@
-    Brush_Build(temp_texdef_face_list->brush,true,true,false,false);
-    // Write changes to our working Texdef list
+        
+        if(g_qeglobals.m_bBrushPrimitMode)
+        {
+                ConvertTexMatWithQTexture(&temp_texdef_face_list->face->brushprimit_texdef, QERApp_Shader_ForName( temp_texdef_face_list->face->texdef.GetName() )->getTexture(), &bp, NULL);
+                TexMatToFakeTexCoords(bp.coords, temp_texdef_face_list->face->texdef.shift, &temp_texdef_face_list->face->texdef.rotate, temp_texdef_face_list->face->texdef.scale);
+        }
-    temp_texdef_face_list->texdef = temp_texdef_face_list->face->texdef;
-  }

GtkRadiant/trunk/radiant/xywindow.cpp

@@ -1502 +1502 @@
-  {
-    delta[i] = xvec[i] * (x - m_nPressx) + yvec[i] * (y - m_nPressy);
-!g_PrefsDlg.m_bNoClam
+g_PrefsDlg.m_bSna
-    {
-      delta[i] = floor(delta[i] / g_qeglobals.d_gridsize + 0.5) * g_qeglobals.d_gridsize;
@@ -2136 +2136 @@
-void XYWnd::SnapToPoint (int x, int y, vec3_t point)
-{
-
+
+
+
+
+
-  {
-    XY_ToPoint(x, y, point);
-  }
-  else
-  {
-    XY_ToGridPoint(x, y, point);
-  }
-}