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.156 by root, Thu Sep 21 14:47:51 2006 UTC vs.
Revision 1.200 by root, Tue Jul 17 16:02:13 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
36# include <sys/types.h> 44# include <sys/types.h>
37# include <sys/socket.h> 45# include <sys/socket.h>
38# include <netinet/in.h> 46# include <netinet/in.h>
39# include <netinet/tcp.h> 47# include <netinet/tcp.h>
40# include <inttypes.h> 48# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 49#endif
49 50
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 52
52#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
53 54
54#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 62#else
62# define PARACHUTE 0 63# define PARACHUTE 0
63#endif 64#endif
64 65
66static AV *texture_av;
67
65static struct 68static struct
66{ 69{
67#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 71#include "glfunc.h"
69#undef GL_FUNC 72#undef GL_FUNC
70} gl; 73} gl;
71 74
75static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 77{
74 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 82 else
79 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
80} 84}
81 85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
108}
109
82#include "texcache.c" 110#include "texcache.c"
83 111
84#include "pango-font.c" 112#include "pango-font.c"
85#include "pango-fontmap.c" 113#include "pango-fontmap.c"
86#include "pango-render.c" 114#include "pango-render.c"
159 187
160 *w = rect.width; 188 *w = rect.width;
161 *h = rect.height; 189 *h = rect.height;
162} 190}
163 191
192typedef uint16_t tileid;
164typedef uint16_t mapface; 193typedef uint16_t faceid;
165 194
166typedef struct { 195typedef struct {
167 GLint name; 196 int name;
168 int w, h; 197 int w, h;
169 float s, t; 198 float s, t;
170 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
171} maptex; 202} maptex;
172 203
173typedef struct { 204typedef struct {
174 uint32_t player; 205 uint32_t player;
175 mapface face[3]; 206 tileid tile[3];
176 uint16_t darkness; 207 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
178} mapcell; 209} mapcell;
179 210
180typedef struct { 211typedef struct {
181 int32_t c0, c1; 212 int32_t c0, c1;
182 mapcell *col; 213 mapcell *col;
183} maprow; 214} maprow;
184 215
185typedef struct map { 216typedef struct map {
186 int x, y, w, h; 217 int x, y, w, h;
187 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
188 int faces; 219 int faces; tileid *face2tile; // [faceid]
189 mapface *face; 220 int texs; maptex *tex; // [tileid]
190
191 int texs;
192 maptex *tex;
193 221
194 int32_t rows; 222 int32_t rows;
195 maprow *row; 223 maprow *row;
196} *CFPlus__Map; 224} *CFPlus__Map;
197 225
217 return ptr; 245 return ptr;
218} 246}
219 247
220#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
221#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
222 270
223static maprow * 271static maprow *
224map_get_row (CFPlus__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
225{ 273{
226 if (0 > y) 274 if (0 > y)
321 cell->player = 0; 369 cell->player = 0;
322 } 370 }
323 } 371 }
324} 372}
325 373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
388}
389
326static void 390static void
327music_finished (void) 391music_finished (void)
328{ 392{
329 SDL_UserEvent ev; 393 SDL_UserEvent ev;
330 394
363 n |= n >> 8; 427 n |= n >> 8;
364 n |= n >> 16; 428 n |= n >> 16;
365 429
366 return n + 1; 430 return n + 1;
367} 431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
368 436
369MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
370 438
371PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
372 440
376 static const struct { 444 static const struct {
377 const char *name; 445 const char *name;
378 IV iv; 446 IV iv;
379 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
380# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
381 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
382 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
383 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
384 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
385 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
394 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
395 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
396 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
397 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
398 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
399 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
400 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
401 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
402 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
403 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
458 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
459 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
460 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
461 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
462 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
463 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
464 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
465 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
466 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
467 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
468 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
469 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
470 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
471 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
472 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
473 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
474 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
475 const_iv (KMOD_CTRL),
476 const_iv (KMOD_SHIFT),
477 const_iv (KMOD_ALT),
478 const_iv (KMOD_META)
479# undef const_iv 556# undef const_iv
480 }; 557 };
481 558
482 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
483 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
484} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
485 571
486int 572int
487in_destruct () 573in_destruct ()
488 CODE: 574 CODE:
489 RETVAL = PL_main_cv == Nullcv; 575 RETVAL = PL_main_cv == Nullcv;
501 opengl_fontmap = pango_opengl_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
502 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
503 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
504} 590}
505 591
592char *
593SDL_GetError ()
594
506int 595int
507SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
508 597
509void 598void
510SDL_Quit () 599SDL_Quit ()
511 600
512void 601void
513SDL_ListModes () 602SDL_ListModes (int rgb, int alpha)
514 PPCODE: 603 PPCODE:
515{ 604{
516 SDL_Rect **m; 605 SDL_Rect **m;
517 606
518 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 607 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
519 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
520 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
521 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 610 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
522 611
523 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 612 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
524 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
525 614
526 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
527 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
528 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
529 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
530 619
531 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
532#if SDL_VERSION_ATLEAST(1,2,10) 621#if SDL_VERSION_ATLEAST(1,2,10)
533 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
534 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
535#endif 624#endif
536 625
537 SDL_EnableUNICODE (1);
538 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
539
540 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
541 627
542 if (m && m != (SDL_Rect **)-1) 628 if (m && m != (SDL_Rect **)-1)
543 while (*m) 629 while (*m)
544 { 630 {
631 if ((*m)->w >= 640 && (*m)->h >= 480)
632 {
545 AV *av = newAV (); 633 AV *av = newAV ();
546 av_push (av, newSViv ((*m)->w)); 634 av_push (av, newSViv ((*m)->w));
547 av_push (av, newSViv ((*m)->h)); 635 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb));
637 av_push (av, newSViv (alpha));
548 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 638 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
639 }
549 640
550 ++m; 641 ++m;
551 } 642 }
552} 643}
553 644
554char *
555SDL_GetError ()
556
557int 645int
558SDL_SetVideoMode (int w, int h, int fullscreen) 646SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
559 CODE: 647 CODE:
648{
649 SDL_EnableUNICODE (1);
650 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
651
652 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
653 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
654 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
655 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
656
560 RETVAL = !!SDL_SetVideoMode ( 657 RETVAL = !!SDL_SetVideoMode (
561 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 658 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
562 ); 659 );
660
563 if (RETVAL) 661 if (RETVAL)
564 { 662 {
663 av_clear (texture_av);
664
565 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
566# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 666#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
567# include "glfunc.h" 667#include "glfunc.h"
568# undef GL_FUNC 668#undef GL_FUNC
569 } 669 }
670}
570 OUTPUT: 671 OUTPUT:
571 RETVAL 672 RETVAL
572 673
573void 674void
574SDL_GL_SwapBuffers () 675SDL_GL_SwapBuffers ()
575 676
576char * 677char *
577SDL_GetKeyName (int sym) 678SDL_GetKeyName (int sym)
578 679
680int
681SDL_GetAppState ()
682
579void 683void
580SDL_PollEvent () 684poll_events ()
581 PPCODE: 685 PPCODE:
582{ 686{
583 SDL_Event ev; 687 SDL_Event ev;
584 688
585 while (SDL_PollEvent (&ev)) 689 SDL_PumpEvents ();
690 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
586 { 691 {
587 HV *hv = newHV (); 692 HV *hv = newHV ();
588 hv_store (hv, "type", 4, newSViv (ev.type), 0); 693 hv_store (hv, "type", 4, newSViv (ev.type), 0);
589 694
590 switch (ev.type) 695 switch (ev.type)
592 case SDL_KEYDOWN: 697 case SDL_KEYDOWN:
593 case SDL_KEYUP: 698 case SDL_KEYUP:
594 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 699 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
595 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 700 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
596 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 701 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
702 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
597 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 703 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
598 break; 704 break;
599 705
600 case SDL_ACTIVEEVENT: 706 case SDL_ACTIVEEVENT:
601 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
602 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 708 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
603 break; 709 break;
604 710
605 case SDL_MOUSEMOTION: 711 case SDL_MOUSEMOTION:
712 {
713 int state = ev.motion.state;
714 int x = ev.motion.x;
715 int y = ev.motion.y;
716 int xrel = ev.motion.xrel;
717 int yrel = ev.motion.yrel;
718
719 /* do simplistic event compression */
720 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
721 && state == ev.motion.state)
722 {
723 xrel += ev.motion.xrel;
724 yrel += ev.motion.yrel;
725 x = ev.motion.x;
726 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 }
729
606 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
607
608 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 731 hv_store (hv, "state", 5, newSViv (state), 0);
609 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 732 hv_store (hv, "x", 1, newSViv (x), 0);
610 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 733 hv_store (hv, "y", 1, newSViv (y), 0);
611 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 734 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
612 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 735 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 }
613 break; 737 break;
614 738
615 case SDL_MOUSEBUTTONDOWN: 739 case SDL_MOUSEBUTTONDOWN:
616 case SDL_MOUSEBUTTONUP: 740 case SDL_MOUSEBUTTONUP:
617 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
646Mix_AllocateChannels (int numchans = -1) 770Mix_AllocateChannels (int numchans = -1)
647 771
648void 772void
649lowdelay (int fd, int val = 1) 773lowdelay (int fd, int val = 1)
650 CODE: 774 CODE:
775 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
776
777void
778win32_proxy_info ()
779 PPCODE:
780{
651#ifndef _WIN32 781#ifdef _WIN32
652 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 782 char buffer[2048];
783 DWORD buflen;
784
785 EXTEND (SP, 3);
786
787 buflen = sizeof (buffer);
788 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
789 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
790 {
791 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
792
793 buflen = sizeof (buffer);
794 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
795 {
796 PUSHs (newSVpv (buffer, 0));
797
798 buflen = sizeof (buffer);
799 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
800 PUSHs (newSVpv (buffer, 0));
801 }
802 }
653#endif 803#endif
804}
654 805
655void 806void
656add_font (char *file) 807add_font (char *file)
657 CODE: 808 CODE:
658 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 809 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
762 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 913 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
763#endif 914#endif
764 _exit (1); 915 _exit (1);
765 916
766void 917void
767_exit (int retval) 918_exit (int retval = 0)
768 CODE: 919 CODE:
920#ifdef WIN32
921 ExitThread (retval); // unclean, please beam me up
922#else
769 _exit (retval); 923 _exit (retval);
924#endif
925
926void
927debug ()
928 CODE:
929{
930#if DEBUG
931 VALGRIND_DO_LEAK_CHECK;
932#endif
933}
770 934
771MODULE = CFPlus PACKAGE = CFPlus::Font 935MODULE = CFPlus PACKAGE = CFPlus::Font
772 936
773CFPlus::Font 937CFPlus::Font
774new_from_file (SV *class, char *path, int id = 0) 938new_from_file (SV *class, char *path, int id = 0)
1021xy_to_index (CFPlus::Layout self, int x, int y) 1185xy_to_index (CFPlus::Layout self, int x, int y)
1022 CODE: 1186 CODE:
1023{ 1187{
1024 int index, trailing; 1188 int index, trailing;
1025 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1189 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1026 RETVAL = index; 1190 RETVAL = index + trailing;
1027} 1191}
1028 OUTPUT: 1192 OUTPUT:
1029 RETVAL 1193 RETVAL
1030 1194
1031void 1195void
1037 1201
1038 EXTEND (SP, 3); 1202 EXTEND (SP, 3);
1039 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1203 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1206}
1207
1208void
1209index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1210 PPCODE:
1211{
1212 int line, x;
1213
1214 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1215 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1216
1217 EXTEND (SP, 2);
1218 PUSHs (sv_2mortal (newSViv (line - 1)));
1219 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1220}
1221
1222void
1223line_x_to_index (CFPlus::Layout self, int line, int x)
1224 PPCODE:
1225{
1226 PangoLayoutLine *lp;
1227 int index, trailing;
1228
1229 if (line < 0)
1230 XSRETURN_EMPTY;
1231
1232 if (!(lp = pango_layout_get_line (self->pl, line)))
1233 XSRETURN_EMPTY; /* do better */
1234
1235 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1236
1237 EXTEND (SP, 2);
1238 if (GIMME_V == G_SCALAR)
1239 PUSHs (sv_2mortal (newSViv (index + trailing)));
1240 else
1241 {
1242 PUSHs (sv_2mortal (newSViv (index)));
1243 PUSHs (sv_2mortal (newSViv (trailing)));
1244 }
1042} 1245}
1043 1246
1044void 1247void
1045render (CFPlus::Layout self, float x, float y, int flags = 0) 1248render (CFPlus::Layout self, float x, float y, int flags = 0)
1046 PPCODE: 1249 PPCODE:
1051 flags 1254 flags
1052 ); 1255 );
1053 1256
1054MODULE = CFPlus PACKAGE = CFPlus::Texture 1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1055 1258
1259int minpot (int n)
1260
1056void 1261void
1057pad2pot (SV *data_, SV *w_, SV *h_) 1262pad2pot (SV *data_, SV *w_, SV *h_)
1058 CODE: 1263 CODE:
1059{ 1264{
1060 int ow = SvIV (w_); 1265 int ow = SvIV (w_);
1137 glDisable (GL_ALPHA_TEST); 1342 glDisable (GL_ALPHA_TEST);
1138 glDisable (GL_BLEND); 1343 glDisable (GL_BLEND);
1139 } 1344 }
1140} 1345}
1141 1346
1347IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1348 CODE:
1349{
1350 GLint width;
1351 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1352 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1353 RETVAL = width > 0;
1354}
1355 OUTPUT:
1356 RETVAL
1357
1142MODULE = CFPlus PACKAGE = CFPlus::Map 1358MODULE = CFPlus PACKAGE = CFPlus::Map
1143 1359
1144CFPlus::Map 1360CFPlus::Map
1145new (SV *class, int map_width, int map_height) 1361new (SV *class)
1146 CODE: 1362 CODE:
1147 New (0, RETVAL, 1, struct map); 1363 New (0, RETVAL, 1, struct map);
1148 RETVAL->x = 0; 1364 RETVAL->x = 0;
1149 RETVAL->y = 0; 1365 RETVAL->y = 0;
1150 RETVAL->w = map_width; 1366 RETVAL->w = 0;
1151 RETVAL->h = map_height; 1367 RETVAL->h = 0;
1152 RETVAL->ox = 0; 1368 RETVAL->ox = 0;
1153 RETVAL->oy = 0; 1369 RETVAL->oy = 0;
1154 RETVAL->faces = 8192; 1370 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1155 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1371 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1156 RETVAL->texs = 8192;
1157 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1158 RETVAL->rows = 0; 1372 RETVAL->rows = 0;
1159 RETVAL->row = 0; 1373 RETVAL->row = 0;
1160 OUTPUT: 1374 OUTPUT:
1161 RETVAL 1375 RETVAL
1162 1376
1163void 1377void
1164DESTROY (CFPlus::Map self) 1378DESTROY (CFPlus::Map self)
1165 CODE: 1379 CODE:
1166{ 1380{
1167 map_clear (self); 1381 map_clear (self);
1168 Safefree (self->face); 1382 Safefree (self->face2tile);
1169 Safefree (self->tex); 1383 Safefree (self->tex);
1170 Safefree (self); 1384 Safefree (self);
1171} 1385}
1172 1386
1173void 1387void
1388resize (CFPlus::Map self, int map_width, int map_height)
1389 CODE:
1390 self->w = map_width;
1391 self->h = map_height;
1392
1393void
1174clear (CFPlus::Map self) 1394clear (CFPlus::Map self)
1175 CODE: 1395 CODE:
1176 map_clear (self); 1396 map_clear (self);
1177 1397
1178void 1398void
1179set_face (CFPlus::Map self, int face, int texid) 1399set_tileid (CFPlus::Map self, int face, int tile)
1180 CODE: 1400 CODE:
1181{ 1401{
1182 while (self->faces <= face) 1402 need_facenum (self, face); self->face2tile [face] = tile;
1183 { 1403 need_texid (self, tile);
1184 Append (mapface, self->face, self->faces, self->faces); 1404}
1185 self->faces *= 2;
1186 }
1187 1405
1188 self->face [face] = texid; 1406void
1407set_smooth (CFPlus::Map self, int face, int smooth, int level)
1408 CODE:
1409{
1410 tileid texid;
1411 maptex *tex;
1412
1413 if (face < 0 || face >= self->faces)
1414 return;
1415
1416 if (smooth < 0 || smooth >= self->faces)
1417 return;
1418
1419 texid = self->face2tile [face];
1420
1421 if (!texid)
1422 return;
1423
1424 tex = self->tex + texid;
1425 tex->smoothtile = self->face2tile [smooth];
1426 tex->smoothlevel = level;
1189} 1427}
1190 1428
1191void 1429void
1192set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1430set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1193 CODE: 1431 CODE:
1194{ 1432{
1195 while (self->texs <= texid) 1433 need_texid (self, texid);
1196 {
1197 Append (maptex, self->tex, self->texs, self->texs);
1198 self->texs *= 2;
1199 }
1200 1434
1201 { 1435 {
1202 maptex *tex = self->tex + texid; 1436 maptex *tex = self->tex + texid;
1203 1437
1204 tex->name = name; 1438 tex->name = name;
1248 CODE: 1482 CODE:
1249{ 1483{
1250 if (dx > 0) 1484 if (dx > 0)
1251 map_blank (self, self->x, self->y, dx, self->h); 1485 map_blank (self, self->x, self->y, dx, self->h);
1252 else if (dx < 0) 1486 else if (dx < 0)
1253 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1487 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1254 1488
1255 if (dy > 0) 1489 if (dy > 0)
1256 map_blank (self, self->x, self->y, self->w, dy); 1490 map_blank (self, self->x, self->y, self->w, dy);
1257 else if (dy < 0) 1491 else if (dy < 0)
1258 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1492 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1259 1493
1260 self->ox += dx; self->x += dx; 1494 self->ox += dx; self->x += dx;
1261 self->oy += dy; self->y += dy; 1495 self->oy += dy; self->y += dy;
1262 1496
1263 while (self->y < 0) 1497 while (self->y < 0)
1315 cell->stat_width = 1; 1549 cell->stat_width = 1;
1316 cell->stat_hp = *data++; 1550 cell->stat_hp = *data++;
1317 } 1551 }
1318 else if (cmd == 6) // monster width 1552 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1; 1553 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width 1554 else if (cmd == 0x47)
1321 { 1555 {
1322 if (*data == 4) 1556 if (*data == 4)
1323 ; // decode player tag 1557 ; // decode player count
1324 1558
1325 data += *data + 1; 1559 data += *data + 1;
1326 } 1560 }
1327 else if (cmd == 8) // cell flags 1561 else if (cmd == 8) // cell flags
1328 cell->flags = *data++; 1562 cell->flags = *data++;
1337 cell->darkness = *data++ + 1; 1571 cell->darkness = *data++ + 1;
1338 } 1572 }
1339 1573
1340 if (flags & 4) 1574 if (flags & 4)
1341 { 1575 {
1342 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [0] = self->face2tile [face];
1343 } 1579 }
1344 1580
1345 if (flags & 2) 1581 if (flags & 2)
1346 { 1582 {
1347 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1583 faceid face = (data [0] << 8) + data [1]; data += 2;
1584 need_facenum (self, face);
1585 cell->tile [1] = self->face2tile [face];
1348 } 1586 }
1349 1587
1350 if (flags & 1) 1588 if (flags & 1)
1351 { 1589 {
1352 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1590 faceid face = (data [0] << 8) + data [1]; data += 2;
1591 need_facenum (self, face);
1592 cell->tile [2] = self->face2tile [face];
1353 } 1593 }
1354 } 1594 }
1355 else 1595 else
1356 cell->darkness = 0; 1596 cell->darkness = 0;
1357 } 1597 }
1387 { 1627 {
1388 mapcell *cell = row->col + (x - row->c0); 1628 mapcell *cell = row->col + (x - row->c0);
1389 1629
1390 for (z = 0; z <= 0; z++) 1630 for (z = 0; z <= 0; z++)
1391 { 1631 {
1392 mapface face = cell->face [z];
1393
1394 if (face)
1395 {
1396 maptex tex = self->tex [face]; 1632 maptex tex = self->tex [cell->tile [z]];
1397 int a0 = 255 - tex.a; 1633 int a0 = 255 - tex.a;
1398 int a1 = tex.a; 1634 int a1 = tex.a;
1399 1635
1400 r = (r * a0 + tex.r * a1) / 255; 1636 r = (r * a0 + tex.r * a1) / 255;
1401 g = (g * a0 + tex.g * a1) / 255; 1637 g = (g * a0 + tex.g * a1) / 255;
1402 b = (b * a0 + tex.b * a1) / 255; 1638 b = (b * a0 + tex.b * a1) / 255;
1403 a = (a * a0 + tex.a * a1) / 255; 1639 a = (a * a0 + tex.a * a1) / 255;
1404 }
1405 } 1640 }
1406 } 1641 }
1407 1642
1408 *map++ = (r ) 1643 *map++ = (r )
1409 | (g << 8) 1644 | (g << 8)
1416} 1651}
1417 OUTPUT: 1652 OUTPUT:
1418 RETVAL 1653 RETVAL
1419 1654
1420void 1655void
1421draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1656draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1422 CODE: 1657 CODE:
1423{ 1658{
1424 int vx, vy; 1659 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1660 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1661 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1662 smooth_key skey;
1425 int x, y, z; 1663 int x, y, z;
1426 int last_name; 1664 int last_name;
1427 mapface face;
1428 1665
1429 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1666 // thats current max. sorry.
1430 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1667 if (sw > 255) sw = 255;
1668 if (sh > 255) sh = 255;
1431 1669
1432 /* 1670 // clear key, in case of extra padding
1433 int vx = self->vx = self->w >= sw 1671 memset (&skey, 0, sizeof (skey));
1434 ? self->x + (self->w - sw) / 2
1435 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1436
1437 int vy = self->vy = self->h >= sh
1438 ? self->y + (self->h - sh) / 2
1439 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1440 */
1441 1672
1442 glColor4ub (255, 255, 255, 255); 1673 glColor4ub (255, 255, 255, 255);
1443 1674
1444 glEnable (GL_BLEND); 1675 glEnable (GL_BLEND);
1445 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1676 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1448 1679
1449 glBegin (GL_QUADS); 1680 glBegin (GL_QUADS);
1450 1681
1451 last_name = 0; 1682 last_name = 0;
1452 1683
1684 mx += self->x;
1685 my += self->y;
1686
1687 // first pass: determine smooth_max
1688 // rather ugly, if you ask me
1689 // could also be stored inside mapcell and updated on change
1690 memset (smooth_max, 0, sizeof (smooth_max));
1691
1692 for (y = 0; y < sh; y++)
1693 if (0 <= y + my && y + my < self->rows)
1694 {
1695 maprow *row = self->row + (y + my);
1696
1697 for (x = 0; x < sw; x++)
1698 if (row->c0 <= x + mx && x + mx < row->c1)
1699 {
1700 mapcell *cell = row->col + (x + mx - row->c0);
1701
1702 smooth_max[x + 1][y + 1] =
1703 MAX (self->tex [cell->tile [0]].smoothlevel,
1704 MAX (self->tex [cell->tile [1]].smoothlevel,
1705 self->tex [cell->tile [2]].smoothlevel));
1706 }
1707 }
1708
1453 for (z = 0; z < 3; z++) 1709 for (z = 0; z <= 2; z++)
1710 {
1711 memset (smooth_level, 0, sizeof (smooth_level));
1712
1454 for (y = 0; y < sh; y++) 1713 for (y = 0; y < sh; y++)
1455 if (0 <= y + vy && y + vy < self->rows) 1714 if (0 <= y + my && y + my < self->rows)
1456 { 1715 {
1457 maprow *row = self->row + (y + vy); 1716 maprow *row = self->row + (y + my);
1458 1717
1459 for (x = 0; x < sw; x++) 1718 for (x = 0; x < sw; x++)
1460 if (row->c0 <= x + vx && x + vx < row->c1) 1719 if (row->c0 <= x + mx && x + mx < row->c1)
1461 { 1720 {
1462 mapcell *cell = row->col + (x + vx - row->c0); 1721 mapcell *cell = row->col + (x + mx - row->c0);
1463
1464 face = cell->face [z]; 1722 tileid tile = cell->tile [z];
1723
1724 if (tile)
1725 {
1726 maptex tex = self->tex [tile];
1727 int px = (x + 1) * T - tex.w;
1728 int py = (y + 1) * T - tex.h;
1465 1729
1466 if (face && face < self->texs) 1730 // suppressing texture state switches here
1731 // is only moderately effective, but worth the extra effort
1732 if (last_name != tex.name)
1733 {
1734 if (!tex.name)
1735 tex = self->tex [2]; /* missing, replace by noface */
1736
1737 glEnd ();
1738 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1739 glBegin (GL_QUADS);
1740 }
1741
1742 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1743 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1744 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1745 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1746
1747 if (cell->flags && z == 2)
1748 {
1749 if (cell->flags & 1)
1750 {
1751 maptex tex = self->tex [1];
1752 int px = x * T + T * 2 / 32;
1753 int py = y * T - T * 6 / 32;
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758
1759 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1760 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1761 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1762 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1763 }
1764 }
1765
1766 // update smooth hash
1767 if (tex.smoothtile)
1768 {
1769 skey.tile = tex.smoothtile;
1770 skey.level = tex.smoothlevel;
1771
1772 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1773
1774 // add bits to current tile and all neighbours. skey.x|y is
1775 // shifted +1|+1 so we always stay positive.
1776
1777 // bits is ___n cccc CCCC bbbb
1778 // n do not draw borders&corners
1779 // c draw these corners, but...
1780 // C ... not these
1781 // b draw these borders
1782
1783 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1784 // ┃· ·· ·┃ ━━
1785
1786 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1787 // ·· ·· ·┏ ┓·
1788
1789 // full tile
1790 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1791
1792 // borders
1793 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1794 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1795 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1796 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1797
1798 // corners
1799 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1800 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1801 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1802 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1803 }
1804 }
1805 }
1806 }
1807
1808 // go through all smoothlevels, lowest to highest, then draw.
1809 // this is basically counting sort
1810 {
1811 int w, b;
1812
1813 for (w = 0; w < 256 / 32; ++w)
1814 {
1815 uint32_t smask = smooth_level [w];
1816 if (smask)
1817 for (b = 0; b < 32; ++b)
1818 if (smask & (((uint32_t)1) << b))
1467 { 1819 {
1468 maptex tex = self->tex [face]; 1820 int level = (w << 5) | b;
1469 int px = (x + 1) * 32 - tex.w; 1821 HE *he;
1470 int py = (y + 1) * 32 - tex.h;
1471 1822
1472 if (last_name != tex.name) 1823 hv_iterinit (smooth);
1824 while ((he = hv_iternext (smooth)))
1473 { 1825 {
1826 smooth_key *skey = (smooth_key *)HeKEY (he);
1827 IV bits = SvIVX (HeVAL (he));
1828
1829 if (!(bits & 0x1000)
1830 && skey->level == level
1831 && level > smooth_max [skey->x][skey->y])
1832 {
1833 maptex tex = self->tex [skey->tile];
1834 int px = (((int)skey->x) - 1) * T;
1835 int py = (((int)skey->y) - 1) * T;
1836 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column
1840
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name)
1844 {
1845 if (!tex.name)
1846 continue; // smoothing not yet available
1847
1474 glEnd (); 1848 glEnd ();
1475 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1476 glBegin (GL_QUADS); 1850 glBegin (GL_QUADS);
1851 }
1852
1853 if (border)
1854 {
1855 float ox = border * dx;
1856
1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1861 }
1862
1863 if (corner)
1864 {
1865 float ox = corner * dx;
1866
1867 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1871 }
1477 } 1872 }
1478
1479 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1480 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1481 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1482 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1483 }
1484
1485 if (cell->flags && z == 2)
1486 {
1487 if (cell->flags & 1)
1488 {
1489 maptex tex = self->tex [1];
1490 int px = (x + 1) * 32 - tex.w + 2;
1491 int py = (y + 1) * 32 - tex.h - 6;
1492
1493 glEnd ();
1494 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1495 glBegin (GL_QUADS);
1496
1497 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1498 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1499 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1500 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1501 } 1873 }
1502 } 1874 }
1503 }
1504 } 1875 }
1876 }
1877
1878 hv_clear (smooth);
1879 }
1505 1880
1506 glEnd (); 1881 glEnd ();
1507 1882
1508 glDisable (GL_TEXTURE_2D); 1883 glDisable (GL_TEXTURE_2D);
1509 glDisable (GL_BLEND); 1884 glDisable (GL_BLEND);
1510 1885
1511 // top layer: overlays such as the health bar 1886 // top layer: overlays such as the health bar
1512 for (y = 0; y < sh; y++) 1887 for (y = 0; y < sh; y++)
1513 if (0 <= y + vy && y + vy < self->rows) 1888 if (0 <= y + my && y + my < self->rows)
1514 { 1889 {
1515 maprow *row = self->row + (y + vy); 1890 maprow *row = self->row + (y + my);
1516 1891
1517 for (x = 0; x < sw; x++) 1892 for (x = 0; x < sw; x++)
1518 if (row->c0 <= x + vx && x + vx < row->c1) 1893 if (row->c0 <= x + mx && x + mx < row->c1)
1519 { 1894 {
1520 mapcell *cell = row->col + (x + vx - row->c0); 1895 mapcell *cell = row->col + (x + mx - row->c0);
1521 1896
1522 int px = x * 32; 1897 int px = x * T;
1523 int py = y * 32; 1898 int py = y * T;
1524 1899
1525 if (cell->stat_hp) 1900 if (cell->stat_hp)
1526 { 1901 {
1527 int width = cell->stat_width * 32; 1902 int width = cell->stat_width * T;
1528 int thick = sh / 28 + 1 + cell->stat_width; 1903 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1529 1904
1530 glColor3ub (0, 0, 0); 1905 glColor3ub (0, 0, 0);
1531 glRectf (px + 1, py - thick - 2, 1906 glRectf (px + 1, py - thick - 2,
1532 px + width - 1, py); 1907 px + width - 1, py);
1533 1908
1599 glDisable (GL_BLEND); 1974 glDisable (GL_BLEND);
1600 glDisable (GL_TEXTURE_2D); 1975 glDisable (GL_TEXTURE_2D);
1601} 1976}
1602 1977
1603void 1978void
1604fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1979fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1605 PPCODE: 1980 PPCODE:
1606{ 1981{
1607 int vx, vy;
1608 int x, y; 1982 int x, y;
1609 int sw4 = (sw + 3) & ~3; 1983 int sw4 = (sw + 3) & ~3;
1610 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1611 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1612 1986
1613 memset (darkness, 255, sw4 * sh); 1987 memset (darkness, 255, sw4 * sh);
1614 SvPOK_only (darkness_sv); 1988 SvPOK_only (darkness_sv);
1615 SvCUR_set (darkness_sv, sw4 * sh); 1989 SvCUR_set (darkness_sv, sw4 * sh);
1616 1990
1617 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1991 mx += self->x;
1618 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1992 my += self->y;
1619 1993
1620 for (y = 0; y < sh; y++) 1994 for (y = 0; y < sh; y++)
1621 if (0 <= y + vy && y + vy < self->rows) 1995 if (0 <= y + my && y + my < self->rows)
1622 { 1996 {
1623 maprow *row = self->row + (y + vy); 1997 maprow *row = self->row + (y + my);
1624 1998
1625 for (x = 0; x < sw; x++) 1999 for (x = 0; x < sw; x++)
1626 if (row->c0 <= x + vx && x + vx < row->c1) 2000 if (row->c0 <= x + mx && x + mx < row->c1)
1627 { 2001 {
1628 mapcell *cell = row->col + (x + vx - row->c0); 2002 mapcell *cell = row->col + (x + mx - row->c0);
1629 2003
1630 darkness[y * sw4 + x] = cell->darkness 2004 darkness[y * sw4 + x] = cell->darkness
1631 ? 255 - (cell->darkness - 1) 2005 ? 255 - (cell->darkness - 1)
1632 : 255 - FOW_DARKNESS; 2006 : 255 - FOW_DARKNESS;
1633 } 2007 }
1673 if (row && row->c0 <= x && x < row->c1) 2047 if (row && row->c0 <= x && x < row->c1)
1674 { 2048 {
1675 mapcell *cell = row->col + (x - row->c0); 2049 mapcell *cell = row->col + (x - row->c0);
1676 uint8_t flags = 0; 2050 uint8_t flags = 0;
1677 2051
1678 if (cell->face [0]) flags |= 1; 2052 if (cell->tile [0]) flags |= 1;
1679 if (cell->face [1]) flags |= 2; 2053 if (cell->tile [1]) flags |= 2;
1680 if (cell->face [2]) flags |= 4; 2054 if (cell->tile [2]) flags |= 4;
1681 2055
1682 *data++ = flags; 2056 *data++ = flags;
1683 2057
1684 if (flags & 1) 2058 if (flags & 1)
1685 { 2059 {
2060 tileid tile = cell->tile [0];
1686 *data++ = cell->face [0] >> 8; 2061 *data++ = tile >> 8;
1687 *data++ = cell->face [0]; 2062 *data++ = tile;
1688 } 2063 }
1689 2064
1690 if (flags & 2) 2065 if (flags & 2)
1691 { 2066 {
2067 tileid tile = cell->tile [1];
1692 *data++ = cell->face [1] >> 8; 2068 *data++ = tile >> 8;
1693 *data++ = cell->face [1]; 2069 *data++ = tile;
1694 } 2070 }
1695 2071
1696 if (flags & 4) 2072 if (flags & 4)
1697 { 2073 {
2074 tileid tile = cell->tile [2];
1698 *data++ = cell->face [2] >> 8; 2075 *data++ = tile >> 8;
1699 *data++ = cell->face [2]; 2076 *data++ = tile;
1700 } 2077 }
1701 } 2078 }
1702 else 2079 else
1703 *data++ = 0; 2080 *data++ = 0;
1704 } 2081 }
1744 { 2121 {
1745 uint8_t flags = *data++; 2122 uint8_t flags = *data++;
1746 2123
1747 if (flags) 2124 if (flags)
1748 { 2125 {
1749 mapface face[3] = { 0, 0, 0 };
1750
1751 mapcell *cell = row_get_cell (row, x); 2126 mapcell *cell = row_get_cell (row, x);
2127 tileid tile[3] = { 0, 0, 0 };
1752 2128
1753 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2129 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1754 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2130 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1755 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2131 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1756 2132
1757 if (cell->darkness == 0) 2133 if (cell->darkness == 0)
1758 { 2134 {
1759 cell->darkness = 0; 2135 cell->darkness = 0;
1760 2136
1761 for (z = 0; z <= 2; z++) 2137 for (z = 0; z <= 2; z++)
1762 { 2138 {
1763 cell->face[z] = face[z]; 2139 tileid t = tile [z];
1764 2140
1765 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2141 if (t >= self->texs || (t && !self->tex [t].name))
2142 {
1766 XPUSHs (sv_2mortal (newSViv (face[z]))); 2143 XPUSHs (sv_2mortal (newSViv (t)));
2144 need_texid (self, t);
2145 }
2146
2147 cell->tile [z] = t;
1767 } 2148 }
1768 } 2149 }
1769 } 2150 }
1770 } 2151 }
1771 } 2152 }
1806 CODE: 2187 CODE:
1807 RETVAL = Mix_VolumeMusic (volume); 2188 RETVAL = Mix_VolumeMusic (volume);
1808 OUTPUT: 2189 OUTPUT:
1809 RETVAL 2190 RETVAL
1810 2191
2192int
2193fade_out (int ms)
2194 CODE:
2195 RETVAL = Mix_FadeOutMusic (ms);
2196 OUTPUT:
2197 RETVAL
2198
1811CFPlus::MixMusic 2199CFPlus::MixMusic
1812new_from_file (SV *class, char *path) 2200new_from_file (SV *class, char *path)
1813 CODE: 2201 CODE:
1814 RETVAL = Mix_LoadMUS (path); 2202 RETVAL = Mix_LoadMUS (path);
1815 OUTPUT: 2203 OUTPUT:
1822 2210
1823int 2211int
1824play (CFPlus::MixMusic self, int loops = -1) 2212play (CFPlus::MixMusic self, int loops = -1)
1825 CODE: 2213 CODE:
1826 RETVAL = Mix_PlayMusic (self, loops); 2214 RETVAL = Mix_PlayMusic (self, loops);
2215 OUTPUT:
2216 RETVAL
2217
2218int
2219fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2220 CODE:
2221 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1827 OUTPUT: 2222 OUTPUT:
1828 RETVAL 2223 RETVAL
1829 2224
1830MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2225MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1831 2226
1835 static const struct { 2230 static const struct {
1836 const char *name; 2231 const char *name;
1837 IV iv; 2232 IV iv;
1838 } *civ, const_iv[] = { 2233 } *civ, const_iv[] = {
1839# define const_iv(name) { # name, (IV)name } 2234# define const_iv(name) { # name, (IV)name }
2235 const_iv (GL_VENDOR),
2236 const_iv (GL_VERSION),
2237 const_iv (GL_EXTENSIONS),
1840 const_iv (GL_COLOR_MATERIAL), 2238 const_iv (GL_COLOR_MATERIAL),
1841 const_iv (GL_SMOOTH), 2239 const_iv (GL_SMOOTH),
1842 const_iv (GL_FLAT), 2240 const_iv (GL_FLAT),
1843 const_iv (GL_DITHER), 2241 const_iv (GL_DITHER),
1844 const_iv (GL_BLEND), 2242 const_iv (GL_BLEND),
1871 const_iv (GL_LUMINANCE), 2269 const_iv (GL_LUMINANCE),
1872 const_iv (GL_LUMINANCE_ALPHA), 2270 const_iv (GL_LUMINANCE_ALPHA),
1873 const_iv (GL_FLOAT), 2271 const_iv (GL_FLOAT),
1874 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2272 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1875 const_iv (GL_COMPILE), 2273 const_iv (GL_COMPILE),
2274 const_iv (GL_PROXY_TEXTURE_1D),
2275 const_iv (GL_PROXY_TEXTURE_2D),
1876 const_iv (GL_TEXTURE_1D), 2276 const_iv (GL_TEXTURE_1D),
1877 const_iv (GL_TEXTURE_2D), 2277 const_iv (GL_TEXTURE_2D),
1878 const_iv (GL_TEXTURE_ENV), 2278 const_iv (GL_TEXTURE_ENV),
1879 const_iv (GL_TEXTURE_MAG_FILTER), 2279 const_iv (GL_TEXTURE_MAG_FILTER),
1880 const_iv (GL_TEXTURE_MIN_FILTER), 2280 const_iv (GL_TEXTURE_MIN_FILTER),
1920# undef const_iv 2320# undef const_iv
1921 }; 2321 };
1922 2322
1923 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2323 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1924 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2324 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2325
2326 texture_av = newAV ();
2327 AvREAL_off (texture_av);
1925} 2328}
1926 2329
1927char * 2330char *
1928gl_vendor () 2331gl_vendor ()
1929 CODE: 2332 CODE:
1940 2343
1941char * 2344char *
1942gl_extensions () 2345gl_extensions ()
1943 CODE: 2346 CODE:
1944 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2347 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2348 OUTPUT:
2349 RETVAL
2350
2351char *glGetString (GLenum pname)
2352
2353GLint glGetInteger (GLenum pname)
2354 CODE:
2355 glGetIntegerv (pname, &RETVAL);
2356 OUTPUT:
2357 RETVAL
2358
2359GLdouble glGetDouble (GLenum pname)
2360 CODE:
2361 glGetDoublev (pname, &RETVAL);
1945 OUTPUT: 2362 OUTPUT:
1946 RETVAL 2363 RETVAL
1947 2364
1948int glGetError () 2365int glGetError ()
1949 2366
2074 2491
2075void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2492void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2076 2493
2077void glDrawPixels (int width, int height, int format, int type, char *pixels) 2494void glDrawPixels (int width, int height, int format, int type, char *pixels)
2078 2495
2496void glPixelZoom (float x, float y)
2497
2079void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2498void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2080 2499
2081int glGenTexture () 2500int glGenTexture ()
2082 CODE: 2501 CODE:
2083{ 2502 RETVAL = gen_texture ();
2084 GLuint name;
2085 glGenTextures (1, &name);
2086 RETVAL = name;
2087}
2088 OUTPUT: 2503 OUTPUT:
2089 RETVAL 2504 RETVAL
2090 2505
2091void glDeleteTexture (int name) 2506void glDeleteTexture (int name)
2092 CODE: 2507 CODE:
2093{
2094 GLuint name_ = name;
2095 glDeleteTextures (1, &name_); 2508 del_texture (name);
2096} 2509
2097
2098int glGenList () 2510int glGenList ()
2099 CODE: 2511 CODE:
2100 RETVAL = glGenLists (1); 2512 RETVAL = glGenLists (1);
2101 OUTPUT: 2513 OUTPUT:
2102 RETVAL 2514 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines