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.134 by root, Fri Aug 4 16:49:58 2006 UTC vs.
Revision 1.201 by root, Tue Jul 17 17:39:06 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
36# include <sys/types.h> 44# include <sys/types.h>
37# include <sys/socket.h> 45# include <sys/socket.h>
38# include <netinet/in.h> 46# include <netinet/in.h>
39# include <netinet/tcp.h> 47# include <netinet/tcp.h>
40# include <inttypes.h> 48# 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 49#endif
49 50
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 52
52#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
53 54
54#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 62#else
62# define PARACHUTE 0 63# define PARACHUTE 0
63#endif 64#endif
64 65
66static AV *texture_av;
67
65static struct 68static struct
66{ 69{
67#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 71#include "glfunc.h"
69#undef GL_FUNC 72#undef GL_FUNC
70} gl; 73} gl;
71 74
75static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 77{
74 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 82 else
79 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
80} 84}
81 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);
108}
109
82#include "texcache.c" 110#include "texcache.c"
83 111
84#include "pango-font.c" 112#include "pango-font.c"
85#include "pango-fontmap.c" 113#include "pango-fontmap.c"
86#include "pango-render.c" 114#include "pango-render.c"
144} 172}
145 173
146static void 174static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
150 181
151 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 184
154 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
155} 186 if (!rect.height) rect.height = 1;
156 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
157typedef uint16_t mapface; 193typedef uint16_t faceid;
158 194
159typedef struct { 195typedef struct {
160 GLint name; 196 int name;
161 int w, h; 197 int w, h;
162 float s, t; 198 float s, t;
163 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
164} maptex; 202} maptex;
165 203
166typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
167 int16_t darkness; 207 uint16_t darkness;
168 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
169} mapcell; 209} mapcell;
170 210
171typedef struct { 211typedef struct {
172 int32_t c0, c1; 212 int32_t c0, c1;
173 mapcell *col; 213 mapcell *col;
174} maprow; 214} maprow;
175 215
176typedef struct map { 216typedef struct map {
177 int x, y, w, h; 217 int x, y, w, h;
178 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
179 int faces; 219 int faces; tileid *face2tile; // [faceid]
180 mapface *face; 220 int texs; maptex *tex; // [tileid]
181
182 int texs;
183 maptex *tex;
184 221
185 int32_t rows; 222 int32_t rows;
186 maprow *row; 223 maprow *row;
187} *CFPlus__Map; 224} *CFPlus__Map;
188 225
208 return ptr; 245 return ptr;
209} 246}
210 247
211#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
212#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
213 270
214static maprow * 271static maprow *
215map_get_row (CFPlus__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
216{ 273{
217 if (0 > y) 274 if (0 > y)
286static void 343static void
287map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 344map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 345{
289 int x, y; 346 int x, y;
290 maprow *row; 347 maprow *row;
348 mapcell *cell;
291 349
292 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 351 if (y >= 0)
294 { 352 {
295 if (y >= self->rows) 353 if (y >= self->rows)
301 if (x >= row->c0) 359 if (x >= row->c0)
302 { 360 {
303 if (x >= row->c1) 361 if (x >= row->c1)
304 break; 362 break;
305 363
306 row->col[x - row->c0].darkness = -1; 364 cell = row->col + x - row->c0;
365
366 cell->darkness = 0;
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
307 } 370 }
308 } 371 }
372}
373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
309} 388}
310 389
311static void 390static void
312music_finished (void) 391music_finished (void)
313{ 392{
348 n |= n >> 8; 427 n |= n >> 8;
349 n |= n >> 16; 428 n |= n >> 16;
350 429
351 return n + 1; 430 return n + 1;
352} 431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
353 436
354MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
355 438
356PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
357 440
361 static const struct { 444 static const struct {
362 const char *name; 445 const char *name;
363 IV iv; 446 IV iv;
364 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
365# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
366 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
367 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
368 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
369 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
370 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
379 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
380 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
381 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
382 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
383 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
384 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
385 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
386 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
387 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
388 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
443 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
444 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
445 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
446 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
447 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
448 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
449 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
450 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
451 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
452 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
453 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
454 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
455 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
456 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
457 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
458 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
459 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
460 const_iv (KMOD_CTRL),
461 const_iv (KMOD_SHIFT),
462 const_iv (KMOD_ALT),
463 const_iv (KMOD_META)
464# undef const_iv 556# undef const_iv
465 }; 557 };
466 558
467 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
469} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
470 571
471int 572int
472in_destruct () 573in_destruct ()
473 CODE: 574 CODE:
474 RETVAL = PL_main_cv == Nullcv; 575 RETVAL = PL_main_cv == Nullcv;
486 opengl_fontmap = pango_opengl_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
487 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
488 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
489} 590}
490 591
592char *
593SDL_GetError ()
594
491int 595int
492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
493 597
494void 598void
495SDL_Quit () 599SDL_Quit ()
496 600
497void 601void
498SDL_ListModes () 602SDL_ListModes (int rgb, int alpha)
499 PPCODE: 603 PPCODE:
500{ 604{
501 SDL_Rect **m; 605 SDL_Rect **m;
502 606
503 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 607 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 610 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
507 611
508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 612 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
510 614
511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515 619
516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517#if SDL_VERSION_ATLEAST(1,2,10) 621#if SDL_VERSION_ATLEAST(1,2,10)
518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif 624#endif
521 625
522 SDL_EnableUNICODE (1);
523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
524
525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
526 627
527 if (m && m != (SDL_Rect **)-1) 628 if (m && m != (SDL_Rect **)-1)
528 while (*m) 629 while (*m)
529 { 630 {
631 if ((*m)->w >= 640 && (*m)->h >= 480)
632 {
530 AV *av = newAV (); 633 AV *av = newAV ();
531 av_push (av, newSViv ((*m)->w)); 634 av_push (av, newSViv ((*m)->w));
532 av_push (av, newSViv ((*m)->h)); 635 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb));
637 av_push (av, newSViv (alpha));
533 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 638 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
639 }
534 640
535 ++m; 641 ++m;
536 } 642 }
537} 643}
538 644
539char *
540SDL_GetError ()
541
542int 645int
543SDL_SetVideoMode (int w, int h, int fullscreen) 646SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
544 CODE: 647 CODE:
648{
649 SDL_EnableUNICODE (1);
650 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
651
652 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
653 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
654 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
655 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
656
545 RETVAL = !!SDL_SetVideoMode ( 657 RETVAL = !!SDL_SetVideoMode (
546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 658 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
547 ); 659 );
660
548 if (RETVAL) 661 if (RETVAL)
549 { 662 {
663 av_clear (texture_av);
664
550 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
551# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 666#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
552# include "glfunc.h" 667#include "glfunc.h"
553# undef GL_FUNC 668#undef GL_FUNC
554 } 669 }
670}
555 OUTPUT: 671 OUTPUT:
556 RETVAL 672 RETVAL
557 673
558void 674void
559SDL_GL_SwapBuffers () 675SDL_GL_SwapBuffers ()
560 676
561char * 677char *
562SDL_GetKeyName (int sym) 678SDL_GetKeyName (int sym)
563 679
680int
681SDL_GetAppState ()
682
564void 683void
565SDL_PollEvent () 684poll_events ()
566 PPCODE: 685 PPCODE:
567{ 686{
568 SDL_Event ev; 687 SDL_Event ev;
569 688
570 while (SDL_PollEvent (&ev)) 689 SDL_PumpEvents ();
690 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
571 { 691 {
572 HV *hv = newHV (); 692 HV *hv = newHV ();
573 hv_store (hv, "type", 4, newSViv (ev.type), 0); 693 hv_store (hv, "type", 4, newSViv (ev.type), 0);
574 694
575 switch (ev.type) 695 switch (ev.type)
577 case SDL_KEYDOWN: 697 case SDL_KEYDOWN:
578 case SDL_KEYUP: 698 case SDL_KEYUP:
579 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 699 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
580 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 700 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
581 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 701 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
702 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
582 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 703 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
583 break; 704 break;
584 705
585 case SDL_ACTIVEEVENT: 706 case SDL_ACTIVEEVENT:
586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 708 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
588 break; 709 break;
589 710
590 case SDL_MOUSEMOTION: 711 case SDL_MOUSEMOTION:
712 {
713 int state = ev.motion.state;
714 int x = ev.motion.x;
715 int y = ev.motion.y;
716 int xrel = ev.motion.xrel;
717 int yrel = ev.motion.yrel;
718
719 /* do simplistic event compression */
720 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
721 && state == ev.motion.state)
722 {
723 xrel += ev.motion.xrel;
724 yrel += ev.motion.yrel;
725 x = ev.motion.x;
726 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 }
729
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 731 hv_store (hv, "state", 5, newSViv (state), 0);
594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 732 hv_store (hv, "x", 1, newSViv (x), 0);
595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 733 hv_store (hv, "y", 1, newSViv (y), 0);
596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 734 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 735 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 }
598 break; 737 break;
599 738
600 case SDL_MOUSEBUTTONDOWN: 739 case SDL_MOUSEBUTTONDOWN:
601 case SDL_MOUSEBUTTONUP: 740 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
631Mix_AllocateChannels (int numchans = -1) 770Mix_AllocateChannels (int numchans = -1)
632 771
633void 772void
634lowdelay (int fd, int val = 1) 773lowdelay (int fd, int val = 1)
635 CODE: 774 CODE:
775 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
776
777void
778win32_proxy_info ()
779 PPCODE:
780{
636#ifndef _WIN32 781#ifdef _WIN32
637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 782 char buffer[2048];
783 DWORD buflen;
784
785 EXTEND (SP, 3);
786
787 buflen = sizeof (buffer);
788 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
789 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
790 {
791 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
792
793 buflen = sizeof (buffer);
794 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
795 {
796 PUSHs (newSVpv (buffer, 0));
797
798 buflen = sizeof (buffer);
799 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
800 PUSHs (newSVpv (buffer, 0));
801 }
802 }
638#endif 803#endif
804}
639 805
640void 806void
641add_font (char *file) 807add_font (char *file)
642 CODE: 808 CODE:
643 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 809 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 913 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
748#endif 914#endif
749 _exit (1); 915 _exit (1);
750 916
751void 917void
752_exit (int retval) 918_exit (int retval = 0)
753 CODE: 919 CODE:
920#ifdef WIN32
921 ExitThread (retval); // unclean, please beam me up
922#else
754 _exit (retval); 923 _exit (retval);
924#endif
925
926void
927debug ()
928 CODE:
929{
930#if DEBUG
931 VALGRIND_DO_LEAK_CHECK;
932#endif
933}
755 934
756MODULE = CFPlus PACKAGE = CFPlus::Font 935MODULE = CFPlus PACKAGE = CFPlus::Font
757 936
758CFPlus::Font 937CFPlus::Font
759new_from_file (SV *class, char *path, int id = 0) 938new_from_file (SV *class, char *path, int id = 0)
1006xy_to_index (CFPlus::Layout self, int x, int y) 1185xy_to_index (CFPlus::Layout self, int x, int y)
1007 CODE: 1186 CODE:
1008{ 1187{
1009 int index, trailing; 1188 int index, trailing;
1010 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1189 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1011 RETVAL = index; 1190 RETVAL = index + trailing;
1012} 1191}
1013 OUTPUT: 1192 OUTPUT:
1014 RETVAL 1193 RETVAL
1015 1194
1016void 1195void
1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1027} 1206}
1028 1207
1029void 1208void
1209index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1210 PPCODE:
1211{
1212 int line, x;
1213
1214 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1215 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1216
1217 EXTEND (SP, 2);
1218 PUSHs (sv_2mortal (newSViv (line - 1)));
1219 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1220}
1221
1222void
1223line_x_to_index (CFPlus::Layout self, int line, int x)
1224 PPCODE:
1225{
1226 PangoLayoutLine *lp;
1227 int index, trailing;
1228
1229 if (line < 0)
1230 XSRETURN_EMPTY;
1231
1232 if (!(lp = pango_layout_get_line (self->pl, line)))
1233 XSRETURN_EMPTY; /* do better */
1234
1235 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1236
1237 EXTEND (SP, 2);
1238 if (GIMME_V == G_SCALAR)
1239 PUSHs (sv_2mortal (newSViv (index + trailing)));
1240 else
1241 {
1242 PUSHs (sv_2mortal (newSViv (index)));
1243 PUSHs (sv_2mortal (newSViv (trailing)));
1244 }
1245}
1246
1247void
1030render (CFPlus::Layout self, float x, float y) 1248render (CFPlus::Layout self, float x, float y, int flags = 0)
1031 PPCODE: 1249 PPCODE:
1032 pango_opengl_render_layout_subpixel ( 1250 pango_opengl_render_layout_subpixel (
1033 self->pl, 1251 self->pl,
1034 x * PANGO_SCALE, y * PANGO_SCALE, 1252 x * PANGO_SCALE, y * PANGO_SCALE,
1035 self->r, self->g, self->b, self->a 1253 self->r, self->g, self->b, self->a,
1254 flags
1036 ); 1255 );
1037 1256
1038MODULE = CFPlus PACKAGE = CFPlus::Texture 1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1258
1259int minpot (int n)
1039 1260
1040void 1261void
1041pad2pot (SV *data_, SV *w_, SV *h_) 1262pad2pot (SV *data_, SV *w_, SV *h_)
1042 CODE: 1263 CODE:
1043{ 1264{
1121 glDisable (GL_ALPHA_TEST); 1342 glDisable (GL_ALPHA_TEST);
1122 glDisable (GL_BLEND); 1343 glDisable (GL_BLEND);
1123 } 1344 }
1124} 1345}
1125 1346
1347IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1348 CODE:
1349{
1350 GLint width;
1351 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1352 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1353 RETVAL = width > 0;
1354}
1355 OUTPUT:
1356 RETVAL
1357
1126MODULE = CFPlus PACKAGE = CFPlus::Map 1358MODULE = CFPlus PACKAGE = CFPlus::Map
1127 1359
1128CFPlus::Map 1360CFPlus::Map
1129new (SV *class, int map_width, int map_height) 1361new (SV *class)
1130 CODE: 1362 CODE:
1131 New (0, RETVAL, 1, struct map); 1363 New (0, RETVAL, 1, struct map);
1132 RETVAL->x = 0; 1364 RETVAL->x = 0;
1133 RETVAL->y = 0; 1365 RETVAL->y = 0;
1134 RETVAL->w = map_width; 1366 RETVAL->w = 0;
1135 RETVAL->h = map_height; 1367 RETVAL->h = 0;
1136 RETVAL->ox = 0; 1368 RETVAL->ox = 0;
1137 RETVAL->oy = 0; 1369 RETVAL->oy = 0;
1138 RETVAL->faces = 8192; 1370 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1139 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1371 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1140 RETVAL->texs = 8192;
1141 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1142 RETVAL->rows = 0; 1372 RETVAL->rows = 0;
1143 RETVAL->row = 0; 1373 RETVAL->row = 0;
1144 OUTPUT: 1374 OUTPUT:
1145 RETVAL 1375 RETVAL
1146 1376
1147void 1377void
1148DESTROY (CFPlus::Map self) 1378DESTROY (CFPlus::Map self)
1149 CODE: 1379 CODE:
1150{ 1380{
1151 map_clear (self); 1381 map_clear (self);
1152 Safefree (self->face); 1382 Safefree (self->face2tile);
1153 Safefree (self->tex); 1383 Safefree (self->tex);
1154 Safefree (self); 1384 Safefree (self);
1155} 1385}
1156 1386
1157void 1387void
1388resize (CFPlus::Map self, int map_width, int map_height)
1389 CODE:
1390 self->w = map_width;
1391 self->h = map_height;
1392
1393void
1158clear (CFPlus::Map self) 1394clear (CFPlus::Map self)
1159 CODE: 1395 CODE:
1160 map_clear (self); 1396 map_clear (self);
1161 1397
1162void 1398void
1163set_face (CFPlus::Map self, int face, int texid) 1399set_tileid (CFPlus::Map self, int face, int tile)
1164 CODE: 1400 CODE:
1165{ 1401{
1166 while (self->faces <= face) 1402 need_facenum (self, face); self->face2tile [face] = tile;
1167 { 1403 need_texid (self, tile);
1168 Append (mapface, self->face, self->faces, self->faces); 1404}
1169 self->faces *= 2;
1170 }
1171 1405
1172 self->face [face] = texid; 1406void
1407set_smooth (CFPlus::Map self, int face, int smooth, int level)
1408 CODE:
1409{
1410 tileid texid;
1411 maptex *tex;
1412
1413 if (face < 0 || face >= self->faces)
1414 return;
1415
1416 if (smooth < 0 || smooth >= self->faces)
1417 return;
1418
1419 texid = self->face2tile [face];
1420
1421 if (!texid)
1422 return;
1423
1424 tex = self->tex + texid;
1425 tex->smoothtile = self->face2tile [smooth];
1426 tex->smoothlevel = level;
1173} 1427}
1174 1428
1175void 1429void
1176set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1430set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1177 CODE: 1431 CODE:
1178{ 1432{
1179 while (self->texs <= texid) 1433 need_texid (self, texid);
1180 {
1181 Append (maptex, self->tex, self->texs, self->texs);
1182 self->texs *= 2;
1183 }
1184 1434
1185 { 1435 {
1186 maptex *tex = self->tex + texid; 1436 maptex *tex = self->tex + texid;
1187 1437
1188 tex->name = name; 1438 tex->name = name;
1230void 1480void
1231scroll (CFPlus::Map self, int dx, int dy) 1481scroll (CFPlus::Map self, int dx, int dy)
1232 CODE: 1482 CODE:
1233{ 1483{
1234 if (dx > 0) 1484 if (dx > 0)
1235 map_blank (self, self->x, self->y, dx - 1, self->h); 1485 map_blank (self, self->x, self->y, dx, self->h);
1236 else if (dx < 0) 1486 else if (dx < 0)
1237 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1487 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1238 1488
1239 if (dy > 0) 1489 if (dy > 0)
1240 map_blank (self, self->x, self->y, self->w, dy - 1); 1490 map_blank (self, self->x, self->y, self->w, dy);
1241 else if (dy < 0) 1491 else if (dy < 0)
1242 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1492 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1243 1493
1244 self->ox += dx; self->x += dx; 1494 self->ox += dx; self->x += dx;
1245 self->oy += dy; self->y += dy; 1495 self->oy += dy; self->y += dy;
1246 1496
1247 while (self->y < 0) 1497 while (self->y < 0)
1252 self->y += MAP_EXTEND_Y; 1502 self->y += MAP_EXTEND_Y;
1253 } 1503 }
1254} 1504}
1255 1505
1256void 1506void
1257map1a_update (CFPlus::Map self, SV *data_) 1507map1a_update (CFPlus::Map self, SV *data_, int extmap)
1258 CODE: 1508 CODE:
1259{ 1509{
1260 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1510 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1261 uint8_t *data_end = (uint8_t *)SvEND (data_); 1511 uint8_t *data_end = (uint8_t *)SvEND (data_);
1262 mapcell *cell; 1512 mapcell *cell;
1263 int x, y, flags; 1513 int x, y, flags;
1264 1514
1265 while (data < data_end) 1515 while (data < data_end - 1)
1266 { 1516 {
1267 flags = (data [0] << 8) + data [1]; data += 2; 1517 flags = (data [0] << 8) + data [1]; data += 2;
1268 1518
1269 x = self->x + ((flags >> 10) & 63); 1519 x = self->x + ((flags >> 10) & 63);
1270 y = self->y + ((flags >> 4) & 63); 1520 y = self->y + ((flags >> 4) & 63);
1271 1521
1272 cell = map_get_cell (self, x, y); 1522 cell = map_get_cell (self, x, y);
1273 1523
1274 if (flags & 15) 1524 if (flags & 15)
1275 { 1525 {
1276 if (cell->darkness < 0) 1526 if (!cell->darkness)
1277 { 1527 {
1528 memset (cell, 0, sizeof (*cell));
1278 cell->darkness = 0; 1529 cell->darkness = 256;
1279 cell->face [0] = 0;
1280 cell->face [1] = 0;
1281 cell->face [2] = 0;
1282 } 1530 }
1283 1531
1284 cell->darkness = flags & 8 ? *data++ : 255;
1285
1286 //TODO: don't trust server data to be in-range(!) 1532 //TODO: don't trust server data to be in-range(!)
1533
1534 if (flags & 8)
1535 {
1536 if (extmap)
1537 {
1538 uint8_t ext, cmd;
1539
1540 do
1541 {
1542 ext = *data++;
1543 cmd = ext & 0x3f;
1544
1545 if (cmd < 4)
1546 cell->darkness = 255 - ext * 64 + 1;
1547 else if (cmd == 5) // health
1548 {
1549 cell->stat_width = 1;
1550 cell->stat_hp = *data++;
1551 }
1552 else if (cmd == 6) // monster width
1553 cell->stat_width = *data++ + 1;
1554 else if (cmd == 0x47)
1555 {
1556 if (*data == 4)
1557 ; // decode player count
1558
1559 data += *data + 1;
1560 }
1561 else if (cmd == 8) // cell flags
1562 cell->flags = *data++;
1563 else if (ext & 0x40) // unknown, multibyte => skip
1564 data += *data + 1;
1565 else
1566 data++;
1567 }
1568 while (ext & 0x80);
1569 }
1570 else
1571 cell->darkness = *data++ + 1;
1572 }
1287 1573
1288 if (flags & 4) 1574 if (flags & 4)
1289 { 1575 {
1290 cell->face [0] = 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 [0] = self->face2tile [face];
1291 } 1579 }
1292 1580
1293 if (flags & 2) 1581 if (flags & 2)
1294 { 1582 {
1295 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1583 faceid face = (data [0] << 8) + data [1]; data += 2;
1584 need_facenum (self, face);
1585 cell->tile [1] = self->face2tile [face];
1296 } 1586 }
1297 1587
1298 if (flags & 1) 1588 if (flags & 1)
1299 { 1589 {
1300 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1590 faceid face = (data [0] << 8) + data [1]; data += 2;
1591 need_facenum (self, face);
1592 cell->tile [2] = self->face2tile [face];
1301 } 1593 }
1302 } 1594 }
1303 else 1595 else
1304 cell->darkness = -1; 1596 cell->darkness = 0;
1305 } 1597 }
1306} 1598}
1307 1599
1308SV * 1600SV *
1309mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1601mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1335 { 1627 {
1336 mapcell *cell = row->col + (x - row->c0); 1628 mapcell *cell = row->col + (x - row->c0);
1337 1629
1338 for (z = 0; z <= 0; z++) 1630 for (z = 0; z <= 0; z++)
1339 { 1631 {
1340 mapface face = cell->face [z];
1341
1342 if (face)
1343 {
1344 maptex tex = self->tex [face]; 1632 maptex tex = self->tex [cell->tile [z]];
1345 int a0 = 255 - tex.a; 1633 int a0 = 255 - tex.a;
1346 int a1 = tex.a; 1634 int a1 = tex.a;
1347 1635
1348 r = (r * a0 + tex.r * a1) / 255; 1636 r = (r * a0 + tex.r * a1) / 255;
1349 g = (g * a0 + tex.g * a1) / 255; 1637 g = (g * a0 + tex.g * a1) / 255;
1350 b = (b * a0 + tex.b * a1) / 255; 1638 b = (b * a0 + tex.b * a1) / 255;
1351 a = (a * a0 + tex.a * a1) / 255; 1639 a = (a * a0 + tex.a * a1) / 255;
1352 }
1353 } 1640 }
1354 } 1641 }
1355 1642
1356 *map++ = (r ) 1643 *map++ = (r )
1357 | (g << 8) 1644 | (g << 8)
1364} 1651}
1365 OUTPUT: 1652 OUTPUT:
1366 RETVAL 1653 RETVAL
1367 1654
1368void 1655void
1369draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1656draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1370 CODE: 1657 CODE:
1371{ 1658{
1372 int vx, vy; 1659 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1660 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1661 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1662 smooth_key skey;
1373 int x, y, z; 1663 int x, y, z;
1374 int last_name; 1664 int last_name;
1375 mapface face;
1376 1665
1377 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1666 // thats current max. sorry.
1378 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1667 if (sw > 255) sw = 255;
1668 if (sh > 255) sh = 255;
1379 1669
1380 /* 1670 // clear key, in case of extra padding
1381 int vx = self->vx = self->w >= sw 1671 memset (&skey, 0, sizeof (skey));
1382 ? self->x + (self->w - sw) / 2
1383 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1384
1385 int vy = self->vy = self->h >= sh
1386 ? self->y + (self->h - sh) / 2
1387 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1388 */
1389 1672
1390 glColor4ub (255, 255, 255, 255); 1673 glColor4ub (255, 255, 255, 255);
1391 1674
1392 glEnable (GL_BLEND); 1675 glEnable (GL_BLEND);
1393 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1676 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1396 1679
1397 glBegin (GL_QUADS); 1680 glBegin (GL_QUADS);
1398 1681
1399 last_name = 0; 1682 last_name = 0;
1400 1683
1684 mx += self->x;
1685 my += self->y;
1686
1687 // first pass: determine smooth_max
1688 // rather ugly, if you ask me
1689 // could also be stored inside mapcell and updated on change
1690 memset (smooth_max, 0, sizeof (smooth_max));
1691
1692 for (y = 0; y < sh; y++)
1693 if (0 <= y + my && y + my < self->rows)
1694 {
1695 maprow *row = self->row + (y + my);
1696
1697 for (x = 0; x < sw; x++)
1698 if (row->c0 <= x + mx && x + mx < row->c1)
1699 {
1700 mapcell *cell = row->col + (x + mx - row->c0);
1701
1702 smooth_max[x + 1][y + 1] =
1703 MAX (self->tex [cell->tile [0]].smoothlevel,
1704 MAX (self->tex [cell->tile [1]].smoothlevel,
1705 self->tex [cell->tile [2]].smoothlevel));
1706 }
1707 }
1708
1401 for (z = 0; z < 3; z++) 1709 for (z = 0; z <= 2; z++)
1710 {
1711 memset (smooth_level, 0, sizeof (smooth_level));
1712
1402 for (y = 0; y < sh; y++) 1713 for (y = 0; y < sh; y++)
1403 if (0 <= y + vy && y + vy < self->rows) 1714 if (0 <= y + my && y + my < self->rows)
1404 { 1715 {
1405 maprow *row = self->row + (y + vy); 1716 maprow *row = self->row + (y + my);
1406 1717
1407 for (x = 0; x < sw; x++) 1718 for (x = 0; x < sw; x++)
1408 if (row->c0 <= x + vx && x + vx < row->c1) 1719 if (row->c0 <= x + mx && x + mx < row->c1)
1409 { 1720 {
1410 mapcell *cell = row->col + (x + vx - row->c0); 1721 mapcell *cell = row->col + (x + mx - row->c0);
1411
1412 face = cell->face [z]; 1722 tileid tile = cell->tile [z];
1413 1723
1414 if (face) 1724 if (tile)
1725 {
1726 maptex tex = self->tex [tile];
1727 int px = (x + 1) * T - tex.w;
1728 int py = (y + 1) * T - tex.h;
1729
1730 // suppressing texture state switches here
1731 // is only moderately effective, but worth the extra effort
1732 if (last_name != tex.name)
1733 {
1734 if (!tex.name)
1735 tex = self->tex [2]; /* missing, replace by noface */
1736
1737 glEnd ();
1738 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1739 glBegin (GL_QUADS);
1740 }
1741
1742 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1743 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1744 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1745 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1746
1747 if (cell->flags && z == 2)
1748 {
1749 if (cell->flags & 1)
1750 {
1751 maptex tex = self->tex [1];
1752 int px = x * T + T * 2 / 32;
1753 int py = y * T - T * 6 / 32;
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758
1759 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1760 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1761 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1762 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1763 }
1764 }
1765
1766 // update smooth hash
1767 if (tex.smoothtile)
1768 {
1769 skey.tile = tex.smoothtile;
1770 skey.level = tex.smoothlevel;
1771
1772 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1773
1774 // add bits to current tile and all neighbours. skey.x|y is
1775 // shifted +1|+1 so we always stay positive.
1776
1777 // bits is ___n cccc CCCC bbbb
1778 // n do not draw borders&corners
1779 // c draw these corners, but...
1780 // C ... not these
1781 // b draw these borders
1782
1783 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1784 // ┃· ·· ·┃ ━━
1785
1786 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1787 // ·· ·· ·┏ ┓·
1788
1789 // full tile
1790 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1791
1792 // borders
1793 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1794 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1795 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1796 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1797
1798 // corners
1799 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1800 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1801 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1802 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1803 }
1804 }
1805 }
1806 }
1807
1808 // go through all smoothlevels, lowest to highest, then draw.
1809 // this is basically counting sort
1810 {
1811 int w, b;
1812
1813 for (w = 0; w < 256 / 32; ++w)
1814 {
1815 uint32_t smask = smooth_level [w];
1816 if (smask)
1817 for (b = 0; b < 32; ++b)
1818 if (smask & (((uint32_t)1) << b))
1415 { 1819 {
1416 maptex tex = self->tex [face]; 1820 int level = (w << 5) | b;
1821 HE *he;
1417 1822
1418 int px = (x + 1) * 32 - tex.w; 1823 hv_iterinit (smooth);
1419 int py = (y + 1) * 32 - tex.h; 1824 while ((he = hv_iternext (smooth)))
1420
1421 if (last_name != tex.name)
1422 { 1825 {
1826 smooth_key *skey = (smooth_key *)HeKEY (he);
1827 IV bits = SvIVX (HeVAL (he));
1828
1829 if (!(bits & 0x1000)
1830 && skey->level == level
1831 && level > smooth_max [skey->x][skey->y])
1832 {
1833 maptex tex = self->tex [skey->tile];
1834 int px = (((int)skey->x) - 1) * T;
1835 int py = (((int)skey->y) - 1) * T;
1836 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column
1840
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name)
1844 {
1845 if (!tex.name)
1846 continue; // smoothing not yet available
1847
1423 glEnd (); 1848 glEnd ();
1424 last_name = tex.name;
1425 glBindTexture (GL_TEXTURE_2D, last_name); 1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1426 glBegin (GL_QUADS); 1850 glBegin (GL_QUADS);
1851 }
1852
1853 if (border)
1854 {
1855 float ox = border * dx;
1856
1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1861 }
1862
1863 if (corner)
1864 {
1865 float ox = corner * dx;
1866
1867 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1871 }
1872 }
1427 } 1873 }
1428
1429 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1430 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1431 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1432 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1433 } 1874 }
1434 }
1435 } 1875 }
1876 }
1877
1878 hv_clear (smooth);
1879 }
1436 1880
1437 glEnd (); 1881 glEnd ();
1438 1882
1439 glDisable (GL_TEXTURE_2D); 1883 glDisable (GL_TEXTURE_2D);
1440 glDisable (GL_BLEND); 1884 glDisable (GL_BLEND);
1885
1886 // top layer: overlays such as the health bar
1887 for (y = 0; y < sh; y++)
1888 if (0 <= y + my && y + my < self->rows)
1889 {
1890 maprow *row = self->row + (y + my);
1891
1892 for (x = 0; x < sw; x++)
1893 if (row->c0 <= x + mx && x + mx < row->c1)
1894 {
1895 mapcell *cell = row->col + (x + mx - row->c0);
1896
1897 int px = x * T;
1898 int py = y * T;
1899
1900 if (cell->stat_hp)
1901 {
1902 int width = cell->stat_width * T;
1903 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1904
1905 glColor3ub (0, 0, 0);
1906 glRectf (px + 1, py - thick - 2,
1907 px + width - 1, py);
1908
1909 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1910 glRectf (px + 2,
1911 py - thick - 1,
1912 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1913 }
1914 }
1915 }
1441} 1916}
1442 1917
1443void 1918void
1444draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1919draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1445 CODE: 1920 CODE:
1499 glDisable (GL_BLEND); 1974 glDisable (GL_BLEND);
1500 glDisable (GL_TEXTURE_2D); 1975 glDisable (GL_TEXTURE_2D);
1501} 1976}
1502 1977
1503void 1978void
1504fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1979fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1505 PPCODE: 1980 PPCODE:
1506{ 1981{
1507 int vx, vy;
1508 int x, y; 1982 int x, y;
1509 int sw4 = (sw + 3) & ~3; 1983 int sw4 = (sw + 3) & ~3;
1510 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1511 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1512 1986
1513 memset (darkness, 255, sw4 * sh); 1987 memset (darkness, 255, sw4 * sh);
1514 SvPOK_only (darkness_sv); 1988 SvPOK_only (darkness_sv);
1515 SvCUR_set (darkness_sv, sw4 * sh); 1989 SvCUR_set (darkness_sv, sw4 * sh);
1516 1990
1517 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1991 mx += self->x;
1518 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1992 my += self->y;
1519 1993
1520 for (y = 0; y < sh; y++) 1994 for (y = 0; y < sh; y++)
1521 if (0 <= y + vy && y + vy < self->rows) 1995 if (0 <= y + my && y + my < self->rows)
1522 { 1996 {
1523 maprow *row = self->row + (y + vy); 1997 maprow *row = self->row + (y + my);
1524 1998
1525 for (x = 0; x < sw; x++) 1999 for (x = 0; x < sw; x++)
1526 if (row->c0 <= x + vx && x + vx < row->c1) 2000 if (row->c0 <= x + mx && x + mx < row->c1)
1527 { 2001 {
1528 mapcell *cell = row->col + (x + vx - row->c0); 2002 mapcell *cell = row->col + (x + mx - row->c0);
1529 2003
1530 darkness[y * sw4 + x] = cell->darkness < 0 2004 darkness[y * sw4 + x] = cell->darkness
2005 ? 255 - (cell->darkness - 1)
1531 ? 255 - FOW_DARKNESS 2006 : 255 - FOW_DARKNESS;
1532 : 255 - cell->darkness;
1533 } 2007 }
1534 } 2008 }
2009
2010 if (smoothing)
2011 {
2012 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2013 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2014
2015 SvPOK_only (darkness2_sv);
2016 SvCUR_set (darkness2_sv, sw4 * sh);
2017
2018 for (y = 0; y < sh; ++y)
2019 for (x = 0; x < sw4; ++x)
2020 {
2021 float *f = (float *)matrix;
2022 int dx, dy;
2023 float sum = 0.f;
2024
2025 for (dy = -1; dy <= 1; ++dy)
2026 for (dx = -1; dx <= 1; ++dx)
2027 {
2028 unsigned int x2 = x + dx;
2029 unsigned int y2 = y + dy;
2030
2031 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2032 }
2033
2034 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2035 }
2036
2037 darkness_sv = darkness2_sv;
2038 }
1535 2039
1536 EXTEND (SP, 3); 2040 EXTEND (SP, 3);
1537 PUSHs (sv_2mortal (newSViv (sw4))); 2041 PUSHs (sv_2mortal (newSViv (sw4)));
1538 PUSHs (sv_2mortal (newSViv (sh))); 2042 PUSHs (sv_2mortal (newSViv (sh)));
1539 PUSHs (darkness_sv); 2043 PUSHs (darkness_sv);
1573 if (row && row->c0 <= x && x < row->c1) 2077 if (row && row->c0 <= x && x < row->c1)
1574 { 2078 {
1575 mapcell *cell = row->col + (x - row->c0); 2079 mapcell *cell = row->col + (x - row->c0);
1576 uint8_t flags = 0; 2080 uint8_t flags = 0;
1577 2081
1578 if (cell->face [0]) flags |= 1; 2082 if (cell->tile [0]) flags |= 1;
1579 if (cell->face [1]) flags |= 2; 2083 if (cell->tile [1]) flags |= 2;
1580 if (cell->face [2]) flags |= 4; 2084 if (cell->tile [2]) flags |= 4;
1581 2085
1582 *data++ = flags; 2086 *data++ = flags;
1583 2087
1584 if (flags & 1) 2088 if (flags & 1)
1585 { 2089 {
2090 tileid tile = cell->tile [0];
1586 *data++ = cell->face [0] >> 8; 2091 *data++ = tile >> 8;
1587 *data++ = cell->face [0]; 2092 *data++ = tile;
1588 } 2093 }
1589 2094
1590 if (flags & 2) 2095 if (flags & 2)
1591 { 2096 {
2097 tileid tile = cell->tile [1];
1592 *data++ = cell->face [1] >> 8; 2098 *data++ = tile >> 8;
1593 *data++ = cell->face [1]; 2099 *data++ = tile;
1594 } 2100 }
1595 2101
1596 if (flags & 4) 2102 if (flags & 4)
1597 { 2103 {
2104 tileid tile = cell->tile [2];
1598 *data++ = cell->face [2] >> 8; 2105 *data++ = tile >> 8;
1599 *data++ = cell->face [2]; 2106 *data++ = tile;
1600 } 2107 }
1601 } 2108 }
1602 else 2109 else
1603 *data++ = 0; 2110 *data++ = 0;
1604 } 2111 }
1644 { 2151 {
1645 uint8_t flags = *data++; 2152 uint8_t flags = *data++;
1646 2153
1647 if (flags) 2154 if (flags)
1648 { 2155 {
1649 mapface face[3] = { 0, 0, 0 };
1650
1651 mapcell *cell = row_get_cell (row, x); 2156 mapcell *cell = row_get_cell (row, x);
2157 tileid tile[3] = { 0, 0, 0 };
1652 2158
1653 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2159 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1654 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2160 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1655 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2161 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1656 2162
1657 if (cell->darkness <= 0) 2163 if (cell->darkness == 0)
1658 { 2164 {
1659 cell->darkness = -1; 2165 cell->darkness = 0;
1660 2166
1661 for (z = 0; z <= 2; z++) 2167 for (z = 0; z <= 2; z++)
1662 { 2168 {
1663 cell->face[z] = face[z]; 2169 tileid t = tile [z];
1664 2170
1665 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2171 if (t >= self->texs || (t && !self->tex [t].name))
2172 {
1666 XPUSHs (sv_2mortal (newSViv (face[z]))); 2173 XPUSHs (sv_2mortal (newSViv (t)));
2174 need_texid (self, t);
2175 }
2176
2177 cell->tile [z] = t;
1667 } 2178 }
1668 } 2179 }
1669 } 2180 }
1670 } 2181 }
1671 } 2182 }
1706 CODE: 2217 CODE:
1707 RETVAL = Mix_VolumeMusic (volume); 2218 RETVAL = Mix_VolumeMusic (volume);
1708 OUTPUT: 2219 OUTPUT:
1709 RETVAL 2220 RETVAL
1710 2221
2222int
2223fade_out (int ms)
2224 CODE:
2225 RETVAL = Mix_FadeOutMusic (ms);
2226 OUTPUT:
2227 RETVAL
2228
1711CFPlus::MixMusic 2229CFPlus::MixMusic
1712new_from_file (SV *class, char *path) 2230new_from_file (SV *class, char *path)
1713 CODE: 2231 CODE:
1714 RETVAL = Mix_LoadMUS (path); 2232 RETVAL = Mix_LoadMUS (path);
1715 OUTPUT: 2233 OUTPUT:
1722 2240
1723int 2241int
1724play (CFPlus::MixMusic self, int loops = -1) 2242play (CFPlus::MixMusic self, int loops = -1)
1725 CODE: 2243 CODE:
1726 RETVAL = Mix_PlayMusic (self, loops); 2244 RETVAL = Mix_PlayMusic (self, loops);
2245 OUTPUT:
2246 RETVAL
2247
2248int
2249fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2250 CODE:
2251 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1727 OUTPUT: 2252 OUTPUT:
1728 RETVAL 2253 RETVAL
1729 2254
1730MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2255MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1731 2256
1735 static const struct { 2260 static const struct {
1736 const char *name; 2261 const char *name;
1737 IV iv; 2262 IV iv;
1738 } *civ, const_iv[] = { 2263 } *civ, const_iv[] = {
1739# define const_iv(name) { # name, (IV)name } 2264# define const_iv(name) { # name, (IV)name }
2265 const_iv (GL_VENDOR),
2266 const_iv (GL_VERSION),
2267 const_iv (GL_EXTENSIONS),
1740 const_iv (GL_COLOR_MATERIAL), 2268 const_iv (GL_COLOR_MATERIAL),
1741 const_iv (GL_SMOOTH), 2269 const_iv (GL_SMOOTH),
1742 const_iv (GL_FLAT), 2270 const_iv (GL_FLAT),
1743 const_iv (GL_DITHER), 2271 const_iv (GL_DITHER),
1744 const_iv (GL_BLEND), 2272 const_iv (GL_BLEND),
1771 const_iv (GL_LUMINANCE), 2299 const_iv (GL_LUMINANCE),
1772 const_iv (GL_LUMINANCE_ALPHA), 2300 const_iv (GL_LUMINANCE_ALPHA),
1773 const_iv (GL_FLOAT), 2301 const_iv (GL_FLOAT),
1774 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2302 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1775 const_iv (GL_COMPILE), 2303 const_iv (GL_COMPILE),
2304 const_iv (GL_PROXY_TEXTURE_1D),
2305 const_iv (GL_PROXY_TEXTURE_2D),
1776 const_iv (GL_TEXTURE_1D), 2306 const_iv (GL_TEXTURE_1D),
1777 const_iv (GL_TEXTURE_2D), 2307 const_iv (GL_TEXTURE_2D),
1778 const_iv (GL_TEXTURE_ENV), 2308 const_iv (GL_TEXTURE_ENV),
1779 const_iv (GL_TEXTURE_MAG_FILTER), 2309 const_iv (GL_TEXTURE_MAG_FILTER),
1780 const_iv (GL_TEXTURE_MIN_FILTER), 2310 const_iv (GL_TEXTURE_MIN_FILTER),
1802 const_iv (GL_SEPARABLE_2D), 2332 const_iv (GL_SEPARABLE_2D),
1803 const_iv (GL_CONVOLUTION_2D), 2333 const_iv (GL_CONVOLUTION_2D),
1804 const_iv (GL_CONVOLUTION_BORDER_MODE), 2334 const_iv (GL_CONVOLUTION_BORDER_MODE),
1805 const_iv (GL_CONSTANT_BORDER), 2335 const_iv (GL_CONSTANT_BORDER),
1806 const_iv (GL_LINES), 2336 const_iv (GL_LINES),
2337 const_iv (GL_LINE_STRIP),
1807 const_iv (GL_LINE_LOOP), 2338 const_iv (GL_LINE_LOOP),
1808 const_iv (GL_QUADS), 2339 const_iv (GL_QUADS),
1809 const_iv (GL_QUAD_STRIP), 2340 const_iv (GL_QUAD_STRIP),
1810 const_iv (GL_TRIANGLES), 2341 const_iv (GL_TRIANGLES),
1811 const_iv (GL_TRIANGLE_STRIP), 2342 const_iv (GL_TRIANGLE_STRIP),
1819# undef const_iv 2350# undef const_iv
1820 }; 2351 };
1821 2352
1822 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2353 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1823 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2354 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2355
2356 texture_av = newAV ();
2357 AvREAL_off (texture_av);
1824} 2358}
1825 2359
1826char * 2360char *
1827gl_vendor () 2361gl_vendor ()
1828 CODE: 2362 CODE:
1839 2373
1840char * 2374char *
1841gl_extensions () 2375gl_extensions ()
1842 CODE: 2376 CODE:
1843 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2377 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2378 OUTPUT:
2379 RETVAL
2380
2381const char *glGetString (GLenum pname)
2382
2383GLint glGetInteger (GLenum pname)
2384 CODE:
2385 glGetIntegerv (pname, &RETVAL);
2386 OUTPUT:
2387 RETVAL
2388
2389GLdouble glGetDouble (GLenum pname)
2390 CODE:
2391 glGetDoublev (pname, &RETVAL);
1844 OUTPUT: 2392 OUTPUT:
1845 RETVAL 2393 RETVAL
1846 2394
1847int glGetError () 2395int glGetError ()
1848 2396
1973 2521
1974void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2522void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1975 2523
1976void glDrawPixels (int width, int height, int format, int type, char *pixels) 2524void glDrawPixels (int width, int height, int format, int type, char *pixels)
1977 2525
2526void glPixelZoom (float x, float y)
2527
1978void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2528void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1979 2529
1980int glGenTexture () 2530int glGenTexture ()
1981 CODE: 2531 CODE:
1982{ 2532 RETVAL = gen_texture ();
1983 GLuint name;
1984 glGenTextures (1, &name);
1985 RETVAL = name;
1986}
1987 OUTPUT: 2533 OUTPUT:
1988 RETVAL 2534 RETVAL
1989 2535
1990void glDeleteTexture (int name) 2536void glDeleteTexture (int name)
1991 CODE: 2537 CODE:
1992{
1993 GLuint name_ = name;
1994 glDeleteTextures (1, &name_); 2538 del_texture (name);
1995} 2539
1996
1997int glGenList () 2540int glGenList ()
1998 CODE: 2541 CODE:
1999 RETVAL = glGenLists (1); 2542 RETVAL = glGenLists (1);
2000 OUTPUT: 2543 OUTPUT:
2001 RETVAL 2544 RETVAL
2008 2551
2009void glEndList () 2552void glEndList ()
2010 2553
2011void glCallList (int list) 2554void glCallList (int list)
2012 2555
2013

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines