DONE:
- Removed usage of gdk_gl_font_use_pango_font() which is no longer in GtkGLExt Git. Radiant now compiles on Linux From Scratch using current versions of software. - As a side effect to the above, font inconsistency issues (like really large intermittent font in GL views) are gone. Font looks better too. - Changing algorithm for labeling grid view to be more robust. Uses new functions gtk_glwidget_font_ascent() and gtk_glwidget_font_descent(), and uses locally defined "cushion" variables. - In xywindow.cpp, changing stepx and stepy based on 40 pixels, not 32. When coordinate numbers are very large the labels get too cluttered. - Added calls to gtk_gl_init() and gdk_gl_init() in main(). This is recommended according to the GtkGLExt reference manual. - Tested all changes on Ubuntu 10.10 and Debian 5.0 (Lenny). TODO: - In glDrawPixels(), instead of using a 32 bit pixel with GL_UNSIGNED_INT_8_8_8_8, see if we can use an 8 bit variant where each byte defines opacity and the GL current color is used. In other words, try to use the FT_Bitmap directly without conversion. - Examine every other use of gtk_glwidget_print_string() and gtk_glwidget_print_char() to make sure the positions are determined accurately. NOT TODO: - Decided not to use glBitmap() with display lists because it would disallow pretty antialiased fonts. git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@335 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#endif
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <gtk/gtkgl.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include "stdafx.h"
|
||||
#include <assert.h>
|
||||
@@ -44,6 +45,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
#include "watchbsp.h"
|
||||
#include "filters.h"
|
||||
#include "glwidget.h"
|
||||
|
||||
bool g_bBuildList = false;
|
||||
int g_argc;
|
||||
@@ -503,6 +505,11 @@ int main( int argc, char* argv[] ) {
|
||||
// gtk_disable_setlocale();
|
||||
|
||||
gtk_init(&argc, &argv);
|
||||
gtk_gl_init(&argc, &argv);
|
||||
gdk_gl_init(&argc, &argv);
|
||||
|
||||
// TODO: Find a better place to call this.
|
||||
gtk_glwidget_create_font();
|
||||
|
||||
if ((ptr = getenv ("Q3R_LIBGL")) != NULL)
|
||||
libgl = ptr;
|
||||
|
||||
Reference in New Issue
Block a user