Commit Graph

1540 Commits

Author SHA1 Message Date
Rudolf Polzer d792d26da8 add an ifdeffed out font size workaround 2010-12-09 06:54:14 +01:00
Rudolf Polzer ceaa322eef be a little nicer to switching font system at compile time 2010-12-09 06:52:52 +01:00
Rudolf Polzer ced815377c fix another dll name typo 2010-12-08 19:47:36 +01:00
Rudolf Polzer 88e8ef8fac one more DLL 2010-12-08 19:38:25 +01:00
Rudolf Polzer 97b6e42415 Revert "we no longer need fixprefix", because we do need it. On cross compiling. On mingw it is harmless.
This reverts commit 189385d856.
2010-12-08 19:37:36 +01:00
Rudolf Polzer 189385d856 we no longer need fixprefix 2010-12-08 14:41:47 +01:00
Rudolf Polzer 896f840e29 mark the package as outdated 2010-12-08 14:41:13 +01:00
Rudolf Polzer 0891d8b03f comment out Quake2WorldPack as the server is currently unreachable 2010-12-08 13:31:22 +01:00
Rudolf Polzer e92d32fdb9 updates to make win32 building work again 2010-12-08 13:30:58 +01:00
Rudolf Polzer 85fdf3de30 change UNZIP to UNZIPPER to make OAPack work 2010-12-05 17:27:36 +01:00
Rudolf Polzer 44cc83f2c4 don't bail out on unzip fail 2010-12-05 17:21:18 +01:00
Rudolf Polzer bc2185ec94 Merge remote branch 'origin/divVerent/pangofix' 2010-12-05 16:52:23 +01:00
Rudolf Polzer db2c428f2e support "real3" as vector type properly 2010-12-05 16:46:09 +01:00
Rudolf Polzer 6d09dee422 workaround for loading broken maps written by ZeroRadiant that have a duplicate plane 2010-12-02 14:31:53 +01:00
TTimo fa657d36f6 updated the setup functionality on windows, new deps file, bumped version up
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@344 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-29 01:12:35 +00:00
TTimo dc4e125df2 apply back 335 and 336, will need to update deps and put a zip out
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@343 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-26 19:50:08 +00:00
TTimo 0152053e52 fix Linux compile from mhash stuff
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@339 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-26 06:46:05 +00:00
TTimo e393e112f4 compiles again on win32, trashed mhash
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@338 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-26 05:59:17 +00:00
TTimo 449fdbd6b7 revert 335 and 336, breaking the win32 build
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@337 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-26 05:58:34 +00:00
Rudolf Polzer 27ecd5cda3 doc fixes 2010-11-19 12:30:39 +01:00
Rudolf Polzer c792ef6379 also fix the unhashed case 2010-11-19 06:43:29 +01:00
Rudolf Polzer 40292b11c8 minor fix for plane snapping 2010-11-19 06:41:58 +01:00
Rudolf Polzer 9bd26c2ebe switch over to pango rendering 2010-11-18 17:13:08 +01:00
Rudolf Polzer c68e337af0 fix font display by moving characters more away from the screen edge (fixes a small overlap) 2010-11-18 17:05:04 +01:00
Rudolf Polzer 3cd914c5e1 remove some redundant data members 2010-11-18 17:03:42 +01:00
Rudolf Polzer 3ce82871e3 refactoring font code to hopefully be closer to be able to exchange the font system by something not call list based 2010-11-18 17:01:21 +01:00
Rudolf Polzer c4d9df0a2c Merge branch 'master' into divVerent/pangofix-public 2010-11-18 16:29:54 +01:00
Rudolf Polzer 8f059eb592 xywindow: draw the x/y/z border properly 2010-11-18 12:56:21 +01:00
Rudolf Polzer e240a832bd pango font stuff: remove reference to a deprectaed pango interface from the new ZeroRadiant code (duh...); make pango a proper dependency now 2010-11-18 12:55:49 +01:00
Rudolf Polzer c5639967f0 ::zerowing-base=336
merge script from zerowing repos
2010-11-18 10:30:36 +01:00
Rudolf Polzer a9e31a3db5 glfont.cpp: add an internal class that uses Pango 2010-11-16 14:07:06 +01:00
Rudolf Polzer 08f58dfd1f makefile: make verbose dep check more verbose 2010-11-16 14:06:41 +01:00
Rudolf Polzer 5473ceccf9 simplify font drawing a bit so we only have to move one function to pango 2010-11-16 12:24:06 +01:00
rambetter 1c8129e946 Doing away with the 32 bit per pixel memory buffer. Now passing the returned
pango memory buffer directly to OpenGL.  This simplifies the code.  Performance
did not seem to be better, but it certainly looks faster in theory.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@336 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-16 07:07:28 +00:00
rambetter c1dbb77342 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
2010-11-16 03:42:28 +00:00
Rudolf Polzer bf2ca2011e bobtools patch width/height fix from OSXNetRadiant. Now we seem to be mostly in sync with OSXNetRadiant rev 94. 2010-11-15 07:21:12 +01:00
rambetter fdab9dc6e2 In Radiant main() method, add putenv("LC_NUMERIC=C").
sscanf() and *printf() calls are all over the code, which are
locale-sensitive.  gtk_init() sets all locales.  So if you're in
Germany, your printf()'s will output e.g. "10,5" for ten and
a half.  Reading floating points with sscanf() is also totally broken
in locales such as Germany.  So, we can't really get rid of all the
*scanf()'s and the *printf()'s.  Instead, set LC_NUMERIC to "C".


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@334 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-14 01:40:25 +00:00
namespace 11bb5b5720 pthread_join Fix from Nerius Landys
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@333 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-13 13:36:27 +00:00
Rudolf Polzer fa9d3a210a new args -meta and -patchmeta to -convert with .map file argument 2010-11-13 08:31:56 +01:00
Rudolf Polzer 32f2674d17 option -forcereadbsp for -convert to allow forcing the BSP reading code in the radiant build menu 2010-11-13 08:03:39 +01:00
Rudolf Polzer ec7957adec change texture lock default to true; remove weird user pref munging 2010-11-04 14:55:43 +01:00
Rudolf Polzer 288318d040 apparently calling FindOrInsertWorldspawn during tree traversing is bad, so let's not do that 2010-11-01 07:43:42 +01:00
Rudolf Polzer 4adf8ad52b WarsowPack download URL doesn't respond... so I have to comment it out to make the compile work again 2010-10-31 16:33:04 +01:00
Rudolf Polzer cf84ba8be2 new light option -fill to improve lossy compression of lightmaps (should have no other impact) 2010-10-31 12:38:58 +01:00
Rudolf Polzer 62fdec79ee local variables ALSO work better when declared 2010-10-30 18:10:23 +02:00
Rudolf Polzer b7a62893a4 add a floodlightDirectionScale value to the _floodlight key too (whatever it does) 2010-10-30 18:07:37 +02:00
Rudolf Polzer 39182c67ef no half lambert for xonotic please, it sucks ;) 2010-10-30 18:00:09 +02:00
Rudolf Polzer 020a3febce no need to artificially limit lightmap position for random supersampling 2010-10-30 16:37:04 +02:00
Rudolf Polzer aa00101d5e dirtmapping: PROPERLY prevent hitting sky 2010-10-30 16:36:53 +02:00
Rudolf Polzer 4553078f35 better override lightSamplesInsist (-samples +1, +2, +3, +4 skip the samples preset loading) 2010-10-22 09:41:48 +02:00