fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-10 01:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
2122 commits 51 branches 7 tags 218 MiB
Commit graph

187 commits

Author SHA1 Message Date
Ozkan Sezer
5678106819 fix sdl2-msvc build 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1103 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-12 11:20:34 +00:00
Ozkan Sezer
039fdaad6f minor whitespace adjustments 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1101 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-11 19:11:40 +00:00
Sander van Dijk
f6d44a3a10 Fix SDL2 fallback when no FSAA is available. 
On my old laptop, when running "./quakespasm -fsaa 2", quakespasm would error out with a "Couldn't create window" message. Our "no FSAA available" fallback was applied at OpenGL context creation time, but according to the SDL2 wiki FSAA settings should be done before creation of the window (see https://wiki.libsdl.org/SDL_GLattr#multisample). Moved it there.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1084 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-05 17:06:35 +00:00
Eric Wasylishen
749ed362e7 gl_vidsdl.c: for OpenGL versions below 1.5, assume "-novbo" (attempting to avoid old, broken VBO implementations). 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1080 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-03 18:31:58 +00:00
Sander van Dijk
1ab2cbde9b input: Support for "plain" numpad keys in the menu/console (still todo: numpad translation). 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1078 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-02 19:21:52 +00:00
Ozkan Sezer
b9032b7815 copyright years, general tidy-up, remove unused d_ifacea.h. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1059 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-22 08:55:46 +00:00
Ozkan Sezer
c80fbd9629 allow KP_ENTER to function as K_ENTER in menus, console, etc., after r1042. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1058 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-22 06:21:06 +00:00
Ozkan Sezer
f040037e64 add code for USE_GAMMA_RAMPS case for SDL2 builds. (still off by default.) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1053 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-21 14:00:56 +00:00
Ozkan Sezer
84e79ad4a2 cleanup USE_GAMMA_RAMPS and USE_SDL2 stuff 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1051 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-21 11:01:02 +00:00
Sander van Dijk
4aedfee2af gl_vidsdl.c: Correct some swap interval related messages. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1050 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-21 07:52:22 +00:00
Eric Wasylishen
90b26fc215 r_world: Add a new R_DrawTextureChains_Multitexture_VBO function. Draws lightmapped surfaces with fulbrights in one pass, using the VBO. Requires 3 TMUs, GL_COMBINE_EXT, and GL_ADD. 
R_DrawTextureChains_Multitexture: revert to the way it was before VBO support was added.
gl_texmgr: expose GL_SelectTexture. make the implementation less convoluted and support 3 TMUs.
gl_vidsdl: check GL_MAX_TEXTURE_UNITS
r_brush: only create VBOs if 3 TMUs available

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1035 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-20 01:08:13 +00:00
Ozkan Sezer
ad2905b5e4 bumped version to 0.90.0 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1033 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-16 09:05:36 +00:00
Sander van Dijk
a5e4a93cf0 gl_vidsdl.c: Minor VID_Toggle() fast path optimization. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1026 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-13 01:48:24 +00:00
Eric Wasylishen
e0680cb6d3 Load world and brush models into a VBO, and draw it in batches in R_DrawTextureChains_Multitexture. Uses the same immediate mode code as before if VBOs are not available, or if "-novbo" used at the command line. I only touched R_DrawTextureChains_Multitexture because it's usually the main bottleneck aside from alias model rendering. 
This seems to help fps a fair bit on maps with a lot of world polys like jam2_tronyn. Tried on a few computers with intel and nvidia gpus, windows, mac os, linux, and there's always at least some fps improvement. Best case was 70fps -> 96fps on jam2_tronyn, on OS X + nvidia 650gt.

Interested to hear how this works for amd gpu's, just do a timedemo with and without "-novbo".

Only downside is I had to disable the fast path in Vid_Toggle_f() because at least with SDL1, the vbo no longer works after a toggle. So as a result, fullscreen toggles with alt-enter are slightly slower.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1018 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-11 04:55:16 +00:00
Eric Wasylishen
24f4a2dab4 SDL2 support, if USE_SDL2 defined. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@987 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-09-05 19:34:43 +00:00
Ozkan Sezer
b8fc8caa0f dropped support for GL_SGIS_multitexture 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@984 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-08-30 08:00:34 +00:00
Eric Wasylishen
b9d280f10b Revert r981 "Simple use of vertex arrays in R_DrawTextureChains_Multitexture." 
It caused a dramatic slowdown on my machine on windows (50% slower)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@983 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-08-30 06:30:49 +00:00
Eric Wasylishen
bdca64b93b Silence warning about vid_fsaa requiring restart when parsing config.cfg at startup. Add missing newline to warning message. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@982 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-08-30 03:22:36 +00:00
Eric Wasylishen
745fa7ecce Simple use of vertex arrays in R_DrawTextureChains_Multitexture. 
The glBegin(GL_POLYGON), for() loop with GL_MTexCoord2fFunc()/glVertex3fv() calls, and glEnd () per polygon is replaced by a memcpy() and a glDrawArrays() call per poly.

My guess is this only saves function call overhead, but it gives a decent ~20% speedup (36 -> 42fps) on my machine on orl’s map.

Note: glDrawArrays() is in OpenGL 1.1, but the glClientActiveTextureARB function is part of the GL_ARB_multitexture extension but not GL_SGIS_multitexture. Instead of splitting into two code paths, I just dropped support for GL_SGIS_multitexture.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@981 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-08-30 03:22:26 +00:00
Eric Wasylishen
fb31319099 new fsaa support patch. commandline flag is -fsaa, cvar is vid_fsaa. cvar is only read in VID_Init, changing it prints a message that the new value will only be used upon restart 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@966 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-08-12 19:39:20 +00:00
Eric Wasylishen
7cca17afaa revert r962 and r963 (first attempt at multisampling) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@965 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-08-12 19:25:14 +00:00
Eric Wasylishen
5f7e61ecd4 cleanup fsaa patch, from szo. removes sdl version checks because qs requires sdl >= 1.2.10 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@963 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-08-11 08:08:15 +00:00
Eric Wasylishen
503db92edb fsaa support, borrowing from uhexen2. cvar is vid_multisample, cmdline arg is -fsaa (inconsistent..) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@962 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-08-11 06:58:42 +00:00
Ozkan Sezer
90c6f024f6 request 24-bit depth buffer / z-buffer. patch from Eric Wasylishen. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@935 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-07-15 07:03:56 +00:00
Ozkan Sezer
75338a37a1 support for GL_ARB_texture_non_power_of_two, patch from Eric Wasylishen. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@931 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-07-11 06:56:09 +00:00
Ozkan Sezer
e27c101a08 gl_vidsdl.c: small gamma update. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@863 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-07-25 09:41:28 +00:00
Ozkan Sezer
50ed45c9b1 gl_vidsdl.c: use SDL_SetGamma() instead of SDL's GammaRamps api. 
see: http://hg.libsdl.org/SDL/rev/3665bc284271
http://bugzilla.libsdl.org/show_bug.cgi?id=1979


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@861 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-07-24 07:00:44 +00:00
Sander van Dijk
d3676574df gl_vidsdl.c: minor cleanup (lets not hijack the SDL_ prefix) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@840 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-03-03 15:01:14 +00:00
Sander van Dijk
bd5b2ae556 gl_vidsdl.c: some video menu code readability tweaking 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@839 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-03-03 13:43:11 +00:00
Sander van Dijk
1c59d663ad gl_vidsdl.c: be bit more lenient (and safer) regarding bpp 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@836 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-03-02 18:10:19 +00:00
Sander van Dijk
e2ea2d2360 gl_vidsdl.c: fix a minor inconsistency in VID_Toggle 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@835 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-03-02 16:35:48 +00:00
Sander van Dijk
78900118f3 gl_vidsdl.c: make the intel hack feedback a bit more informative 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@834 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-03-02 15:32:27 +00:00
Sander van Dijk
f02120cc7f gl_vidsdl.c: remove the PowerVR stuff, as it seems to be outdated 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@833 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-03-02 13:46:59 +00:00
Sander van Dijk
d245a15fe2 oops 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@832 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-03-02 13:13:47 +00:00
Sander van Dijk
f26daa58c2 Simplify the Intel video hack, make the PowerVR hack do the same 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@831 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-03-02 13:10:02 +00:00
Sander van Dijk
3d7a0fd66a revert r612, fix VID_Test blackscreen properly 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@826 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-03-02 09:34:18 +00:00
Ozkan Sezer
47b044893e putenv () may conform to different standards, therefore keep the vid_center[] 
static char array in VID_Init ().

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@822 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-24 17:15:04 +00:00
Sander van Dijk
a6b83f69ce gl_vidsdl.c: make bpp default to current bpp 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@821 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-24 16:28:28 +00:00
Sander van Dijk
7ae0a9e7f2 gl_vidsdl.c: fix an initialization oops 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@820 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-24 13:46:19 +00:00
Sander van Dijk
8dfabe4e7f gl_vidsdl.c, vid.h: cleanup some modestate related stuff (requires a clean build) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@819 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-24 13:42:23 +00:00
Sander van Dijk
3aa34cba34 gl_vidsdl.c: remove modelist[0] special treatment, some cleanup 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@818 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-24 13:33:30 +00:00
Sander van Dijk
9f59c863f1 gl_vidsdl.c: make VID_Init independent from modelist 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@817 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-24 13:23:26 +00:00
Sander van Dijk
8872f4df63 gl_vidsdl.c: some cleanup 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@816 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-21 19:35:21 +00:00
Sander van Dijk
ca18412bac gl_vidsdl.c: fix ValidMode(), bpp < 16 is problematic on windows 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@815 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-21 19:17:18 +00:00
Sander van Dijk
00a3f7659b gl_vidsdl.c: make VID_Restart independent from modelist 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@812 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-19 19:20:17 +00:00
Sander van Dijk
88b0694432 gl_vidsdl.c: make VID_Test independent from modelist 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@811 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-19 19:00:19 +00:00
Sander van Dijk
5c09de09ee gl_vidsdl.c: some cleanup 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@810 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-19 18:18:38 +00:00
Sander van Dijk
dd40be29eb gl_vidsdl.c: make VID_SetMode independent from "modelist" 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@809 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-18 19:19:32 +00:00
Sander van Dijk
083c27abce gl_vidsdl.c: don't depend on "modelist" for current mode info 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@808 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-17 18:12:00 +00:00
Sander van Dijk
0a7c6f77de gl_vidsdl.c: get rid of "modenum" 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@807 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-17 17:58:05 +00:00
Sander van Dijk
64f3091f05 rename the modestate_t enum items 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@805 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-13 19:07:19 +00:00
Sander van Dijk
103f041614 remove "type" from "viddef_t", use "modestate" instead 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@804 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-13 19:01:26 +00:00
Sander van Dijk
ea0b236563 gl_vidsdl.c: remove "modenum" from vmode_t 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@803 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-11 18:13:09 +00:00
Sander van Dijk
148386cc03 gl_vidsdl.c: remove "modedesc" from vmode_t 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@802 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-11 18:03:14 +00:00
Sander van Dijk
a958e33054 gl_vidsdl.c: get rid of obsolete "badmode" 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@801 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-10 17:30:40 +00:00
Sander van Dijk
ba5c538d27 gl_vidsdl.c: Simplification of some functions 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@800 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-09 16:10:23 +00:00
Sander van Dijk
dbaa3fec52 gl_vidsdl.c: Remove "halfscreen" stuff. 
AFAICS this is not needed for SDL, and it in fact
breaks weird widescreen resolutions such as 1280x600.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@798 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2013-02-01 20:44:25 +00:00
Sander van Dijk
d91f083ee4 Remove more dead code. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@790 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-28 19:10:52 +00:00
Sander van Dijk
011ca12117 gl_vidsdl.c: Remove some dead code. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@789 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-22 18:58:45 +00:00
Sander van Dijk
7b155bc6cc Really fix vsync saving/loading (finally...) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@787 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-11 17:35:43 +00:00
Ozkan Sezer
860a6007e8 regenerate gl_extensions_nice everytime the extensions string is retrieved 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@785 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-07 12:44:30 +00:00
Ozkan Sezer
c66e78f53d move GL_Init(), TexMgr_ReloadImages() and GL_SetupState() calls from 
VID_SetMode() to VID_Restart() so they aren't called twice at startup.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@784 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-07 12:27:39 +00:00
Ozkan Sezer
bf64fd2d1a better parse for opengl extensions list (from quakeforge.) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@783 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-07 07:51:41 +00:00
Ozkan Sezer
7ce7ce71ca made GL_Init() to be called every time a video mode is changed. we may 
need to kill device and rendering contexts too, will see to that later.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@781 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-06 08:50:45 +00:00
Sander van Dijk
d15e823ab7 Fix vsync saving/loading (take three...) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@780 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-02 22:16:08 +00:00
Sander van Dijk
a138b55fbe Fix vsync saving/loading (take two...) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@779 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-02 20:04:26 +00:00
Sander van Dijk
1777d5a49b Fix vsync saving/loading (hopefully...) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@778 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-11-01 17:34:40 +00:00
Sander van Dijk
95d20d835f revert (most of) r521, r756 and r759. Alter "gamekey" handling a bit to compensate. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@761 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-10-06 18:09:23 +00:00
Ozkan Sezer
a19ea6b14b removed duplicated assignment to the local 'was_changed' 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@760 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-10-06 12:28:33 +00:00
Sander van Dijk
d4611c823e more mouse grab/release fixes 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@759 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-10-05 18:58:59 +00:00
Sander van Dijk
6d8e3aa171 minor tuning of r753 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@754 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-10-01 01:57:20 +00:00
Ozkan Sezer
0dc8eab2a9 array size fix for r752 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@753 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-09-30 21:35:16 +00:00
Sander van Dijk
3be0ae496c gl_vidsdl.c: minor improvement to bpp list creation 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@752 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-09-30 21:11:39 +00:00
Ozkan Sezer
769d2ac75b simplify VID_Gamma_f: the oldgamma stuff is already handled by the cvar 
system itself.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@751 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-09-30 14:03:15 +00:00
Ozkan Sezer
74e8e5f719 changed ToggleFullscreen failure message to be a debug print 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@705 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-09-04 06:54:59 +00:00
Ozkan Sezer
50e014d050 Updated support for building the OSX versions using Makefile.darwin. Do 
not rely on sdl-config on OSX Framework builds, define new SDL_FRAMEWORK
and NO_SDL_CONFIG preprocessor macros to indicate that and include SDL.h
with the "SDL" subdirectory name included. Add new libmad and ogg/vorbis
headers and static and dynamic libraries for macosx. Xcode project files
need further updating.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@699 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-08-16 04:51:41 +00:00
Ozkan Sezer
5a2a7d96a7 * keys.h: renamed KP_* key macros to K_KP_*. 
* key.c (Key_ClearStates): Instead of clearing all key's down state
  and repeat count, run KeyEvent(k,false) keys in down state, which
  will already clear those states for them. This also helps getting
  rid of several actions bound to keypad keys. Minor cleanups.
* gl_vidsdl.c (ClearAllStates): Removed code triggering every key
  with a release event, because we just changed Key_ClearStates() to
  do that for the necessary keys.
* in_sdl.c: Minor cleanups. Made K_KP_5 to send '5' when not in game
  mode, regardless of the numlock status. Moved prev_gamekey to top
  level and call SDL_EnableUNICODE() correctly.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@686 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-06-25 11:20:38 +00:00
Ozkan Sezer
8b45bbd612 minor gl_vidsdl.c cleanups: tidied up VID_SetMode(). Removed the defunct 
_windowed_mouse cvar. Simplified va()+Cvar_Set() calls into Cvar_SetValue().

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@673 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-05-21 12:32:20 +00:00
Ozkan Sezer
ee56c76abd removed the defunct block_drawing global (btw, it was checked incorrectly 
in GL_EndRendering()... )

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@632 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-02-10 22:37:07 +00:00
Ozkan Sezer
7cddd6cb2b gl_vidsdl.c (VID_Init): fixed a -Wparentheses-equality warning from clang 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@623 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-29 18:04:28 +00:00
Ozkan Sezer
abb004f5d4 minor cleanup 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@616 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-20 17:11:24 +00:00
Ozkan Sezer
0912ffd8a6 make sure gl_max_anisotropy is initialized. also added a uberparanoid check 
for gl_max_anisotropy.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@615 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-19 20:55:27 +00:00
Sander van Dijk
272919a523 When modetesting, redraw the screen before asking for confirmation. Otherwise the screen is just a black rectangle, which may be confusing for the user. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@612 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-18 12:48:09 +00:00
Ozkan Sezer
17a4f90bb2 gl_texmgr.c, gl_vidsdl.c: made a lot of functions and variables static. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@584 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-30 14:00:28 +00:00
Ozkan Sezer
ba8f8801c1 gl_vidsdl.c (GL_Init): set VID_Changed_f() callback to vid_vsync only if 
GL_CheckExtensions() set gl_swap_control as true.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@582 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-30 12:15:19 +00:00
Ozkan Sezer
72efc8e384 gl_vidsdl.c (VID_SyncCvars): set vid_vsync to 1 only if the received value 
is positive, not "not zero".

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@579 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-30 00:10:16 +00:00
Ozkan Sezer
6c341b9ed0 minor typo fixes for vsync related messages. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@578 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 23:05:12 +00:00
Ozkan Sezer
f6d96cf7e9 gl_vidsdl.c (VID_Toggle): if SDL_WM_ToggleFullScreen() succeeded, ignore 
the vid_fullscreen callback function setting vid_changed to true.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@577 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 21:44:36 +00:00
Ozkan Sezer
eb09523d00 changed some of the Cvar_Set[Value] calls to their *Quick variants in the 
source files where the vars are defined.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@576 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 21:21:11 +00:00
Ozkan Sezer
19953bd399 silenced -Wsign-compare warnings. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@575 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 19:06:08 +00:00
Ozkan Sezer
1928f2e1b8 * first shot at cvar flag system and cvar layer clean-ups : 
- removed the archive and server members of cvar_t structure
  which are now represented by the CVAR_ARCHIVE, CVAR_NOTIFY
  and CVAR_SERVERINFO flags.
- added new Cvar_SetROM and Cvar_SetValueROM functions to 
  set vars marked as CVAR_ROM (read-only vars) programaticaly
- added Cvar_SetCallback() as a new function to assign (or
  remove) a callback function to a cvar.
- changed Cvar_RegisterVariable() to only accept a var pointer
  as in original quake
- moved notification handling from Cvar_Set() to callbacks.
- changed Cvar_Set() so that it doesn't reallocate the var's
  string buffer if nothing is changed, nor does it run the
  var's callback.
- changed the 'registered' and 'cmdline' cvars to be read-only
  so that the users can't change it using the console.  (and
  with 'registered' flagged as CVAR_ROM, the 'static_registered'
  thing is no longer required)
- added comment that sending cmdline upon CCREQ_RULE_INFO is
  evil...
- more to follow later.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@566 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-28 22:01:33 +00:00
Ozkan Sezer
42e55b3377 changed cvar callback functions to accept a cvar_t pointer arg. I may 
have a use for that later.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@545 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-24 14:04:01 +00:00
Ozkan Sezer
0953ac6751 removed support for the -mode argument from gl_vidsdl.c 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@535 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-22 23:10:25 +00:00
Ozkan Sezer
1befaa5a49 gl_vidsdl.c fixes/changes from Sander van Dijk: if (hypothetically) no 
fullscreen modes are reported at all fixes bad behaviour of several
options in the video menu, and allows the user to use "-force" to force
a fullscreen mode even if none was reported; this was previously only
possible if there was at least one fullscreen mode reported), makes the
treatment of "-current" more similar to "-width/-height/-bpp" (only
forcing it if the user provides "-force"), gets rid of leavecurrentmode
hack (which didn't do much useful, besides making the code less clear).

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@534 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-22 21:55:48 +00:00
Ozkan Sezer
6c4ad9c240 backport from uhexen2: read video variables early so that a vid_restart 
isn't necessary after init. thanks to Sander van Dijk.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@531 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-20 09:22:19 +00:00
Ozkan Sezer
968b469872 gl_vidsdl.c: comment out the rest of vid_refreshrate usage which isn't supported. 
(VID_SetMode): check whether SDL_SetVideoMode() actually succeeded. otherwise we
just segfault. noticed by Sander.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@530 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-18 16:27:14 +00:00
Steven
fc70175239 Make the default fullscreen mode 800x600 (same as window default), from Sander. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@487 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-09-20 06:41:36 +00:00
Ozkan Sezer
250fa2b7ce check for arguments to several command line options. patch from Sander van Dijk. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@446 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-04-19 18:29:41 +00:00
Ozkan Sezer
4f95ba8ef8 fixed several gcc-4.6 -Wunused-but-set-variable warnings. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@442 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-04-12 12:36:04 +00:00
Ozkan Sezer
e3d1bf3814 gl_vidsdl.c (VID_Menu_ChooseNextRate): refresh rates not implemented for SDL. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@403 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-01-29 07:21:04 +00:00