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.182 by root, Wed Apr 18 09:39:49 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"
… …
614 RETVAL = !!SDL_SetVideoMode ( 641 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 642 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 643 );
617 if (RETVAL) 644 if (RETVAL)
618 { 645 {
646 av_clear (texture_av);
647
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 648 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620# 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);
621# include "glfunc.h" 650# include "glfunc.h"
622# undef GL_FUNC 651# undef GL_FUNC
652
623 } 653 }
624 OUTPUT: 654 OUTPUT:
625 RETVAL 655 RETVAL
626 656
627void 657void
… …
1391 CODE: 1421 CODE:
1392{ 1422{
1393 if (dx > 0) 1423 if (dx > 0)
1394 map_blank (self, self->x, self->y, dx, self->h); 1424 map_blank (self, self->x, self->y, dx, self->h);
1395 else if (dx < 0) 1425 else if (dx < 0)
1396 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1426 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1397 1427
1398 if (dy > 0) 1428 if (dy > 0)
1399 map_blank (self, self->x, self->y, self->w, dy); 1429 map_blank (self, self->x, self->y, self->w, dy);
1400 else if (dy < 0) 1430 else if (dy < 0)
1401 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1431 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1402 1432
1403 self->ox += dx; self->x += dx; 1433 self->ox += dx; self->x += dx;
1404 self->oy += dy; self->y += dy; 1434 self->oy += dy; self->y += dy;
1405 1435
1406 while (self->y < 0) 1436 while (self->y < 0)
… …
1735 smooth_key *skey = (smooth_key *)HeKEY (he); 1765 smooth_key *skey = (smooth_key *)HeKEY (he);
1736 IV bits = SvIVX (HeVAL (he)); 1766 IV bits = SvIVX (HeVAL (he));
1737 1767
1738 if (!(bits & 0x1000) 1768 if (!(bits & 0x1000)
1739 && skey->level == level 1769 && skey->level == level
1740 && level >= smooth_max [skey->x][skey->y]) 1770 && level > smooth_max [skey->x][skey->y])
1741 { 1771 {
1742 maptex tex = self->tex [skey->tile]; 1772 maptex tex = self->tex [skey->tile];
1743 int px = (((int)skey->x) - 1) * T; 1773 int px = (((int)skey->x) - 1) * T;
1744 int py = (((int)skey->y) - 1) * T; 1774 int py = (((int)skey->y) - 1) * T;
1745 int border = bits & 15; 1775 int border = bits & 15;
… …
2210# undef const_iv 2240# undef const_iv
2211 }; 2241 };
2212 2242
2213 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; )
2214 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);
2215} 2248}
2216 2249
2217char * 2250char *
2218gl_vendor () 2251gl_vendor ()
2219 CODE: 2252 CODE:
… …
2368 2401
2369void 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)
2370 2403
2371int glGenTexture () 2404int glGenTexture ()
2372 CODE: 2405 CODE:
2373{ 2406 RETVAL = gen_texture ();
2374 GLuint name;
2375 glGenTextures (1, &name);
2376 RETVAL = name;
2377}
2378 OUTPUT: 2407 OUTPUT:
2379 RETVAL 2408 RETVAL
2380 2409
2381void glDeleteTexture (int name) 2410void glDeleteTexture (int name)
2382 CODE: 2411 CODE:
2383{
2384 GLuint name_ = name;
2385 glDeleteTextures (1, &name_); 2412 del_texture (name);
2386} 2413
2387
2388int glGenList () 2414int glGenList ()
2389 CODE: 2415 CODE:
2390 RETVAL = glGenLists (1); 2416 RETVAL = glGenLists (1);
2391 OUTPUT: 2417 OUTPUT:
2392 RETVAL 2418 RETVAL

Diff Legend

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