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.153 by root, Tue Sep 19 22:02:38 2006 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
22#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
23#include <SDL_endian.h> 32#include <SDL_endian.h>
24#include <SDL_image.h> 33#include <SDL_image.h>
25#include <SDL_mixer.h> 34#include <SDL_mixer.h>
26#include <SDL_opengl.h> 35#include <SDL_opengl.h>
27 36
36# include <sys/types.h> 45# include <sys/types.h>
37# include <sys/socket.h> 46# include <sys/socket.h>
38# include <netinet/in.h> 47# include <netinet/in.h>
39# include <netinet/tcp.h> 48# include <netinet/tcp.h>
40# include <inttypes.h> 49# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 50#endif
49 51
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 53
52#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
53 55
54#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 63#else
62# define PARACHUTE 0 64# define PARACHUTE 0
63#endif 65#endif
64 66
67static AV *texture_av;
68
65static struct 69static struct
66{ 70{
67#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 72#include "glfunc.h"
69#undef GL_FUNC 73#undef GL_FUNC
70} gl; 74} gl;
71 75
76static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 78{
74 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 83 else
79 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
80} 85}
81 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
82#include "texcache.c" 111#include "texcache.c"
83 112
84#include "pango-font.c" 113#include "pango-font.c"
85#include "pango-fontmap.c" 114#include "pango-fontmap.c"
86#include "pango-render.c" 115#include "pango-render.c"
159 188
160 *w = rect.width; 189 *w = rect.width;
161 *h = rect.height; 190 *h = rect.height;
162} 191}
163 192
193typedef uint16_t tileid;
164typedef uint16_t mapface; 194typedef uint16_t faceid;
165 195
166typedef struct { 196typedef struct {
167 GLint name; 197 int name;
168 int w, h; 198 int w, h;
169 float s, t; 199 float s, t;
170 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
171} maptex; 203} maptex;
172 204
173typedef struct { 205typedef struct {
174 uint32_t player; 206 uint32_t player;
175 mapface face[3]; 207 tileid tile[3];
176 uint16_t darkness; 208 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
178} mapcell; 210} mapcell;
179 211
180typedef struct { 212typedef struct {
181 int32_t c0, c1; 213 int32_t c0, c1;
182 mapcell *col; 214 mapcell *col;
183} maprow; 215} maprow;
184 216
185typedef struct map { 217typedef struct map {
186 int x, y, w, h; 218 int x, y, w, h;
187 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
188 int faces; 220 int faces; tileid *face2tile; // [faceid]
189 mapface *face; 221 int texs; maptex *tex; // [tileid]
190
191 int texs;
192 maptex *tex;
193 222
194 int32_t rows; 223 int32_t rows;
195 maprow *row; 224 maprow *row;
196} *CFPlus__Map; 225} *CFPlus__Map;
197 226
217 return ptr; 246 return ptr;
218} 247}
219 248
220#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
221#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
222 271
223static maprow * 272static maprow *
224map_get_row (CFPlus__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
225{ 274{
226 if (0 > y) 275 if (0 > y)
315 364
316 cell = row->col + x - row->c0; 365 cell = row->col + x - row->c0;
317 366
318 cell->darkness = 0; 367 cell->darkness = 0;
319 cell->stat_hp = 0; 368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
320 } 371 }
321 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
322} 389}
323 390
324static void 391static void
325music_finished (void) 392music_finished (void)
326{ 393{
361 n |= n >> 8; 428 n |= n >> 8;
362 n |= n >> 16; 429 n |= n >> 16;
363 430
364 return n + 1; 431 return n + 1;
365} 432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
366 437
367MODULE = CFPlus PACKAGE = CFPlus 438MODULE = CFPlus PACKAGE = CFPlus
368 439
369PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
370 441
374 static const struct { 445 static const struct {
375 const char *name; 446 const char *name;
376 IV iv; 447 IV iv;
377 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
378# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
379 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
380 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
381 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
382 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
383 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
392 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
393 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
394 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
395 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
396 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
397 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
398 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
399 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
400 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
401 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
456 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
457 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
458 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
459 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
460 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
461 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
462 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
463 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
464 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
465 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
466 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
467 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
468 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
469 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
470 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
471 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
472 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
473 const_iv (KMOD_CTRL),
474 const_iv (KMOD_SHIFT),
475 const_iv (KMOD_ALT),
476 const_iv (KMOD_META)
477# undef const_iv 557# undef const_iv
478 }; 558 };
479 559
480 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
481 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
482} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
483 572
484int 573int
485in_destruct () 574in_destruct ()
486 CODE: 575 CODE:
487 RETVAL = PL_main_cv == Nullcv; 576 RETVAL = PL_main_cv == Nullcv;
499 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
500 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
501 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
502} 591}
503 592
593char *
594SDL_GetError ()
595
504int 596int
505SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
506 598
507void 599void
508SDL_Quit () 600SDL_Quit ()
509 601
510void 602void
511SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
512 PPCODE: 604 PPCODE:
513{ 605{
514 SDL_Rect **m; 606 SDL_Rect **m;
515 607
516 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
517 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
518 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
519 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
520 612
521 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
522 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
523 615
524 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
525 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
526 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
527 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
528 620
529 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
530#if SDL_VERSION_ATLEAST(1,2,10) 622#if SDL_VERSION_ATLEAST(1,2,10)
531 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
532 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
533#endif 625#endif
534 626
535 SDL_EnableUNICODE (1);
536 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
537
538 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
539 628
540 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
541 while (*m) 630 while (*m)
542 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
543 AV *av = newAV (); 634 AV *av = newAV ();
544 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
545 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
546 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
547 641
548 ++m; 642 ++m;
549 } 643 }
550} 644}
551 645
552char *
553SDL_GetError ()
554
555int 646int
556SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
557 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
558 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
559 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
560 ); 660 );
661
561 if (RETVAL) 662 if (RETVAL)
562 { 663 {
664 av_clear (texture_av);
665
563 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
564# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
565# include "glfunc.h" 668#include "glfunc.h"
566# undef GL_FUNC 669#undef GL_FUNC
567 } 670 }
671}
568 OUTPUT: 672 OUTPUT:
569 RETVAL 673 RETVAL
570 674
571void 675void
572SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
573 677
574char * 678char *
575SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
576 680
681int
682SDL_GetAppState ()
683
577void 684void
578SDL_PollEvent () 685poll_events ()
579 PPCODE: 686 PPCODE:
580{ 687{
581 SDL_Event ev; 688 SDL_Event ev;
582 689
583 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
584 { 692 {
585 HV *hv = newHV (); 693 HV *hv = newHV ();
586 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
587 695
588 switch (ev.type) 696 switch (ev.type)
590 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
591 case SDL_KEYUP: 699 case SDL_KEYUP:
592 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
593 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
594 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
595 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
596 break; 705 break;
597 706
598 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
599 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
600 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
601 break; 710 break;
602 711
603 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
604 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
605
606 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
607 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
608 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
609 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
610 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
611 break; 738 break;
612 739
613 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
614 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
615 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
645 772
646void 773void
647lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
648 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
649#ifndef _WIN32 782#ifdef _WIN32
650 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 783 char buffer[2048];
784 DWORD buflen;
785
786 EXTEND (SP, 3);
787
788 buflen = sizeof (buffer);
789 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
790 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
791 {
792 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
793
794 buflen = sizeof (buffer);
795 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
796 {
797 PUSHs (newSVpv (buffer, 0));
798
799 buflen = sizeof (buffer);
800 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
801 PUSHs (newSVpv (buffer, 0));
802 }
803 }
651#endif 804#endif
805}
652 806
653void 807void
654add_font (char *file) 808add_font (char *file)
655 CODE: 809 CODE:
656 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
760 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
761#endif 915#endif
762 _exit (1); 916 _exit (1);
763 917
764void 918void
765_exit (int retval) 919_exit (int retval = 0)
766 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
767 _exit (retval); 924 _exit (retval);
925#endif
926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
768 935
769MODULE = CFPlus PACKAGE = CFPlus::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
770 937
771CFPlus::Font 938CFPlus::Font
772new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
1019xy_to_index (CFPlus::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
1020 CODE: 1187 CODE:
1021{ 1188{
1022 int index, trailing; 1189 int index, trailing;
1023 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1024 RETVAL = index; 1191 RETVAL = index + trailing;
1025} 1192}
1026 OUTPUT: 1193 OUTPUT:
1027 RETVAL 1194 RETVAL
1028 1195
1029void 1196void
1035 1202
1036 EXTEND (SP, 3); 1203 EXTEND (SP, 3);
1037 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1038 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1039 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1207}
1208
1209void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1211 PPCODE:
1212{
1213 int line, x;
1214
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217
1218 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221}
1222
1223void
1224line_x_to_index (CFPlus::Layout self, int line, int x)
1225 PPCODE:
1226{
1227 PangoLayoutLine *lp;
1228 int index, trailing;
1229
1230 if (line < 0)
1231 XSRETURN_EMPTY;
1232
1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */
1235
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237
1238 EXTEND (SP, 2);
1239 if (GIMME_V == G_SCALAR)
1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1241 else
1242 {
1243 PUSHs (sv_2mortal (newSViv (index)));
1244 PUSHs (sv_2mortal (newSViv (trailing)));
1245 }
1040} 1246}
1041 1247
1042void 1248void
1043render (CFPlus::Layout self, float x, float y, int flags = 0) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1044 PPCODE: 1250 PPCODE:
1049 flags 1255 flags
1050 ); 1256 );
1051 1257
1052MODULE = CFPlus PACKAGE = CFPlus::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1053 1259
1054void 1260int minpot (int n)
1055pad2pot (SV *data_, SV *w_, SV *h_)
1056 CODE:
1057{
1058 int ow = SvIV (w_);
1059 int oh = SvIV (h_);
1060 1261
1061 if (ow && oh) 1262void
1263pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE:
1265{
1266 if ((nw != ow || nh != oh) && SvOK (data_))
1062 { 1267 {
1063 int nw = minpot (ow);
1064 int nh = minpot (oh);
1065
1066 if (nw != ow || nh != oh)
1067 {
1068 if (SvOK (data_))
1069 {
1070 STRLEN datalen; 1268 STRLEN datalen;
1071 char *data = SvPVbyte (data_, datalen); 1269 char *data = SvPVbyte (data_, datalen);
1072 int bpp = datalen / (ow * oh); 1270 int bpp = datalen / (ow * oh);
1073 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1271 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1074 1272
1075 SvPOK_only (result_); 1273 SvPOK_only (result_);
1076 SvCUR_set (result_, nw * nh * bpp); 1274 SvCUR_set (result_, nw * nh * bpp);
1077 1275
1078 memset (SvPVX (result_), 0, nw * nh * bpp); 1276 memset (SvPVX (result_), 0, nw * nh * bpp);
1079 while (oh--) 1277 while (oh--)
1080 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1278 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1081 1279
1082 sv_setsv (data_, result_); 1280 sv_setsv (data_, result_);
1083 }
1084
1085 sv_setiv (w_, nw);
1086 sv_setiv (h_, nh);
1087 }
1088 } 1281 }
1089} 1282}
1090 1283
1091void 1284void
1092draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1135 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1136 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1137 } 1330 }
1138} 1331}
1139 1332
1333IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1334 CODE:
1335{
1336 GLint width;
1337 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1338 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1339 RETVAL = width > 0;
1340}
1341 OUTPUT:
1342 RETVAL
1343
1140MODULE = CFPlus PACKAGE = CFPlus::Map 1344MODULE = CFPlus PACKAGE = CFPlus::Map
1141 1345
1142CFPlus::Map 1346CFPlus::Map
1143new (SV *class, int map_width, int map_height) 1347new (SV *class)
1144 CODE: 1348 CODE:
1145 New (0, RETVAL, 1, struct map); 1349 New (0, RETVAL, 1, struct map);
1146 RETVAL->x = 0; 1350 RETVAL->x = 0;
1147 RETVAL->y = 0; 1351 RETVAL->y = 0;
1148 RETVAL->w = map_width; 1352 RETVAL->w = 0;
1149 RETVAL->h = map_height; 1353 RETVAL->h = 0;
1150 RETVAL->ox = 0; 1354 RETVAL->ox = 0;
1151 RETVAL->oy = 0; 1355 RETVAL->oy = 0;
1152 RETVAL->faces = 8192; 1356 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1153 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1357 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1154 RETVAL->texs = 8192;
1155 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1156 RETVAL->rows = 0; 1358 RETVAL->rows = 0;
1157 RETVAL->row = 0; 1359 RETVAL->row = 0;
1158 OUTPUT: 1360 OUTPUT:
1159 RETVAL 1361 RETVAL
1160 1362
1161void 1363void
1162DESTROY (CFPlus::Map self) 1364DESTROY (CFPlus::Map self)
1163 CODE: 1365 CODE:
1164{ 1366{
1165 map_clear (self); 1367 map_clear (self);
1166 Safefree (self->face); 1368 Safefree (self->face2tile);
1167 Safefree (self->tex); 1369 Safefree (self->tex);
1168 Safefree (self); 1370 Safefree (self);
1169} 1371}
1170 1372
1171void 1373void
1374resize (CFPlus::Map self, int map_width, int map_height)
1375 CODE:
1376 self->w = map_width;
1377 self->h = map_height;
1378
1379void
1172clear (CFPlus::Map self) 1380clear (CFPlus::Map self)
1173 CODE: 1381 CODE:
1174 map_clear (self); 1382 map_clear (self);
1175 1383
1176void 1384void
1177set_face (CFPlus::Map self, int face, int texid) 1385set_tileid (CFPlus::Map self, int face, int tile)
1178 CODE: 1386 CODE:
1179{ 1387{
1180 while (self->faces <= face) 1388 need_facenum (self, face); self->face2tile [face] = tile;
1181 { 1389 need_texid (self, tile);
1182 Append (mapface, self->face, self->faces, self->faces); 1390}
1183 self->faces *= 2;
1184 }
1185 1391
1186 self->face [face] = texid; 1392void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level)
1394 CODE:
1395{
1396 tileid texid;
1397 maptex *tex;
1398
1399 if (face < 0 || face >= self->faces)
1400 return;
1401
1402 if (smooth < 0 || smooth >= self->faces)
1403 return;
1404
1405 texid = self->face2tile [face];
1406
1407 if (!texid)
1408 return;
1409
1410 tex = self->tex + texid;
1411 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level;
1187} 1413}
1188 1414
1189void 1415void
1190set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1416set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1191 CODE: 1417 CODE:
1192{ 1418{
1193 while (self->texs <= texid) 1419 need_texid (self, texid);
1194 {
1195 Append (maptex, self->tex, self->texs, self->texs);
1196 self->texs *= 2;
1197 }
1198 1420
1199 { 1421 {
1200 maptex *tex = self->tex + texid; 1422 maptex *tex = self->tex + texid;
1201 1423
1202 tex->name = name; 1424 tex->name = name;
1244void 1466void
1245scroll (CFPlus::Map self, int dx, int dy) 1467scroll (CFPlus::Map self, int dx, int dy)
1246 CODE: 1468 CODE:
1247{ 1469{
1248 if (dx > 0) 1470 if (dx > 0)
1249 map_blank (self, self->x, self->y, dx - 1, self->h); 1471 map_blank (self, self->x, self->y, dx, self->h);
1250 else if (dx < 0) 1472 else if (dx < 0)
1251 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1473 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1252 1474
1253 if (dy > 0) 1475 if (dy > 0)
1254 map_blank (self, self->x, self->y, self->w, dy - 1); 1476 map_blank (self, self->x, self->y, self->w, dy);
1255 else if (dy < 0) 1477 else if (dy < 0)
1256 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1478 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1257 1479
1258 self->ox += dx; self->x += dx; 1480 self->ox += dx; self->x += dx;
1259 self->oy += dy; self->y += dy; 1481 self->oy += dy; self->y += dy;
1260 1482
1261 while (self->y < 0) 1483 while (self->y < 0)
1287 1509
1288 if (flags & 15) 1510 if (flags & 15)
1289 { 1511 {
1290 if (!cell->darkness) 1512 if (!cell->darkness)
1291 { 1513 {
1514 memset (cell, 0, sizeof (*cell));
1292 cell->darkness = 256; 1515 cell->darkness = 256;
1293 cell->face [0] = 0;
1294 cell->face [1] = 0;
1295 cell->face [2] = 0;
1296 } 1516 }
1297 1517
1298 //TODO: don't trust server data to be in-range(!) 1518 //TODO: don't trust server data to be in-range(!)
1299 1519
1300 if (flags & 8) 1520 if (flags & 8)
1315 cell->stat_width = 1; 1535 cell->stat_width = 1;
1316 cell->stat_hp = *data++; 1536 cell->stat_hp = *data++;
1317 } 1537 }
1318 else if (cmd == 6) // monster width 1538 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1; 1539 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width 1540 else if (cmd == 0x47)
1321 { 1541 {
1322 if (*data == 4) 1542 if (*data == 4)
1323 ; // decode player tag 1543 ; // decode player count
1324 1544
1325 data += *data + 1; 1545 data += *data + 1;
1326 } 1546 }
1327 else if (cmd == 8) // cell flags 1547 else if (cmd == 8) // cell flags
1328 cell->flags = *data++; 1548 cell->flags = *data++;
1337 cell->darkness = *data++ + 1; 1557 cell->darkness = *data++ + 1;
1338 } 1558 }
1339 1559
1340 if (flags & 4) 1560 if (flags & 4)
1341 { 1561 {
1342 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1562 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face];
1343 } 1565 }
1344 1566
1345 if (flags & 2) 1567 if (flags & 2)
1346 { 1568 {
1347 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1569 faceid face = (data [0] << 8) + data [1]; data += 2;
1570 need_facenum (self, face);
1571 cell->tile [1] = self->face2tile [face];
1348 } 1572 }
1349 1573
1350 if (flags & 1) 1574 if (flags & 1)
1351 { 1575 {
1352 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [2] = self->face2tile [face];
1353 } 1579 }
1354 } 1580 }
1355 else 1581 else
1356 {
1357 cell->darkness = 0; 1582 cell->darkness = 0;
1358 cell->stat_hp = 0;
1359 }
1360 } 1583 }
1361} 1584}
1362 1585
1363SV * 1586SV *
1364mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1390 { 1613 {
1391 mapcell *cell = row->col + (x - row->c0); 1614 mapcell *cell = row->col + (x - row->c0);
1392 1615
1393 for (z = 0; z <= 0; z++) 1616 for (z = 0; z <= 0; z++)
1394 { 1617 {
1395 mapface face = cell->face [z];
1396
1397 if (face)
1398 {
1399 maptex tex = self->tex [face]; 1618 maptex tex = self->tex [cell->tile [z]];
1400 int a0 = 255 - tex.a; 1619 int a0 = 255 - tex.a;
1401 int a1 = tex.a; 1620 int a1 = tex.a;
1402 1621
1403 r = (r * a0 + tex.r * a1) / 255; 1622 r = (r * a0 + tex.r * a1) / 255;
1404 g = (g * a0 + tex.g * a1) / 255; 1623 g = (g * a0 + tex.g * a1) / 255;
1405 b = (b * a0 + tex.b * a1) / 255; 1624 b = (b * a0 + tex.b * a1) / 255;
1406 a = (a * a0 + tex.a * a1) / 255; 1625 a = (a * a0 + tex.a * a1) / 255;
1407 }
1408 } 1626 }
1409 } 1627 }
1410 1628
1411 *map++ = (r ) 1629 *map++ = (r )
1412 | (g << 8) 1630 | (g << 8)
1419} 1637}
1420 OUTPUT: 1638 OUTPUT:
1421 RETVAL 1639 RETVAL
1422 1640
1423void 1641void
1424draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1425 CODE: 1643 CODE:
1426{ 1644{
1427 int vx, vy; 1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1647 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1648 smooth_key skey;
1428 int x, y, z; 1649 int x, y, z;
1429 int last_name; 1650 int last_name;
1430 mapface face;
1431 1651
1432 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1652 // thats current max. sorry.
1433 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1653 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255;
1434 1655
1435 /* 1656 // clear key, in case of extra padding
1436 int vx = self->vx = self->w >= sw 1657 memset (&skey, 0, sizeof (skey));
1437 ? self->x + (self->w - sw) / 2
1438 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1439
1440 int vy = self->vy = self->h >= sh
1441 ? self->y + (self->h - sh) / 2
1442 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1443 */
1444 1658
1445 glColor4ub (255, 255, 255, 255); 1659 glColor4ub (255, 255, 255, 255);
1446 1660
1447 glEnable (GL_BLEND); 1661 glEnable (GL_BLEND);
1448 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1451 1665
1452 glBegin (GL_QUADS); 1666 glBegin (GL_QUADS);
1453 1667
1454 last_name = 0; 1668 last_name = 0;
1455 1669
1670 mx += self->x;
1671 my += self->y;
1672
1673 // first pass: determine smooth_max
1674 // rather ugly, if you ask me
1675 // could also be stored inside mapcell and updated on change
1676 memset (smooth_max, 0, sizeof (smooth_max));
1677
1678 for (y = 0; y < sh; y++)
1679 if (0 <= y + my && y + my < self->rows)
1680 {
1681 maprow *row = self->row + (y + my);
1682
1683 for (x = 0; x < sw; x++)
1684 if (row->c0 <= x + mx && x + mx < row->c1)
1685 {
1686 mapcell *cell = row->col + (x + mx - row->c0);
1687
1688 smooth_max[x + 1][y + 1] =
1689 MAX (self->tex [cell->tile [0]].smoothlevel,
1690 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel));
1692 }
1693 }
1694
1456 for (z = 0; z < 3; z++) 1695 for (z = 0; z <= 2; z++)
1696 {
1697 memset (smooth_level, 0, sizeof (smooth_level));
1698
1457 for (y = 0; y < sh; y++) 1699 for (y = 0; y < sh; y++)
1458 if (0 <= y + vy && y + vy < self->rows) 1700 if (0 <= y + my && y + my < self->rows)
1459 { 1701 {
1460 maprow *row = self->row + (y + vy); 1702 maprow *row = self->row + (y + my);
1461 1703
1462 for (x = 0; x < sw; x++) 1704 for (x = 0; x < sw; x++)
1463 if (row->c0 <= x + vx && x + vx < row->c1) 1705 if (row->c0 <= x + mx && x + mx < row->c1)
1464 { 1706 {
1465 mapcell *cell = row->col + (x + vx - row->c0); 1707 mapcell *cell = row->col + (x + mx - row->c0);
1466
1467 face = cell->face [z]; 1708 tileid tile = cell->tile [z];
1709
1710 if (tile)
1711 {
1712 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w;
1714 int py = (y + 1) * T - tex.h;
1468 1715
1469 if (face && face < self->texs) 1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name)
1719 {
1720 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */
1722
1723 glEnd ();
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1725 glBegin (GL_QUADS);
1726 }
1727
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1729 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1730 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1731 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1732
1733 if (cell->flags && z == 2)
1734 {
1735 if (cell->flags & 1)
1736 {
1737 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32;
1740
1741 glEnd ();
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1743 glBegin (GL_QUADS);
1744
1745 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1746 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1747 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1748 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1749 }
1750 }
1751
1752 // update smooth hash
1753 if (tex.smoothtile)
1754 {
1755 skey.tile = tex.smoothtile;
1756 skey.level = tex.smoothlevel;
1757
1758 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1759
1760 // add bits to current tile and all neighbours. skey.x|y is
1761 // shifted +1|+1 so we always stay positive.
1762
1763 // bits is ___n cccc CCCC bbbb
1764 // n do not draw borders&corners
1765 // c draw these corners, but...
1766 // C ... not these
1767 // b draw these borders
1768
1769 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1770 // ┃· ·· ·┃ ━━
1771
1772 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1773 // ·· ·· ·┏ ┓·
1774
1775 // full tile
1776 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1777
1778 // borders
1779 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1780 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1781 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1782 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1783
1784 // corners
1785 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1786 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1787 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1788 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1789 }
1790 }
1791 }
1792 }
1793
1794 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort
1796 {
1797 int w, b;
1798
1799 for (w = 0; w < 256 / 32; ++w)
1800 {
1801 uint32_t smask = smooth_level [w];
1802 if (smask)
1803 for (b = 0; b < 32; ++b)
1804 if (smask & (((uint32_t)1) << b))
1470 { 1805 {
1471 maptex tex = self->tex [face]; 1806 int level = (w << 5) | b;
1472 int px = (x + 1) * 32 - tex.w; 1807 HE *he;
1473 int py = (y + 1) * 32 - tex.h;
1474 1808
1475 if (last_name != tex.name) 1809 hv_iterinit (smooth);
1810 while ((he = hv_iternext (smooth)))
1476 { 1811 {
1812 smooth_key *skey = (smooth_key *)HeKEY (he);
1813 IV bits = SvIVX (HeVAL (he));
1814
1815 if (!(bits & 0x1000)
1816 && skey->level == level
1817 && level > smooth_max [skey->x][skey->y])
1818 {
1819 maptex tex = self->tex [skey->tile];
1820 int px = (((int)skey->x) - 1) * T;
1821 int py = (((int)skey->y) - 1) * T;
1822 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column
1826
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name)
1830 {
1831 if (!tex.name)
1832 continue; // smoothing not yet available
1833
1477 glEnd (); 1834 glEnd ();
1478 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1479 glBegin (GL_QUADS); 1836 glBegin (GL_QUADS);
1837 }
1838
1839 if (border)
1840 {
1841 float ox = border * dx;
1842
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1847 }
1848
1849 if (corner)
1850 {
1851 float ox = corner * dx;
1852
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1857 }
1480 } 1858 }
1481
1482 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1483 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1484 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1485 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1486 }
1487
1488 if (cell->flags && z == 2)
1489 {
1490 if (cell->flags & 1)
1491 {
1492 maptex tex = self->tex [1];
1493 int px = (x + 1) * 32 - tex.w + 2;
1494 int py = (y + 1) * 32 - tex.h - 6;
1495
1496 glEnd ();
1497 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1498 glBegin (GL_QUADS);
1499
1500 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1501 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1502 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1503 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1504 } 1859 }
1505 } 1860 }
1506 }
1507 } 1861 }
1862 }
1863
1864 hv_clear (smooth);
1865 }
1508 1866
1509 glEnd (); 1867 glEnd ();
1510 1868
1511 glDisable (GL_TEXTURE_2D); 1869 glDisable (GL_TEXTURE_2D);
1512 glDisable (GL_BLEND); 1870 glDisable (GL_BLEND);
1513 1871
1514 // top layer: overlays such as the health bar 1872 // top layer: overlays such as the health bar
1515 for (y = 0; y < sh; y++) 1873 for (y = 0; y < sh; y++)
1516 if (0 <= y + vy && y + vy < self->rows) 1874 if (0 <= y + my && y + my < self->rows)
1517 { 1875 {
1518 maprow *row = self->row + (y + vy); 1876 maprow *row = self->row + (y + my);
1519 1877
1520 for (x = 0; x < sw; x++) 1878 for (x = 0; x < sw; x++)
1521 if (row->c0 <= x + vx && x + vx < row->c1) 1879 if (row->c0 <= x + mx && x + mx < row->c1)
1522 { 1880 {
1523 mapcell *cell = row->col + (x + vx - row->c0); 1881 mapcell *cell = row->col + (x + mx - row->c0);
1524 1882
1525 int px = x * 32; 1883 int px = x * T;
1526 int py = y * 32; 1884 int py = y * T;
1527 1885
1528 if (cell->stat_hp) 1886 if (cell->stat_hp)
1529 { 1887 {
1530 int width = cell->stat_width * 32; 1888 int width = cell->stat_width * T;
1531 int thick = sh / 28 + 1 + cell->stat_width; 1889 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1532 1890
1533 glColor3ub (0, 0, 0); 1891 glColor3ub (0, 0, 0);
1534 glRectf (px + 1, py - thick - 2, 1892 glRectf (px + 1, py - thick - 2,
1535 px + width - 1, py); 1893 px + width - 1, py);
1536 1894
1602 glDisable (GL_BLEND); 1960 glDisable (GL_BLEND);
1603 glDisable (GL_TEXTURE_2D); 1961 glDisable (GL_TEXTURE_2D);
1604} 1962}
1605 1963
1606void 1964void
1607fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1608 PPCODE: 1966 PPCODE:
1609{ 1967{
1610 int vx, vy;
1611 int x, y; 1968 int x, y;
1612 int sw4 = (sw + 3) & ~3; 1969 int sw4 = (sw + 3) & ~3;
1613 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1614 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1615 1972
1616 memset (darkness, 255, sw4 * sh); 1973 memset (darkness, 255, sw4 * sh);
1617 SvPOK_only (darkness_sv); 1974 SvPOK_only (darkness_sv);
1618 SvCUR_set (darkness_sv, sw4 * sh); 1975 SvCUR_set (darkness_sv, sw4 * sh);
1619 1976
1620 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1977 mx += self->x;
1621 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1978 my += self->y;
1622 1979
1623 for (y = 0; y < sh; y++) 1980 for (y = 0; y < sh; y++)
1624 if (0 <= y + vy && y + vy < self->rows) 1981 if (0 <= y + my && y + my < self->rows)
1625 { 1982 {
1626 maprow *row = self->row + (y + vy); 1983 maprow *row = self->row + (y + my);
1627 1984
1628 for (x = 0; x < sw; x++) 1985 for (x = 0; x < sw; x++)
1629 if (row->c0 <= x + vx && x + vx < row->c1) 1986 if (row->c0 <= x + mx && x + mx < row->c1)
1630 { 1987 {
1631 mapcell *cell = row->col + (x + vx - row->c0); 1988 mapcell *cell = row->col + (x + mx - row->c0);
1632 1989
1633 darkness[y * sw4 + x] = cell->darkness 1990 darkness[y * sw4 + x] = cell->darkness
1634 ? 255 - (cell->darkness - 1) 1991 ? 255 - (cell->darkness - 1)
1635 : 255 - FOW_DARKNESS; 1992 : 255 - FOW_DARKNESS;
1636 } 1993 }
1637 } 1994 }
1995
1996 if (smoothing)
1997 {
1998 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
1999 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2000
2001 SvPOK_only (darkness2_sv);
2002 SvCUR_set (darkness2_sv, sw4 * sh);
2003
2004 for (y = 0; y < sh; ++y)
2005 for (x = 0; x < sw4; ++x)
2006 {
2007 float *f = (float *)matrix;
2008 int dx, dy;
2009 float sum = 0.f;
2010
2011 for (dy = -1; dy <= 1; ++dy)
2012 for (dx = -1; dx <= 1; ++dx)
2013 {
2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
2016
2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2018 }
2019
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2021 }
2022
2023 darkness_sv = darkness2_sv;
2024 }
1638 2025
1639 EXTEND (SP, 3); 2026 EXTEND (SP, 3);
1640 PUSHs (sv_2mortal (newSViv (sw4))); 2027 PUSHs (sv_2mortal (newSViv (sw4)));
1641 PUSHs (sv_2mortal (newSViv (sh))); 2028 PUSHs (sv_2mortal (newSViv (sh)));
1642 PUSHs (darkness_sv); 2029 PUSHs (darkness_sv);
1676 if (row && row->c0 <= x && x < row->c1) 2063 if (row && row->c0 <= x && x < row->c1)
1677 { 2064 {
1678 mapcell *cell = row->col + (x - row->c0); 2065 mapcell *cell = row->col + (x - row->c0);
1679 uint8_t flags = 0; 2066 uint8_t flags = 0;
1680 2067
1681 if (cell->face [0]) flags |= 1; 2068 if (cell->tile [0]) flags |= 1;
1682 if (cell->face [1]) flags |= 2; 2069 if (cell->tile [1]) flags |= 2;
1683 if (cell->face [2]) flags |= 4; 2070 if (cell->tile [2]) flags |= 4;
1684 2071
1685 *data++ = flags; 2072 *data++ = flags;
1686 2073
1687 if (flags & 1) 2074 if (flags & 1)
1688 { 2075 {
2076 tileid tile = cell->tile [0];
1689 *data++ = cell->face [0] >> 8; 2077 *data++ = tile >> 8;
1690 *data++ = cell->face [0]; 2078 *data++ = tile;
1691 } 2079 }
1692 2080
1693 if (flags & 2) 2081 if (flags & 2)
1694 { 2082 {
2083 tileid tile = cell->tile [1];
1695 *data++ = cell->face [1] >> 8; 2084 *data++ = tile >> 8;
1696 *data++ = cell->face [1]; 2085 *data++ = tile;
1697 } 2086 }
1698 2087
1699 if (flags & 4) 2088 if (flags & 4)
1700 { 2089 {
2090 tileid tile = cell->tile [2];
1701 *data++ = cell->face [2] >> 8; 2091 *data++ = tile >> 8;
1702 *data++ = cell->face [2]; 2092 *data++ = tile;
1703 } 2093 }
1704 } 2094 }
1705 else 2095 else
1706 *data++ = 0; 2096 *data++ = 0;
1707 } 2097 }
1747 { 2137 {
1748 uint8_t flags = *data++; 2138 uint8_t flags = *data++;
1749 2139
1750 if (flags) 2140 if (flags)
1751 { 2141 {
1752 mapface face[3] = { 0, 0, 0 };
1753
1754 mapcell *cell = row_get_cell (row, x); 2142 mapcell *cell = row_get_cell (row, x);
2143 tileid tile[3] = { 0, 0, 0 };
1755 2144
1756 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2145 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1757 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2146 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1758 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2147 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1759 2148
1760 if (cell->darkness == 0) 2149 if (cell->darkness == 0)
1761 { 2150 {
1762 cell->darkness = 0; 2151 cell->darkness = 0;
1763 2152
1764 for (z = 0; z <= 2; z++) 2153 for (z = 0; z <= 2; z++)
1765 { 2154 {
1766 cell->face[z] = face[z]; 2155 tileid t = tile [z];
1767 2156
1768 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2157 if (t >= self->texs || (t && !self->tex [t].name))
2158 {
1769 XPUSHs (sv_2mortal (newSViv (face[z]))); 2159 XPUSHs (sv_2mortal (newSViv (t)));
2160 need_texid (self, t);
2161 }
2162
2163 cell->tile [z] = t;
1770 } 2164 }
1771 } 2165 }
1772 } 2166 }
1773 } 2167 }
1774 } 2168 }
1809 CODE: 2203 CODE:
1810 RETVAL = Mix_VolumeMusic (volume); 2204 RETVAL = Mix_VolumeMusic (volume);
1811 OUTPUT: 2205 OUTPUT:
1812 RETVAL 2206 RETVAL
1813 2207
2208int
2209fade_out (int ms)
2210 CODE:
2211 RETVAL = Mix_FadeOutMusic (ms);
2212 OUTPUT:
2213 RETVAL
2214
1814CFPlus::MixMusic 2215CFPlus::MixMusic
1815new_from_file (SV *class, char *path) 2216new_from_file (SV *class, char *path)
1816 CODE: 2217 CODE:
1817 RETVAL = Mix_LoadMUS (path); 2218 RETVAL = Mix_LoadMUS (path);
1818 OUTPUT: 2219 OUTPUT:
1825 2226
1826int 2227int
1827play (CFPlus::MixMusic self, int loops = -1) 2228play (CFPlus::MixMusic self, int loops = -1)
1828 CODE: 2229 CODE:
1829 RETVAL = Mix_PlayMusic (self, loops); 2230 RETVAL = Mix_PlayMusic (self, loops);
2231 OUTPUT:
2232 RETVAL
2233
2234int
2235fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2236 CODE:
2237 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1830 OUTPUT: 2238 OUTPUT:
1831 RETVAL 2239 RETVAL
1832 2240
1833MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1834 2242
1838 static const struct { 2246 static const struct {
1839 const char *name; 2247 const char *name;
1840 IV iv; 2248 IV iv;
1841 } *civ, const_iv[] = { 2249 } *civ, const_iv[] = {
1842# define const_iv(name) { # name, (IV)name } 2250# define const_iv(name) { # name, (IV)name }
2251 const_iv (GL_VENDOR),
2252 const_iv (GL_VERSION),
2253 const_iv (GL_EXTENSIONS),
1843 const_iv (GL_COLOR_MATERIAL), 2254 const_iv (GL_COLOR_MATERIAL),
1844 const_iv (GL_SMOOTH), 2255 const_iv (GL_SMOOTH),
1845 const_iv (GL_FLAT), 2256 const_iv (GL_FLAT),
1846 const_iv (GL_DITHER), 2257 const_iv (GL_DITHER),
1847 const_iv (GL_BLEND), 2258 const_iv (GL_BLEND),
1874 const_iv (GL_LUMINANCE), 2285 const_iv (GL_LUMINANCE),
1875 const_iv (GL_LUMINANCE_ALPHA), 2286 const_iv (GL_LUMINANCE_ALPHA),
1876 const_iv (GL_FLOAT), 2287 const_iv (GL_FLOAT),
1877 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2288 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1878 const_iv (GL_COMPILE), 2289 const_iv (GL_COMPILE),
2290 const_iv (GL_PROXY_TEXTURE_1D),
2291 const_iv (GL_PROXY_TEXTURE_2D),
1879 const_iv (GL_TEXTURE_1D), 2292 const_iv (GL_TEXTURE_1D),
1880 const_iv (GL_TEXTURE_2D), 2293 const_iv (GL_TEXTURE_2D),
1881 const_iv (GL_TEXTURE_ENV), 2294 const_iv (GL_TEXTURE_ENV),
1882 const_iv (GL_TEXTURE_MAG_FILTER), 2295 const_iv (GL_TEXTURE_MAG_FILTER),
1883 const_iv (GL_TEXTURE_MIN_FILTER), 2296 const_iv (GL_TEXTURE_MIN_FILTER),
1923# undef const_iv 2336# undef const_iv
1924 }; 2337 };
1925 2338
1926 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2339 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1927 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2340 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2341
2342 texture_av = newAV ();
2343 AvREAL_off (texture_av);
1928} 2344}
1929 2345
1930char * 2346char *
1931gl_vendor () 2347gl_vendor ()
1932 CODE: 2348 CODE:
1943 2359
1944char * 2360char *
1945gl_extensions () 2361gl_extensions ()
1946 CODE: 2362 CODE:
1947 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2363 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2364 OUTPUT:
2365 RETVAL
2366
2367const char *glGetString (GLenum pname)
2368
2369GLint glGetInteger (GLenum pname)
2370 CODE:
2371 glGetIntegerv (pname, &RETVAL);
2372 OUTPUT:
2373 RETVAL
2374
2375GLdouble glGetDouble (GLenum pname)
2376 CODE:
2377 glGetDoublev (pname, &RETVAL);
1948 OUTPUT: 2378 OUTPUT:
1949 RETVAL 2379 RETVAL
1950 2380
1951int glGetError () 2381int glGetError ()
1952 2382
2077 2507
2078void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2508void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2079 2509
2080void glDrawPixels (int width, int height, int format, int type, char *pixels) 2510void glDrawPixels (int width, int height, int format, int type, char *pixels)
2081 2511
2512void glPixelZoom (float x, float y)
2513
2082void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2514void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2083 2515
2084int glGenTexture () 2516int glGenTexture ()
2085 CODE: 2517 CODE:
2086{ 2518 RETVAL = gen_texture ();
2087 GLuint name;
2088 glGenTextures (1, &name);
2089 RETVAL = name;
2090}
2091 OUTPUT: 2519 OUTPUT:
2092 RETVAL 2520 RETVAL
2093 2521
2094void glDeleteTexture (int name) 2522void glDeleteTexture (int name)
2095 CODE: 2523 CODE:
2096{
2097 GLuint name_ = name;
2098 glDeleteTextures (1, &name_); 2524 del_texture (name);
2099} 2525
2100
2101int glGenList () 2526int glGenList ()
2102 CODE: 2527 CODE:
2103 RETVAL = glGenLists (1); 2528 RETVAL = glGenLists (1);
2104 OUTPUT: 2529 OUTPUT:
2105 RETVAL 2530 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines