ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.187 by root, Sat Apr 21 23:36:20 2007 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC

… …
56# define PARACHUTE SDL_INIT_NOPARACHUTE 56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 57#else
58# define PARACHUTE 0 58# define PARACHUTE 0
59#endif 59#endif
60 60
61static AV *texture_av;
62
61static struct 63static struct
62{ 64{
63#define GL_FUNC(ptr,name) ptr name; 65#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 66#include "glfunc.h"
65#undef GL_FUNC 67#undef GL_FUNC
66} gl; 68} gl;
67 69
70static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 71gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 72{
70 if (gl.BlendFuncSeparate) 73 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 74 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 75 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 76 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 77 else
75 glBlendFunc (sa, da); 78 glBlendFunc (sa, da);
79}
80
81static GLuint
82gen_texture ()
83{
84 GLuint name;
85
86 if (AvFILL (texture_av) >= 0)
87 name = (GLuint)(size_t)av_pop (texture_av);
88 else
89 glGenTextures (1, &name);
90
91 return name;
92}
93
94static void
95del_texture (GLuint name)
96{
97 /* make a half-assed attempt at returning the memory used by the texture */
98 /* textures are frequently being reused by cfplus anyway */
99 /*glBindTexture (GL_TEXTURE_2D, name);*/
100 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
101 av_push (texture_av, (SV *)(size_t)name);
102 glDeleteTextures (1, &name);
76} 103}
77 104
78#include "texcache.c" 105#include "texcache.c"
79 106
80#include "pango-font.c" 107#include "pango-font.c"
… …
400 427
401/* SDL should provide this, really. */ 428/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 429#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 430#define SDLK_MODIFIER_MAX 314
404 431
405static AV *texture_av;
406
407MODULE = CFPlus PACKAGE = CFPlus 432MODULE = CFPlus PACKAGE = CFPlus
408 433
409PROTOTYPES: ENABLE 434PROTOTYPES: ENABLE
410 435
411BOOT: 436BOOT:
412{ 437{
413 texture_av = newAV ();
414 AvREAL_off (texture_av);
415
416 HV *stash = gv_stashpv ("CFPlus", 1); 438 HV *stash = gv_stashpv ("CFPlus", 1);
417 static const struct { 439 static const struct {
418 const char *name; 440 const char *name;
419 IV iv; 441 IV iv;
420 } *civ, const_iv[] = { 442 } *civ, const_iv[] = {
… …
619 RETVAL = !!SDL_SetVideoMode ( 641 RETVAL = !!SDL_SetVideoMode (
620 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 642 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
621 ); 643 );
622 if (RETVAL) 644 if (RETVAL)
623 { 645 {
646 av_clear (texture_av);
647
624 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 648 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
625# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 649# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
626# include "glfunc.h" 650# include "glfunc.h"
627# undef GL_FUNC 651# undef GL_FUNC
652
628 } 653 }
629 OUTPUT: 654 OUTPUT:
630 RETVAL 655 RETVAL
631 656
632void 657void
… …
1740 smooth_key *skey = (smooth_key *)HeKEY (he); 1765 smooth_key *skey = (smooth_key *)HeKEY (he);
1741 IV bits = SvIVX (HeVAL (he)); 1766 IV bits = SvIVX (HeVAL (he));
1742 1767
1743 if (!(bits & 0x1000) 1768 if (!(bits & 0x1000)
1744 && skey->level == level 1769 && skey->level == level
1745 && level >= smooth_max [skey->x][skey->y]) 1770 && level > smooth_max [skey->x][skey->y])
1746 { 1771 {
1747 maptex tex = self->tex [skey->tile]; 1772 maptex tex = self->tex [skey->tile];
1748 int px = (((int)skey->x) - 1) * T; 1773 int px = (((int)skey->x) - 1) * T;
1749 int py = (((int)skey->y) - 1) * T; 1774 int py = (((int)skey->y) - 1) * T;
1750 int border = bits & 15; 1775 int border = bits & 15;
… …
2215# undef const_iv 2240# undef const_iv
2216 }; 2241 };
2217 2242
2218 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2243 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2219 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2244 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2245
2246 texture_av = newAV ();
2247 AvREAL_off (texture_av);
2220} 2248}
2221 2249
2222char * 2250char *
2223gl_vendor () 2251gl_vendor ()
2224 CODE: 2252 CODE:
… …
2373 2401
2374void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2402void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2375 2403
2376int glGenTexture () 2404int glGenTexture ()
2377 CODE: 2405 CODE:
2378{ 2406 RETVAL = gen_texture ();
2379 GLuint name;
2380 if (AvFILL (texture_av) >= 0)
2381 name = (GLuint)av_pop (texture_av);
2382 else
2383 glGenTextures (1, &name);
2384 RETVAL = name;
2385}
2386 OUTPUT: 2407 OUTPUT:
2387 RETVAL 2408 RETVAL
2388 2409
2389void glDeleteTexture (int name) 2410void glDeleteTexture (int name)
2390 CODE: 2411 CODE:
2391{ 2412 del_texture (name);
2392 /* make a half-assed attempt at returning the memory used by the texture */ 2413
2393 /* textures are frequently being reused by cfplus anyway */
2394 glBindTexture (GL_TEXTURE_2D, name);
2395 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2396 av_push (texture_av, (SV *)name);
2397 /*glDeleteTextures (1, &name_);*/
2398}
2399
2400int glGenList () 2414int glGenList ()
2401 CODE: 2415 CODE:
2402 RETVAL = glGenLists (1); 2416 RETVAL = glGenLists (1);
2403 OUTPUT: 2417 OUTPUT:
2404 RETVAL 2418 RETVAL

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines