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.165 by root, Fri Dec 8 14:59:54 2006 UTC vs.
Revision 1.205 by root, Thu Jul 19 22:38:52 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# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# undef pipe 21# undef pipe
17#endif 22#endif
18 23
24#include <assert.h>
19#include <math.h> 25#include <math.h>
20#include <string.h> 26#include <string.h>
21#include <stdio.h> 27#include <stdio.h>
22#include <stdlib.h> 28#include <stdlib.h>
23 29
24#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
25#include <SDL_endian.h> 32#include <SDL_endian.h>
26#include <SDL_image.h> 33#include <SDL_image.h>
27#include <SDL_mixer.h> 34#include <SDL_mixer.h>
28#include <SDL_opengl.h> 35#include <SDL_opengl.h>
29 36
55# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
56#else 63#else
57# define PARACHUTE 0 64# define PARACHUTE 0
58#endif 65#endif
59 66
67static AV *texture_av;
68
60static struct 69static struct
61{ 70{
62#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
63#include "glfunc.h" 72#include "glfunc.h"
64#undef GL_FUNC 73#undef GL_FUNC
65} gl; 74} gl;
66 75
76static void
67static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68{ 78{
69 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
70 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
71 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
72 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73 else 83 else
74 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
75} 85}
76 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
77#include "texcache.c" 111#include "texcache.c"
78 112
79#include "pango-font.c" 113#include "pango-font.c"
80#include "pango-fontmap.c" 114#include "pango-fontmap.c"
81#include "pango-render.c" 115#include "pango-render.c"
154 188
155 *w = rect.width; 189 *w = rect.width;
156 *h = rect.height; 190 *h = rect.height;
157} 191}
158 192
193typedef uint16_t tileid;
159typedef uint16_t mapface; 194typedef uint16_t faceid;
160 195
161typedef struct { 196typedef struct {
162 GLint name; 197 int name;
163 int w, h; 198 int w, h;
164 float s, t; 199 float s, t;
165 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
166} maptex; 203} maptex;
167 204
168typedef struct { 205typedef struct {
169 uint32_t player; 206 uint32_t player;
170 mapface face[3]; 207 tileid tile[3];
171 uint16_t darkness; 208 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
173} mapcell; 210} mapcell;
174 211
175typedef struct { 212typedef struct {
176 int32_t c0, c1; 213 int32_t c0, c1;
177 mapcell *col; 214 mapcell *col;
178} maprow; 215} maprow;
179 216
180typedef struct map { 217typedef struct map {
181 int x, y, w, h; 218 int x, y, w, h;
182 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
183 int faces; 220 int faces; tileid *face2tile; // [faceid]
184 mapface *face; 221 int texs; maptex *tex; // [tileid]
185
186 int texs;
187 maptex *tex;
188 222
189 int32_t rows; 223 int32_t rows;
190 maprow *row; 224 maprow *row;
191} *CFPlus__Map; 225} *CFPlus__Map;
192 226
212 return ptr; 246 return ptr;
213} 247}
214 248
215#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))
216#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}
217 271
218static maprow * 272static maprow *
219map_get_row (CFPlus__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
220{ 274{
221 if (0 > y) 275 if (0 > y)
316 cell->player = 0; 370 cell->player = 0;
317 } 371 }
318 } 372 }
319} 373}
320 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);
389}
390
321static void 391static void
322music_finished (void) 392music_finished (void)
323{ 393{
324 SDL_UserEvent ev; 394 SDL_UserEvent ev;
325 395
358 n |= n >> 8; 428 n |= n >> 8;
359 n |= n >> 16; 429 n |= n >> 16;
360 430
361 return n + 1; 431 return n + 1;
362} 432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
363 437
364MODULE = CFPlus PACKAGE = CFPlus 438MODULE = CFPlus PACKAGE = CFPlus
365 439
366PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
367 441
371 static const struct { 445 static const struct {
372 const char *name; 446 const char *name;
373 IV iv; 447 IV iv;
374 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
375# 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
376 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
377 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
378 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
379 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
380 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
389 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
390 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
391 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
392 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
393 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
394 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
395 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
396 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
397 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
398 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
453 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
454 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
455 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
456 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
457 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
458 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
460 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
461 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
462 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
463 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
464 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
465 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
466 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
467 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
468 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
469 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
470 const_iv (KMOD_CTRL),
471 const_iv (KMOD_SHIFT),
472 const_iv (KMOD_ALT),
473 const_iv (KMOD_META)
474# undef const_iv 557# undef const_iv
475 }; 558 };
476 559
477 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; )
478 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);
479} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
480 572
481int 573int
482in_destruct () 574in_destruct ()
483 CODE: 575 CODE:
484 RETVAL = PL_main_cv == Nullcv; 576 RETVAL = PL_main_cv == Nullcv;
496 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
497 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);
498 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
499} 591}
500 592
593char *
594SDL_GetError ()
595
501int 596int
502SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
503 598
504void 599void
505SDL_Quit () 600SDL_Quit ()
506 601
507void 602void
508SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
509 PPCODE: 604 PPCODE:
510{ 605{
511 SDL_Rect **m; 606 SDL_Rect **m;
512 607
513 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
514 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
515 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
516 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
517 612
518 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
519 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
520 615
521 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
525 620
526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10) 622#if SDL_VERSION_ATLEAST(1,2,10)
528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif 625#endif
531 626
532 SDL_EnableUNICODE (1);
533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
534
535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
536 628
537 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
538 while (*m) 630 while (*m)
539 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
540 AV *av = newAV (); 634 AV *av = newAV ();
541 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
542 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));
543 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
544 641
545 ++m; 642 ++m;
546 } 643 }
547} 644}
548 645
549char *
550SDL_GetError ()
551
552int 646int
553SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
554 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
555 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
556 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
557 ); 660 );
661
558 if (RETVAL) 662 if (RETVAL)
559 { 663 {
664 av_clear (texture_av);
665
560 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
561# 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);
562# include "glfunc.h" 668#include "glfunc.h"
563# undef GL_FUNC 669#undef GL_FUNC
564 } 670 }
671}
565 OUTPUT: 672 OUTPUT:
566 RETVAL 673 RETVAL
567 674
568void 675void
569SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
570 677
571char * 678char *
572SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
573 680
681int
682SDL_GetAppState ()
683
574void 684void
575SDL_PollEvent () 685poll_events ()
576 PPCODE: 686 PPCODE:
577{ 687{
578 SDL_Event ev; 688 SDL_Event ev;
579 689
580 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
581 { 692 {
582 HV *hv = newHV (); 693 HV *hv = newHV ();
583 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
584 695
585 switch (ev.type) 696 switch (ev.type)
587 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
588 case SDL_KEYUP: 699 case SDL_KEYUP:
589 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591 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 */
592 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593 break; 705 break;
594 706
595 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
597 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
598 break; 710 break;
599 711
600 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
601 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602
603 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
604 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
605 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
606 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
607 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
608 break; 738 break;
609 739
610 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
611 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
612 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
641Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
642 772
643void 773void
644lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
645 CODE: 775 CODE:
646#ifndef _WIN32
647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648#endif
649 777
650void 778void
651win32_proxy_info () 779win32_proxy_info ()
652 PPCODE: 780 PPCODE:
653{ 781{
794 ExitThread (retval); // unclean, please beam me up 922 ExitThread (retval); // unclean, please beam me up
795#else 923#else
796 _exit (retval); 924 _exit (retval);
797#endif 925#endif
798 926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
799MODULE = CFPlus PACKAGE = CFPlus::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
937
938PROTOTYPES: DISABLE
800 939
801CFPlus::Font 940CFPlus::Font
802new_from_file (SV *class, char *path, int id = 0) 941new_from_file (SV *class, char *path, int id = 0)
803 CODE: 942 CODE:
804{ 943{
815 CODE: 954 CODE:
816 pango_font_description_free (self); 955 pango_font_description_free (self);
817 956
818void 957void
819make_default (CFPlus::Font self) 958make_default (CFPlus::Font self)
959 PROTOTYPE: $
820 CODE: 960 CODE:
821 default_font = self; 961 default_font = self;
822 962
823MODULE = CFPlus PACKAGE = CFPlus::Layout 963MODULE = CFPlus PACKAGE = CFPlus::Layout
824 964
965PROTOTYPES: DISABLE
966
825void 967void
826reset_glyph_cache () 968reset_glyph_cache ()
969 PROTOTYPE:
827 CODE: 970 CODE:
828 tc_clear (); 971 tc_clear ();
829 972
830CFPlus::Layout 973CFPlus::Layout
831new (SV *class) 974new (SV *class)
1094 XSRETURN_EMPTY; 1237 XSRETURN_EMPTY;
1095 1238
1096 if (!(lp = pango_layout_get_line (self->pl, line))) 1239 if (!(lp = pango_layout_get_line (self->pl, line)))
1097 XSRETURN_EMPTY; /* do better */ 1240 XSRETURN_EMPTY; /* do better */
1098 1241
1099 if (!pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing)) 1242 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1100 XSRETURN_EMPTY; /* do better */
1101 1243
1102 EXTEND (SP, 2); 1244 EXTEND (SP, 2);
1103 if (GIMME_V == G_SCALAR) 1245 if (GIMME_V == G_SCALAR)
1104 PUSHs (sv_2mortal (newSViv (index + trailing))); 1246 PUSHs (sv_2mortal (newSViv (index + trailing)));
1105 else 1247 else
1119 flags 1261 flags
1120 ); 1262 );
1121 1263
1122MODULE = CFPlus PACKAGE = CFPlus::Texture 1264MODULE = CFPlus PACKAGE = CFPlus::Texture
1123 1265
1124void 1266PROTOTYPES: ENABLE
1125pad2pot (SV *data_, SV *w_, SV *h_)
1126 CODE:
1127{
1128 int ow = SvIV (w_);
1129 int oh = SvIV (h_);
1130 1267
1131 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_))
1132 { 1275 {
1133 int nw = minpot (ow);
1134 int nh = minpot (oh);
1135
1136 if (nw != ow || nh != oh)
1137 {
1138 if (SvOK (data_))
1139 {
1140 STRLEN datalen; 1276 STRLEN datalen;
1141 char *data = SvPVbyte (data_, datalen); 1277 char *data = SvPVbyte (data_, datalen);
1142 int bpp = datalen / (ow * oh); 1278 int bpp = datalen / (ow * oh);
1143 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1279 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1144 1280
1145 SvPOK_only (result_); 1281 SvPOK_only (result_);
1146 SvCUR_set (result_, nw * nh * bpp); 1282 SvCUR_set (result_, nw * nh * bpp);
1147 1283
1148 memset (SvPVX (result_), 0, nw * nh * bpp); 1284 memset (SvPVX (result_), 0, nw * nh * bpp);
1149 while (oh--) 1285 while (oh--)
1150 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);
1151 1287
1152 sv_setsv (data_, result_); 1288 sv_setsv (data_, result_);
1153 }
1154
1155 sv_setiv (w_, nw);
1156 sv_setiv (h_, nh);
1157 }
1158 } 1289 }
1159} 1290}
1160 1291
1161void 1292void
1162draw_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.)
1205 glDisable (GL_ALPHA_TEST); 1336 glDisable (GL_ALPHA_TEST);
1206 glDisable (GL_BLEND); 1337 glDisable (GL_BLEND);
1207 } 1338 }
1208} 1339}
1209 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
1210MODULE = CFPlus PACKAGE = CFPlus::Map 1352MODULE = CFPlus PACKAGE = CFPlus::Map
1353
1354PROTOTYPES: DISABLE
1211 1355
1212CFPlus::Map 1356CFPlus::Map
1213new (SV *class) 1357new (SV *class)
1214 CODE: 1358 CODE:
1215 New (0, RETVAL, 1, struct map); 1359 New (0, RETVAL, 1, struct map);
1217 RETVAL->y = 0; 1361 RETVAL->y = 0;
1218 RETVAL->w = 0; 1362 RETVAL->w = 0;
1219 RETVAL->h = 0; 1363 RETVAL->h = 0;
1220 RETVAL->ox = 0; 1364 RETVAL->ox = 0;
1221 RETVAL->oy = 0; 1365 RETVAL->oy = 0;
1222 RETVAL->faces = 8192; 1366 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1223 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1367 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1224 RETVAL->texs = 8192;
1225 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1226 RETVAL->rows = 0; 1368 RETVAL->rows = 0;
1227 RETVAL->row = 0; 1369 RETVAL->row = 0;
1228 OUTPUT: 1370 OUTPUT:
1229 RETVAL 1371 RETVAL
1230 1372
1231void 1373void
1232DESTROY (CFPlus::Map self) 1374DESTROY (CFPlus::Map self)
1233 CODE: 1375 CODE:
1234{ 1376{
1235 map_clear (self); 1377 map_clear (self);
1236 Safefree (self->face); 1378 Safefree (self->face2tile);
1237 Safefree (self->tex); 1379 Safefree (self->tex);
1238 Safefree (self); 1380 Safefree (self);
1239} 1381}
1240 1382
1241void 1383void
1248clear (CFPlus::Map self) 1390clear (CFPlus::Map self)
1249 CODE: 1391 CODE:
1250 map_clear (self); 1392 map_clear (self);
1251 1393
1252void 1394void
1253set_face (CFPlus::Map self, int face, int texid) 1395set_tileid (CFPlus::Map self, int face, int tile)
1254 CODE: 1396 CODE:
1255{ 1397{
1256 while (self->faces <= face) 1398 need_facenum (self, face); self->face2tile [face] = tile;
1257 { 1399 need_texid (self, tile);
1258 Append (mapface, self->face, self->faces, self->faces); 1400}
1259 self->faces *= 2;
1260 }
1261 1401
1262 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;
1263} 1423}
1264 1424
1265void 1425void
1266set_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)
1267 CODE: 1427 CODE:
1268{ 1428{
1269 while (self->texs <= texid) 1429 need_texid (self, texid);
1270 {
1271 Append (maptex, self->tex, self->texs, self->texs);
1272 self->texs *= 2;
1273 }
1274 1430
1275 { 1431 {
1276 maptex *tex = self->tex + texid; 1432 maptex *tex = self->tex + texid;
1277 1433
1278 tex->name = name; 1434 tex->name = name;
1322 CODE: 1478 CODE:
1323{ 1479{
1324 if (dx > 0) 1480 if (dx > 0)
1325 map_blank (self, self->x, self->y, dx, self->h); 1481 map_blank (self, self->x, self->y, dx, self->h);
1326 else if (dx < 0) 1482 else if (dx < 0)
1327 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1483 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1328 1484
1329 if (dy > 0) 1485 if (dy > 0)
1330 map_blank (self, self->x, self->y, self->w, dy); 1486 map_blank (self, self->x, self->y, self->w, dy);
1331 else if (dy < 0) 1487 else if (dy < 0)
1332 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1488 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1333 1489
1334 self->ox += dx; self->x += dx; 1490 self->ox += dx; self->x += dx;
1335 self->oy += dy; self->y += dy; 1491 self->oy += dy; self->y += dy;
1336 1492
1337 while (self->y < 0) 1493 while (self->y < 0)
1389 cell->stat_width = 1; 1545 cell->stat_width = 1;
1390 cell->stat_hp = *data++; 1546 cell->stat_hp = *data++;
1391 } 1547 }
1392 else if (cmd == 6) // monster width 1548 else if (cmd == 6) // monster width
1393 cell->stat_width = *data++ + 1; 1549 cell->stat_width = *data++ + 1;
1394 else if (cmd == 0x47) // monster width 1550 else if (cmd == 0x47)
1395 { 1551 {
1396 if (*data == 4) 1552 if (*data == 4)
1397 ; // decode player tag 1553 ; // decode player count
1398 1554
1399 data += *data + 1; 1555 data += *data + 1;
1400 } 1556 }
1401 else if (cmd == 8) // cell flags 1557 else if (cmd == 8) // cell flags
1402 cell->flags = *data++; 1558 cell->flags = *data++;
1411 cell->darkness = *data++ + 1; 1567 cell->darkness = *data++ + 1;
1412 } 1568 }
1413 1569
1414 if (flags & 4) 1570 if (flags & 4)
1415 { 1571 {
1416 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];
1417 } 1575 }
1418 1576
1419 if (flags & 2) 1577 if (flags & 2)
1420 { 1578 {
1421 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];
1422 } 1582 }
1423 1583
1424 if (flags & 1) 1584 if (flags & 1)
1425 { 1585 {
1426 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];
1427 } 1589 }
1428 } 1590 }
1429 else 1591 else
1430 cell->darkness = 0; 1592 cell->darkness = 0;
1431 } 1593 }
1461 { 1623 {
1462 mapcell *cell = row->col + (x - row->c0); 1624 mapcell *cell = row->col + (x - row->c0);
1463 1625
1464 for (z = 0; z <= 0; z++) 1626 for (z = 0; z <= 0; z++)
1465 { 1627 {
1466 mapface face = cell->face [z];
1467
1468 if (face)
1469 {
1470 maptex tex = self->tex [face]; 1628 maptex tex = self->tex [cell->tile [z]];
1471 int a0 = 255 - tex.a; 1629 int a0 = 255 - tex.a;
1472 int a1 = tex.a; 1630 int a1 = tex.a;
1473 1631
1474 r = (r * a0 + tex.r * a1) / 255; 1632 r = (r * a0 + tex.r * a1) / 255;
1475 g = (g * a0 + tex.g * a1) / 255; 1633 g = (g * a0 + tex.g * a1) / 255;
1476 b = (b * a0 + tex.b * a1) / 255; 1634 b = (b * a0 + tex.b * a1) / 255;
1477 a = (a * a0 + tex.a * a1) / 255; 1635 a = (a * a0 + tex.a * a1) / 255;
1478 }
1479 } 1636 }
1480 } 1637 }
1481 1638
1482 *map++ = (r ) 1639 *map++ = (r )
1483 | (g << 8) 1640 | (g << 8)
1490} 1647}
1491 OUTPUT: 1648 OUTPUT:
1492 RETVAL 1649 RETVAL
1493 1650
1494void 1651void
1495draw (CFPlus::Map self, int mx, int my, int sw, int sh) 1652draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1496 CODE: 1653 CODE:
1497{ 1654{
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;
1498 int x, y, z; 1659 int x, y, z;
1499 int last_name; 1660 int last_name;
1500 mapface face; 1661
1662 // thats current max. sorry.
1663 if (sw > 255) sw = 255;
1664 if (sh > 255) sh = 255;
1665
1666 // clear key, in case of extra padding
1667 memset (&skey, 0, sizeof (skey));
1501 1668
1502 glColor4ub (255, 255, 255, 255); 1669 glColor4ub (255, 255, 255, 255);
1503 1670
1504 glEnable (GL_BLEND); 1671 glEnable (GL_BLEND);
1505 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1672 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1511 last_name = 0; 1678 last_name = 0;
1512 1679
1513 mx += self->x; 1680 mx += self->x;
1514 my += self->y; 1681 my += self->y;
1515 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
1516 for (z = 0; z < 3; z++) 1705 for (z = 0; z <= 2; z++)
1706 {
1707 memset (smooth_level, 0, sizeof (smooth_level));
1708
1517 for (y = 0; y < sh; y++) 1709 for (y = 0; y < sh; y++)
1518 if (0 <= y + my && y + my < self->rows) 1710 if (0 <= y + my && y + my < self->rows)
1519 { 1711 {
1520 maprow *row = self->row + (y + my); 1712 maprow *row = self->row + (y + my);
1521 1713
1522 for (x = 0; x < sw; x++) 1714 for (x = 0; x < sw; x++)
1523 if (row->c0 <= x + mx && x + mx < row->c1) 1715 if (row->c0 <= x + mx && x + mx < row->c1)
1524 { 1716 {
1525 mapcell *cell = row->col + (x + mx - row->c0); 1717 mapcell *cell = row->col + (x + mx - row->c0);
1526
1527 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;
1528 1725
1529 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))
1530 { 1815 {
1531 maptex tex = self->tex [face]; 1816 int level = (w << 5) | b;
1532 int px = (x + 1) * 32 - tex.w; 1817 HE *he;
1533 int py = (y + 1) * 32 - tex.h;
1534 1818
1535 if (last_name != tex.name) 1819 hv_iterinit (smooth);
1820 while ((he = hv_iternext (smooth)))
1536 { 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
1537 glEnd (); 1844 glEnd ();
1538 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1845 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1539 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 }
1540 } 1868 }
1541
1542 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1543 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1544 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1545 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1546 }
1547
1548 if (cell->flags && z == 2)
1549 {
1550 if (cell->flags & 1)
1551 {
1552 maptex tex = self->tex [1];
1553 int px = (x + 1) * 32 - tex.w + 2;
1554 int py = (y + 1) * 32 - tex.h - 6;
1555
1556 glEnd ();
1557 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1558 glBegin (GL_QUADS);
1559
1560 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1561 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1562 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1563 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1564 } 1869 }
1565 } 1870 }
1566 }
1567 } 1871 }
1872 }
1873
1874 hv_clear (smooth);
1875 }
1568 1876
1569 glEnd (); 1877 glEnd ();
1570 1878
1571 glDisable (GL_TEXTURE_2D); 1879 glDisable (GL_TEXTURE_2D);
1572 glDisable (GL_BLEND); 1880 glDisable (GL_BLEND);
1580 for (x = 0; x < sw; x++) 1888 for (x = 0; x < sw; x++)
1581 if (row->c0 <= x + mx && x + mx < row->c1) 1889 if (row->c0 <= x + mx && x + mx < row->c1)
1582 { 1890 {
1583 mapcell *cell = row->col + (x + mx - row->c0); 1891 mapcell *cell = row->col + (x + mx - row->c0);
1584 1892
1585 int px = x * 32; 1893 int px = x * T;
1586 int py = y * 32; 1894 int py = y * T;
1587 1895
1588 if (cell->stat_hp) 1896 if (cell->stat_hp)
1589 { 1897 {
1590 int width = cell->stat_width * 32; 1898 int width = cell->stat_width * T;
1591 int thick = sh / 28 + 1 + cell->stat_width; 1899 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1592 1900
1593 glColor3ub (0, 0, 0); 1901 glColor3ub (0, 0, 0);
1594 glRectf (px + 1, py - thick - 2, 1902 glRectf (px + 1, py - thick - 2,
1595 px + width - 1, py); 1903 px + width - 1, py);
1596 1904
1666void 1974void
1667fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 1975fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1668 PPCODE: 1976 PPCODE:
1669{ 1977{
1670 int x, y; 1978 int x, y;
1979 int sw1 = sw + 2;
1980 int sh1 = sh + 2;
1981 int sh3 = sh * 3;
1671 int sw4 = (sw + 3) & ~3; 1982 int sw34 = (sw * 3 + 3) & ~3;
1983 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1672 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1984 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1673 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1985 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1674 1986
1675 memset (darkness, 255, sw4 * sh);
1676 SvPOK_only (darkness_sv); 1987 SvPOK_only (darkness3_sv);
1677 SvCUR_set (darkness_sv, sw4 * sh); 1988 SvCUR_set (darkness3_sv, sw34 * sh3);
1678 1989
1679 mx += self->x; 1990 mx += self->x - 1;
1680 my += self->y; 1991 my += self->y - 1;
1681 1992
1993 memset (darkness1, 255, sw1 * sh1);
1994
1682 for (y = 0; y < sh; y++) 1995 for (y = 0; y < sh1; y++)
1683 if (0 <= y + my && y + my < self->rows) 1996 if (0 <= y + my && y + my < self->rows)
1684 { 1997 {
1685 maprow *row = self->row + (y + my); 1998 maprow *row = self->row + (y + my);
1686 1999
1687 for (x = 0; x < sw; x++) 2000 for (x = 0; x < sw1; x++)
1688 if (row->c0 <= x + mx && x + mx < row->c1) 2001 if (row->c0 <= x + mx && x + mx < row->c1)
1689 { 2002 {
1690 mapcell *cell = row->col + (x + mx - row->c0); 2003 mapcell *cell = row->col + (x + mx - row->c0);
1691 2004
1692 darkness[y * sw4 + x] = cell->darkness 2005 darkness1 [y * sw1 + x] = cell->darkness
1693 ? 255 - (cell->darkness - 1) 2006 ? 255 - (cell->darkness - 1)
1694 : 255 - FOW_DARKNESS; 2007 : 255 - FOW_DARKNESS;
1695 } 2008 }
1696 } 2009 }
1697 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
1698 EXTEND (SP, 3); 2049 EXTEND (SP, 3);
1699 PUSHs (sv_2mortal (newSViv (sw4))); 2050 PUSHs (sv_2mortal (newSViv (sw34)));
1700 PUSHs (sv_2mortal (newSViv (sh))); 2051 PUSHs (sv_2mortal (newSViv (sh3)));
1701 PUSHs (darkness_sv); 2052 PUSHs (darkness3_sv);
1702} 2053}
1703 2054
1704SV * 2055SV *
1705get_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)
1706 CODE: 2057 CODE:
1735 if (row && row->c0 <= x && x < row->c1) 2086 if (row && row->c0 <= x && x < row->c1)
1736 { 2087 {
1737 mapcell *cell = row->col + (x - row->c0); 2088 mapcell *cell = row->col + (x - row->c0);
1738 uint8_t flags = 0; 2089 uint8_t flags = 0;
1739 2090
1740 if (cell->face [0]) flags |= 1; 2091 if (cell->tile [0]) flags |= 1;
1741 if (cell->face [1]) flags |= 2; 2092 if (cell->tile [1]) flags |= 2;
1742 if (cell->face [2]) flags |= 4; 2093 if (cell->tile [2]) flags |= 4;
1743 2094
1744 *data++ = flags; 2095 *data++ = flags;
1745 2096
1746 if (flags & 1) 2097 if (flags & 1)
1747 { 2098 {
2099 tileid tile = cell->tile [0];
1748 *data++ = cell->face [0] >> 8; 2100 *data++ = tile >> 8;
1749 *data++ = cell->face [0]; 2101 *data++ = tile;
1750 } 2102 }
1751 2103
1752 if (flags & 2) 2104 if (flags & 2)
1753 { 2105 {
2106 tileid tile = cell->tile [1];
1754 *data++ = cell->face [1] >> 8; 2107 *data++ = tile >> 8;
1755 *data++ = cell->face [1]; 2108 *data++ = tile;
1756 } 2109 }
1757 2110
1758 if (flags & 4) 2111 if (flags & 4)
1759 { 2112 {
2113 tileid tile = cell->tile [2];
1760 *data++ = cell->face [2] >> 8; 2114 *data++ = tile >> 8;
1761 *data++ = cell->face [2]; 2115 *data++ = tile;
1762 } 2116 }
1763 } 2117 }
1764 else 2118 else
1765 *data++ = 0; 2119 *data++ = 0;
1766 } 2120 }
1806 { 2160 {
1807 uint8_t flags = *data++; 2161 uint8_t flags = *data++;
1808 2162
1809 if (flags) 2163 if (flags)
1810 { 2164 {
1811 mapface face[3] = { 0, 0, 0 };
1812
1813 mapcell *cell = row_get_cell (row, x); 2165 mapcell *cell = row_get_cell (row, x);
2166 tileid tile[3] = { 0, 0, 0 };
1814 2167
1815 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2168 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1816 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2169 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1817 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2170 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1818 2171
1819 if (cell->darkness == 0) 2172 if (cell->darkness == 0)
1820 { 2173 {
1821 cell->darkness = 0; 2174 cell->darkness = 0;
1822 2175
1823 for (z = 0; z <= 2; z++) 2176 for (z = 0; z <= 2; z++)
1824 { 2177 {
1825 cell->face[z] = face[z]; 2178 tileid t = tile [z];
1826 2179
1827 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2180 if (t >= self->texs || (t && !self->tex [t].name))
2181 {
1828 XPUSHs (sv_2mortal (newSViv (face[z]))); 2182 XPUSHs (sv_2mortal (newSViv (t)));
2183 need_texid (self, t);
2184 }
2185
2186 cell->tile [z] = t;
1829 } 2187 }
1830 } 2188 }
1831 } 2189 }
1832 } 2190 }
1833 } 2191 }
1834} 2192}
1835 2193
1836MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2194MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1837 2195
2196PROTOTYPES: DISABLE
2197
1838CFPlus::MixChunk 2198CFPlus::MixChunk
1839new_from_file (SV *class, char *path) 2199new_from_file (SV *class, char *path)
1840 CODE: 2200 CODE:
1841 RETVAL = Mix_LoadWAV (path); 2201 RETVAL = Mix_LoadWAV (path);
1842 OUTPUT: 2202 OUTPUT:
1863 2223
1864MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2224MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1865 2225
1866int 2226int
1867volume (int volume = -1) 2227volume (int volume = -1)
2228 PROTOTYPE: ;$
1868 CODE: 2229 CODE:
1869 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);
1870 OUTPUT: 2238 OUTPUT:
1871 RETVAL 2239 RETVAL
1872 2240
1873CFPlus::MixMusic 2241CFPlus::MixMusic
1874new_from_file (SV *class, char *path) 2242new_from_file (SV *class, char *path)
1887 CODE: 2255 CODE:
1888 RETVAL = Mix_PlayMusic (self, loops); 2256 RETVAL = Mix_PlayMusic (self, loops);
1889 OUTPUT: 2257 OUTPUT:
1890 RETVAL 2258 RETVAL
1891 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
1892MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2267MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2268
2269PROTOTYPES: ENABLE
1893 2270
1894BOOT: 2271BOOT:
1895{ 2272{
1896 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2273 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1897 static const struct { 2274 static const struct {
1898 const char *name; 2275 const char *name;
1899 IV iv; 2276 IV iv;
1900 } *civ, const_iv[] = { 2277 } *civ, const_iv[] = {
1901# 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),
1902 const_iv (GL_COLOR_MATERIAL), 2282 const_iv (GL_COLOR_MATERIAL),
1903 const_iv (GL_SMOOTH), 2283 const_iv (GL_SMOOTH),
1904 const_iv (GL_FLAT), 2284 const_iv (GL_FLAT),
1905 const_iv (GL_DITHER), 2285 const_iv (GL_DITHER),
1906 const_iv (GL_BLEND), 2286 const_iv (GL_BLEND),
1933 const_iv (GL_LUMINANCE), 2313 const_iv (GL_LUMINANCE),
1934 const_iv (GL_LUMINANCE_ALPHA), 2314 const_iv (GL_LUMINANCE_ALPHA),
1935 const_iv (GL_FLOAT), 2315 const_iv (GL_FLOAT),
1936 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2316 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1937 const_iv (GL_COMPILE), 2317 const_iv (GL_COMPILE),
2318 const_iv (GL_PROXY_TEXTURE_1D),
2319 const_iv (GL_PROXY_TEXTURE_2D),
1938 const_iv (GL_TEXTURE_1D), 2320 const_iv (GL_TEXTURE_1D),
1939 const_iv (GL_TEXTURE_2D), 2321 const_iv (GL_TEXTURE_2D),
1940 const_iv (GL_TEXTURE_ENV), 2322 const_iv (GL_TEXTURE_ENV),
1941 const_iv (GL_TEXTURE_MAG_FILTER), 2323 const_iv (GL_TEXTURE_MAG_FILTER),
1942 const_iv (GL_TEXTURE_MIN_FILTER), 2324 const_iv (GL_TEXTURE_MIN_FILTER),
1982# undef const_iv 2364# undef const_iv
1983 }; 2365 };
1984 2366
1985 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2367 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1986 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2368 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2369
2370 texture_av = newAV ();
2371 AvREAL_off (texture_av);
1987} 2372}
1988 2373
1989char * 2374char *
1990gl_vendor () 2375gl_vendor ()
1991 CODE: 2376 CODE:
2002 2387
2003char * 2388char *
2004gl_extensions () 2389gl_extensions ()
2005 CODE: 2390 CODE:
2006 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2391 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2392 OUTPUT:
2393 RETVAL
2394
2395const char *glGetString (GLenum pname)
2396
2397GLint glGetInteger (GLenum pname)
2398 CODE:
2399 glGetIntegerv (pname, &RETVAL);
2400 OUTPUT:
2401 RETVAL
2402
2403GLdouble glGetDouble (GLenum pname)
2404 CODE:
2405 glGetDoublev (pname, &RETVAL);
2007 OUTPUT: 2406 OUTPUT:
2008 RETVAL 2407 RETVAL
2009 2408
2010int glGetError () 2409int glGetError ()
2011 2410
2136 2535
2137void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2536void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2138 2537
2139void glDrawPixels (int width, int height, int format, int type, char *pixels) 2538void glDrawPixels (int width, int height, int format, int type, char *pixels)
2140 2539
2540void glPixelZoom (float x, float y)
2541
2141void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2542void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2142 2543
2143int glGenTexture () 2544int glGenTexture ()
2144 CODE: 2545 CODE:
2145{ 2546 RETVAL = gen_texture ();
2146 GLuint name;
2147 glGenTextures (1, &name);
2148 RETVAL = name;
2149}
2150 OUTPUT: 2547 OUTPUT:
2151 RETVAL 2548 RETVAL
2152 2549
2153void glDeleteTexture (int name) 2550void glDeleteTexture (int name)
2154 CODE: 2551 CODE:
2155{
2156 GLuint name_ = name;
2157 glDeleteTextures (1, &name_); 2552 del_texture (name);
2158} 2553
2159
2160int glGenList () 2554int glGenList ()
2161 CODE: 2555 CODE:
2162 RETVAL = glGenLists (1); 2556 RETVAL = glGenLists (1);
2163 OUTPUT: 2557 OUTPUT:
2164 RETVAL 2558 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines