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.138 by root, Mon Aug 14 01:21:01 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 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"
144} 172}
145 173
146static void 174static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
150 181
151 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 184
154 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
155} 186 if (!rect.height) rect.height = 1;
156 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
157typedef uint16_t mapface; 193typedef uint16_t faceid;
158 194
159typedef struct { 195typedef struct {
160 GLint name; 196 int name;
161 int w, h; 197 int w, h;
162 float s, t; 198 float s, t;
163 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
164} maptex; 202} maptex;
165 203
166typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
167 int16_t darkness; 207 uint16_t darkness;
168 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
169} mapcell; 209} mapcell;
170 210
171typedef struct { 211typedef struct {
172 int32_t c0, c1; 212 int32_t c0, c1;
173 mapcell *col; 213 mapcell *col;
174} maprow; 214} maprow;
175 215
176typedef struct map { 216typedef struct map {
177 int x, y, w, h; 217 int x, y, w, h;
178 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
179 int faces; 219 int faces; tileid *face2tile; // [faceid]
180 mapface *face; 220 int texs; maptex *tex; // [tileid]
181
182 int texs;
183 maptex *tex;
184 221
185 int32_t rows; 222 int32_t rows;
186 maprow *row; 223 maprow *row;
187} *CFPlus__Map; 224} *CFPlus__Map;
188 225
208 return ptr; 245 return ptr;
209} 246}
210 247
211#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))
212#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}
213 270
214static maprow * 271static maprow *
215map_get_row (CFPlus__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
216{ 273{
217 if (0 > y) 274 if (0 > y)
286static void 343static void
287map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 344map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 345{
289 int x, y; 346 int x, y;
290 maprow *row; 347 maprow *row;
348 mapcell *cell;
291 349
292 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 351 if (y >= 0)
294 { 352 {
295 if (y >= self->rows) 353 if (y >= self->rows)
301 if (x >= row->c0) 359 if (x >= row->c0)
302 { 360 {
303 if (x >= row->c1) 361 if (x >= row->c1)
304 break; 362 break;
305 363
306 row->col[x - row->c0].darkness = -1; 364 cell = row->col + x - row->c0;
365
366 cell->darkness = 0;
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
307 } 370 }
308 } 371 }
372}
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);
309} 388}
310 389
311static void 390static void
312music_finished (void) 391music_finished (void)
313{ 392{
348 n |= n >> 8; 427 n |= n >> 8;
349 n |= n >> 16; 428 n |= n >> 16;
350 429
351 return n + 1; 430 return n + 1;
352} 431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
353 436
354MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
355 438
356PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
357 440
361 static const struct { 444 static const struct {
362 const char *name; 445 const char *name;
363 IV iv; 446 IV iv;
364 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
365# 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
366 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
367 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
368 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
369 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
370 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
379 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
380 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
381 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
382 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
383 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
384 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
385 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
386 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
387 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
388 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
443 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
444 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
445 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
446 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
447 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
448 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
449 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
450 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
451 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
452 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
453 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
454 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
455 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
456 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
457 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
458 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
459 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
460 const_iv (KMOD_CTRL),
461 const_iv (KMOD_SHIFT),
462 const_iv (KMOD_ALT),
463 const_iv (KMOD_META)
464# undef const_iv 556# undef const_iv
465 }; 557 };
466 558
467 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; )
468 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);
469} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
470 571
471int 572int
472in_destruct () 573in_destruct ()
473 CODE: 574 CODE:
474 RETVAL = PL_main_cv == Nullcv; 575 RETVAL = PL_main_cv == Nullcv;
545 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
547 ); 648 );
548 if (RETVAL) 649 if (RETVAL)
549 { 650 {
651 av_clear (texture_av);
652
550 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
551# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
552# include "glfunc.h" 655# include "glfunc.h"
553# undef GL_FUNC 656# undef GL_FUNC
657
554 } 658 }
555 OUTPUT: 659 OUTPUT:
556 RETVAL 660 RETVAL
557 661
558void 662void
559SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
560 664
561char * 665char *
562SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
563 667
668int
669SDL_GetAppState ()
670
564void 671void
565SDL_PollEvent () 672poll_events ()
566 PPCODE: 673 PPCODE:
567{ 674{
568 SDL_Event ev; 675 SDL_Event ev;
569 676
570 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
571 { 679 {
572 HV *hv = newHV (); 680 HV *hv = newHV ();
573 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
574 682
575 switch (ev.type) 683 switch (ev.type)
577 case SDL_KEYDOWN: 685 case SDL_KEYDOWN:
578 case SDL_KEYUP: 686 case SDL_KEYUP:
579 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
580 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
581 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
690 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
582 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
583 break; 692 break;
584 693
585 case SDL_ACTIVEEVENT: 694 case SDL_ACTIVEEVENT:
586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
588 break; 697 break;
589 698
590 case SDL_MOUSEMOTION: 699 case SDL_MOUSEMOTION:
700 {
701 int state = ev.motion.state;
702 int x = ev.motion.x;
703 int y = ev.motion.y;
704 int xrel = ev.motion.xrel;
705 int yrel = ev.motion.yrel;
706
707 /* do simplistic event compression */
708 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
709 && state == ev.motion.state)
710 {
711 xrel += ev.motion.xrel;
712 yrel += ev.motion.yrel;
713 x = ev.motion.x;
714 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 }
717
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
598 break; 725 break;
599 726
600 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
601 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
631Mix_AllocateChannels (int numchans = -1) 758Mix_AllocateChannels (int numchans = -1)
632 759
633void 760void
634lowdelay (int fd, int val = 1) 761lowdelay (int fd, int val = 1)
635 CODE: 762 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
764
765void
766win32_proxy_info ()
767 PPCODE:
768{
636#ifndef _WIN32 769#ifdef _WIN32
637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 770 char buffer[2048];
771 DWORD buflen;
772
773 EXTEND (SP, 3);
774
775 buflen = sizeof (buffer);
776 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
777 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
778 {
779 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
780
781 buflen = sizeof (buffer);
782 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
783 {
784 PUSHs (newSVpv (buffer, 0));
785
786 buflen = sizeof (buffer);
787 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
788 PUSHs (newSVpv (buffer, 0));
789 }
790 }
638#endif 791#endif
792}
639 793
640void 794void
641add_font (char *file) 795add_font (char *file)
642 CODE: 796 CODE:
643 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 797 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
748#endif 902#endif
749 _exit (1); 903 _exit (1);
750 904
751void 905void
752_exit (int retval) 906_exit (int retval = 0)
753 CODE: 907 CODE:
908#ifdef WIN32
909 ExitThread (retval); // unclean, please beam me up
910#else
754 _exit (retval); 911 _exit (retval);
912#endif
913
914void
915debug ()
916 CODE:
917{
918#if DEBUG
919 VALGRIND_DO_LEAK_CHECK;
920#endif
921}
755 922
756MODULE = CFPlus PACKAGE = CFPlus::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
757 924
758CFPlus::Font 925CFPlus::Font
759new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
1006xy_to_index (CFPlus::Layout self, int x, int y) 1173xy_to_index (CFPlus::Layout self, int x, int y)
1007 CODE: 1174 CODE:
1008{ 1175{
1009 int index, trailing; 1176 int index, trailing;
1010 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1177 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1011 RETVAL = index; 1178 RETVAL = index + trailing;
1012} 1179}
1013 OUTPUT: 1180 OUTPUT:
1014 RETVAL 1181 RETVAL
1015 1182
1016void 1183void
1022 1189
1023 EXTEND (SP, 3); 1190 EXTEND (SP, 3);
1024 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1191 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1194}
1195
1196void
1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1198 PPCODE:
1199{
1200 int line, x;
1201
1202 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1203 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1204
1205 EXTEND (SP, 2);
1206 PUSHs (sv_2mortal (newSViv (line - 1)));
1207 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1208}
1209
1210void
1211line_x_to_index (CFPlus::Layout self, int line, int x)
1212 PPCODE:
1213{
1214 PangoLayoutLine *lp;
1215 int index, trailing;
1216
1217 if (line < 0)
1218 XSRETURN_EMPTY;
1219
1220 if (!(lp = pango_layout_get_line (self->pl, line)))
1221 XSRETURN_EMPTY; /* do better */
1222
1223 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1224
1225 EXTEND (SP, 2);
1226 if (GIMME_V == G_SCALAR)
1227 PUSHs (sv_2mortal (newSViv (index + trailing)));
1228 else
1229 {
1230 PUSHs (sv_2mortal (newSViv (index)));
1231 PUSHs (sv_2mortal (newSViv (trailing)));
1232 }
1027} 1233}
1028 1234
1029void 1235void
1030render (CFPlus::Layout self, float x, float y, int flags = 0) 1236render (CFPlus::Layout self, float x, float y, int flags = 0)
1031 PPCODE: 1237 PPCODE:
1036 flags 1242 flags
1037 ); 1243 );
1038 1244
1039MODULE = CFPlus PACKAGE = CFPlus::Texture 1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1040 1246
1247int minpot (int n)
1248
1041void 1249void
1042pad2pot (SV *data_, SV *w_, SV *h_) 1250pad2pot (SV *data_, SV *w_, SV *h_)
1043 CODE: 1251 CODE:
1044{ 1252{
1045 int ow = SvIV (w_); 1253 int ow = SvIV (w_);
1122 glDisable (GL_ALPHA_TEST); 1330 glDisable (GL_ALPHA_TEST);
1123 glDisable (GL_BLEND); 1331 glDisable (GL_BLEND);
1124 } 1332 }
1125} 1333}
1126 1334
1335IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1336 CODE:
1337{
1338 GLint width;
1339 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1340 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1341 RETVAL = width > 0;
1342}
1343 OUTPUT:
1344 RETVAL
1345
1127MODULE = CFPlus PACKAGE = CFPlus::Map 1346MODULE = CFPlus PACKAGE = CFPlus::Map
1128 1347
1129CFPlus::Map 1348CFPlus::Map
1130new (SV *class, int map_width, int map_height) 1349new (SV *class)
1131 CODE: 1350 CODE:
1132 New (0, RETVAL, 1, struct map); 1351 New (0, RETVAL, 1, struct map);
1133 RETVAL->x = 0; 1352 RETVAL->x = 0;
1134 RETVAL->y = 0; 1353 RETVAL->y = 0;
1135 RETVAL->w = map_width; 1354 RETVAL->w = 0;
1136 RETVAL->h = map_height; 1355 RETVAL->h = 0;
1137 RETVAL->ox = 0; 1356 RETVAL->ox = 0;
1138 RETVAL->oy = 0; 1357 RETVAL->oy = 0;
1139 RETVAL->faces = 8192; 1358 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1140 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1359 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1141 RETVAL->texs = 8192;
1142 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1143 RETVAL->rows = 0; 1360 RETVAL->rows = 0;
1144 RETVAL->row = 0; 1361 RETVAL->row = 0;
1145 OUTPUT: 1362 OUTPUT:
1146 RETVAL 1363 RETVAL
1147 1364
1148void 1365void
1149DESTROY (CFPlus::Map self) 1366DESTROY (CFPlus::Map self)
1150 CODE: 1367 CODE:
1151{ 1368{
1152 map_clear (self); 1369 map_clear (self);
1153 Safefree (self->face); 1370 Safefree (self->face2tile);
1154 Safefree (self->tex); 1371 Safefree (self->tex);
1155 Safefree (self); 1372 Safefree (self);
1156} 1373}
1157 1374
1158void 1375void
1376resize (CFPlus::Map self, int map_width, int map_height)
1377 CODE:
1378 self->w = map_width;
1379 self->h = map_height;
1380
1381void
1159clear (CFPlus::Map self) 1382clear (CFPlus::Map self)
1160 CODE: 1383 CODE:
1161 map_clear (self); 1384 map_clear (self);
1162 1385
1163void 1386void
1164set_face (CFPlus::Map self, int face, int texid) 1387set_tileid (CFPlus::Map self, int face, int tile)
1165 CODE: 1388 CODE:
1166{ 1389{
1167 while (self->faces <= face) 1390 need_facenum (self, face); self->face2tile [face] = tile;
1168 { 1391 need_texid (self, tile);
1169 Append (mapface, self->face, self->faces, self->faces); 1392}
1170 self->faces *= 2;
1171 }
1172 1393
1173 self->face [face] = texid; 1394void
1395set_smooth (CFPlus::Map self, int face, int smooth, int level)
1396 CODE:
1397{
1398 tileid texid;
1399 maptex *tex;
1400
1401 if (face < 0 || face >= self->faces)
1402 return;
1403
1404 if (smooth < 0 || smooth >= self->faces)
1405 return;
1406
1407 texid = self->face2tile [face];
1408
1409 if (!texid)
1410 return;
1411
1412 tex = self->tex + texid;
1413 tex->smoothtile = self->face2tile [smooth];
1414 tex->smoothlevel = level;
1174} 1415}
1175 1416
1176void 1417void
1177set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1418set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1178 CODE: 1419 CODE:
1179{ 1420{
1180 while (self->texs <= texid) 1421 need_texid (self, texid);
1181 {
1182 Append (maptex, self->tex, self->texs, self->texs);
1183 self->texs *= 2;
1184 }
1185 1422
1186 { 1423 {
1187 maptex *tex = self->tex + texid; 1424 maptex *tex = self->tex + texid;
1188 1425
1189 tex->name = name; 1426 tex->name = name;
1231void 1468void
1232scroll (CFPlus::Map self, int dx, int dy) 1469scroll (CFPlus::Map self, int dx, int dy)
1233 CODE: 1470 CODE:
1234{ 1471{
1235 if (dx > 0) 1472 if (dx > 0)
1236 map_blank (self, self->x, self->y, dx - 1, self->h); 1473 map_blank (self, self->x, self->y, dx, self->h);
1237 else if (dx < 0) 1474 else if (dx < 0)
1238 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1475 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1239 1476
1240 if (dy > 0) 1477 if (dy > 0)
1241 map_blank (self, self->x, self->y, self->w, dy - 1); 1478 map_blank (self, self->x, self->y, self->w, dy);
1242 else if (dy < 0) 1479 else if (dy < 0)
1243 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1480 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1244 1481
1245 self->ox += dx; self->x += dx; 1482 self->ox += dx; self->x += dx;
1246 self->oy += dy; self->y += dy; 1483 self->oy += dy; self->y += dy;
1247 1484
1248 while (self->y < 0) 1485 while (self->y < 0)
1253 self->y += MAP_EXTEND_Y; 1490 self->y += MAP_EXTEND_Y;
1254 } 1491 }
1255} 1492}
1256 1493
1257void 1494void
1258map1a_update (CFPlus::Map self, SV *data_) 1495map1a_update (CFPlus::Map self, SV *data_, int extmap)
1259 CODE: 1496 CODE:
1260{ 1497{
1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1498 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1262 uint8_t *data_end = (uint8_t *)SvEND (data_); 1499 uint8_t *data_end = (uint8_t *)SvEND (data_);
1263 mapcell *cell; 1500 mapcell *cell;
1264 int x, y, flags; 1501 int x, y, flags;
1265 1502
1266 while (data < data_end) 1503 while (data < data_end - 1)
1267 { 1504 {
1268 flags = (data [0] << 8) + data [1]; data += 2; 1505 flags = (data [0] << 8) + data [1]; data += 2;
1269 1506
1270 x = self->x + ((flags >> 10) & 63); 1507 x = self->x + ((flags >> 10) & 63);
1271 y = self->y + ((flags >> 4) & 63); 1508 y = self->y + ((flags >> 4) & 63);
1272 1509
1273 cell = map_get_cell (self, x, y); 1510 cell = map_get_cell (self, x, y);
1274 1511
1275 if (flags & 15) 1512 if (flags & 15)
1276 { 1513 {
1277 if (cell->darkness < 0) 1514 if (!cell->darkness)
1278 { 1515 {
1516 memset (cell, 0, sizeof (*cell));
1279 cell->darkness = 0; 1517 cell->darkness = 256;
1280 cell->face [0] = 0;
1281 cell->face [1] = 0;
1282 cell->face [2] = 0;
1283 } 1518 }
1284 1519
1285 cell->darkness = flags & 8 ? *data++ : 255;
1286
1287 //TODO: don't trust server data to be in-range(!) 1520 //TODO: don't trust server data to be in-range(!)
1521
1522 if (flags & 8)
1523 {
1524 if (extmap)
1525 {
1526 uint8_t ext, cmd;
1527
1528 do
1529 {
1530 ext = *data++;
1531 cmd = ext & 0x3f;
1532
1533 if (cmd < 4)
1534 cell->darkness = 255 - ext * 64 + 1;
1535 else if (cmd == 5) // health
1536 {
1537 cell->stat_width = 1;
1538 cell->stat_hp = *data++;
1539 }
1540 else if (cmd == 6) // monster width
1541 cell->stat_width = *data++ + 1;
1542 else if (cmd == 0x47)
1543 {
1544 if (*data == 4)
1545 ; // decode player count
1546
1547 data += *data + 1;
1548 }
1549 else if (cmd == 8) // cell flags
1550 cell->flags = *data++;
1551 else if (ext & 0x40) // unknown, multibyte => skip
1552 data += *data + 1;
1553 else
1554 data++;
1555 }
1556 while (ext & 0x80);
1557 }
1558 else
1559 cell->darkness = *data++ + 1;
1560 }
1288 1561
1289 if (flags & 4) 1562 if (flags & 4)
1290 { 1563 {
1291 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1564 faceid face = (data [0] << 8) + data [1]; data += 2;
1565 need_facenum (self, face);
1566 cell->tile [0] = self->face2tile [face];
1292 } 1567 }
1293 1568
1294 if (flags & 2) 1569 if (flags & 2)
1295 { 1570 {
1296 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1571 faceid face = (data [0] << 8) + data [1]; data += 2;
1572 need_facenum (self, face);
1573 cell->tile [1] = self->face2tile [face];
1297 } 1574 }
1298 1575
1299 if (flags & 1) 1576 if (flags & 1)
1300 { 1577 {
1301 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1578 faceid face = (data [0] << 8) + data [1]; data += 2;
1579 need_facenum (self, face);
1580 cell->tile [2] = self->face2tile [face];
1302 } 1581 }
1303 } 1582 }
1304 else 1583 else
1305 cell->darkness = -1; 1584 cell->darkness = 0;
1306 } 1585 }
1307} 1586}
1308 1587
1309SV * 1588SV *
1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1589mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1336 { 1615 {
1337 mapcell *cell = row->col + (x - row->c0); 1616 mapcell *cell = row->col + (x - row->c0);
1338 1617
1339 for (z = 0; z <= 0; z++) 1618 for (z = 0; z <= 0; z++)
1340 { 1619 {
1341 mapface face = cell->face [z];
1342
1343 if (face)
1344 {
1345 maptex tex = self->tex [face]; 1620 maptex tex = self->tex [cell->tile [z]];
1346 int a0 = 255 - tex.a; 1621 int a0 = 255 - tex.a;
1347 int a1 = tex.a; 1622 int a1 = tex.a;
1348 1623
1349 r = (r * a0 + tex.r * a1) / 255; 1624 r = (r * a0 + tex.r * a1) / 255;
1350 g = (g * a0 + tex.g * a1) / 255; 1625 g = (g * a0 + tex.g * a1) / 255;
1351 b = (b * a0 + tex.b * a1) / 255; 1626 b = (b * a0 + tex.b * a1) / 255;
1352 a = (a * a0 + tex.a * a1) / 255; 1627 a = (a * a0 + tex.a * a1) / 255;
1353 }
1354 } 1628 }
1355 } 1629 }
1356 1630
1357 *map++ = (r ) 1631 *map++ = (r )
1358 | (g << 8) 1632 | (g << 8)
1365} 1639}
1366 OUTPUT: 1640 OUTPUT:
1367 RETVAL 1641 RETVAL
1368 1642
1369void 1643void
1370draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1644draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1371 CODE: 1645 CODE:
1372{ 1646{
1373 int vx, vy; 1647 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1648 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1649 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1650 smooth_key skey;
1374 int x, y, z; 1651 int x, y, z;
1375 int last_name; 1652 int last_name;
1376 mapface face;
1377 1653
1378 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1654 // thats current max. sorry.
1379 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1655 if (sw > 255) sw = 255;
1656 if (sh > 255) sh = 255;
1380 1657
1381 /* 1658 // clear key, in case of extra padding
1382 int vx = self->vx = self->w >= sw 1659 memset (&skey, 0, sizeof (skey));
1383 ? self->x + (self->w - sw) / 2
1384 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1385
1386 int vy = self->vy = self->h >= sh
1387 ? self->y + (self->h - sh) / 2
1388 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1389 */
1390 1660
1391 glColor4ub (255, 255, 255, 255); 1661 glColor4ub (255, 255, 255, 255);
1392 1662
1393 glEnable (GL_BLEND); 1663 glEnable (GL_BLEND);
1394 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1664 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1397 1667
1398 glBegin (GL_QUADS); 1668 glBegin (GL_QUADS);
1399 1669
1400 last_name = 0; 1670 last_name = 0;
1401 1671
1672 mx += self->x;
1673 my += self->y;
1674
1675 // first pass: determine smooth_max
1676 // rather ugly, if you ask me
1677 // could also be stored inside mapcell and updated on change
1678 memset (smooth_max, 0, sizeof (smooth_max));
1679
1680 for (y = 0; y < sh; y++)
1681 if (0 <= y + my && y + my < self->rows)
1682 {
1683 maprow *row = self->row + (y + my);
1684
1685 for (x = 0; x < sw; x++)
1686 if (row->c0 <= x + mx && x + mx < row->c1)
1687 {
1688 mapcell *cell = row->col + (x + mx - row->c0);
1689
1690 smooth_max[x + 1][y + 1] =
1691 MAX (self->tex [cell->tile [0]].smoothlevel,
1692 MAX (self->tex [cell->tile [1]].smoothlevel,
1693 self->tex [cell->tile [2]].smoothlevel));
1694 }
1695 }
1696
1402 for (z = 0; z < 3; z++) 1697 for (z = 0; z <= 2; z++)
1698 {
1699 memset (smooth_level, 0, sizeof (smooth_level));
1700
1403 for (y = 0; y < sh; y++) 1701 for (y = 0; y < sh; y++)
1404 if (0 <= y + vy && y + vy < self->rows) 1702 if (0 <= y + my && y + my < self->rows)
1405 { 1703 {
1406 maprow *row = self->row + (y + vy); 1704 maprow *row = self->row + (y + my);
1407 1705
1408 for (x = 0; x < sw; x++) 1706 for (x = 0; x < sw; x++)
1409 if (row->c0 <= x + vx && x + vx < row->c1) 1707 if (row->c0 <= x + mx && x + mx < row->c1)
1410 { 1708 {
1411 mapcell *cell = row->col + (x + vx - row->c0); 1709 mapcell *cell = row->col + (x + mx - row->c0);
1412
1413 face = cell->face [z]; 1710 tileid tile = cell->tile [z];
1414 1711
1415 if (face) 1712 if (tile)
1713 {
1714 maptex tex = self->tex [tile];
1715 int px = (x + 1) * T - tex.w;
1716 int py = (y + 1) * T - tex.h;
1717
1718 // suppressing texture state switches here
1719 // is only moderately effective, but worth the extra effort
1720 if (last_name != tex.name)
1721 {
1722 if (!tex.name)
1723 tex = self->tex [2]; /* missing, replace by noface */
1724
1725 glEnd ();
1726 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1727 glBegin (GL_QUADS);
1728 }
1729
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1734
1735 if (cell->flags && z == 2)
1736 {
1737 if (cell->flags & 1)
1738 {
1739 maptex tex = self->tex [1];
1740 int px = x * T + T * 2 / 32;
1741 int py = y * T - T * 6 / 32;
1742
1743 glEnd ();
1744 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1745 glBegin (GL_QUADS);
1746
1747 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1748 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1749 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1750 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1751 }
1752 }
1753
1754 // update smooth hash
1755 if (tex.smoothtile)
1756 {
1757 skey.tile = tex.smoothtile;
1758 skey.level = tex.smoothlevel;
1759
1760 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1761
1762 // add bits to current tile and all neighbours. skey.x|y is
1763 // shifted +1|+1 so we always stay positive.
1764
1765 // bits is ___n cccc CCCC bbbb
1766 // n do not draw borders&corners
1767 // c draw these corners, but...
1768 // C ... not these
1769 // b draw these borders
1770
1771 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1772 // ┃· ·· ·┃ ━━
1773
1774 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1775 // ·· ·· ·┏ ┓·
1776
1777 // full tile
1778 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1779
1780 // borders
1781 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1782 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1783 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1784 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1785
1786 // corners
1787 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1788 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1789 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1790 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1791 }
1792 }
1793 }
1794 }
1795
1796 // go through all smoothlevels, lowest to highest, then draw.
1797 // this is basically counting sort
1798 {
1799 int w, b;
1800
1801 for (w = 0; w < 256 / 32; ++w)
1802 {
1803 uint32_t smask = smooth_level [w];
1804 if (smask)
1805 for (b = 0; b < 32; ++b)
1806 if (smask & (((uint32_t)1) << b))
1416 { 1807 {
1417 maptex tex = self->tex [face]; 1808 int level = (w << 5) | b;
1809 HE *he;
1418 1810
1419 int px = (x + 1) * 32 - tex.w; 1811 hv_iterinit (smooth);
1420 int py = (y + 1) * 32 - tex.h; 1812 while ((he = hv_iternext (smooth)))
1421
1422 if (last_name != tex.name)
1423 { 1813 {
1814 smooth_key *skey = (smooth_key *)HeKEY (he);
1815 IV bits = SvIVX (HeVAL (he));
1816
1817 if (!(bits & 0x1000)
1818 && skey->level == level
1819 && level > smooth_max [skey->x][skey->y])
1820 {
1821 maptex tex = self->tex [skey->tile];
1822 int px = (((int)skey->x) - 1) * T;
1823 int py = (((int)skey->y) - 1) * T;
1824 int border = bits & 15;
1825 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1826 float dx = tex.s * .0625f; // 16 images/row
1827 float dy = tex.t * .5f ; // 2 images/column
1828
1829 // this time naively avoiding texture state changes
1830 // save gobs of state changes.
1831 if (last_name != tex.name)
1832 {
1833 if (!tex.name)
1834 continue; // smoothing not yet available
1835
1424 glEnd (); 1836 glEnd ();
1425 last_name = tex.name;
1426 glBindTexture (GL_TEXTURE_2D, last_name); 1837 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1427 glBegin (GL_QUADS); 1838 glBegin (GL_QUADS);
1839 }
1840
1841 if (border)
1842 {
1843 float ox = border * dx;
1844
1845 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1846 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1847 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1848 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1849 }
1850
1851 if (corner)
1852 {
1853 float ox = corner * dx;
1854
1855 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1856 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1857 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1858 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1859 }
1860 }
1428 } 1861 }
1429
1430 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1431 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1432 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1433 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1434 } 1862 }
1435 }
1436 } 1863 }
1864 }
1865
1866 hv_clear (smooth);
1867 }
1437 1868
1438 glEnd (); 1869 glEnd ();
1439 1870
1440 glDisable (GL_TEXTURE_2D); 1871 glDisable (GL_TEXTURE_2D);
1441 glDisable (GL_BLEND); 1872 glDisable (GL_BLEND);
1873
1874 // top layer: overlays such as the health bar
1875 for (y = 0; y < sh; y++)
1876 if (0 <= y + my && y + my < self->rows)
1877 {
1878 maprow *row = self->row + (y + my);
1879
1880 for (x = 0; x < sw; x++)
1881 if (row->c0 <= x + mx && x + mx < row->c1)
1882 {
1883 mapcell *cell = row->col + (x + mx - row->c0);
1884
1885 int px = x * T;
1886 int py = y * T;
1887
1888 if (cell->stat_hp)
1889 {
1890 int width = cell->stat_width * T;
1891 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1892
1893 glColor3ub (0, 0, 0);
1894 glRectf (px + 1, py - thick - 2,
1895 px + width - 1, py);
1896
1897 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1898 glRectf (px + 2,
1899 py - thick - 1,
1900 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1901 }
1902 }
1903 }
1442} 1904}
1443 1905
1444void 1906void
1445draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1907draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1446 CODE: 1908 CODE:
1500 glDisable (GL_BLEND); 1962 glDisable (GL_BLEND);
1501 glDisable (GL_TEXTURE_2D); 1963 glDisable (GL_TEXTURE_2D);
1502} 1964}
1503 1965
1504void 1966void
1505fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1967fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1506 PPCODE: 1968 PPCODE:
1507{ 1969{
1508 int vx, vy;
1509 int x, y; 1970 int x, y;
1510 int sw4 = (sw + 3) & ~3; 1971 int sw4 = (sw + 3) & ~3;
1511 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1972 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1512 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1973 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1513 1974
1514 memset (darkness, 255, sw4 * sh); 1975 memset (darkness, 255, sw4 * sh);
1515 SvPOK_only (darkness_sv); 1976 SvPOK_only (darkness_sv);
1516 SvCUR_set (darkness_sv, sw4 * sh); 1977 SvCUR_set (darkness_sv, sw4 * sh);
1517 1978
1518 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1979 mx += self->x;
1519 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1980 my += self->y;
1520 1981
1521 for (y = 0; y < sh; y++) 1982 for (y = 0; y < sh; y++)
1522 if (0 <= y + vy && y + vy < self->rows) 1983 if (0 <= y + my && y + my < self->rows)
1523 { 1984 {
1524 maprow *row = self->row + (y + vy); 1985 maprow *row = self->row + (y + my);
1525 1986
1526 for (x = 0; x < sw; x++) 1987 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1) 1988 if (row->c0 <= x + mx && x + mx < row->c1)
1528 { 1989 {
1529 mapcell *cell = row->col + (x + vx - row->c0); 1990 mapcell *cell = row->col + (x + mx - row->c0);
1530 1991
1531 darkness[y * sw4 + x] = cell->darkness < 0 1992 darkness[y * sw4 + x] = cell->darkness
1993 ? 255 - (cell->darkness - 1)
1532 ? 255 - FOW_DARKNESS 1994 : 255 - FOW_DARKNESS;
1533 : 255 - cell->darkness;
1534 } 1995 }
1535 } 1996 }
1536 1997
1537 EXTEND (SP, 3); 1998 EXTEND (SP, 3);
1538 PUSHs (sv_2mortal (newSViv (sw4))); 1999 PUSHs (sv_2mortal (newSViv (sw4)));
1574 if (row && row->c0 <= x && x < row->c1) 2035 if (row && row->c0 <= x && x < row->c1)
1575 { 2036 {
1576 mapcell *cell = row->col + (x - row->c0); 2037 mapcell *cell = row->col + (x - row->c0);
1577 uint8_t flags = 0; 2038 uint8_t flags = 0;
1578 2039
1579 if (cell->face [0]) flags |= 1; 2040 if (cell->tile [0]) flags |= 1;
1580 if (cell->face [1]) flags |= 2; 2041 if (cell->tile [1]) flags |= 2;
1581 if (cell->face [2]) flags |= 4; 2042 if (cell->tile [2]) flags |= 4;
1582 2043
1583 *data++ = flags; 2044 *data++ = flags;
1584 2045
1585 if (flags & 1) 2046 if (flags & 1)
1586 { 2047 {
2048 tileid tile = cell->tile [0];
1587 *data++ = cell->face [0] >> 8; 2049 *data++ = tile >> 8;
1588 *data++ = cell->face [0]; 2050 *data++ = tile;
1589 } 2051 }
1590 2052
1591 if (flags & 2) 2053 if (flags & 2)
1592 { 2054 {
2055 tileid tile = cell->tile [1];
1593 *data++ = cell->face [1] >> 8; 2056 *data++ = tile >> 8;
1594 *data++ = cell->face [1]; 2057 *data++ = tile;
1595 } 2058 }
1596 2059
1597 if (flags & 4) 2060 if (flags & 4)
1598 { 2061 {
2062 tileid tile = cell->tile [2];
1599 *data++ = cell->face [2] >> 8; 2063 *data++ = tile >> 8;
1600 *data++ = cell->face [2]; 2064 *data++ = tile;
1601 } 2065 }
1602 } 2066 }
1603 else 2067 else
1604 *data++ = 0; 2068 *data++ = 0;
1605 } 2069 }
1645 { 2109 {
1646 uint8_t flags = *data++; 2110 uint8_t flags = *data++;
1647 2111
1648 if (flags) 2112 if (flags)
1649 { 2113 {
1650 mapface face[3] = { 0, 0, 0 };
1651
1652 mapcell *cell = row_get_cell (row, x); 2114 mapcell *cell = row_get_cell (row, x);
2115 tileid tile[3] = { 0, 0, 0 };
1653 2116
1654 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2117 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1655 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2118 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1656 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2119 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1657 2120
1658 if (cell->darkness <= 0) 2121 if (cell->darkness == 0)
1659 { 2122 {
1660 cell->darkness = -1; 2123 cell->darkness = 0;
1661 2124
1662 for (z = 0; z <= 2; z++) 2125 for (z = 0; z <= 2; z++)
1663 { 2126 {
1664 cell->face[z] = face[z]; 2127 tileid t = tile [z];
1665 2128
1666 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2129 if (t >= self->texs || (t && !self->tex [t].name))
2130 {
1667 XPUSHs (sv_2mortal (newSViv (face[z]))); 2131 XPUSHs (sv_2mortal (newSViv (t)));
2132 need_texid (self, t);
2133 }
2134
2135 cell->tile [z] = t;
1668 } 2136 }
1669 } 2137 }
1670 } 2138 }
1671 } 2139 }
1672 } 2140 }
1707 CODE: 2175 CODE:
1708 RETVAL = Mix_VolumeMusic (volume); 2176 RETVAL = Mix_VolumeMusic (volume);
1709 OUTPUT: 2177 OUTPUT:
1710 RETVAL 2178 RETVAL
1711 2179
2180int
2181fade_out (int ms)
2182 CODE:
2183 RETVAL = Mix_FadeOutMusic (ms);
2184 OUTPUT:
2185 RETVAL
2186
1712CFPlus::MixMusic 2187CFPlus::MixMusic
1713new_from_file (SV *class, char *path) 2188new_from_file (SV *class, char *path)
1714 CODE: 2189 CODE:
1715 RETVAL = Mix_LoadMUS (path); 2190 RETVAL = Mix_LoadMUS (path);
1716 OUTPUT: 2191 OUTPUT:
1723 2198
1724int 2199int
1725play (CFPlus::MixMusic self, int loops = -1) 2200play (CFPlus::MixMusic self, int loops = -1)
1726 CODE: 2201 CODE:
1727 RETVAL = Mix_PlayMusic (self, loops); 2202 RETVAL = Mix_PlayMusic (self, loops);
2203 OUTPUT:
2204 RETVAL
2205
2206int
2207fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2208 CODE:
2209 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1728 OUTPUT: 2210 OUTPUT:
1729 RETVAL 2211 RETVAL
1730 2212
1731MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2213MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1732 2214
1736 static const struct { 2218 static const struct {
1737 const char *name; 2219 const char *name;
1738 IV iv; 2220 IV iv;
1739 } *civ, const_iv[] = { 2221 } *civ, const_iv[] = {
1740# define const_iv(name) { # name, (IV)name } 2222# define const_iv(name) { # name, (IV)name }
2223 const_iv (GL_VENDOR),
2224 const_iv (GL_VERSION),
2225 const_iv (GL_EXTENSIONS),
1741 const_iv (GL_COLOR_MATERIAL), 2226 const_iv (GL_COLOR_MATERIAL),
1742 const_iv (GL_SMOOTH), 2227 const_iv (GL_SMOOTH),
1743 const_iv (GL_FLAT), 2228 const_iv (GL_FLAT),
1744 const_iv (GL_DITHER), 2229 const_iv (GL_DITHER),
1745 const_iv (GL_BLEND), 2230 const_iv (GL_BLEND),
1772 const_iv (GL_LUMINANCE), 2257 const_iv (GL_LUMINANCE),
1773 const_iv (GL_LUMINANCE_ALPHA), 2258 const_iv (GL_LUMINANCE_ALPHA),
1774 const_iv (GL_FLOAT), 2259 const_iv (GL_FLOAT),
1775 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2260 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1776 const_iv (GL_COMPILE), 2261 const_iv (GL_COMPILE),
2262 const_iv (GL_PROXY_TEXTURE_1D),
2263 const_iv (GL_PROXY_TEXTURE_2D),
1777 const_iv (GL_TEXTURE_1D), 2264 const_iv (GL_TEXTURE_1D),
1778 const_iv (GL_TEXTURE_2D), 2265 const_iv (GL_TEXTURE_2D),
1779 const_iv (GL_TEXTURE_ENV), 2266 const_iv (GL_TEXTURE_ENV),
1780 const_iv (GL_TEXTURE_MAG_FILTER), 2267 const_iv (GL_TEXTURE_MAG_FILTER),
1781 const_iv (GL_TEXTURE_MIN_FILTER), 2268 const_iv (GL_TEXTURE_MIN_FILTER),
1821# undef const_iv 2308# undef const_iv
1822 }; 2309 };
1823 2310
1824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2311 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2312 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2313
2314 texture_av = newAV ();
2315 AvREAL_off (texture_av);
1826} 2316}
1827 2317
1828char * 2318char *
1829gl_vendor () 2319gl_vendor ()
1830 CODE: 2320 CODE:
1841 2331
1842char * 2332char *
1843gl_extensions () 2333gl_extensions ()
1844 CODE: 2334 CODE:
1845 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2335 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2336 OUTPUT:
2337 RETVAL
2338
2339char *glGetString (GLenum pname)
2340
2341GLint glGetInteger (GLenum pname)
2342 CODE:
2343 glGetIntegerv (pname, &RETVAL);
2344 OUTPUT:
2345 RETVAL
2346
2347GLdouble glGetDouble (GLenum pname)
2348 CODE:
2349 glGetDoublev (pname, &RETVAL);
1846 OUTPUT: 2350 OUTPUT:
1847 RETVAL 2351 RETVAL
1848 2352
1849int glGetError () 2353int glGetError ()
1850 2354
1975 2479
1976void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2480void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1977 2481
1978void glDrawPixels (int width, int height, int format, int type, char *pixels) 2482void glDrawPixels (int width, int height, int format, int type, char *pixels)
1979 2483
2484void glPixelZoom (float x, float y)
2485
1980void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2486void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1981 2487
1982int glGenTexture () 2488int glGenTexture ()
1983 CODE: 2489 CODE:
1984{ 2490 RETVAL = gen_texture ();
1985 GLuint name;
1986 glGenTextures (1, &name);
1987 RETVAL = name;
1988}
1989 OUTPUT: 2491 OUTPUT:
1990 RETVAL 2492 RETVAL
1991 2493
1992void glDeleteTexture (int name) 2494void glDeleteTexture (int name)
1993 CODE: 2495 CODE:
1994{
1995 GLuint name_ = name;
1996 glDeleteTextures (1, &name_); 2496 del_texture (name);
1997} 2497
1998
1999int glGenList () 2498int glGenList ()
2000 CODE: 2499 CODE:
2001 RETVAL = glGenLists (1); 2500 RETVAL = glGenLists (1);
2002 OUTPUT: 2501 OUTPUT:
2003 RETVAL 2502 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines