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.180 by root, Fri Apr 13 18:11:26 2007 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

… …
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
… …
56# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 62#else
58# define PARACHUTE 0 63# define PARACHUTE 0
59#endif 64#endif
60 65
66static AV *texture_av;
67
61static struct 68static struct
62{ 69{
63#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 71#include "glfunc.h"
65#undef GL_FUNC 72#undef GL_FUNC
66} gl; 73} gl;
67 74
75static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 77{
70 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 82 else
75 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
84}
85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
76} 108}
77 109
78#include "texcache.c" 110#include "texcache.c"
79 111
80#include "pango-font.c" 112#include "pango-font.c"
… …
345} smooth_key; 377} smooth_key;
346 378
347static void 379static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 381{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 383
352 if (SvIOK (*sv)) 384 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 385 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 386 else
355 sv_setiv (*sv, bits); 387 sv_setiv (*sv, bits);
… …
614 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 648 );
617 if (RETVAL) 649 if (RETVAL)
618 { 650 {
651 av_clear (texture_av);
652
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621# include "glfunc.h" 655# include "glfunc.h"
622# undef GL_FUNC 656# undef GL_FUNC
657
623 } 658 }
624 OUTPUT: 659 OUTPUT:
625 RETVAL 660 RETVAL
626 661
627void 662void
628SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
629 664
630char * 665char *
631SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
632 667
668int
669SDL_GetAppState ()
670
633void 671void
634SDL_PollEvent () 672poll_events ()
635 PPCODE: 673 PPCODE:
636{ 674{
637 SDL_Event ev; 675 SDL_Event ev;
638 676
639 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640 { 679 {
641 HV *hv = newHV (); 680 HV *hv = newHV ();
642 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
643 682
644 switch (ev.type) 683 switch (ev.type)
… …
656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658 break; 697 break;
659 698
660 case SDL_MOUSEMOTION: 699 case SDL_MOUSEMOTION:
700 {
701 int state = ev.motion.state;
702 int x = ev.motion.x;
703 int y = ev.motion.y;
704 int xrel = ev.motion.xrel;
705 int yrel = ev.motion.yrel;
706
707 /* do simplistic event compression */
708 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
709 && state == ev.motion.state)
710 {
711 xrel += ev.motion.xrel;
712 yrel += ev.motion.yrel;
713 x = ev.motion.x;
714 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 }
717
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
662
663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
668 break; 725 break;
669 726
670 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
671 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
… …
852 ExitThread (retval); // unclean, please beam me up 909 ExitThread (retval); // unclean, please beam me up
853#else 910#else
854 _exit (retval); 911 _exit (retval);
855#endif 912#endif
856 913
914void
915debug ()
916 CODE:
917{
918#if DEBUG
919 VALGRIND_DO_LEAK_CHECK;
920#endif
921}
922
857MODULE = CFPlus PACKAGE = CFPlus::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
858 924
859CFPlus::Font 925CFPlus::Font
860new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
861 CODE: 927 CODE:
… …
1391 CODE: 1457 CODE:
1392{ 1458{
1393 if (dx > 0) 1459 if (dx > 0)
1394 map_blank (self, self->x, self->y, dx, self->h); 1460 map_blank (self, self->x, self->y, dx, self->h);
1395 else if (dx < 0) 1461 else if (dx < 0)
1396 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1462 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1397 1463
1398 if (dy > 0) 1464 if (dy > 0)
1399 map_blank (self, self->x, self->y, self->w, dy); 1465 map_blank (self, self->x, self->y, self->w, dy);
1400 else if (dy < 0) 1466 else if (dy < 0)
1401 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1467 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1402 1468
1403 self->ox += dx; self->x += dx; 1469 self->ox += dx; self->x += dx;
1404 self->oy += dy; self->y += dy; 1470 self->oy += dy; self->y += dy;
1405 1471
1406 while (self->y < 0) 1472 while (self->y < 0)
… …
1460 } 1526 }
1461 else if (cmd == 6) // monster width 1527 else if (cmd == 6) // monster width
1462 cell->stat_width = *data++ + 1; 1528 cell->stat_width = *data++ + 1;
1463 else if (cmd == 0x47) 1529 else if (cmd == 0x47)
1464 { 1530 {
1465 if (*data == 8) 1531 if (*data == 4)
1466 ; // decode player uuid 1532 ; // decode player count
1467 1533
1468 data += *data + 1; 1534 data += *data + 1;
1469 } 1535 }
1470 else if (cmd == 8) // cell flags 1536 else if (cmd == 8) // cell flags
1471 cell->flags = *data++; 1537 cell->flags = *data++;
… …
1712 } 1778 }
1713 } 1779 }
1714 } 1780 }
1715 } 1781 }
1716 1782
1717 // go through all smoothlevels, lowest to highest, then draw 1783 // go through all smoothlevels, lowest to highest, then draw.
1718 // this is basically counting sort 1784 // this is basically counting sort
1719 { 1785 {
1720 int w, b; 1786 int w, b;
1721 1787
1722 for (w = 0; w < 256 / 32; ++w) 1788 for (w = 0; w < 256 / 32; ++w)
… …
1735 smooth_key *skey = (smooth_key *)HeKEY (he); 1801 smooth_key *skey = (smooth_key *)HeKEY (he);
1736 IV bits = SvIVX (HeVAL (he)); 1802 IV bits = SvIVX (HeVAL (he));
1737 1803
1738 if (!(bits & 0x1000) 1804 if (!(bits & 0x1000)
1739 && skey->level == level 1805 && skey->level == level
1740 && level >= smooth_max [skey->x][skey->y]) 1806 && level > smooth_max [skey->x][skey->y])
1741 { 1807 {
1742 maptex tex = self->tex [skey->tile]; 1808 maptex tex = self->tex [skey->tile];
1743 int px = (((int)skey->x) - 1) * T; 1809 int px = (((int)skey->x) - 1) * T;
1744 int py = (((int)skey->y) - 1) * T; 1810 int py = (((int)skey->y) - 1) * T;
1745 int border = bits & 15; 1811 int border = bits & 15;
… …
2096 CODE: 2162 CODE:
2097 RETVAL = Mix_VolumeMusic (volume); 2163 RETVAL = Mix_VolumeMusic (volume);
2098 OUTPUT: 2164 OUTPUT:
2099 RETVAL 2165 RETVAL
2100 2166
2167int
2168fade_out (int ms)
2169 CODE:
2170 RETVAL = Mix_FadeOutMusic (ms);
2171 OUTPUT:
2172 RETVAL
2173
2101CFPlus::MixMusic 2174CFPlus::MixMusic
2102new_from_file (SV *class, char *path) 2175new_from_file (SV *class, char *path)
2103 CODE: 2176 CODE:
2104 RETVAL = Mix_LoadMUS (path); 2177 RETVAL = Mix_LoadMUS (path);
2105 OUTPUT: 2178 OUTPUT:
… …
2112 2185
2113int 2186int
2114play (CFPlus::MixMusic self, int loops = -1) 2187play (CFPlus::MixMusic self, int loops = -1)
2115 CODE: 2188 CODE:
2116 RETVAL = Mix_PlayMusic (self, loops); 2189 RETVAL = Mix_PlayMusic (self, loops);
2190 OUTPUT:
2191 RETVAL
2192
2193int
2194fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2195 CODE:
2196 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2117 OUTPUT: 2197 OUTPUT:
2118 RETVAL 2198 RETVAL
2119 2199
2120MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2200MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2121 2201
… …
2210# undef const_iv 2290# undef const_iv
2211 }; 2291 };
2212 2292
2213 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2293 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2214 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2294 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2295
2296 texture_av = newAV ();
2297 AvREAL_off (texture_av);
2215} 2298}
2216 2299
2217char * 2300char *
2218gl_vendor () 2301gl_vendor ()
2219 CODE: 2302 CODE:
… …
2368 2451
2369void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2452void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2370 2453
2371int glGenTexture () 2454int glGenTexture ()
2372 CODE: 2455 CODE:
2373{ 2456 RETVAL = gen_texture ();
2374 GLuint name;
2375 glGenTextures (1, &name);
2376 RETVAL = name;
2377}
2378 OUTPUT: 2457 OUTPUT:
2379 RETVAL 2458 RETVAL
2380 2459
2381void glDeleteTexture (int name) 2460void glDeleteTexture (int name)
2382 CODE: 2461 CODE:
2383{
2384 GLuint name_ = name;
2385 glDeleteTextures (1, &name_); 2462 del_texture (name);
2386} 2463
2387
2388int glGenList () 2464int glGenList ()
2389 CODE: 2465 CODE:
2390 RETVAL = glGenLists (1); 2466 RETVAL = glGenLists (1);
2391 OUTPUT: 2467 OUTPUT:
2392 RETVAL 2468 RETVAL

Diff Legend

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