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.151 by root, Sat Aug 19 18:17:18 2006 UTC vs.
Revision 1.206 by root, Thu Jul 19 23:29:16 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
22#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
23#include <SDL_endian.h> 32#include <SDL_endian.h>
24#include <SDL_image.h> 33#include <SDL_image.h>
25#include <SDL_mixer.h> 34#include <SDL_mixer.h>
26#include <SDL_opengl.h> 35#include <SDL_opengl.h>
27 36
36# include <sys/types.h> 45# include <sys/types.h>
37# include <sys/socket.h> 46# include <sys/socket.h>
38# include <netinet/in.h> 47# include <netinet/in.h>
39# include <netinet/tcp.h> 48# include <netinet/tcp.h>
40# include <inttypes.h> 49# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 50#endif
49 51
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 53
52#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
53 55
54#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 63#else
62# define PARACHUTE 0 64# define PARACHUTE 0
63#endif 65#endif
64 66
67static AV *texture_av;
68
65static struct 69static struct
66{ 70{
67#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 72#include "glfunc.h"
69#undef GL_FUNC 73#undef GL_FUNC
70} gl; 74} gl;
71 75
76static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 78{
74 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 83 else
79 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
80} 85}
81 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
82#include "texcache.c" 111#include "texcache.c"
83 112
84#include "pango-font.c" 113#include "pango-font.c"
85#include "pango-fontmap.c" 114#include "pango-fontmap.c"
86#include "pango-render.c" 115#include "pango-render.c"
159 188
160 *w = rect.width; 189 *w = rect.width;
161 *h = rect.height; 190 *h = rect.height;
162} 191}
163 192
193typedef uint16_t tileid;
164typedef uint16_t mapface; 194typedef uint16_t faceid;
165 195
166typedef struct { 196typedef struct {
167 GLint name; 197 int name;
168 int w, h; 198 int w, h;
169 float s, t; 199 float s, t;
170 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
171} maptex; 203} maptex;
172 204
173typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
174 uint16_t darkness; 208 uint16_t darkness;
175 mapface face[3];
176 uint8_t stat_width, stat_hp; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
177} mapcell; 210} mapcell;
178 211
179typedef struct { 212typedef struct {
180 int32_t c0, c1; 213 int32_t c0, c1;
181 mapcell *col; 214 mapcell *col;
182} maprow; 215} maprow;
183 216
184typedef struct map { 217typedef struct map {
185 int x, y, w, h; 218 int x, y, w, h;
186 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
187 int faces; 220 int faces; tileid *face2tile; // [faceid]
188 mapface *face; 221 int texs; maptex *tex; // [tileid]
189
190 int texs;
191 maptex *tex;
192 222
193 int32_t rows; 223 int32_t rows;
194 maprow *row; 224 maprow *row;
195} *CFPlus__Map; 225} *CFPlus__Map;
196 226
216 return ptr; 246 return ptr;
217} 247}
218 248
219#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))
220#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}
221 271
222static maprow * 272static maprow *
223map_get_row (CFPlus__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
224{ 274{
225 if (0 > y) 275 if (0 > y)
314 364
315 cell = row->col + x - row->c0; 365 cell = row->col + x - row->c0;
316 366
317 cell->darkness = 0; 367 cell->darkness = 0;
318 cell->stat_hp = 0; 368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
319 } 371 }
320 } 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);
321} 389}
322 390
323static void 391static void
324music_finished (void) 392music_finished (void)
325{ 393{
360 n |= n >> 8; 428 n |= n >> 8;
361 n |= n >> 16; 429 n |= n >> 16;
362 430
363 return n + 1; 431 return n + 1;
364} 432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
365 437
366MODULE = CFPlus PACKAGE = CFPlus 438MODULE = CFPlus PACKAGE = CFPlus
367 439
368PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
369 441
373 static const struct { 445 static const struct {
374 const char *name; 446 const char *name;
375 IV iv; 447 IV iv;
376 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
377# 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
378 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
379 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
380 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
381 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
382 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
391 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
392 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
393 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
394 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
395 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
396 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
397 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
398 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
399 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
400 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
455 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
456 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
457 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
458 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
459 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
460 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
461 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
462 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
463 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
464 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
465 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
466 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
467 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
468 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
469 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
470 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
471 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
472 const_iv (KMOD_CTRL),
473 const_iv (KMOD_SHIFT),
474 const_iv (KMOD_ALT),
475 const_iv (KMOD_META)
476# undef const_iv 557# undef const_iv
477 }; 558 };
478 559
479 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; )
480 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);
481} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
482 572
483int 573int
484in_destruct () 574in_destruct ()
485 CODE: 575 CODE:
486 RETVAL = PL_main_cv == Nullcv; 576 RETVAL = PL_main_cv == Nullcv;
498 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
499 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);
500 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
501} 591}
502 592
593char *
594SDL_GetError ()
595
503int 596int
504SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
505 598
506void 599void
507SDL_Quit () 600SDL_Quit ()
508 601
509void 602void
510SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
511 PPCODE: 604 PPCODE:
512{ 605{
513 SDL_Rect **m; 606 SDL_Rect **m;
514 607
515 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
516 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
517 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
518 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
519 612
520 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
521 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
522 615
523 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
524 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
525 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
526 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
527 620
528 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
529#if SDL_VERSION_ATLEAST(1,2,10) 622#if SDL_VERSION_ATLEAST(1,2,10)
530 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
531 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
532#endif 625#endif
533 626
534 SDL_EnableUNICODE (1);
535 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
536
537 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
538 628
539 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
540 while (*m) 630 while (*m)
541 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
542 AV *av = newAV (); 634 AV *av = newAV ();
543 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
544 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));
545 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
546 641
547 ++m; 642 ++m;
548 } 643 }
549} 644}
550 645
551char *
552SDL_GetError ()
553
554int 646int
555SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
556 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
557 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
558 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
559 ); 660 );
661
560 if (RETVAL) 662 if (RETVAL)
561 { 663 {
664 av_clear (texture_av);
665
562 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
563# 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);
564# include "glfunc.h" 668#include "glfunc.h"
565# undef GL_FUNC 669#undef GL_FUNC
566 } 670 }
671}
567 OUTPUT: 672 OUTPUT:
568 RETVAL 673 RETVAL
569 674
570void 675void
571SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
572 677
573char * 678char *
574SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
575 680
681int
682SDL_GetAppState ()
683
576void 684void
577SDL_PollEvent () 685poll_events ()
578 PPCODE: 686 PPCODE:
579{ 687{
580 SDL_Event ev; 688 SDL_Event ev;
581 689
582 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
583 { 692 {
584 HV *hv = newHV (); 693 HV *hv = newHV ();
585 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
586 695
587 switch (ev.type) 696 switch (ev.type)
589 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
590 case SDL_KEYUP: 699 case SDL_KEYUP:
591 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
592 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
593 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 */
594 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
595 break; 705 break;
596 706
597 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
598 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
599 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
600 break; 710 break;
601 711
602 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
603 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
604
605 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
606 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
607 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
608 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
609 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
610 break; 738 break;
611 739
612 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
613 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
614 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
643Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
644 772
645void 773void
646lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
647 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
648#ifndef _WIN32 782#ifdef _WIN32
649 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 }
650#endif 804#endif
805}
651 806
652void 807void
653add_font (char *file) 808add_font (char *file)
654 CODE: 809 CODE:
655 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
760#endif 915#endif
761 _exit (1); 916 _exit (1);
762 917
763void 918void
764_exit (int retval) 919_exit (int retval = 0)
765 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
766 _exit (retval); 924 _exit (retval);
925#endif
926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
767 935
768MODULE = CFPlus PACKAGE = CFPlus::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
937
938PROTOTYPES: DISABLE
769 939
770CFPlus::Font 940CFPlus::Font
771new_from_file (SV *class, char *path, int id = 0) 941new_from_file (SV *class, char *path, int id = 0)
772 CODE: 942 CODE:
773{ 943{
784 CODE: 954 CODE:
785 pango_font_description_free (self); 955 pango_font_description_free (self);
786 956
787void 957void
788make_default (CFPlus::Font self) 958make_default (CFPlus::Font self)
959 PROTOTYPE: $
789 CODE: 960 CODE:
790 default_font = self; 961 default_font = self;
791 962
792MODULE = CFPlus PACKAGE = CFPlus::Layout 963MODULE = CFPlus PACKAGE = CFPlus::Layout
793 964
965PROTOTYPES: DISABLE
966
794void 967void
795reset_glyph_cache () 968reset_glyph_cache ()
969 PROTOTYPE:
796 CODE: 970 CODE:
797 tc_clear (); 971 tc_clear ();
798 972
799CFPlus::Layout 973CFPlus::Layout
800new (SV *class) 974new (SV *class)
1018xy_to_index (CFPlus::Layout self, int x, int y) 1192xy_to_index (CFPlus::Layout self, int x, int y)
1019 CODE: 1193 CODE:
1020{ 1194{
1021 int index, trailing; 1195 int index, trailing;
1022 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1196 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1023 RETVAL = index; 1197 RETVAL = index + trailing;
1024} 1198}
1025 OUTPUT: 1199 OUTPUT:
1026 RETVAL 1200 RETVAL
1027 1201
1028void 1202void
1034 1208
1035 EXTEND (SP, 3); 1209 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1210 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1211 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1212 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1213}
1214
1215void
1216index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1217 PPCODE:
1218{
1219 int line, x;
1220
1221 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1222 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1223
1224 EXTEND (SP, 2);
1225 PUSHs (sv_2mortal (newSViv (line - 1)));
1226 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1227}
1228
1229void
1230line_x_to_index (CFPlus::Layout self, int line, int x)
1231 PPCODE:
1232{
1233 PangoLayoutLine *lp;
1234 int index, trailing;
1235
1236 if (line < 0)
1237 XSRETURN_EMPTY;
1238
1239 if (!(lp = pango_layout_get_line (self->pl, line)))
1240 XSRETURN_EMPTY; /* do better */
1241
1242 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1243
1244 EXTEND (SP, 2);
1245 if (GIMME_V == G_SCALAR)
1246 PUSHs (sv_2mortal (newSViv (index + trailing)));
1247 else
1248 {
1249 PUSHs (sv_2mortal (newSViv (index)));
1250 PUSHs (sv_2mortal (newSViv (trailing)));
1251 }
1039} 1252}
1040 1253
1041void 1254void
1042render (CFPlus::Layout self, float x, float y, int flags = 0) 1255render (CFPlus::Layout self, float x, float y, int flags = 0)
1043 PPCODE: 1256 PPCODE:
1048 flags 1261 flags
1049 ); 1262 );
1050 1263
1051MODULE = CFPlus PACKAGE = CFPlus::Texture 1264MODULE = CFPlus PACKAGE = CFPlus::Texture
1052 1265
1053void 1266PROTOTYPES: ENABLE
1054pad2pot (SV *data_, SV *w_, SV *h_)
1055 CODE:
1056{
1057 int ow = SvIV (w_);
1058 int oh = SvIV (h_);
1059 1267
1060 if (ow && oh) 1268int minpot (int n)
1269
1270void
1271pad (SV *data_, int ow, int oh, int nw, int nh)
1272 CODE:
1273{
1274 if ((nw != ow || nh != oh) && SvOK (data_))
1061 { 1275 {
1062 int nw = minpot (ow);
1063 int nh = minpot (oh);
1064
1065 if (nw != ow || nh != oh)
1066 {
1067 if (SvOK (data_))
1068 {
1069 STRLEN datalen; 1276 STRLEN datalen;
1070 char *data = SvPVbyte (data_, datalen); 1277 char *data = SvPVbyte (data_, datalen);
1071 int bpp = datalen / (ow * oh); 1278 int bpp = datalen / (ow * oh);
1072 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1279 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1073 1280
1074 SvPOK_only (result_); 1281 SvPOK_only (result_);
1075 SvCUR_set (result_, nw * nh * bpp); 1282 SvCUR_set (result_, nw * nh * bpp);
1076 1283
1077 memset (SvPVX (result_), 0, nw * nh * bpp); 1284 memset (SvPVX (result_), 0, nw * nh * bpp);
1078 while (oh--) 1285 while (oh--)
1079 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1286 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1080 1287
1081 sv_setsv (data_, result_); 1288 sv_setsv (data_, result_);
1082 }
1083
1084 sv_setiv (w_, nw);
1085 sv_setiv (h_, nh);
1086 }
1087 } 1289 }
1088} 1290}
1089 1291
1090void 1292void
1091draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1293draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1134 glDisable (GL_ALPHA_TEST); 1336 glDisable (GL_ALPHA_TEST);
1135 glDisable (GL_BLEND); 1337 glDisable (GL_BLEND);
1136 } 1338 }
1137} 1339}
1138 1340
1341IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1342 CODE:
1343{
1344 GLint width;
1345 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1346 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1347 RETVAL = width > 0;
1348}
1349 OUTPUT:
1350 RETVAL
1351
1139MODULE = CFPlus PACKAGE = CFPlus::Map 1352MODULE = CFPlus PACKAGE = CFPlus::Map
1140 1353
1354PROTOTYPES: DISABLE
1355
1141CFPlus::Map 1356CFPlus::Map
1142new (SV *class, int map_width, int map_height) 1357new (SV *class)
1143 CODE: 1358 CODE:
1144 New (0, RETVAL, 1, struct map); 1359 New (0, RETVAL, 1, struct map);
1145 RETVAL->x = 0; 1360 RETVAL->x = 0;
1146 RETVAL->y = 0; 1361 RETVAL->y = 0;
1147 RETVAL->w = map_width; 1362 RETVAL->w = 0;
1148 RETVAL->h = map_height; 1363 RETVAL->h = 0;
1149 RETVAL->ox = 0; 1364 RETVAL->ox = 0;
1150 RETVAL->oy = 0; 1365 RETVAL->oy = 0;
1151 RETVAL->faces = 8192; 1366 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1152 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1367 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1153 RETVAL->texs = 8192;
1154 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1155 RETVAL->rows = 0; 1368 RETVAL->rows = 0;
1156 RETVAL->row = 0; 1369 RETVAL->row = 0;
1157 OUTPUT: 1370 OUTPUT:
1158 RETVAL 1371 RETVAL
1159 1372
1160void 1373void
1161DESTROY (CFPlus::Map self) 1374DESTROY (CFPlus::Map self)
1162 CODE: 1375 CODE:
1163{ 1376{
1164 map_clear (self); 1377 map_clear (self);
1165 Safefree (self->face); 1378 Safefree (self->face2tile);
1166 Safefree (self->tex); 1379 Safefree (self->tex);
1167 Safefree (self); 1380 Safefree (self);
1168} 1381}
1169 1382
1170void 1383void
1384resize (CFPlus::Map self, int map_width, int map_height)
1385 CODE:
1386 self->w = map_width;
1387 self->h = map_height;
1388
1389void
1171clear (CFPlus::Map self) 1390clear (CFPlus::Map self)
1172 CODE: 1391 CODE:
1173 map_clear (self); 1392 map_clear (self);
1174 1393
1175void 1394void
1176set_face (CFPlus::Map self, int face, int texid) 1395set_tileid (CFPlus::Map self, int face, int tile)
1177 CODE: 1396 CODE:
1178{ 1397{
1179 while (self->faces <= face) 1398 need_facenum (self, face); self->face2tile [face] = tile;
1180 { 1399 need_texid (self, tile);
1181 Append (mapface, self->face, self->faces, self->faces); 1400}
1182 self->faces *= 2;
1183 }
1184 1401
1185 self->face [face] = texid; 1402void
1403set_smooth (CFPlus::Map self, int face, int smooth, int level)
1404 CODE:
1405{
1406 tileid texid;
1407 maptex *tex;
1408
1409 if (face < 0 || face >= self->faces)
1410 return;
1411
1412 if (smooth < 0 || smooth >= self->faces)
1413 return;
1414
1415 texid = self->face2tile [face];
1416
1417 if (!texid)
1418 return;
1419
1420 tex = self->tex + texid;
1421 tex->smoothtile = self->face2tile [smooth];
1422 tex->smoothlevel = level;
1186} 1423}
1187 1424
1188void 1425void
1189set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1426set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1190 CODE: 1427 CODE:
1191{ 1428{
1192 while (self->texs <= texid) 1429 need_texid (self, texid);
1193 {
1194 Append (maptex, self->tex, self->texs, self->texs);
1195 self->texs *= 2;
1196 }
1197 1430
1198 { 1431 {
1199 maptex *tex = self->tex + texid; 1432 maptex *tex = self->tex + texid;
1200 1433
1201 tex->name = name; 1434 tex->name = name;
1243void 1476void
1244scroll (CFPlus::Map self, int dx, int dy) 1477scroll (CFPlus::Map self, int dx, int dy)
1245 CODE: 1478 CODE:
1246{ 1479{
1247 if (dx > 0) 1480 if (dx > 0)
1248 map_blank (self, self->x, self->y, dx - 1, self->h); 1481 map_blank (self, self->x, self->y, dx, self->h);
1249 else if (dx < 0) 1482 else if (dx < 0)
1250 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1483 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1251 1484
1252 if (dy > 0) 1485 if (dy > 0)
1253 map_blank (self, self->x, self->y, self->w, dy - 1); 1486 map_blank (self, self->x, self->y, self->w, dy);
1254 else if (dy < 0) 1487 else if (dy < 0)
1255 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1488 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1256 1489
1257 self->ox += dx; self->x += dx; 1490 self->ox += dx; self->x += dx;
1258 self->oy += dy; self->y += dy; 1491 self->oy += dy; self->y += dy;
1259 1492
1260 while (self->y < 0) 1493 while (self->y < 0)
1286 1519
1287 if (flags & 15) 1520 if (flags & 15)
1288 { 1521 {
1289 if (!cell->darkness) 1522 if (!cell->darkness)
1290 { 1523 {
1524 memset (cell, 0, sizeof (*cell));
1291 cell->darkness = 256; 1525 cell->darkness = 256;
1292 cell->face [0] = 0;
1293 cell->face [1] = 0;
1294 cell->face [2] = 0;
1295 } 1526 }
1296 1527
1297 //TODO: don't trust server data to be in-range(!) 1528 //TODO: don't trust server data to be in-range(!)
1298 1529
1299 if (flags & 8) 1530 if (flags & 8)
1314 cell->stat_width = 1; 1545 cell->stat_width = 1;
1315 cell->stat_hp = *data++; 1546 cell->stat_hp = *data++;
1316 } 1547 }
1317 else if (cmd == 6) // monster width 1548 else if (cmd == 6) // monster width
1318 cell->stat_width = *data++ + 1; 1549 cell->stat_width = *data++ + 1;
1550 else if (cmd == 0x47)
1551 {
1552 if (*data == 4)
1553 ; // decode player count
1554
1555 data += *data + 1;
1556 }
1557 else if (cmd == 8) // cell flags
1558 cell->flags = *data++;
1319 else if (ext & 0x40) // unknown, multibyte => skip 1559 else if (ext & 0x40) // unknown, multibyte => skip
1320 data += *data + 1; 1560 data += *data + 1;
1321 else 1561 else
1322 data++; 1562 data++;
1323 } 1563 }
1327 cell->darkness = *data++ + 1; 1567 cell->darkness = *data++ + 1;
1328 } 1568 }
1329 1569
1330 if (flags & 4) 1570 if (flags & 4)
1331 { 1571 {
1332 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1572 faceid face = (data [0] << 8) + data [1]; data += 2;
1573 need_facenum (self, face);
1574 cell->tile [0] = self->face2tile [face];
1333 } 1575 }
1334 1576
1335 if (flags & 2) 1577 if (flags & 2)
1336 { 1578 {
1337 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1579 faceid face = (data [0] << 8) + data [1]; data += 2;
1580 need_facenum (self, face);
1581 cell->tile [1] = self->face2tile [face];
1338 } 1582 }
1339 1583
1340 if (flags & 1) 1584 if (flags & 1)
1341 { 1585 {
1342 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1586 faceid face = (data [0] << 8) + data [1]; data += 2;
1587 need_facenum (self, face);
1588 cell->tile [2] = self->face2tile [face];
1343 } 1589 }
1344 } 1590 }
1345 else 1591 else
1346 {
1347 cell->darkness = 0; 1592 cell->darkness = 0;
1348 cell->stat_hp = 0;
1349 }
1350 } 1593 }
1351} 1594}
1352 1595
1353SV * 1596SV *
1354mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1597mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1380 { 1623 {
1381 mapcell *cell = row->col + (x - row->c0); 1624 mapcell *cell = row->col + (x - row->c0);
1382 1625
1383 for (z = 0; z <= 0; z++) 1626 for (z = 0; z <= 0; z++)
1384 { 1627 {
1385 mapface face = cell->face [z];
1386
1387 if (face)
1388 {
1389 maptex tex = self->tex [face]; 1628 maptex tex = self->tex [cell->tile [z]];
1390 int a0 = 255 - tex.a; 1629 int a0 = 255 - tex.a;
1391 int a1 = tex.a; 1630 int a1 = tex.a;
1392 1631
1393 r = (r * a0 + tex.r * a1) / 255; 1632 r = (r * a0 + tex.r * a1) / 255;
1394 g = (g * a0 + tex.g * a1) / 255; 1633 g = (g * a0 + tex.g * a1) / 255;
1395 b = (b * a0 + tex.b * a1) / 255; 1634 b = (b * a0 + tex.b * a1) / 255;
1396 a = (a * a0 + tex.a * a1) / 255; 1635 a = (a * a0 + tex.a * a1) / 255;
1397 }
1398 } 1636 }
1399 } 1637 }
1400 1638
1401 *map++ = (r ) 1639 *map++ = (r )
1402 | (g << 8) 1640 | (g << 8)
1409} 1647}
1410 OUTPUT: 1648 OUTPUT:
1411 RETVAL 1649 RETVAL
1412 1650
1413void 1651void
1414draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1652draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1415 CODE: 1653 CODE:
1416{ 1654{
1417 int vx, vy; 1655 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1656 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1657 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1658 smooth_key skey;
1418 int x, y, z; 1659 int x, y, z;
1419 int last_name; 1660 int last_name;
1420 mapface face;
1421 1661
1422 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1662 // thats current max. sorry.
1423 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1663 if (sw > 255) sw = 255;
1664 if (sh > 255) sh = 255;
1424 1665
1425 /* 1666 // clear key, in case of extra padding
1426 int vx = self->vx = self->w >= sw 1667 memset (&skey, 0, sizeof (skey));
1427 ? self->x + (self->w - sw) / 2
1428 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1429
1430 int vy = self->vy = self->h >= sh
1431 ? self->y + (self->h - sh) / 2
1432 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1433 */
1434 1668
1435 glColor4ub (255, 255, 255, 255); 1669 glColor4ub (255, 255, 255, 255);
1436 1670
1437 glEnable (GL_BLEND); 1671 glEnable (GL_BLEND);
1438 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1672 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1441 1675
1442 glBegin (GL_QUADS); 1676 glBegin (GL_QUADS);
1443 1677
1444 last_name = 0; 1678 last_name = 0;
1445 1679
1680 mx += self->x;
1681 my += self->y;
1682
1683 // first pass: determine smooth_max
1684 // rather ugly, if you ask me
1685 // could also be stored inside mapcell and updated on change
1686 memset (smooth_max, 0, sizeof (smooth_max));
1687
1688 for (y = 0; y < sh; y++)
1689 if (0 <= y + my && y + my < self->rows)
1690 {
1691 maprow *row = self->row + (y + my);
1692
1693 for (x = 0; x < sw; x++)
1694 if (row->c0 <= x + mx && x + mx < row->c1)
1695 {
1696 mapcell *cell = row->col + (x + mx - row->c0);
1697
1698 smooth_max[x + 1][y + 1] =
1699 MAX (self->tex [cell->tile [0]].smoothlevel,
1700 MAX (self->tex [cell->tile [1]].smoothlevel,
1701 self->tex [cell->tile [2]].smoothlevel));
1702 }
1703 }
1704
1446 for (z = 0; z < 3; z++) 1705 for (z = 0; z <= 2; z++)
1706 {
1707 memset (smooth_level, 0, sizeof (smooth_level));
1708
1447 for (y = 0; y < sh; y++) 1709 for (y = 0; y < sh; y++)
1448 if (0 <= y + vy && y + vy < self->rows) 1710 if (0 <= y + my && y + my < self->rows)
1449 { 1711 {
1450 maprow *row = self->row + (y + vy); 1712 maprow *row = self->row + (y + my);
1451 1713
1452 for (x = 0; x < sw; x++) 1714 for (x = 0; x < sw; x++)
1453 if (row->c0 <= x + vx && x + vx < row->c1) 1715 if (row->c0 <= x + mx && x + mx < row->c1)
1454 { 1716 {
1455 mapcell *cell = row->col + (x + vx - row->c0); 1717 mapcell *cell = row->col + (x + mx - row->c0);
1456
1457 face = cell->face [z]; 1718 tileid tile = cell->tile [z];
1719
1720 if (tile)
1721 {
1722 maptex tex = self->tex [tile];
1723 int px = (x + 1) * T - tex.w;
1724 int py = (y + 1) * T - tex.h;
1458 1725
1459 if (face && face < self->texs) 1726 // suppressing texture state switches here
1727 // is only moderately effective, but worth the extra effort
1728 if (last_name != tex.name)
1729 {
1730 if (!tex.name)
1731 tex = self->tex [2]; /* missing, replace by noface */
1732
1733 glEnd ();
1734 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1735 glBegin (GL_QUADS);
1736 }
1737
1738 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1739 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1740 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1741 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1742
1743 if (cell->flags && z == 2)
1744 {
1745 if (cell->flags & 1)
1746 {
1747 maptex tex = self->tex [1];
1748 int px = x * T + T * 2 / 32;
1749 int py = y * T - T * 6 / 32;
1750
1751 glEnd ();
1752 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1753 glBegin (GL_QUADS);
1754
1755 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1756 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1757 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1758 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1759 }
1760 }
1761
1762 // update smooth hash
1763 if (tex.smoothtile)
1764 {
1765 skey.tile = tex.smoothtile;
1766 skey.level = tex.smoothlevel;
1767
1768 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1769
1770 // add bits to current tile and all neighbours. skey.x|y is
1771 // shifted +1|+1 so we always stay positive.
1772
1773 // bits is ___n cccc CCCC bbbb
1774 // n do not draw borders&corners
1775 // c draw these corners, but...
1776 // C ... not these
1777 // b draw these borders
1778
1779 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1780 // ┃· ·· ·┃ ━━
1781
1782 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1783 // ·· ·· ·┏ ┓·
1784
1785 // full tile
1786 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1787
1788 // borders
1789 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1790 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1791 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1792 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1793
1794 // corners
1795 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1796 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1797 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1798 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1799 }
1800 }
1801 }
1802 }
1803
1804 // go through all smoothlevels, lowest to highest, then draw.
1805 // this is basically counting sort
1806 {
1807 int w, b;
1808
1809 for (w = 0; w < 256 / 32; ++w)
1810 {
1811 uint32_t smask = smooth_level [w];
1812 if (smask)
1813 for (b = 0; b < 32; ++b)
1814 if (smask & (((uint32_t)1) << b))
1460 { 1815 {
1461 maptex tex = self->tex [face]; 1816 int level = (w << 5) | b;
1817 HE *he;
1462 1818
1463 int px = (x + 1) * 32 - tex.w; 1819 hv_iterinit (smooth);
1464 int py = (y + 1) * 32 - tex.h; 1820 while ((he = hv_iternext (smooth)))
1465
1466 if (last_name != tex.name)
1467 { 1821 {
1822 smooth_key *skey = (smooth_key *)HeKEY (he);
1823 IV bits = SvIVX (HeVAL (he));
1824
1825 if (!(bits & 0x1000)
1826 && skey->level == level
1827 && level > smooth_max [skey->x][skey->y])
1828 {
1829 maptex tex = self->tex [skey->tile];
1830 int px = (((int)skey->x) - 1) * T;
1831 int py = (((int)skey->y) - 1) * T;
1832 int border = bits & 15;
1833 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1834 float dx = tex.s * .0625f; // 16 images/row
1835 float dy = tex.t * .5f ; // 2 images/column
1836
1837 // this time naively avoiding texture state changes
1838 // save gobs of state changes.
1839 if (last_name != tex.name)
1840 {
1841 if (!tex.name)
1842 continue; // smoothing not yet available
1843
1468 glEnd (); 1844 glEnd ();
1469 last_name = tex.name;
1470 glBindTexture (GL_TEXTURE_2D, last_name); 1845 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1471 glBegin (GL_QUADS); 1846 glBegin (GL_QUADS);
1847 }
1848
1849 if (border)
1850 {
1851 float ox = border * dx;
1852
1853 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1854 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1855 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1856 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1857 }
1858
1859 if (corner)
1860 {
1861 float ox = corner * dx;
1862
1863 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1864 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1865 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1866 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1867 }
1868 }
1472 } 1869 }
1473
1474 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1475 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1476 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1477 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1478 } 1870 }
1479 }
1480 } 1871 }
1872 }
1873
1874 hv_clear (smooth);
1875 }
1481 1876
1482 glEnd (); 1877 glEnd ();
1483 1878
1484 glDisable (GL_TEXTURE_2D); 1879 glDisable (GL_TEXTURE_2D);
1880 glDisable (GL_BLEND);
1485 1881
1486 // top layer: overlays such as the health bar 1882 // top layer: overlays such as the health bar
1487 for (y = 0; y < sh; y++) 1883 for (y = 0; y < sh; y++)
1488 if (0 <= y + vy && y + vy < self->rows) 1884 if (0 <= y + my && y + my < self->rows)
1489 { 1885 {
1490 maprow *row = self->row + (y + vy); 1886 maprow *row = self->row + (y + my);
1491 1887
1492 for (x = 0; x < sw; x++) 1888 for (x = 0; x < sw; x++)
1493 if (row->c0 <= x + vx && x + vx < row->c1) 1889 if (row->c0 <= x + mx && x + mx < row->c1)
1494 { 1890 {
1495 mapcell *cell = row->col + (x + vx - row->c0); 1891 mapcell *cell = row->col + (x + mx - row->c0);
1496 1892
1497 int px = x * 32; 1893 int px = x * T;
1498 int py = y * 32; 1894 int py = y * T;
1499 1895
1500 if (cell->stat_hp) 1896 if (cell->stat_hp)
1501 { 1897 {
1502 int width = cell->stat_width * 32; 1898 int width = cell->stat_width * T;
1503 int thick = sh / 28 + 1 + cell->stat_width; 1899 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1504 1900
1505 glColor4ub (0, 0, 0, 223); 1901 glColor3ub (0, 0, 0);
1506 glRectf (px + 1, py - thick - 2, 1902 glRectf (px + 1, py - thick - 2,
1507 px + width - 1, py); 1903 px + width - 1, py);
1508 1904
1509 glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 223); 1905 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1510 glRectf (px + 2, 1906 glRectf (px + 2,
1511 py - thick - 1, 1907 py - thick - 1,
1512 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 1908 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1513 } 1909 }
1514 } 1910 }
1515 } 1911 }
1516
1517 glDisable (GL_BLEND);
1518} 1912}
1519 1913
1520void 1914void
1521draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1915draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1522 CODE: 1916 CODE:
1576 glDisable (GL_BLEND); 1970 glDisable (GL_BLEND);
1577 glDisable (GL_TEXTURE_2D); 1971 glDisable (GL_TEXTURE_2D);
1578} 1972}
1579 1973
1580void 1974void
1581fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1975fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1582 PPCODE: 1976 PPCODE:
1583{ 1977{
1584 int vx, vy;
1585 int x, y; 1978 int x, y;
1979 int sw1 = sw + 2;
1980 int sh1 = sh + 2;
1981 int sh3 = sh * 3;
1586 int sw4 = (sw + 3) & ~3; 1982 int sw34 = (sw * 3 + 3) & ~3;
1983 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1587 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1984 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1588 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1985 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1589 1986
1590 memset (darkness, 255, sw4 * sh);
1591 SvPOK_only (darkness_sv); 1987 SvPOK_only (darkness3_sv);
1592 SvCUR_set (darkness_sv, sw4 * sh); 1988 SvCUR_set (darkness3_sv, sw34 * sh3);
1593 1989
1594 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1990 mx += self->x - 1;
1595 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1991 my += self->y - 1;
1596 1992
1993 memset (darkness1, 255, sw1 * sh1);
1994
1597 for (y = 0; y < sh; y++) 1995 for (y = 0; y < sh1; y++)
1598 if (0 <= y + vy && y + vy < self->rows) 1996 if (0 <= y + my && y + my < self->rows)
1599 { 1997 {
1600 maprow *row = self->row + (y + vy); 1998 maprow *row = self->row + (y + my);
1601 1999
1602 for (x = 0; x < sw; x++) 2000 for (x = 0; x < sw1; x++)
1603 if (row->c0 <= x + vx && x + vx < row->c1) 2001 if (row->c0 <= x + mx && x + mx < row->c1)
1604 { 2002 {
1605 mapcell *cell = row->col + (x + vx - row->c0); 2003 mapcell *cell = row->col + (x + mx - row->c0);
1606 2004
1607 darkness[y * sw4 + x] = cell->darkness 2005 darkness1 [y * sw1 + x] = cell->darkness
1608 ? 255 - (cell->darkness - 1) 2006 ? 255 - (cell->darkness - 1)
1609 : 255 - FOW_DARKNESS; 2007 : 255 - FOW_DARKNESS;
1610 } 2008 }
1611 } 2009 }
1612 2010
2011 for (y = 0; y < sh; ++y)
2012 for (x = 0; x < sw; ++x)
2013 {
2014 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2015 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2016 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2017 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2018 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2019 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2020 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2021 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2022 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2023
2024 uint8_t r11 = (d11 + d21 + d12) / 3;
2025 uint8_t r21 = d21;
2026 uint8_t r31 = (d21 + d31 + d32) / 3;
2027
2028 uint8_t r12 = d12;
2029 uint8_t r22 = d22;
2030 uint8_t r32 = d32;
2031
2032 uint8_t r13 = (d13 + d23 + d12) / 3;
2033 uint8_t r23 = d23;
2034 uint8_t r33 = (d23 + d33 + d32) / 3;
2035
2036 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2037 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2038 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2039 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2040 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2041 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2042 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2043 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2044 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2045 }
2046
2047 free (darkness1);
2048
1613 EXTEND (SP, 3); 2049 EXTEND (SP, 3);
1614 PUSHs (sv_2mortal (newSViv (sw4))); 2050 PUSHs (sv_2mortal (newSViv (sw34)));
1615 PUSHs (sv_2mortal (newSViv (sh))); 2051 PUSHs (sv_2mortal (newSViv (sh3)));
1616 PUSHs (darkness_sv); 2052 PUSHs (darkness3_sv);
1617} 2053}
1618 2054
1619SV * 2055SV *
1620get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2056get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1621 CODE: 2057 CODE:
1650 if (row && row->c0 <= x && x < row->c1) 2086 if (row && row->c0 <= x && x < row->c1)
1651 { 2087 {
1652 mapcell *cell = row->col + (x - row->c0); 2088 mapcell *cell = row->col + (x - row->c0);
1653 uint8_t flags = 0; 2089 uint8_t flags = 0;
1654 2090
1655 if (cell->face [0]) flags |= 1; 2091 if (cell->tile [0]) flags |= 1;
1656 if (cell->face [1]) flags |= 2; 2092 if (cell->tile [1]) flags |= 2;
1657 if (cell->face [2]) flags |= 4; 2093 if (cell->tile [2]) flags |= 4;
1658 2094
1659 *data++ = flags; 2095 *data++ = flags;
1660 2096
1661 if (flags & 1) 2097 if (flags & 1)
1662 { 2098 {
2099 tileid tile = cell->tile [0];
1663 *data++ = cell->face [0] >> 8; 2100 *data++ = tile >> 8;
1664 *data++ = cell->face [0]; 2101 *data++ = tile;
1665 } 2102 }
1666 2103
1667 if (flags & 2) 2104 if (flags & 2)
1668 { 2105 {
2106 tileid tile = cell->tile [1];
1669 *data++ = cell->face [1] >> 8; 2107 *data++ = tile >> 8;
1670 *data++ = cell->face [1]; 2108 *data++ = tile;
1671 } 2109 }
1672 2110
1673 if (flags & 4) 2111 if (flags & 4)
1674 { 2112 {
2113 tileid tile = cell->tile [2];
1675 *data++ = cell->face [2] >> 8; 2114 *data++ = tile >> 8;
1676 *data++ = cell->face [2]; 2115 *data++ = tile;
1677 } 2116 }
1678 } 2117 }
1679 else 2118 else
1680 *data++ = 0; 2119 *data++ = 0;
1681 } 2120 }
1721 { 2160 {
1722 uint8_t flags = *data++; 2161 uint8_t flags = *data++;
1723 2162
1724 if (flags) 2163 if (flags)
1725 { 2164 {
1726 mapface face[3] = { 0, 0, 0 };
1727
1728 mapcell *cell = row_get_cell (row, x); 2165 mapcell *cell = row_get_cell (row, x);
2166 tileid tile[3] = { 0, 0, 0 };
1729 2167
1730 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2168 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1731 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2169 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1732 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2170 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1733 2171
1734 if (cell->darkness == 0) 2172 if (cell->darkness == 0)
1735 { 2173 {
1736 cell->darkness = 0; 2174 cell->darkness = 0;
1737 2175
1738 for (z = 0; z <= 2; z++) 2176 for (z = 0; z <= 2; z++)
1739 { 2177 {
1740 cell->face[z] = face[z]; 2178 tileid t = tile [z];
1741 2179
1742 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2180 if (t >= self->texs || (t && !self->tex [t].name))
2181 {
1743 XPUSHs (sv_2mortal (newSViv (face[z]))); 2182 XPUSHs (sv_2mortal (newSViv (t)));
2183 need_texid (self, t);
2184 }
2185
2186 cell->tile [z] = t;
1744 } 2187 }
1745 } 2188 }
1746 } 2189 }
1747 } 2190 }
1748 } 2191 }
1749} 2192}
1750 2193
1751MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2194MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1752 2195
2196PROTOTYPES: DISABLE
2197
1753CFPlus::MixChunk 2198CFPlus::MixChunk
1754new_from_file (SV *class, char *path) 2199new_from_file (SV *class, char *path)
1755 CODE: 2200 CODE:
1756 RETVAL = Mix_LoadWAV (path); 2201 RETVAL = Mix_LoadWAV (path);
1757 OUTPUT: 2202 OUTPUT:
1778 2223
1779MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2224MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1780 2225
1781int 2226int
1782volume (int volume = -1) 2227volume (int volume = -1)
2228 PROTOTYPE: ;$
1783 CODE: 2229 CODE:
1784 RETVAL = Mix_VolumeMusic (volume); 2230 RETVAL = Mix_VolumeMusic (volume);
2231 OUTPUT:
2232 RETVAL
2233
2234int
2235fade_out (int ms)
2236 CODE:
2237 RETVAL = Mix_FadeOutMusic (ms);
1785 OUTPUT: 2238 OUTPUT:
1786 RETVAL 2239 RETVAL
1787 2240
1788CFPlus::MixMusic 2241CFPlus::MixMusic
1789new_from_file (SV *class, char *path) 2242new_from_file (SV *class, char *path)
1802 CODE: 2255 CODE:
1803 RETVAL = Mix_PlayMusic (self, loops); 2256 RETVAL = Mix_PlayMusic (self, loops);
1804 OUTPUT: 2257 OUTPUT:
1805 RETVAL 2258 RETVAL
1806 2259
2260int
2261fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2262 CODE:
2263 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2264 OUTPUT:
2265 RETVAL
2266
1807MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2267MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2268
2269PROTOTYPES: ENABLE
1808 2270
1809BOOT: 2271BOOT:
1810{ 2272{
1811 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2273 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1812 static const struct { 2274 static const struct {
1813 const char *name; 2275 const char *name;
1814 IV iv; 2276 IV iv;
1815 } *civ, const_iv[] = { 2277 } *civ, const_iv[] = {
1816# define const_iv(name) { # name, (IV)name } 2278# define const_iv(name) { # name, (IV)name }
2279 const_iv (GL_VENDOR),
2280 const_iv (GL_VERSION),
2281 const_iv (GL_EXTENSIONS),
1817 const_iv (GL_COLOR_MATERIAL), 2282 const_iv (GL_COLOR_MATERIAL),
1818 const_iv (GL_SMOOTH), 2283 const_iv (GL_SMOOTH),
1819 const_iv (GL_FLAT), 2284 const_iv (GL_FLAT),
1820 const_iv (GL_DITHER), 2285 const_iv (GL_DITHER),
1821 const_iv (GL_BLEND), 2286 const_iv (GL_BLEND),
1825 const_iv (GL_ALPHA_TEST), 2290 const_iv (GL_ALPHA_TEST),
1826 const_iv (GL_NORMALIZE), 2291 const_iv (GL_NORMALIZE),
1827 const_iv (GL_RESCALE_NORMAL), 2292 const_iv (GL_RESCALE_NORMAL),
1828 const_iv (GL_FRONT), 2293 const_iv (GL_FRONT),
1829 const_iv (GL_BACK), 2294 const_iv (GL_BACK),
2295 const_iv (GL_AUX0),
1830 const_iv (GL_AND), 2296 const_iv (GL_AND),
1831 const_iv (GL_ONE), 2297 const_iv (GL_ONE),
1832 const_iv (GL_ZERO), 2298 const_iv (GL_ZERO),
1833 const_iv (GL_SRC_ALPHA), 2299 const_iv (GL_SRC_ALPHA),
1834 const_iv (GL_DST_ALPHA), 2300 const_iv (GL_DST_ALPHA),
1848 const_iv (GL_LUMINANCE), 2314 const_iv (GL_LUMINANCE),
1849 const_iv (GL_LUMINANCE_ALPHA), 2315 const_iv (GL_LUMINANCE_ALPHA),
1850 const_iv (GL_FLOAT), 2316 const_iv (GL_FLOAT),
1851 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2317 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1852 const_iv (GL_COMPILE), 2318 const_iv (GL_COMPILE),
2319 const_iv (GL_PROXY_TEXTURE_1D),
2320 const_iv (GL_PROXY_TEXTURE_2D),
1853 const_iv (GL_TEXTURE_1D), 2321 const_iv (GL_TEXTURE_1D),
1854 const_iv (GL_TEXTURE_2D), 2322 const_iv (GL_TEXTURE_2D),
1855 const_iv (GL_TEXTURE_ENV), 2323 const_iv (GL_TEXTURE_ENV),
1856 const_iv (GL_TEXTURE_MAG_FILTER), 2324 const_iv (GL_TEXTURE_MAG_FILTER),
1857 const_iv (GL_TEXTURE_MIN_FILTER), 2325 const_iv (GL_TEXTURE_MIN_FILTER),
1887 const_iv (GL_QUAD_STRIP), 2355 const_iv (GL_QUAD_STRIP),
1888 const_iv (GL_TRIANGLES), 2356 const_iv (GL_TRIANGLES),
1889 const_iv (GL_TRIANGLE_STRIP), 2357 const_iv (GL_TRIANGLE_STRIP),
1890 const_iv (GL_TRIANGLE_FAN), 2358 const_iv (GL_TRIANGLE_FAN),
1891 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2359 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2360 const_iv (GL_POINT_SMOOTH_HINT),
2361 const_iv (GL_LINE_SMOOTH_HINT),
2362 const_iv (GL_POLYGON_SMOOTH_HINT),
2363 const_iv (GL_GENERATE_MIPMAP_HINT),
1892 const_iv (GL_FASTEST), 2364 const_iv (GL_FASTEST),
2365 const_iv (GL_DONT_CARE),
2366 const_iv (GL_NICEST),
1893 const_iv (GL_V2F), 2367 const_iv (GL_V2F),
1894 const_iv (GL_V3F), 2368 const_iv (GL_V3F),
1895 const_iv (GL_T2F_V3F), 2369 const_iv (GL_T2F_V3F),
1896 const_iv (GL_T2F_N3F_V3F), 2370 const_iv (GL_T2F_N3F_V3F),
1897# undef const_iv 2371# undef const_iv
1898 }; 2372 };
1899 2373
1900 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2374 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1901 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2375 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2376
2377 texture_av = newAV ();
2378 AvREAL_off (texture_av);
1902} 2379}
1903 2380
1904char * 2381char *
1905gl_vendor () 2382gl_vendor ()
1906 CODE: 2383 CODE:
1917 2394
1918char * 2395char *
1919gl_extensions () 2396gl_extensions ()
1920 CODE: 2397 CODE:
1921 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2398 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2399 OUTPUT:
2400 RETVAL
2401
2402const char *glGetString (GLenum pname)
2403
2404GLint glGetInteger (GLenum pname)
2405 CODE:
2406 glGetIntegerv (pname, &RETVAL);
2407 OUTPUT:
2408 RETVAL
2409
2410GLdouble glGetDouble (GLenum pname)
2411 CODE:
2412 glGetDoublev (pname, &RETVAL);
1922 OUTPUT: 2413 OUTPUT:
1923 RETVAL 2414 RETVAL
1924 2415
1925int glGetError () 2416int glGetError ()
1926 2417
2051 2542
2052void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2543void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2053 2544
2054void glDrawPixels (int width, int height, int format, int type, char *pixels) 2545void glDrawPixels (int width, int height, int format, int type, char *pixels)
2055 2546
2547void glPixelZoom (float x, float y)
2548
2056void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2549void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2057 2550
2058int glGenTexture () 2551int glGenTexture ()
2059 CODE: 2552 CODE:
2060{ 2553 RETVAL = gen_texture ();
2061 GLuint name;
2062 glGenTextures (1, &name);
2063 RETVAL = name;
2064}
2065 OUTPUT: 2554 OUTPUT:
2066 RETVAL 2555 RETVAL
2067 2556
2068void glDeleteTexture (int name) 2557void glDeleteTexture (int name)
2069 CODE: 2558 CODE:
2070{
2071 GLuint name_ = name;
2072 glDeleteTextures (1, &name_); 2559 del_texture (name);
2073} 2560
2074
2075int glGenList () 2561int glGenList ()
2076 CODE: 2562 CODE:
2077 RETVAL = glGenLists (1); 2563 RETVAL = glGenLists (1);
2078 OUTPUT: 2564 OUTPUT:
2079 RETVAL 2565 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines