5473ceccf9
simplify font drawing a bit so we only have to move one function to pango
Rudolf Polzer
2010-11-16 12:24:06 +01:00
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.
rambetter
2010-11-16 07:07:28 +00:00
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.
rambetter
2010-11-16 03:42:28 +00:00
bf2ca2011e
bobtools patch width/height fix from OSXNetRadiant. Now we seem to be mostly in sync with OSXNetRadiant rev 94.
Rudolf Polzer
2010-11-15 07:21:12 +01:00
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".
rambetter
2010-11-14 01:40:25 +00:00
11bb5b5720
pthread_join Fix from Nerius Landys
namespace
2010-11-13 13:36:27 +00:00
fa9d3a210a
new args -meta and -patchmeta to -convert with .map file argument
Rudolf Polzer
2010-11-13 08:10:27 +01:00
32f2674d17
option -forcereadbsp for -convert to allow forcing the BSP reading code in the radiant build menu
Rudolf Polzer
2010-11-13 08:03:39 +01:00
ec7957adec
change texture lock default to true; remove weird user pref munging
Rudolf Polzer
2010-11-04 14:55:43 +01:00
288318d040
apparently calling FindOrInsertWorldspawn during tree traversing is bad, so let's not do that
Rudolf Polzer
2010-11-01 07:43:42 +01:00
4adf8ad52b
WarsowPack download URL doesn't respond... so I have to comment it out to make the compile work again
Rudolf Polzer
2010-10-31 16:33:04 +01:00
cf84ba8be2
new light option -fill to improve lossy compression of lightmaps (should have no other impact)
Rudolf Polzer
2010-10-31 12:38:58 +01:00
62fdec79ee
local variables ALSO work better when declared
Rudolf Polzer
2010-10-30 18:10:23 +02:00
b7a62893a4
add a floodlightDirectionScale value to the _floodlight key too (whatever it does)
Rudolf Polzer
2010-10-30 18:07:37 +02:00
39182c67ef
no half lambert for xonotic please, it sucks ;)
Rudolf Polzer
2010-10-30 18:00:09 +02:00
020a3febce
no need to artificially limit lightmap position for random supersampling
Rudolf Polzer
2010-10-30 16:37:04 +02:00
4553078f35
better override lightSamplesInsist (-samples +1, +2, +3, +4 skip the samples preset loading)
Rudolf Polzer
2010-10-22 09:41:48 +02:00
91ea2ae81c
be more verbose about randomsamples presets
Rudolf Polzer
2010-10-22 09:36:40 +02:00
d1e3042389
support search box size in randomsamples too (although useless)
Rudolf Polzer
2010-10-22 09:35:41 +02:00
10dfced6cb
-randomsamples: special handling of -samples 1, 2, 3, 4 as quality presets (to be more consistent with typical -samples use)
Rudolf Polzer
2010-10-21 20:35:35 +02:00
5ec6743f09
new .gitattributes file, remove comments from a .map file
Rudolf Polzer
2010-10-21 18:12:15 +02:00
cc6bdd4869
Merge branch 'master' of ssh://icculus.org/netradiant
Rudolf Polzer
2010-10-14 10:07:39 +02:00
8c7ca79ef5
Ignore transparent surfaces when floodlighting
jal
2010-10-13 16:26:28 +02:00
ce482631a3
last workaround did not work. Try a really simple one then.
Rudolf Polzer
2010-10-11 20:26:55 +02:00
f7a2cb9e04
reinit OpenGL state on redraw properly
Rudolf Polzer
2010-10-11 20:19:52 +02:00
61c537beac
Merge remote branch 'origin/divVerent/convert-from-map-to-map'
Rudolf Polzer
2010-10-10 16:53:39 +02:00
90402b6978
update surface dialog when moving a brush
Rudolf Polzer
2010-10-10 16:44:27 +02:00
7a0665f156
automatically run the decompiler when specifying a BSP file in Import...
Rudolf Polzer
2010-10-10 16:04:41 +02:00
599056d188
allow different file type selections for open/import/save
Rudolf Polzer
2010-10-10 14:35:18 +02:00
e1ed914df2
clean up the reload-if-failed code
Rudolf Polzer
2010-10-10 14:10:10 +02:00
182f62c459
rename to toggleFormat
Rudolf Polzer
2010-10-10 13:54:01 +02:00
112586a3cf
clean up toggleProjection code
Rudolf Polzer
2010-10-10 13:53:40 +02:00
2b0a97c814
somewhat unclean code, sorry... but it allows opening brushPrimitives maps in nonBrushPrimitives mode (experimental) by temp toggling to the correct mode
Rudolf Polzer
2010-10-10 10:47:16 +02:00
652a2d36fb
allow changing the "Alternate texture projection" mode at runtime (requires Map_New currently though)
Rudolf Polzer
2010-10-10 10:26:46 +02:00
551d4434f8
detect the wrong type Q3 format by a different error message when loading
Rudolf Polzer
2010-10-10 10:05:03 +02:00
05b62ff70f
warn on wrong -convert use, always allow .map input
Rudolf Polzer
2010-10-09 21:54:55 +02:00
cf1b60d899
don't write the bsp twice when pseudo compiling
Rudolf Polzer
2010-10-09 21:29:15 +02:00
6980df0b21
EXPERIMENTAL: make the pseudo compiler able to output a .bsp file: q3map2 -game xonotic -convert -format xonotic filename.map note that this is a quite bad compile (no tjunctions, no models, nothing, but lightning fast)
Rudolf Polzer
2010-10-09 21:22:22 +02:00
af9f1a2e22
add missing EndBSPFile() call
Rudolf Polzer
2010-10-09 19:47:13 +02:00
8442ecbb14
.ase also works from .map!
Rudolf Polzer
2010-10-09 19:37:43 +02:00
1b73f1f78b
the decompiler now can convert .map files too
Rudolf Polzer
2010-10-09 19:28:19 +02:00
205771e916
initial code for converting .map to .map
Rudolf Polzer
2010-10-09 18:25:19 +02:00
43f30dc837
fix issues with embedded models
Rudolf Polzer
2010-10-08 20:38:30 +02:00
266de1d7bb
fix "bad texdef"
Rudolf Polzer
2010-10-08 06:22:47 +02:00
b5c33b5fd7
decompiler now outputs somewhat correct texdef
Rudolf Polzer
2010-10-07 21:04:54 +02:00
e5e8f67120
break break break ;)
Rudolf Polzer
2010-10-07 17:56:41 +02:00
f5fc3cd9f9
fix compile errors
Rudolf Polzer
2010-10-07 17:43:05 +02:00
c5745ac942
experimental non-BrushPrimit map decompiling (probably won't even compile yet)
Rudolf Polzer
2010-10-07 17:38:45 +02:00
18c11bf55e
YEAH! I think this fixes the lightmaps-of-patches bug!
Rudolf Polzer
2010-10-05 18:50:24 +02:00
cadab3422e
more warnings
Rudolf Polzer
2010-10-05 15:06:52 +02:00
d5a9782200
fix some more warnings
Rudolf Polzer
2010-10-05 15:04:45 +02:00
4487b4d44f
fix "ExpandPath called without qdir set" as qdir is never set in Xonotic/Nexuiz/any other nonquake
Rudolf Polzer
2010-10-05 11:24:42 +02:00
c34227108a
make radiant compile again
rpolzer
2010-10-05 11:05:24 +02:00
5ec3a47e10
q3map2 is now waring free
rpolzer
2010-10-05 10:57:07 +02:00
5f1f257a1c
add a missing VectorClear
rpolzer
2010-10-04 10:48:22 +02:00
4c13f31535
use a Gaussian-like random distribution for random subsampling
Rudolf Polzer
2010-10-03 21:14:54 +02:00
02d17b50a7
also subsample the deluxemap (this was forgotten all the time!)
Rudolf Polzer
2010-10-03 20:50:09 +02:00
61d0c06cc6
option -randomsamples: makes -samples use adaptive random subsampling (only subsamples near edges, uses random distribution for luxels then)
Rudolf Polzer
2010-10-03 20:23:14 +02:00
8ff9eafc50
fix bugs in skin load code
Rudolf Polzer
2010-10-01 12:13:36 +02:00
5c389d3f8a
fix segfault
Rudolf Polzer
2010-10-01 11:55:29 +02:00
43b05f81bc
skinfiles: use the VFS
Rudolf Polzer
2010-10-01 11:49:38 +02:00
7b7d0471b6
fix warnings
Rudolf Polzer
2010-10-01 11:28:27 +02:00
3dd2ff55b1
support .skin files for models (modelname_<n>.skin) like Q3A and DP
Rudolf Polzer
2010-10-01 11:28:07 +02:00
570c4f2bc4
temporarily disable WarsowPack as its download fails
Rudolf Polzer
2010-09-27 13:08:01 +02:00
1773a1823c
Merge branch 'master' of ssh://git.xonotic.org/netradiant
Rudolf Polzer
2010-09-27 09:58:57 +02:00
20eed03c3f
remove some unused code
Rudolf Polzer
2010-09-27 09:58:50 +02:00
511f7bd2c2
remove some debug code that is potentially dangerous
Rudolf Polzer
2010-09-27 09:58:22 +02:00
30a8c2c22c
more deluxemap+surfacelight fixes
Rudolf Polzer
2010-09-23 08:30:17 +02:00
c13784bc3a
force subsampling only where REALLY needed
Rudolf Polzer
2010-09-22 08:49:43 +02:00
382e2da9a0
fix compile error
Rudolf Polzer
2010-09-22 08:28:00 +02:00
d14718daef
force going all the way down when subsampling grates
Rudolf Polzer
2010-09-22 08:26:54 +02:00
fd6d38c979
force the first stage of subsampling on luxels that are hit through an alphashadow surface
Rudolf Polzer
2010-09-22 08:22:26 +02:00
33dae6db13
try to help subsampling with grates
Rudolf Polzer
2010-09-22 07:28:51 +02:00
1ec2aec67e
deluxemapping: ignore light contribution from the other side of a surface
Rudolf Polzer
2010-09-22 07:17:33 +02:00
4243255b4a
new funny option: -samplessearchboxsize, tunes the size of the search box of -samples (default 1 = "correct" size, can be up to 4)
Rudolf Polzer
2010-09-22 06:38:02 +02:00
5522a08f6c
fix the maths REALLY
Rudolf Polzer
2010-09-22 06:23:27 +02:00
07cf00e0a2
fix a small math error in -samples causing it to only ever consider 2/3 of the length of each luxel
Rudolf Polzer
2010-09-21 22:04:55 +02:00
5f44865ec2
fix cloning (don't clone the worldspam)
Rudolf Polzer
2010-09-04 13:52:03 +02:00
4d1e944aca
Merge remote branch 'origin/merlijn/osx-compile'
Rudolf Polzer
2010-09-01 21:29:48 +02:00
f0215523f0
do not break tjunctions :P
Rudolf Polzer
2010-09-01 08:30:09 +02:00
526654d3dd
another debug print
Rudolf Polzer
2010-09-01 07:52:20 +02:00
1875137f28
improve area calculation by a shift width to simulate fragments
Rudolf Polzer
2010-09-01 07:51:01 +02:00
76e61abc01
favor blocky triangles over thin triangles a bit
Rudolf Polzer
2010-09-01 07:14:16 +02:00
08dc2f96dc
bsp: new option -maxarea, selects more GPU friendly face surface splitting algorithm
Rudolf Polzer
2010-08-31 15:38:00 +02:00
eadc09e9f6
Update these files as well
merlijn
2010-08-29 20:47:06 +02:00
6dee38b998
OSX build stuff - default to using MacPorts instead of Fink and update the MACVERSION stuff as it should not be needed in most cases.
merlijn
2010-08-29 20:44:05 +02:00
61c6265531
fix gamedetect NULL pointer
Rudolf Polzer
2010-08-23 21:41:42 +02:00
21f19dbd91
fix a CP_R command
Rudolf Polzer
2010-08-17 20:58:36 +02:00
0a784ea439
remove some stupid debug prints
Rudolf Polzer
2010-08-11 07:58:19 +02:00
370cc40d7f
also hide _reflect and _alpha texture files
Rudolf Polzer
2010-08-09 06:43:45 +02:00
bb104da06f
do not REPEATEDLY blow up _skybox surfaces
Rudolf Polzer
2010-08-08 20:56:47 +02:00
2ddfb486e9
we can move the <glib.h> include a bit more then
Rudolf Polzer
2010-08-08 16:42:40 +02:00
4d04ade414
include glib.h instead of limits.h
merlijn
2010-08-08 16:30:20 +02:00
Rudolf Polzer