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.139 by root, Mon Aug 14 03:04:17 2006 UTC vs.
Revision 1.204 by root, Thu Jul 19 14:54:50 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"
155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
156 185
157 if (!rect.width) rect.width = 1; 186 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1; 187 if (!rect.height) rect.height = 1;
159 188
160 rect.width = (rect.width + 3) & ~3;
161
162 *w = rect.width; 189 *w = rect.width;
163 *h = rect.height; 190 *h = rect.height;
164} 191}
165 192
193typedef uint16_t tileid;
166typedef uint16_t mapface; 194typedef uint16_t faceid;
167 195
168typedef struct { 196typedef struct {
169 GLint name; 197 int name;
170 int w, h; 198 int w, h;
171 float s, t; 199 float s, t;
172 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
173} maptex; 203} maptex;
174 204
175typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
176 int16_t darkness; 208 uint16_t darkness;
177 mapface face[3]; 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)
295static void 344static void
296map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
297{ 346{
298 int x, y; 347 int x, y;
299 maprow *row; 348 maprow *row;
349 mapcell *cell;
300 350
301 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
302 if (y >= 0) 352 if (y >= 0)
303 { 353 {
304 if (y >= self->rows) 354 if (y >= self->rows)
310 if (x >= row->c0) 360 if (x >= row->c0)
311 { 361 {
312 if (x >= row->c1) 362 if (x >= row->c1)
313 break; 363 break;
314 364
315 row->col[x - row->c0].darkness = -1; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
316 } 371 }
317 } 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);
318} 389}
319 390
320static void 391static void
321music_finished (void) 392music_finished (void)
322{ 393{
357 n |= n >> 8; 428 n |= n >> 8;
358 n |= n >> 16; 429 n |= n >> 16;
359 430
360 return n + 1; 431 return n + 1;
361} 432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
362 437
363MODULE = CFPlus PACKAGE = CFPlus 438MODULE = CFPlus PACKAGE = CFPlus
364 439
365PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
366 441
370 static const struct { 445 static const struct {
371 const char *name; 446 const char *name;
372 IV iv; 447 IV iv;
373 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
374# 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
375 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
376 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
377 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
378 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
379 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
388 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
389 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
390 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
391 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
392 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
393 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
394 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
395 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
396 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
397 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
452 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
453 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
454 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
455 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
456 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
457 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
458 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
459 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
460 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
461 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
462 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
463 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
464 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
465 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
466 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
467 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
468 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
469 const_iv (KMOD_CTRL),
470 const_iv (KMOD_SHIFT),
471 const_iv (KMOD_ALT),
472 const_iv (KMOD_META)
473# undef const_iv 557# undef const_iv
474 }; 558 };
475 559
476 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; )
477 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);
478} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
479 572
480int 573int
481in_destruct () 574in_destruct ()
482 CODE: 575 CODE:
483 RETVAL = PL_main_cv == Nullcv; 576 RETVAL = PL_main_cv == Nullcv;
495 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
496 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);
497 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
498} 591}
499 592
593char *
594SDL_GetError ()
595
500int 596int
501SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
502 598
503void 599void
504SDL_Quit () 600SDL_Quit ()
505 601
506void 602void
507SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
508 PPCODE: 604 PPCODE:
509{ 605{
510 SDL_Rect **m; 606 SDL_Rect **m;
511 607
512 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
513 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
514 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
515 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
516 612
517 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
518 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
519 615
520 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
521 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
522 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
523 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
524 620
525 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
526#if SDL_VERSION_ATLEAST(1,2,10) 622#if SDL_VERSION_ATLEAST(1,2,10)
527 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
528 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
529#endif 625#endif
530 626
531 SDL_EnableUNICODE (1);
532 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
533
534 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
535 628
536 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
537 while (*m) 630 while (*m)
538 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
539 AV *av = newAV (); 634 AV *av = newAV ();
540 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
541 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));
542 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
543 641
544 ++m; 642 ++m;
545 } 643 }
546} 644}
547 645
548char *
549SDL_GetError ()
550
551int 646int
552SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
553 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
554 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
555 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
556 ); 660 );
661
557 if (RETVAL) 662 if (RETVAL)
558 { 663 {
664 av_clear (texture_av);
665
559 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
560# 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);
561# include "glfunc.h" 668#include "glfunc.h"
562# undef GL_FUNC 669#undef GL_FUNC
563 } 670 }
671}
564 OUTPUT: 672 OUTPUT:
565 RETVAL 673 RETVAL
566 674
567void 675void
568SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
569 677
570char * 678char *
571SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
572 680
681int
682SDL_GetAppState ()
683
573void 684void
574SDL_PollEvent () 685poll_events ()
575 PPCODE: 686 PPCODE:
576{ 687{
577 SDL_Event ev; 688 SDL_Event ev;
578 689
579 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
580 { 692 {
581 HV *hv = newHV (); 693 HV *hv = newHV ();
582 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
583 695
584 switch (ev.type) 696 switch (ev.type)
586 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
587 case SDL_KEYUP: 699 case SDL_KEYUP:
588 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
589 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
590 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 */
591 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
592 break; 705 break;
593 706
594 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
595 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
596 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
597 break; 710 break;
598 711
599 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
600 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
601
602 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
603 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
604 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
605 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
606 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
607 break; 738 break;
608 739
609 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
610 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
611 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
640Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
641 772
642void 773void
643lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
644 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
645#ifndef _WIN32 782#ifdef _WIN32
646 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 }
647#endif 804#endif
805}
648 806
649void 807void
650add_font (char *file) 808add_font (char *file)
651 CODE: 809 CODE:
652 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
756 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
757#endif 915#endif
758 _exit (1); 916 _exit (1);
759 917
760void 918void
761_exit (int retval) 919_exit (int retval = 0)
762 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
763 _exit (retval); 924 _exit (retval);
925#endif
926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
764 935
765MODULE = CFPlus PACKAGE = CFPlus::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
766 937
767CFPlus::Font 938CFPlus::Font
768new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
1015xy_to_index (CFPlus::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
1016 CODE: 1187 CODE:
1017{ 1188{
1018 int index, trailing; 1189 int index, trailing;
1019 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);
1020 RETVAL = index; 1191 RETVAL = index + trailing;
1021} 1192}
1022 OUTPUT: 1193 OUTPUT:
1023 RETVAL 1194 RETVAL
1024 1195
1025void 1196void
1031 1202
1032 EXTEND (SP, 3); 1203 EXTEND (SP, 3);
1033 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1034 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1035 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 }
1036} 1246}
1037 1247
1038void 1248void
1039render (CFPlus::Layout self, float x, float y, int flags = 0) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1040 PPCODE: 1250 PPCODE:
1045 flags 1255 flags
1046 ); 1256 );
1047 1257
1048MODULE = CFPlus PACKAGE = CFPlus::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1049 1259
1050void 1260int minpot (int n)
1051pad2pot (SV *data_, SV *w_, SV *h_)
1052 CODE:
1053{
1054 int ow = SvIV (w_);
1055 int oh = SvIV (h_);
1056 1261
1057 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_))
1058 { 1267 {
1059 int nw = minpot (ow);
1060 int nh = minpot (oh);
1061
1062 if (nw != ow || nh != oh)
1063 {
1064 if (SvOK (data_))
1065 {
1066 STRLEN datalen; 1268 STRLEN datalen;
1067 char *data = SvPVbyte (data_, datalen); 1269 char *data = SvPVbyte (data_, datalen);
1068 int bpp = datalen / (ow * oh); 1270 int bpp = datalen / (ow * oh);
1069 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1271 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1070 1272
1071 SvPOK_only (result_); 1273 SvPOK_only (result_);
1072 SvCUR_set (result_, nw * nh * bpp); 1274 SvCUR_set (result_, nw * nh * bpp);
1073 1275
1074 memset (SvPVX (result_), 0, nw * nh * bpp); 1276 memset (SvPVX (result_), 0, nw * nh * bpp);
1075 while (oh--) 1277 while (oh--)
1076 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);
1077 1279
1078 sv_setsv (data_, result_); 1280 sv_setsv (data_, result_);
1079 }
1080
1081 sv_setiv (w_, nw);
1082 sv_setiv (h_, nh);
1083 }
1084 } 1281 }
1085} 1282}
1086 1283
1087void 1284void
1088draw_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.)
1131 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1132 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1133 } 1330 }
1134} 1331}
1135 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
1136MODULE = CFPlus PACKAGE = CFPlus::Map 1344MODULE = CFPlus PACKAGE = CFPlus::Map
1137 1345
1138CFPlus::Map 1346CFPlus::Map
1139new (SV *class, int map_width, int map_height) 1347new (SV *class)
1140 CODE: 1348 CODE:
1141 New (0, RETVAL, 1, struct map); 1349 New (0, RETVAL, 1, struct map);
1142 RETVAL->x = 0; 1350 RETVAL->x = 0;
1143 RETVAL->y = 0; 1351 RETVAL->y = 0;
1144 RETVAL->w = map_width; 1352 RETVAL->w = 0;
1145 RETVAL->h = map_height; 1353 RETVAL->h = 0;
1146 RETVAL->ox = 0; 1354 RETVAL->ox = 0;
1147 RETVAL->oy = 0; 1355 RETVAL->oy = 0;
1148 RETVAL->faces = 8192; 1356 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1149 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1357 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1150 RETVAL->texs = 8192;
1151 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1152 RETVAL->rows = 0; 1358 RETVAL->rows = 0;
1153 RETVAL->row = 0; 1359 RETVAL->row = 0;
1154 OUTPUT: 1360 OUTPUT:
1155 RETVAL 1361 RETVAL
1156 1362
1157void 1363void
1158DESTROY (CFPlus::Map self) 1364DESTROY (CFPlus::Map self)
1159 CODE: 1365 CODE:
1160{ 1366{
1161 map_clear (self); 1367 map_clear (self);
1162 Safefree (self->face); 1368 Safefree (self->face2tile);
1163 Safefree (self->tex); 1369 Safefree (self->tex);
1164 Safefree (self); 1370 Safefree (self);
1165} 1371}
1166 1372
1167void 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
1168clear (CFPlus::Map self) 1380clear (CFPlus::Map self)
1169 CODE: 1381 CODE:
1170 map_clear (self); 1382 map_clear (self);
1171 1383
1172void 1384void
1173set_face (CFPlus::Map self, int face, int texid) 1385set_tileid (CFPlus::Map self, int face, int tile)
1174 CODE: 1386 CODE:
1175{ 1387{
1176 while (self->faces <= face) 1388 need_facenum (self, face); self->face2tile [face] = tile;
1177 { 1389 need_texid (self, tile);
1178 Append (mapface, self->face, self->faces, self->faces); 1390}
1179 self->faces *= 2;
1180 }
1181 1391
1182 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;
1183} 1413}
1184 1414
1185void 1415void
1186set_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)
1187 CODE: 1417 CODE:
1188{ 1418{
1189 while (self->texs <= texid) 1419 need_texid (self, texid);
1190 {
1191 Append (maptex, self->tex, self->texs, self->texs);
1192 self->texs *= 2;
1193 }
1194 1420
1195 { 1421 {
1196 maptex *tex = self->tex + texid; 1422 maptex *tex = self->tex + texid;
1197 1423
1198 tex->name = name; 1424 tex->name = name;
1240void 1466void
1241scroll (CFPlus::Map self, int dx, int dy) 1467scroll (CFPlus::Map self, int dx, int dy)
1242 CODE: 1468 CODE:
1243{ 1469{
1244 if (dx > 0) 1470 if (dx > 0)
1245 map_blank (self, self->x, self->y, dx - 1, self->h); 1471 map_blank (self, self->x, self->y, dx, self->h);
1246 else if (dx < 0) 1472 else if (dx < 0)
1247 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);
1248 1474
1249 if (dy > 0) 1475 if (dy > 0)
1250 map_blank (self, self->x, self->y, self->w, dy - 1); 1476 map_blank (self, self->x, self->y, self->w, dy);
1251 else if (dy < 0) 1477 else if (dy < 0)
1252 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);
1253 1479
1254 self->ox += dx; self->x += dx; 1480 self->ox += dx; self->x += dx;
1255 self->oy += dy; self->y += dy; 1481 self->oy += dy; self->y += dy;
1256 1482
1257 while (self->y < 0) 1483 while (self->y < 0)
1262 self->y += MAP_EXTEND_Y; 1488 self->y += MAP_EXTEND_Y;
1263 } 1489 }
1264} 1490}
1265 1491
1266void 1492void
1267map1a_update (CFPlus::Map self, SV *data_) 1493map1a_update (CFPlus::Map self, SV *data_, int extmap)
1268 CODE: 1494 CODE:
1269{ 1495{
1270 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1271 uint8_t *data_end = (uint8_t *)SvEND (data_); 1497 uint8_t *data_end = (uint8_t *)SvEND (data_);
1272 mapcell *cell; 1498 mapcell *cell;
1273 int x, y, flags; 1499 int x, y, flags;
1274 1500
1275 while (data < data_end) 1501 while (data < data_end - 1)
1276 { 1502 {
1277 flags = (data [0] << 8) + data [1]; data += 2; 1503 flags = (data [0] << 8) + data [1]; data += 2;
1278 1504
1279 x = self->x + ((flags >> 10) & 63); 1505 x = self->x + ((flags >> 10) & 63);
1280 y = self->y + ((flags >> 4) & 63); 1506 y = self->y + ((flags >> 4) & 63);
1281 1507
1282 cell = map_get_cell (self, x, y); 1508 cell = map_get_cell (self, x, y);
1283 1509
1284 if (flags & 15) 1510 if (flags & 15)
1285 { 1511 {
1286 if (cell->darkness < 0) 1512 if (!cell->darkness)
1287 { 1513 {
1514 memset (cell, 0, sizeof (*cell));
1288 cell->darkness = 0; 1515 cell->darkness = 256;
1289 cell->face [0] = 0;
1290 cell->face [1] = 0;
1291 cell->face [2] = 0;
1292 } 1516 }
1293 1517
1294 cell->darkness = flags & 8 ? *data++ : 255;
1295
1296 //TODO: don't trust server data to be in-range(!) 1518 //TODO: don't trust server data to be in-range(!)
1519
1520 if (flags & 8)
1521 {
1522 if (extmap)
1523 {
1524 uint8_t ext, cmd;
1525
1526 do
1527 {
1528 ext = *data++;
1529 cmd = ext & 0x3f;
1530
1531 if (cmd < 4)
1532 cell->darkness = 255 - ext * 64 + 1;
1533 else if (cmd == 5) // health
1534 {
1535 cell->stat_width = 1;
1536 cell->stat_hp = *data++;
1537 }
1538 else if (cmd == 6) // monster width
1539 cell->stat_width = *data++ + 1;
1540 else if (cmd == 0x47)
1541 {
1542 if (*data == 4)
1543 ; // decode player count
1544
1545 data += *data + 1;
1546 }
1547 else if (cmd == 8) // cell flags
1548 cell->flags = *data++;
1549 else if (ext & 0x40) // unknown, multibyte => skip
1550 data += *data + 1;
1551 else
1552 data++;
1553 }
1554 while (ext & 0x80);
1555 }
1556 else
1557 cell->darkness = *data++ + 1;
1558 }
1297 1559
1298 if (flags & 4) 1560 if (flags & 4)
1299 { 1561 {
1300 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];
1301 } 1565 }
1302 1566
1303 if (flags & 2) 1567 if (flags & 2)
1304 { 1568 {
1305 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];
1306 } 1572 }
1307 1573
1308 if (flags & 1) 1574 if (flags & 1)
1309 { 1575 {
1310 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];
1311 } 1579 }
1312 } 1580 }
1313 else 1581 else
1314 cell->darkness = -1; 1582 cell->darkness = 0;
1315 } 1583 }
1316} 1584}
1317 1585
1318SV * 1586SV *
1319mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1345 { 1613 {
1346 mapcell *cell = row->col + (x - row->c0); 1614 mapcell *cell = row->col + (x - row->c0);
1347 1615
1348 for (z = 0; z <= 0; z++) 1616 for (z = 0; z <= 0; z++)
1349 { 1617 {
1350 mapface face = cell->face [z];
1351
1352 if (face)
1353 {
1354 maptex tex = self->tex [face]; 1618 maptex tex = self->tex [cell->tile [z]];
1355 int a0 = 255 - tex.a; 1619 int a0 = 255 - tex.a;
1356 int a1 = tex.a; 1620 int a1 = tex.a;
1357 1621
1358 r = (r * a0 + tex.r * a1) / 255; 1622 r = (r * a0 + tex.r * a1) / 255;
1359 g = (g * a0 + tex.g * a1) / 255; 1623 g = (g * a0 + tex.g * a1) / 255;
1360 b = (b * a0 + tex.b * a1) / 255; 1624 b = (b * a0 + tex.b * a1) / 255;
1361 a = (a * a0 + tex.a * a1) / 255; 1625 a = (a * a0 + tex.a * a1) / 255;
1362 }
1363 } 1626 }
1364 } 1627 }
1365 1628
1366 *map++ = (r ) 1629 *map++ = (r )
1367 | (g << 8) 1630 | (g << 8)
1374} 1637}
1375 OUTPUT: 1638 OUTPUT:
1376 RETVAL 1639 RETVAL
1377 1640
1378void 1641void
1379draw (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)
1380 CODE: 1643 CODE:
1381{ 1644{
1382 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;
1383 int x, y, z; 1649 int x, y, z;
1384 int last_name; 1650 int last_name;
1385 mapface face;
1386 1651
1387 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1652 // thats current max. sorry.
1388 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1653 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255;
1389 1655
1390 /* 1656 // clear key, in case of extra padding
1391 int vx = self->vx = self->w >= sw 1657 memset (&skey, 0, sizeof (skey));
1392 ? self->x + (self->w - sw) / 2
1393 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1394
1395 int vy = self->vy = self->h >= sh
1396 ? self->y + (self->h - sh) / 2
1397 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1398 */
1399 1658
1400 glColor4ub (255, 255, 255, 255); 1659 glColor4ub (255, 255, 255, 255);
1401 1660
1402 glEnable (GL_BLEND); 1661 glEnable (GL_BLEND);
1403 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1406 1665
1407 glBegin (GL_QUADS); 1666 glBegin (GL_QUADS);
1408 1667
1409 last_name = 0; 1668 last_name = 0;
1410 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
1411 for (z = 0; z < 3; z++) 1695 for (z = 0; z <= 2; z++)
1696 {
1697 memset (smooth_level, 0, sizeof (smooth_level));
1698
1412 for (y = 0; y < sh; y++) 1699 for (y = 0; y < sh; y++)
1413 if (0 <= y + vy && y + vy < self->rows) 1700 if (0 <= y + my && y + my < self->rows)
1414 { 1701 {
1415 maprow *row = self->row + (y + vy); 1702 maprow *row = self->row + (y + my);
1416 1703
1417 for (x = 0; x < sw; x++) 1704 for (x = 0; x < sw; x++)
1418 if (row->c0 <= x + vx && x + vx < row->c1) 1705 if (row->c0 <= x + mx && x + mx < row->c1)
1419 { 1706 {
1420 mapcell *cell = row->col + (x + vx - row->c0); 1707 mapcell *cell = row->col + (x + mx - row->c0);
1421
1422 face = cell->face [z]; 1708 tileid tile = cell->tile [z];
1423 1709
1424 if (face) 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;
1715
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))
1425 { 1805 {
1426 maptex tex = self->tex [face]; 1806 int level = (w << 5) | b;
1807 HE *he;
1427 1808
1428 int px = (x + 1) * 32 - tex.w; 1809 hv_iterinit (smooth);
1429 int py = (y + 1) * 32 - tex.h; 1810 while ((he = hv_iternext (smooth)))
1430
1431 if (last_name != tex.name)
1432 { 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
1433 glEnd (); 1834 glEnd ();
1434 last_name = tex.name;
1435 glBindTexture (GL_TEXTURE_2D, last_name); 1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1436 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 }
1858 }
1437 } 1859 }
1438
1439 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1440 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1441 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1442 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1443 } 1860 }
1444 }
1445 } 1861 }
1862 }
1863
1864 hv_clear (smooth);
1865 }
1446 1866
1447 glEnd (); 1867 glEnd ();
1448 1868
1449 glDisable (GL_TEXTURE_2D); 1869 glDisable (GL_TEXTURE_2D);
1450 glDisable (GL_BLEND); 1870 glDisable (GL_BLEND);
1871
1872 // top layer: overlays such as the health bar
1873 for (y = 0; y < sh; y++)
1874 if (0 <= y + my && y + my < self->rows)
1875 {
1876 maprow *row = self->row + (y + my);
1877
1878 for (x = 0; x < sw; x++)
1879 if (row->c0 <= x + mx && x + mx < row->c1)
1880 {
1881 mapcell *cell = row->col + (x + mx - row->c0);
1882
1883 int px = x * T;
1884 int py = y * T;
1885
1886 if (cell->stat_hp)
1887 {
1888 int width = cell->stat_width * T;
1889 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1890
1891 glColor3ub (0, 0, 0);
1892 glRectf (px + 1, py - thick - 2,
1893 px + width - 1, py);
1894
1895 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1896 glRectf (px + 2,
1897 py - thick - 1,
1898 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1899 }
1900 }
1901 }
1451} 1902}
1452 1903
1453void 1904void
1454draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1905draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1455 CODE: 1906 CODE:
1509 glDisable (GL_BLEND); 1960 glDisable (GL_BLEND);
1510 glDisable (GL_TEXTURE_2D); 1961 glDisable (GL_TEXTURE_2D);
1511} 1962}
1512 1963
1513void 1964void
1514fow_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)
1515 PPCODE: 1966 PPCODE:
1516{ 1967{
1517 int vx, vy;
1518 int x, y; 1968 int x, y;
1969 int sw1 = sw + 2;
1970 int sh1 = sh + 2;
1971 int sh3 = sh * 3;
1519 int sw4 = (sw + 3) & ~3; 1972 int sw34 = (sw * 3 + 3) & ~3;
1973 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1520 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1974 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1521 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1975 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1522 1976
1523 memset (darkness, 255, sw4 * sh);
1524 SvPOK_only (darkness_sv); 1977 SvPOK_only (darkness3_sv);
1525 SvCUR_set (darkness_sv, sw4 * sh); 1978 SvCUR_set (darkness3_sv, sw34 * sh3);
1526 1979
1527 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1980 mx += self->x - 1;
1528 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1981 my += self->y - 1;
1529 1982
1983 memset (darkness1, 255, sw1 * sh1);
1984
1530 for (y = 0; y < sh; y++) 1985 for (y = 0; y < sh1; y++)
1531 if (0 <= y + vy && y + vy < self->rows) 1986 if (0 <= y + my && y + my < self->rows)
1532 { 1987 {
1533 maprow *row = self->row + (y + vy); 1988 maprow *row = self->row + (y + my);
1534 1989
1535 for (x = 0; x < sw; x++) 1990 for (x = 0; x < sw1; x++)
1536 if (row->c0 <= x + vx && x + vx < row->c1) 1991 if (row->c0 <= x + mx && x + mx < row->c1)
1537 { 1992 {
1538 mapcell *cell = row->col + (x + vx - row->c0); 1993 mapcell *cell = row->col + (x + mx - row->c0);
1539 1994
1540 darkness[y * sw4 + x] = cell->darkness < 0 1995 darkness1 [y * sw1 + x] = cell->darkness
1996 ? 255 - (cell->darkness - 1)
1541 ? 255 - FOW_DARKNESS 1997 : 255 - FOW_DARKNESS;
1542 : 255 - cell->darkness;
1543 } 1998 }
1544 } 1999 }
1545 2000
2001 for (y = 0; y < sh; ++y)
2002 for (x = 0; x < sw; ++x)
2003 {
2004 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2005 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2006 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2007 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2008 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2009 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2010 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2011 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2012 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2013
2014 uint8_t r11 = (d11 + d21 + d12) / 3;
2015 uint8_t r21 = d21;
2016 uint8_t r31 = (d21 + d31 + d32) / 3;
2017
2018 uint8_t r12 = d12;
2019 uint8_t r22 = d22;
2020 uint8_t r32 = d32;
2021
2022 uint8_t r13 = (d13 + d23 + d12) / 3;
2023 uint8_t r23 = d23;
2024 uint8_t r33 = (d23 + d33 + d32) / 3;
2025
2026 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2027 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2028 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2029 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2030 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2031 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2032 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2033 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2034 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2035 }
2036
2037 free (darkness1);
2038
1546 EXTEND (SP, 3); 2039 EXTEND (SP, 3);
1547 PUSHs (sv_2mortal (newSViv (sw4))); 2040 PUSHs (sv_2mortal (newSViv (sw34)));
1548 PUSHs (sv_2mortal (newSViv (sh))); 2041 PUSHs (sv_2mortal (newSViv (sh3)));
1549 PUSHs (darkness_sv); 2042 PUSHs (darkness3_sv);
1550} 2043}
1551 2044
1552SV * 2045SV *
1553get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2046get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1554 CODE: 2047 CODE:
1583 if (row && row->c0 <= x && x < row->c1) 2076 if (row && row->c0 <= x && x < row->c1)
1584 { 2077 {
1585 mapcell *cell = row->col + (x - row->c0); 2078 mapcell *cell = row->col + (x - row->c0);
1586 uint8_t flags = 0; 2079 uint8_t flags = 0;
1587 2080
1588 if (cell->face [0]) flags |= 1; 2081 if (cell->tile [0]) flags |= 1;
1589 if (cell->face [1]) flags |= 2; 2082 if (cell->tile [1]) flags |= 2;
1590 if (cell->face [2]) flags |= 4; 2083 if (cell->tile [2]) flags |= 4;
1591 2084
1592 *data++ = flags; 2085 *data++ = flags;
1593 2086
1594 if (flags & 1) 2087 if (flags & 1)
1595 { 2088 {
2089 tileid tile = cell->tile [0];
1596 *data++ = cell->face [0] >> 8; 2090 *data++ = tile >> 8;
1597 *data++ = cell->face [0]; 2091 *data++ = tile;
1598 } 2092 }
1599 2093
1600 if (flags & 2) 2094 if (flags & 2)
1601 { 2095 {
2096 tileid tile = cell->tile [1];
1602 *data++ = cell->face [1] >> 8; 2097 *data++ = tile >> 8;
1603 *data++ = cell->face [1]; 2098 *data++ = tile;
1604 } 2099 }
1605 2100
1606 if (flags & 4) 2101 if (flags & 4)
1607 { 2102 {
2103 tileid tile = cell->tile [2];
1608 *data++ = cell->face [2] >> 8; 2104 *data++ = tile >> 8;
1609 *data++ = cell->face [2]; 2105 *data++ = tile;
1610 } 2106 }
1611 } 2107 }
1612 else 2108 else
1613 *data++ = 0; 2109 *data++ = 0;
1614 } 2110 }
1654 { 2150 {
1655 uint8_t flags = *data++; 2151 uint8_t flags = *data++;
1656 2152
1657 if (flags) 2153 if (flags)
1658 { 2154 {
1659 mapface face[3] = { 0, 0, 0 };
1660
1661 mapcell *cell = row_get_cell (row, x); 2155 mapcell *cell = row_get_cell (row, x);
2156 tileid tile[3] = { 0, 0, 0 };
1662 2157
1663 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2158 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1664 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2159 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1665 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2160 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1666 2161
1667 if (cell->darkness <= 0) 2162 if (cell->darkness == 0)
1668 { 2163 {
1669 cell->darkness = -1; 2164 cell->darkness = 0;
1670 2165
1671 for (z = 0; z <= 2; z++) 2166 for (z = 0; z <= 2; z++)
1672 { 2167 {
1673 cell->face[z] = face[z]; 2168 tileid t = tile [z];
1674 2169
1675 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2170 if (t >= self->texs || (t && !self->tex [t].name))
2171 {
1676 XPUSHs (sv_2mortal (newSViv (face[z]))); 2172 XPUSHs (sv_2mortal (newSViv (t)));
2173 need_texid (self, t);
2174 }
2175
2176 cell->tile [z] = t;
1677 } 2177 }
1678 } 2178 }
1679 } 2179 }
1680 } 2180 }
1681 } 2181 }
1716 CODE: 2216 CODE:
1717 RETVAL = Mix_VolumeMusic (volume); 2217 RETVAL = Mix_VolumeMusic (volume);
1718 OUTPUT: 2218 OUTPUT:
1719 RETVAL 2219 RETVAL
1720 2220
2221int
2222fade_out (int ms)
2223 CODE:
2224 RETVAL = Mix_FadeOutMusic (ms);
2225 OUTPUT:
2226 RETVAL
2227
1721CFPlus::MixMusic 2228CFPlus::MixMusic
1722new_from_file (SV *class, char *path) 2229new_from_file (SV *class, char *path)
1723 CODE: 2230 CODE:
1724 RETVAL = Mix_LoadMUS (path); 2231 RETVAL = Mix_LoadMUS (path);
1725 OUTPUT: 2232 OUTPUT:
1732 2239
1733int 2240int
1734play (CFPlus::MixMusic self, int loops = -1) 2241play (CFPlus::MixMusic self, int loops = -1)
1735 CODE: 2242 CODE:
1736 RETVAL = Mix_PlayMusic (self, loops); 2243 RETVAL = Mix_PlayMusic (self, loops);
2244 OUTPUT:
2245 RETVAL
2246
2247int
2248fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2249 CODE:
2250 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1737 OUTPUT: 2251 OUTPUT:
1738 RETVAL 2252 RETVAL
1739 2253
1740MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2254MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1741 2255
1745 static const struct { 2259 static const struct {
1746 const char *name; 2260 const char *name;
1747 IV iv; 2261 IV iv;
1748 } *civ, const_iv[] = { 2262 } *civ, const_iv[] = {
1749# define const_iv(name) { # name, (IV)name } 2263# define const_iv(name) { # name, (IV)name }
2264 const_iv (GL_VENDOR),
2265 const_iv (GL_VERSION),
2266 const_iv (GL_EXTENSIONS),
1750 const_iv (GL_COLOR_MATERIAL), 2267 const_iv (GL_COLOR_MATERIAL),
1751 const_iv (GL_SMOOTH), 2268 const_iv (GL_SMOOTH),
1752 const_iv (GL_FLAT), 2269 const_iv (GL_FLAT),
1753 const_iv (GL_DITHER), 2270 const_iv (GL_DITHER),
1754 const_iv (GL_BLEND), 2271 const_iv (GL_BLEND),
1781 const_iv (GL_LUMINANCE), 2298 const_iv (GL_LUMINANCE),
1782 const_iv (GL_LUMINANCE_ALPHA), 2299 const_iv (GL_LUMINANCE_ALPHA),
1783 const_iv (GL_FLOAT), 2300 const_iv (GL_FLOAT),
1784 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2301 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1785 const_iv (GL_COMPILE), 2302 const_iv (GL_COMPILE),
2303 const_iv (GL_PROXY_TEXTURE_1D),
2304 const_iv (GL_PROXY_TEXTURE_2D),
1786 const_iv (GL_TEXTURE_1D), 2305 const_iv (GL_TEXTURE_1D),
1787 const_iv (GL_TEXTURE_2D), 2306 const_iv (GL_TEXTURE_2D),
1788 const_iv (GL_TEXTURE_ENV), 2307 const_iv (GL_TEXTURE_ENV),
1789 const_iv (GL_TEXTURE_MAG_FILTER), 2308 const_iv (GL_TEXTURE_MAG_FILTER),
1790 const_iv (GL_TEXTURE_MIN_FILTER), 2309 const_iv (GL_TEXTURE_MIN_FILTER),
1830# undef const_iv 2349# undef const_iv
1831 }; 2350 };
1832 2351
1833 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2352 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1834 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2353 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2354
2355 texture_av = newAV ();
2356 AvREAL_off (texture_av);
1835} 2357}
1836 2358
1837char * 2359char *
1838gl_vendor () 2360gl_vendor ()
1839 CODE: 2361 CODE:
1850 2372
1851char * 2373char *
1852gl_extensions () 2374gl_extensions ()
1853 CODE: 2375 CODE:
1854 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2376 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2377 OUTPUT:
2378 RETVAL
2379
2380const char *glGetString (GLenum pname)
2381
2382GLint glGetInteger (GLenum pname)
2383 CODE:
2384 glGetIntegerv (pname, &RETVAL);
2385 OUTPUT:
2386 RETVAL
2387
2388GLdouble glGetDouble (GLenum pname)
2389 CODE:
2390 glGetDoublev (pname, &RETVAL);
1855 OUTPUT: 2391 OUTPUT:
1856 RETVAL 2392 RETVAL
1857 2393
1858int glGetError () 2394int glGetError ()
1859 2395
1984 2520
1985void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2521void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1986 2522
1987void glDrawPixels (int width, int height, int format, int type, char *pixels) 2523void glDrawPixels (int width, int height, int format, int type, char *pixels)
1988 2524
2525void glPixelZoom (float x, float y)
2526
1989void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2527void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1990 2528
1991int glGenTexture () 2529int glGenTexture ()
1992 CODE: 2530 CODE:
1993{ 2531 RETVAL = gen_texture ();
1994 GLuint name;
1995 glGenTextures (1, &name);
1996 RETVAL = name;
1997}
1998 OUTPUT: 2532 OUTPUT:
1999 RETVAL 2533 RETVAL
2000 2534
2001void glDeleteTexture (int name) 2535void glDeleteTexture (int name)
2002 CODE: 2536 CODE:
2003{
2004 GLuint name_ = name;
2005 glDeleteTextures (1, &name_); 2537 del_texture (name);
2006} 2538
2007
2008int glGenList () 2539int glGenList ()
2009 CODE: 2540 CODE:
2010 RETVAL = glGenLists (1); 2541 RETVAL = glGenLists (1);
2011 OUTPUT: 2542 OUTPUT:
2012 RETVAL 2543 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines