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.202 by root, Tue Jul 17 18:34:24 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
800 937
801CFPlus::Font 938CFPlus::Font
802new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
803 CODE: 940 CODE:
1094 XSRETURN_EMPTY; 1231 XSRETURN_EMPTY;
1095 1232
1096 if (!(lp = pango_layout_get_line (self->pl, line))) 1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1097 XSRETURN_EMPTY; /* do better */ 1234 XSRETURN_EMPTY; /* do better */
1098 1235
1099 if (!pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing)) 1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1100 XSRETURN_EMPTY; /* do better */
1101 1237
1102 EXTEND (SP, 2); 1238 EXTEND (SP, 2);
1103 if (GIMME_V == G_SCALAR) 1239 if (GIMME_V == G_SCALAR)
1104 PUSHs (sv_2mortal (newSViv (index + trailing))); 1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1105 else 1241 else
1119 flags 1255 flags
1120 ); 1256 );
1121 1257
1122MODULE = CFPlus PACKAGE = CFPlus::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1123 1259
1260int minpot (int n)
1261
1124void 1262void
1125pad2pot (SV *data_, SV *w_, SV *h_) 1263pad2pot (SV *data_, SV *w_, SV *h_)
1126 CODE: 1264 CODE:
1127{ 1265{
1128 int ow = SvIV (w_); 1266 int ow = SvIV (w_);
1205 glDisable (GL_ALPHA_TEST); 1343 glDisable (GL_ALPHA_TEST);
1206 glDisable (GL_BLEND); 1344 glDisable (GL_BLEND);
1207 } 1345 }
1208} 1346}
1209 1347
1348IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1349 CODE:
1350{
1351 GLint width;
1352 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1353 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1354 RETVAL = width > 0;
1355}
1356 OUTPUT:
1357 RETVAL
1358
1210MODULE = CFPlus PACKAGE = CFPlus::Map 1359MODULE = CFPlus PACKAGE = CFPlus::Map
1211 1360
1212CFPlus::Map 1361CFPlus::Map
1213new (SV *class) 1362new (SV *class)
1214 CODE: 1363 CODE:
1217 RETVAL->y = 0; 1366 RETVAL->y = 0;
1218 RETVAL->w = 0; 1367 RETVAL->w = 0;
1219 RETVAL->h = 0; 1368 RETVAL->h = 0;
1220 RETVAL->ox = 0; 1369 RETVAL->ox = 0;
1221 RETVAL->oy = 0; 1370 RETVAL->oy = 0;
1222 RETVAL->faces = 8192; 1371 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1223 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1372 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; 1373 RETVAL->rows = 0;
1227 RETVAL->row = 0; 1374 RETVAL->row = 0;
1228 OUTPUT: 1375 OUTPUT:
1229 RETVAL 1376 RETVAL
1230 1377
1231void 1378void
1232DESTROY (CFPlus::Map self) 1379DESTROY (CFPlus::Map self)
1233 CODE: 1380 CODE:
1234{ 1381{
1235 map_clear (self); 1382 map_clear (self);
1236 Safefree (self->face); 1383 Safefree (self->face2tile);
1237 Safefree (self->tex); 1384 Safefree (self->tex);
1238 Safefree (self); 1385 Safefree (self);
1239} 1386}
1240 1387
1241void 1388void
1248clear (CFPlus::Map self) 1395clear (CFPlus::Map self)
1249 CODE: 1396 CODE:
1250 map_clear (self); 1397 map_clear (self);
1251 1398
1252void 1399void
1253set_face (CFPlus::Map self, int face, int texid) 1400set_tileid (CFPlus::Map self, int face, int tile)
1254 CODE: 1401 CODE:
1255{ 1402{
1256 while (self->faces <= face) 1403 need_facenum (self, face); self->face2tile [face] = tile;
1257 { 1404 need_texid (self, tile);
1258 Append (mapface, self->face, self->faces, self->faces); 1405}
1259 self->faces *= 2;
1260 }
1261 1406
1262 self->face [face] = texid; 1407void
1408set_smooth (CFPlus::Map self, int face, int smooth, int level)
1409 CODE:
1410{
1411 tileid texid;
1412 maptex *tex;
1413
1414 if (face < 0 || face >= self->faces)
1415 return;
1416
1417 if (smooth < 0 || smooth >= self->faces)
1418 return;
1419
1420 texid = self->face2tile [face];
1421
1422 if (!texid)
1423 return;
1424
1425 tex = self->tex + texid;
1426 tex->smoothtile = self->face2tile [smooth];
1427 tex->smoothlevel = level;
1263} 1428}
1264 1429
1265void 1430void
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) 1431set_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: 1432 CODE:
1268{ 1433{
1269 while (self->texs <= texid) 1434 need_texid (self, texid);
1270 {
1271 Append (maptex, self->tex, self->texs, self->texs);
1272 self->texs *= 2;
1273 }
1274 1435
1275 { 1436 {
1276 maptex *tex = self->tex + texid; 1437 maptex *tex = self->tex + texid;
1277 1438
1278 tex->name = name; 1439 tex->name = name;
1322 CODE: 1483 CODE:
1323{ 1484{
1324 if (dx > 0) 1485 if (dx > 0)
1325 map_blank (self, self->x, self->y, dx, self->h); 1486 map_blank (self, self->x, self->y, dx, self->h);
1326 else if (dx < 0) 1487 else if (dx < 0)
1327 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1488 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1328 1489
1329 if (dy > 0) 1490 if (dy > 0)
1330 map_blank (self, self->x, self->y, self->w, dy); 1491 map_blank (self, self->x, self->y, self->w, dy);
1331 else if (dy < 0) 1492 else if (dy < 0)
1332 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1493 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1333 1494
1334 self->ox += dx; self->x += dx; 1495 self->ox += dx; self->x += dx;
1335 self->oy += dy; self->y += dy; 1496 self->oy += dy; self->y += dy;
1336 1497
1337 while (self->y < 0) 1498 while (self->y < 0)
1389 cell->stat_width = 1; 1550 cell->stat_width = 1;
1390 cell->stat_hp = *data++; 1551 cell->stat_hp = *data++;
1391 } 1552 }
1392 else if (cmd == 6) // monster width 1553 else if (cmd == 6) // monster width
1393 cell->stat_width = *data++ + 1; 1554 cell->stat_width = *data++ + 1;
1394 else if (cmd == 0x47) // monster width 1555 else if (cmd == 0x47)
1395 { 1556 {
1396 if (*data == 4) 1557 if (*data == 4)
1397 ; // decode player tag 1558 ; // decode player count
1398 1559
1399 data += *data + 1; 1560 data += *data + 1;
1400 } 1561 }
1401 else if (cmd == 8) // cell flags 1562 else if (cmd == 8) // cell flags
1402 cell->flags = *data++; 1563 cell->flags = *data++;
1411 cell->darkness = *data++ + 1; 1572 cell->darkness = *data++ + 1;
1412 } 1573 }
1413 1574
1414 if (flags & 4) 1575 if (flags & 4)
1415 { 1576 {
1416 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1577 faceid face = (data [0] << 8) + data [1]; data += 2;
1578 need_facenum (self, face);
1579 cell->tile [0] = self->face2tile [face];
1417 } 1580 }
1418 1581
1419 if (flags & 2) 1582 if (flags & 2)
1420 { 1583 {
1421 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1584 faceid face = (data [0] << 8) + data [1]; data += 2;
1585 need_facenum (self, face);
1586 cell->tile [1] = self->face2tile [face];
1422 } 1587 }
1423 1588
1424 if (flags & 1) 1589 if (flags & 1)
1425 { 1590 {
1426 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1591 faceid face = (data [0] << 8) + data [1]; data += 2;
1592 need_facenum (self, face);
1593 cell->tile [2] = self->face2tile [face];
1427 } 1594 }
1428 } 1595 }
1429 else 1596 else
1430 cell->darkness = 0; 1597 cell->darkness = 0;
1431 } 1598 }
1461 { 1628 {
1462 mapcell *cell = row->col + (x - row->c0); 1629 mapcell *cell = row->col + (x - row->c0);
1463 1630
1464 for (z = 0; z <= 0; z++) 1631 for (z = 0; z <= 0; z++)
1465 { 1632 {
1466 mapface face = cell->face [z];
1467
1468 if (face)
1469 {
1470 maptex tex = self->tex [face]; 1633 maptex tex = self->tex [cell->tile [z]];
1471 int a0 = 255 - tex.a; 1634 int a0 = 255 - tex.a;
1472 int a1 = tex.a; 1635 int a1 = tex.a;
1473 1636
1474 r = (r * a0 + tex.r * a1) / 255; 1637 r = (r * a0 + tex.r * a1) / 255;
1475 g = (g * a0 + tex.g * a1) / 255; 1638 g = (g * a0 + tex.g * a1) / 255;
1476 b = (b * a0 + tex.b * a1) / 255; 1639 b = (b * a0 + tex.b * a1) / 255;
1477 a = (a * a0 + tex.a * a1) / 255; 1640 a = (a * a0 + tex.a * a1) / 255;
1478 }
1479 } 1641 }
1480 } 1642 }
1481 1643
1482 *map++ = (r ) 1644 *map++ = (r )
1483 | (g << 8) 1645 | (g << 8)
1490} 1652}
1491 OUTPUT: 1653 OUTPUT:
1492 RETVAL 1654 RETVAL
1493 1655
1494void 1656void
1495draw (CFPlus::Map self, int mx, int my, int sw, int sh) 1657draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1496 CODE: 1658 CODE:
1497{ 1659{
1660 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1661 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1662 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1663 smooth_key skey;
1498 int x, y, z; 1664 int x, y, z;
1499 int last_name; 1665 int last_name;
1500 mapface face; 1666
1667 // thats current max. sorry.
1668 if (sw > 255) sw = 255;
1669 if (sh > 255) sh = 255;
1670
1671 // clear key, in case of extra padding
1672 memset (&skey, 0, sizeof (skey));
1501 1673
1502 glColor4ub (255, 255, 255, 255); 1674 glColor4ub (255, 255, 255, 255);
1503 1675
1504 glEnable (GL_BLEND); 1676 glEnable (GL_BLEND);
1505 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1677 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1511 last_name = 0; 1683 last_name = 0;
1512 1684
1513 mx += self->x; 1685 mx += self->x;
1514 my += self->y; 1686 my += self->y;
1515 1687
1688 // first pass: determine smooth_max
1689 // rather ugly, if you ask me
1690 // could also be stored inside mapcell and updated on change
1691 memset (smooth_max, 0, sizeof (smooth_max));
1692
1693 for (y = 0; y < sh; y++)
1694 if (0 <= y + my && y + my < self->rows)
1695 {
1696 maprow *row = self->row + (y + my);
1697
1698 for (x = 0; x < sw; x++)
1699 if (row->c0 <= x + mx && x + mx < row->c1)
1700 {
1701 mapcell *cell = row->col + (x + mx - row->c0);
1702
1703 smooth_max[x + 1][y + 1] =
1704 MAX (self->tex [cell->tile [0]].smoothlevel,
1705 MAX (self->tex [cell->tile [1]].smoothlevel,
1706 self->tex [cell->tile [2]].smoothlevel));
1707 }
1708 }
1709
1516 for (z = 0; z < 3; z++) 1710 for (z = 0; z <= 2; z++)
1711 {
1712 memset (smooth_level, 0, sizeof (smooth_level));
1713
1517 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1518 if (0 <= y + my && y + my < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1519 { 1716 {
1520 maprow *row = self->row + (y + my); 1717 maprow *row = self->row + (y + my);
1521 1718
1522 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1523 if (row->c0 <= x + mx && x + mx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1524 { 1721 {
1525 mapcell *cell = row->col + (x + mx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1526
1527 face = cell->face [z]; 1723 tileid tile = cell->tile [z];
1724
1725 if (tile)
1726 {
1727 maptex tex = self->tex [tile];
1728 int px = (x + 1) * T - tex.w;
1729 int py = (y + 1) * T - tex.h;
1528 1730
1529 if (face && face < self->texs) 1731 // suppressing texture state switches here
1732 // is only moderately effective, but worth the extra effort
1733 if (last_name != tex.name)
1734 {
1735 if (!tex.name)
1736 tex = self->tex [2]; /* missing, replace by noface */
1737
1738 glEnd ();
1739 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1740 glBegin (GL_QUADS);
1741 }
1742
1743 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1744 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1745 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1746 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1747
1748 if (cell->flags && z == 2)
1749 {
1750 if (cell->flags & 1)
1751 {
1752 maptex tex = self->tex [1];
1753 int px = x * T + T * 2 / 32;
1754 int py = y * T - T * 6 / 32;
1755
1756 glEnd ();
1757 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1758 glBegin (GL_QUADS);
1759
1760 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1761 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1762 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1763 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1764 }
1765 }
1766
1767 // update smooth hash
1768 if (tex.smoothtile)
1769 {
1770 skey.tile = tex.smoothtile;
1771 skey.level = tex.smoothlevel;
1772
1773 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1774
1775 // add bits to current tile and all neighbours. skey.x|y is
1776 // shifted +1|+1 so we always stay positive.
1777
1778 // bits is ___n cccc CCCC bbbb
1779 // n do not draw borders&corners
1780 // c draw these corners, but...
1781 // C ... not these
1782 // b draw these borders
1783
1784 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1785 // ┃· ·· ·┃ ━━
1786
1787 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1788 // ·· ·· ·┏ ┓·
1789
1790 // full tile
1791 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1792
1793 // borders
1794 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1795 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1796 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1797 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1798
1799 // corners
1800 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1801 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1802 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1803 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1804 }
1805 }
1806 }
1807 }
1808
1809 // go through all smoothlevels, lowest to highest, then draw.
1810 // this is basically counting sort
1811 {
1812 int w, b;
1813
1814 for (w = 0; w < 256 / 32; ++w)
1815 {
1816 uint32_t smask = smooth_level [w];
1817 if (smask)
1818 for (b = 0; b < 32; ++b)
1819 if (smask & (((uint32_t)1) << b))
1530 { 1820 {
1531 maptex tex = self->tex [face]; 1821 int level = (w << 5) | b;
1532 int px = (x + 1) * 32 - tex.w; 1822 HE *he;
1533 int py = (y + 1) * 32 - tex.h;
1534 1823
1535 if (last_name != tex.name) 1824 hv_iterinit (smooth);
1825 while ((he = hv_iternext (smooth)))
1536 { 1826 {
1827 smooth_key *skey = (smooth_key *)HeKEY (he);
1828 IV bits = SvIVX (HeVAL (he));
1829
1830 if (!(bits & 0x1000)
1831 && skey->level == level
1832 && level > smooth_max [skey->x][skey->y])
1833 {
1834 maptex tex = self->tex [skey->tile];
1835 int px = (((int)skey->x) - 1) * T;
1836 int py = (((int)skey->y) - 1) * T;
1837 int border = bits & 15;
1838 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1839 float dx = tex.s * .0625f; // 16 images/row
1840 float dy = tex.t * .5f ; // 2 images/column
1841
1842 // this time naively avoiding texture state changes
1843 // save gobs of state changes.
1844 if (last_name != tex.name)
1845 {
1846 if (!tex.name)
1847 continue; // smoothing not yet available
1848
1537 glEnd (); 1849 glEnd ();
1538 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1850 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1539 glBegin (GL_QUADS); 1851 glBegin (GL_QUADS);
1852 }
1853
1854 if (border)
1855 {
1856 float ox = border * dx;
1857
1858 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1859 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1860 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1861 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1862 }
1863
1864 if (corner)
1865 {
1866 float ox = corner * dx;
1867
1868 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1869 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1870 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1871 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1872 }
1540 } 1873 }
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 } 1874 }
1565 } 1875 }
1566 }
1567 } 1876 }
1877 }
1878
1879 hv_clear (smooth);
1880 }
1568 1881
1569 glEnd (); 1882 glEnd ();
1570 1883
1571 glDisable (GL_TEXTURE_2D); 1884 glDisable (GL_TEXTURE_2D);
1572 glDisable (GL_BLEND); 1885 glDisable (GL_BLEND);
1580 for (x = 0; x < sw; x++) 1893 for (x = 0; x < sw; x++)
1581 if (row->c0 <= x + mx && x + mx < row->c1) 1894 if (row->c0 <= x + mx && x + mx < row->c1)
1582 { 1895 {
1583 mapcell *cell = row->col + (x + mx - row->c0); 1896 mapcell *cell = row->col + (x + mx - row->c0);
1584 1897
1585 int px = x * 32; 1898 int px = x * T;
1586 int py = y * 32; 1899 int py = y * T;
1587 1900
1588 if (cell->stat_hp) 1901 if (cell->stat_hp)
1589 { 1902 {
1590 int width = cell->stat_width * 32; 1903 int width = cell->stat_width * T;
1591 int thick = sh / 28 + 1 + cell->stat_width; 1904 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1592 1905
1593 glColor3ub (0, 0, 0); 1906 glColor3ub (0, 0, 0);
1594 glRectf (px + 1, py - thick - 2, 1907 glRectf (px + 1, py - thick - 2,
1595 px + width - 1, py); 1908 px + width - 1, py);
1596 1909
1662 glDisable (GL_BLEND); 1975 glDisable (GL_BLEND);
1663 glDisable (GL_TEXTURE_2D); 1976 glDisable (GL_TEXTURE_2D);
1664} 1977}
1665 1978
1666void 1979void
1667fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1668 PPCODE: 1981 PPCODE:
1669{ 1982{
1670 int x, y; 1983 int x, y;
1671 int sw4 = (sw + 3) & ~3; 1984 int sw4 = (sw + 3) & ~3;
1672 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1692 darkness[y * sw4 + x] = cell->darkness 2005 darkness[y * sw4 + 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 }
2010
2011 if (smoothing)
2012 {
2013 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2014 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2015
2016 SvPOK_only (darkness2_sv);
2017 SvCUR_set (darkness2_sv, sw4 * sh);
2018
2019 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x)
2021 {
2022 float *f = (float *)matrix;
2023 int dx, dy;
2024 float sum = 0.f;
2025
2026 for (dy = -1; dy <= 1; ++dy)
2027 for (dx = -1; dx <= 1; ++dx)
2028 {
2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
2031
2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2033 }
2034
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2036 }
2037
2038 darkness_sv = darkness2_sv;
2039 }
1697 2040
1698 EXTEND (SP, 3); 2041 EXTEND (SP, 3);
1699 PUSHs (sv_2mortal (newSViv (sw4))); 2042 PUSHs (sv_2mortal (newSViv (sw4)));
1700 PUSHs (sv_2mortal (newSViv (sh))); 2043 PUSHs (sv_2mortal (newSViv (sh)));
1701 PUSHs (darkness_sv); 2044 PUSHs (darkness_sv);
1735 if (row && row->c0 <= x && x < row->c1) 2078 if (row && row->c0 <= x && x < row->c1)
1736 { 2079 {
1737 mapcell *cell = row->col + (x - row->c0); 2080 mapcell *cell = row->col + (x - row->c0);
1738 uint8_t flags = 0; 2081 uint8_t flags = 0;
1739 2082
1740 if (cell->face [0]) flags |= 1; 2083 if (cell->tile [0]) flags |= 1;
1741 if (cell->face [1]) flags |= 2; 2084 if (cell->tile [1]) flags |= 2;
1742 if (cell->face [2]) flags |= 4; 2085 if (cell->tile [2]) flags |= 4;
1743 2086
1744 *data++ = flags; 2087 *data++ = flags;
1745 2088
1746 if (flags & 1) 2089 if (flags & 1)
1747 { 2090 {
2091 tileid tile = cell->tile [0];
1748 *data++ = cell->face [0] >> 8; 2092 *data++ = tile >> 8;
1749 *data++ = cell->face [0]; 2093 *data++ = tile;
1750 } 2094 }
1751 2095
1752 if (flags & 2) 2096 if (flags & 2)
1753 { 2097 {
2098 tileid tile = cell->tile [1];
1754 *data++ = cell->face [1] >> 8; 2099 *data++ = tile >> 8;
1755 *data++ = cell->face [1]; 2100 *data++ = tile;
1756 } 2101 }
1757 2102
1758 if (flags & 4) 2103 if (flags & 4)
1759 { 2104 {
2105 tileid tile = cell->tile [2];
1760 *data++ = cell->face [2] >> 8; 2106 *data++ = tile >> 8;
1761 *data++ = cell->face [2]; 2107 *data++ = tile;
1762 } 2108 }
1763 } 2109 }
1764 else 2110 else
1765 *data++ = 0; 2111 *data++ = 0;
1766 } 2112 }
1806 { 2152 {
1807 uint8_t flags = *data++; 2153 uint8_t flags = *data++;
1808 2154
1809 if (flags) 2155 if (flags)
1810 { 2156 {
1811 mapface face[3] = { 0, 0, 0 };
1812
1813 mapcell *cell = row_get_cell (row, x); 2157 mapcell *cell = row_get_cell (row, x);
2158 tileid tile[3] = { 0, 0, 0 };
1814 2159
1815 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2160 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1816 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2161 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1817 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2162 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1818 2163
1819 if (cell->darkness == 0) 2164 if (cell->darkness == 0)
1820 { 2165 {
1821 cell->darkness = 0; 2166 cell->darkness = 0;
1822 2167
1823 for (z = 0; z <= 2; z++) 2168 for (z = 0; z <= 2; z++)
1824 { 2169 {
1825 cell->face[z] = face[z]; 2170 tileid t = tile [z];
1826 2171
1827 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2172 if (t >= self->texs || (t && !self->tex [t].name))
2173 {
1828 XPUSHs (sv_2mortal (newSViv (face[z]))); 2174 XPUSHs (sv_2mortal (newSViv (t)));
2175 need_texid (self, t);
2176 }
2177
2178 cell->tile [z] = t;
1829 } 2179 }
1830 } 2180 }
1831 } 2181 }
1832 } 2182 }
1833 } 2183 }
1868 CODE: 2218 CODE:
1869 RETVAL = Mix_VolumeMusic (volume); 2219 RETVAL = Mix_VolumeMusic (volume);
1870 OUTPUT: 2220 OUTPUT:
1871 RETVAL 2221 RETVAL
1872 2222
2223int
2224fade_out (int ms)
2225 CODE:
2226 RETVAL = Mix_FadeOutMusic (ms);
2227 OUTPUT:
2228 RETVAL
2229
1873CFPlus::MixMusic 2230CFPlus::MixMusic
1874new_from_file (SV *class, char *path) 2231new_from_file (SV *class, char *path)
1875 CODE: 2232 CODE:
1876 RETVAL = Mix_LoadMUS (path); 2233 RETVAL = Mix_LoadMUS (path);
1877 OUTPUT: 2234 OUTPUT:
1884 2241
1885int 2242int
1886play (CFPlus::MixMusic self, int loops = -1) 2243play (CFPlus::MixMusic self, int loops = -1)
1887 CODE: 2244 CODE:
1888 RETVAL = Mix_PlayMusic (self, loops); 2245 RETVAL = Mix_PlayMusic (self, loops);
2246 OUTPUT:
2247 RETVAL
2248
2249int
2250fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2251 CODE:
2252 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1889 OUTPUT: 2253 OUTPUT:
1890 RETVAL 2254 RETVAL
1891 2255
1892MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1893 2257
1897 static const struct { 2261 static const struct {
1898 const char *name; 2262 const char *name;
1899 IV iv; 2263 IV iv;
1900 } *civ, const_iv[] = { 2264 } *civ, const_iv[] = {
1901# define const_iv(name) { # name, (IV)name } 2265# define const_iv(name) { # name, (IV)name }
2266 const_iv (GL_VENDOR),
2267 const_iv (GL_VERSION),
2268 const_iv (GL_EXTENSIONS),
1902 const_iv (GL_COLOR_MATERIAL), 2269 const_iv (GL_COLOR_MATERIAL),
1903 const_iv (GL_SMOOTH), 2270 const_iv (GL_SMOOTH),
1904 const_iv (GL_FLAT), 2271 const_iv (GL_FLAT),
1905 const_iv (GL_DITHER), 2272 const_iv (GL_DITHER),
1906 const_iv (GL_BLEND), 2273 const_iv (GL_BLEND),
1933 const_iv (GL_LUMINANCE), 2300 const_iv (GL_LUMINANCE),
1934 const_iv (GL_LUMINANCE_ALPHA), 2301 const_iv (GL_LUMINANCE_ALPHA),
1935 const_iv (GL_FLOAT), 2302 const_iv (GL_FLOAT),
1936 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2303 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1937 const_iv (GL_COMPILE), 2304 const_iv (GL_COMPILE),
2305 const_iv (GL_PROXY_TEXTURE_1D),
2306 const_iv (GL_PROXY_TEXTURE_2D),
1938 const_iv (GL_TEXTURE_1D), 2307 const_iv (GL_TEXTURE_1D),
1939 const_iv (GL_TEXTURE_2D), 2308 const_iv (GL_TEXTURE_2D),
1940 const_iv (GL_TEXTURE_ENV), 2309 const_iv (GL_TEXTURE_ENV),
1941 const_iv (GL_TEXTURE_MAG_FILTER), 2310 const_iv (GL_TEXTURE_MAG_FILTER),
1942 const_iv (GL_TEXTURE_MIN_FILTER), 2311 const_iv (GL_TEXTURE_MIN_FILTER),
1982# undef const_iv 2351# undef const_iv
1983 }; 2352 };
1984 2353
1985 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2354 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1986 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2355 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2356
2357 texture_av = newAV ();
2358 AvREAL_off (texture_av);
1987} 2359}
1988 2360
1989char * 2361char *
1990gl_vendor () 2362gl_vendor ()
1991 CODE: 2363 CODE:
2002 2374
2003char * 2375char *
2004gl_extensions () 2376gl_extensions ()
2005 CODE: 2377 CODE:
2006 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2378 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2379 OUTPUT:
2380 RETVAL
2381
2382const char *glGetString (GLenum pname)
2383
2384GLint glGetInteger (GLenum pname)
2385 CODE:
2386 glGetIntegerv (pname, &RETVAL);
2387 OUTPUT:
2388 RETVAL
2389
2390GLdouble glGetDouble (GLenum pname)
2391 CODE:
2392 glGetDoublev (pname, &RETVAL);
2007 OUTPUT: 2393 OUTPUT:
2008 RETVAL 2394 RETVAL
2009 2395
2010int glGetError () 2396int glGetError ()
2011 2397
2136 2522
2137void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2523void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2138 2524
2139void glDrawPixels (int width, int height, int format, int type, char *pixels) 2525void glDrawPixels (int width, int height, int format, int type, char *pixels)
2140 2526
2527void glPixelZoom (float x, float y)
2528
2141void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2529void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2142 2530
2143int glGenTexture () 2531int glGenTexture ()
2144 CODE: 2532 CODE:
2145{ 2533 RETVAL = gen_texture ();
2146 GLuint name;
2147 glGenTextures (1, &name);
2148 RETVAL = name;
2149}
2150 OUTPUT: 2534 OUTPUT:
2151 RETVAL 2535 RETVAL
2152 2536
2153void glDeleteTexture (int name) 2537void glDeleteTexture (int name)
2154 CODE: 2538 CODE:
2155{
2156 GLuint name_ = name;
2157 glDeleteTextures (1, &name_); 2539 del_texture (name);
2158} 2540
2159
2160int glGenList () 2541int glGenList ()
2161 CODE: 2542 CODE:
2162 RETVAL = glGenLists (1); 2543 RETVAL = glGenLists (1);
2163 OUTPUT: 2544 OUTPUT:
2164 RETVAL 2545 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines