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.160 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2long _ftol (double); /* defined by VC6 C libs */
3long _ftol2 (double dblSource) { return _ftol (dblSource); }
4# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
5# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
6# include <malloc.h> 4# include <malloc.h>
7# include <windows.h> 5# include <windows.h>
8# include <wininet.h> 6# include <wininet.h>
9# 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>
10#endif 14#endif
11 15
12#include "EXTERN.h" 16#include "EXTERN.h"
13#include "perl.h" 17#include "perl.h"
14#include "XSUB.h" 18#include "XSUB.h"
15 19
16#ifdef _WIN32 20#ifdef _WIN32
17# undef pipe 21# undef pipe
18#endif 22#endif
19 23
24#include <assert.h>
20#include <math.h> 25#include <math.h>
21#include <string.h> 26#include <string.h>
22#include <stdio.h> 27#include <stdio.h>
23#include <stdlib.h> 28#include <stdlib.h>
24 29
39# include <sys/types.h> 44# include <sys/types.h>
40# include <sys/socket.h> 45# include <sys/socket.h>
41# include <netinet/in.h> 46# include <netinet/in.h>
42# include <netinet/tcp.h> 47# include <netinet/tcp.h>
43# include <inttypes.h> 48# include <inttypes.h>
44#else
45 typedef unsigned char uint8_t;
46 typedef unsigned short uint16_t;
47 typedef unsigned int uint32_t;
48 typedef signed char int8_t;
49 typedef signed short int16_t;
50 typedef signed int int32_t;
51#endif 49#endif
52 50
53#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
54 52
55#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
56 54
57#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
58#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
63# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
64#else 62#else
65# define PARACHUTE 0 63# define PARACHUTE 0
66#endif 64#endif
67 65
66static AV *texture_av;
67
68static struct 68static struct
69{ 69{
70#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
71#include "glfunc.h" 71#include "glfunc.h"
72#undef GL_FUNC 72#undef GL_FUNC
73} gl; 73} gl;
74 74
75static void
75static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
76{ 77{
77 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
78 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
79 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
80 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
81 else 82 else
82 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
83} 84}
84 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
85#include "texcache.c" 110#include "texcache.c"
86 111
87#include "pango-font.c" 112#include "pango-font.c"
88#include "pango-fontmap.c" 113#include "pango-fontmap.c"
89#include "pango-render.c" 114#include "pango-render.c"
162 187
163 *w = rect.width; 188 *w = rect.width;
164 *h = rect.height; 189 *h = rect.height;
165} 190}
166 191
192typedef uint16_t tileid;
167typedef uint16_t mapface; 193typedef uint16_t faceid;
168 194
169typedef struct { 195typedef struct {
170 GLint name; 196 int name;
171 int w, h; 197 int w, h;
172 float s, t; 198 float s, t;
173 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
174} maptex; 202} maptex;
175 203
176typedef struct { 204typedef struct {
177 uint32_t player; 205 uint32_t player;
178 mapface face[3]; 206 tileid tile[3];
179 uint16_t darkness; 207 uint16_t darkness;
180 uint8_t stat_width, stat_hp, flags; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
181} mapcell; 209} mapcell;
182 210
183typedef struct { 211typedef struct {
184 int32_t c0, c1; 212 int32_t c0, c1;
185 mapcell *col; 213 mapcell *col;
186} maprow; 214} maprow;
187 215
188typedef struct map { 216typedef struct map {
189 int x, y, w, h; 217 int x, y, w, h;
190 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
191 int faces; 219 int faces; tileid *face2tile; // [faceid]
192 mapface *face; 220 int texs; maptex *tex; // [tileid]
193
194 int texs;
195 maptex *tex;
196 221
197 int32_t rows; 222 int32_t rows;
198 maprow *row; 223 maprow *row;
199} *CFPlus__Map; 224} *CFPlus__Map;
200 225
220 return ptr; 245 return ptr;
221} 246}
222 247
223#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))
224#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}
225 270
226static maprow * 271static maprow *
227map_get_row (CFPlus__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
228{ 273{
229 if (0 > y) 274 if (0 > y)
324 cell->player = 0; 369 cell->player = 0;
325 } 370 }
326 } 371 }
327} 372}
328 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
329static void 390static void
330music_finished (void) 391music_finished (void)
331{ 392{
332 SDL_UserEvent ev; 393 SDL_UserEvent ev;
333 394
366 n |= n >> 8; 427 n |= n >> 8;
367 n |= n >> 16; 428 n |= n >> 16;
368 429
369 return n + 1; 430 return n + 1;
370} 431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
371 436
372MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
373 438
374PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
375 440
379 static const struct { 444 static const struct {
380 const char *name; 445 const char *name;
381 IV iv; 446 IV iv;
382 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
383# 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
384 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
385 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
386 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
387 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
388 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
397 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
398 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
399 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
400 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
401 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
402 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
403 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
404 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
405 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
406 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
461 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
462 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
463 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
464 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
465 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
466 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
467 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
468 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
469 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
470 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
471 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
472 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
473 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
474 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
475 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
476 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
477 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
478 const_iv (KMOD_CTRL),
479 const_iv (KMOD_SHIFT),
480 const_iv (KMOD_ALT),
481 const_iv (KMOD_META)
482# undef const_iv 556# undef const_iv
483 }; 557 };
484 558
485 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; )
486 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);
487} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
488 571
489int 572int
490in_destruct () 573in_destruct ()
491 CODE: 574 CODE:
492 RETVAL = PL_main_cv == Nullcv; 575 RETVAL = PL_main_cv == Nullcv;
563 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
564 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
565 ); 648 );
566 if (RETVAL) 649 if (RETVAL)
567 { 650 {
651 av_clear (texture_av);
652
568 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
569# 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);
570# include "glfunc.h" 655# include "glfunc.h"
571# undef GL_FUNC 656# undef GL_FUNC
657
572 } 658 }
573 OUTPUT: 659 OUTPUT:
574 RETVAL 660 RETVAL
575 661
576void 662void
577SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
578 664
579char * 665char *
580SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
581 667
668int
669SDL_GetAppState ()
670
582void 671void
583SDL_PollEvent () 672poll_events ()
584 PPCODE: 673 PPCODE:
585{ 674{
586 SDL_Event ev; 675 SDL_Event ev;
587 676
588 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
589 { 679 {
590 HV *hv = newHV (); 680 HV *hv = newHV ();
591 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
592 682
593 switch (ev.type) 683 switch (ev.type)
595 case SDL_KEYDOWN: 685 case SDL_KEYDOWN:
596 case SDL_KEYUP: 686 case SDL_KEYUP:
597 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
598 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
599 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 */
600 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
601 break; 692 break;
602 693
603 case SDL_ACTIVEEVENT: 694 case SDL_ACTIVEEVENT:
604 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
605 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
606 break; 697 break;
607 698
608 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
609 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
610
611 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
612 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
613 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
614 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
615 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
616 break; 725 break;
617 726
618 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
619 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
620 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
649Mix_AllocateChannels (int numchans = -1) 758Mix_AllocateChannels (int numchans = -1)
650 759
651void 760void
652lowdelay (int fd, int val = 1) 761lowdelay (int fd, int val = 1)
653 CODE: 762 CODE:
654#ifndef _WIN32
655 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
656#endif
657 764
658void 765void
659win32_proxy_info () 766win32_proxy_info ()
660 PPCODE: 767 PPCODE:
661{ 768{
796 _exit (1); 903 _exit (1);
797 904
798void 905void
799_exit (int retval = 0) 906_exit (int retval = 0)
800 CODE: 907 CODE:
908#ifdef WIN32
909 ExitThread (retval); // unclean, please beam me up
910#else
801 _exit (retval); 911 _exit (retval);
912#endif
913
914void
915debug ()
916 CODE:
917{
918#if DEBUG
919 VALGRIND_DO_LEAK_CHECK;
920#endif
921}
802 922
803MODULE = CFPlus PACKAGE = CFPlus::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
804 924
805CFPlus::Font 925CFPlus::Font
806new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
1053xy_to_index (CFPlus::Layout self, int x, int y) 1173xy_to_index (CFPlus::Layout self, int x, int y)
1054 CODE: 1174 CODE:
1055{ 1175{
1056 int index, trailing; 1176 int index, trailing;
1057 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);
1058 RETVAL = index; 1178 RETVAL = index + trailing;
1059} 1179}
1060 OUTPUT: 1180 OUTPUT:
1061 RETVAL 1181 RETVAL
1062 1182
1063void 1183void
1069 1189
1070 EXTEND (SP, 3); 1190 EXTEND (SP, 3);
1071 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1191 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1072 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1073 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 }
1074} 1233}
1075 1234
1076void 1235void
1077render (CFPlus::Layout self, float x, float y, int flags = 0) 1236render (CFPlus::Layout self, float x, float y, int flags = 0)
1078 PPCODE: 1237 PPCODE:
1083 flags 1242 flags
1084 ); 1243 );
1085 1244
1086MODULE = CFPlus PACKAGE = CFPlus::Texture 1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1087 1246
1247int minpot (int n)
1248
1088void 1249void
1089pad2pot (SV *data_, SV *w_, SV *h_) 1250pad2pot (SV *data_, SV *w_, SV *h_)
1090 CODE: 1251 CODE:
1091{ 1252{
1092 int ow = SvIV (w_); 1253 int ow = SvIV (w_);
1169 glDisable (GL_ALPHA_TEST); 1330 glDisable (GL_ALPHA_TEST);
1170 glDisable (GL_BLEND); 1331 glDisable (GL_BLEND);
1171 } 1332 }
1172} 1333}
1173 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
1174MODULE = CFPlus PACKAGE = CFPlus::Map 1346MODULE = CFPlus PACKAGE = CFPlus::Map
1175 1347
1176CFPlus::Map 1348CFPlus::Map
1177new (SV *class, int map_width, int map_height) 1349new (SV *class)
1178 CODE: 1350 CODE:
1179 New (0, RETVAL, 1, struct map); 1351 New (0, RETVAL, 1, struct map);
1180 RETVAL->x = 0; 1352 RETVAL->x = 0;
1181 RETVAL->y = 0; 1353 RETVAL->y = 0;
1182 RETVAL->w = map_width; 1354 RETVAL->w = 0;
1183 RETVAL->h = map_height; 1355 RETVAL->h = 0;
1184 RETVAL->ox = 0; 1356 RETVAL->ox = 0;
1185 RETVAL->oy = 0; 1357 RETVAL->oy = 0;
1186 RETVAL->faces = 8192; 1358 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1187 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1359 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1188 RETVAL->texs = 8192;
1189 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1190 RETVAL->rows = 0; 1360 RETVAL->rows = 0;
1191 RETVAL->row = 0; 1361 RETVAL->row = 0;
1192 OUTPUT: 1362 OUTPUT:
1193 RETVAL 1363 RETVAL
1194 1364
1195void 1365void
1196DESTROY (CFPlus::Map self) 1366DESTROY (CFPlus::Map self)
1197 CODE: 1367 CODE:
1198{ 1368{
1199 map_clear (self); 1369 map_clear (self);
1200 Safefree (self->face); 1370 Safefree (self->face2tile);
1201 Safefree (self->tex); 1371 Safefree (self->tex);
1202 Safefree (self); 1372 Safefree (self);
1203} 1373}
1204 1374
1205void 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
1206clear (CFPlus::Map self) 1382clear (CFPlus::Map self)
1207 CODE: 1383 CODE:
1208 map_clear (self); 1384 map_clear (self);
1209 1385
1210void 1386void
1211set_face (CFPlus::Map self, int face, int texid) 1387set_tileid (CFPlus::Map self, int face, int tile)
1212 CODE: 1388 CODE:
1213{ 1389{
1214 while (self->faces <= face) 1390 need_facenum (self, face); self->face2tile [face] = tile;
1215 { 1391 need_texid (self, tile);
1216 Append (mapface, self->face, self->faces, self->faces); 1392}
1217 self->faces *= 2;
1218 }
1219 1393
1220 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;
1221} 1415}
1222 1416
1223void 1417void
1224set_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)
1225 CODE: 1419 CODE:
1226{ 1420{
1227 while (self->texs <= texid) 1421 need_texid (self, texid);
1228 {
1229 Append (maptex, self->tex, self->texs, self->texs);
1230 self->texs *= 2;
1231 }
1232 1422
1233 { 1423 {
1234 maptex *tex = self->tex + texid; 1424 maptex *tex = self->tex + texid;
1235 1425
1236 tex->name = name; 1426 tex->name = name;
1280 CODE: 1470 CODE:
1281{ 1471{
1282 if (dx > 0) 1472 if (dx > 0)
1283 map_blank (self, self->x, self->y, dx, self->h); 1473 map_blank (self, self->x, self->y, dx, self->h);
1284 else if (dx < 0) 1474 else if (dx < 0)
1285 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1475 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1286 1476
1287 if (dy > 0) 1477 if (dy > 0)
1288 map_blank (self, self->x, self->y, self->w, dy); 1478 map_blank (self, self->x, self->y, self->w, dy);
1289 else if (dy < 0) 1479 else if (dy < 0)
1290 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1480 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1291 1481
1292 self->ox += dx; self->x += dx; 1482 self->ox += dx; self->x += dx;
1293 self->oy += dy; self->y += dy; 1483 self->oy += dy; self->y += dy;
1294 1484
1295 while (self->y < 0) 1485 while (self->y < 0)
1347 cell->stat_width = 1; 1537 cell->stat_width = 1;
1348 cell->stat_hp = *data++; 1538 cell->stat_hp = *data++;
1349 } 1539 }
1350 else if (cmd == 6) // monster width 1540 else if (cmd == 6) // monster width
1351 cell->stat_width = *data++ + 1; 1541 cell->stat_width = *data++ + 1;
1352 else if (cmd == 0x47) // monster width 1542 else if (cmd == 0x47)
1353 { 1543 {
1354 if (*data == 4) 1544 if (*data == 4)
1355 ; // decode player tag 1545 ; // decode player count
1356 1546
1357 data += *data + 1; 1547 data += *data + 1;
1358 } 1548 }
1359 else if (cmd == 8) // cell flags 1549 else if (cmd == 8) // cell flags
1360 cell->flags = *data++; 1550 cell->flags = *data++;
1369 cell->darkness = *data++ + 1; 1559 cell->darkness = *data++ + 1;
1370 } 1560 }
1371 1561
1372 if (flags & 4) 1562 if (flags & 4)
1373 { 1563 {
1374 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];
1375 } 1567 }
1376 1568
1377 if (flags & 2) 1569 if (flags & 2)
1378 { 1570 {
1379 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];
1380 } 1574 }
1381 1575
1382 if (flags & 1) 1576 if (flags & 1)
1383 { 1577 {
1384 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];
1385 } 1581 }
1386 } 1582 }
1387 else 1583 else
1388 cell->darkness = 0; 1584 cell->darkness = 0;
1389 } 1585 }
1419 { 1615 {
1420 mapcell *cell = row->col + (x - row->c0); 1616 mapcell *cell = row->col + (x - row->c0);
1421 1617
1422 for (z = 0; z <= 0; z++) 1618 for (z = 0; z <= 0; z++)
1423 { 1619 {
1424 mapface face = cell->face [z];
1425
1426 if (face)
1427 {
1428 maptex tex = self->tex [face]; 1620 maptex tex = self->tex [cell->tile [z]];
1429 int a0 = 255 - tex.a; 1621 int a0 = 255 - tex.a;
1430 int a1 = tex.a; 1622 int a1 = tex.a;
1431 1623
1432 r = (r * a0 + tex.r * a1) / 255; 1624 r = (r * a0 + tex.r * a1) / 255;
1433 g = (g * a0 + tex.g * a1) / 255; 1625 g = (g * a0 + tex.g * a1) / 255;
1434 b = (b * a0 + tex.b * a1) / 255; 1626 b = (b * a0 + tex.b * a1) / 255;
1435 a = (a * a0 + tex.a * a1) / 255; 1627 a = (a * a0 + tex.a * a1) / 255;
1436 }
1437 } 1628 }
1438 } 1629 }
1439 1630
1440 *map++ = (r ) 1631 *map++ = (r )
1441 | (g << 8) 1632 | (g << 8)
1448} 1639}
1449 OUTPUT: 1640 OUTPUT:
1450 RETVAL 1641 RETVAL
1451 1642
1452void 1643void
1453draw (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)
1454 CODE: 1645 CODE:
1455{ 1646{
1456 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;
1457 int x, y, z; 1651 int x, y, z;
1458 int last_name; 1652 int last_name;
1459 mapface face;
1460 1653
1461 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1654 // thats current max. sorry.
1462 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1655 if (sw > 255) sw = 255;
1656 if (sh > 255) sh = 255;
1463 1657
1464 /* 1658 // clear key, in case of extra padding
1465 int vx = self->vx = self->w >= sw 1659 memset (&skey, 0, sizeof (skey));
1466 ? self->x + (self->w - sw) / 2
1467 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1468
1469 int vy = self->vy = self->h >= sh
1470 ? self->y + (self->h - sh) / 2
1471 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1472 */
1473 1660
1474 glColor4ub (255, 255, 255, 255); 1661 glColor4ub (255, 255, 255, 255);
1475 1662
1476 glEnable (GL_BLEND); 1663 glEnable (GL_BLEND);
1477 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1664 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1480 1667
1481 glBegin (GL_QUADS); 1668 glBegin (GL_QUADS);
1482 1669
1483 last_name = 0; 1670 last_name = 0;
1484 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
1485 for (z = 0; z < 3; z++) 1697 for (z = 0; z <= 2; z++)
1698 {
1699 memset (smooth_level, 0, sizeof (smooth_level));
1700
1486 for (y = 0; y < sh; y++) 1701 for (y = 0; y < sh; y++)
1487 if (0 <= y + vy && y + vy < self->rows) 1702 if (0 <= y + my && y + my < self->rows)
1488 { 1703 {
1489 maprow *row = self->row + (y + vy); 1704 maprow *row = self->row + (y + my);
1490 1705
1491 for (x = 0; x < sw; x++) 1706 for (x = 0; x < sw; x++)
1492 if (row->c0 <= x + vx && x + vx < row->c1) 1707 if (row->c0 <= x + mx && x + mx < row->c1)
1493 { 1708 {
1494 mapcell *cell = row->col + (x + vx - row->c0); 1709 mapcell *cell = row->col + (x + mx - row->c0);
1495
1496 face = cell->face [z]; 1710 tileid tile = cell->tile [z];
1711
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;
1497 1717
1498 if (face && face < self->texs) 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))
1499 { 1807 {
1500 maptex tex = self->tex [face]; 1808 int level = (w << 5) | b;
1501 int px = (x + 1) * 32 - tex.w; 1809 HE *he;
1502 int py = (y + 1) * 32 - tex.h;
1503 1810
1504 if (last_name != tex.name) 1811 hv_iterinit (smooth);
1812 while ((he = hv_iternext (smooth)))
1505 { 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
1506 glEnd (); 1836 glEnd ();
1507 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1837 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1508 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 }
1509 } 1860 }
1510
1511 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1512 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1513 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1514 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1515 }
1516
1517 if (cell->flags && z == 2)
1518 {
1519 if (cell->flags & 1)
1520 {
1521 maptex tex = self->tex [1];
1522 int px = (x + 1) * 32 - tex.w + 2;
1523 int py = (y + 1) * 32 - tex.h - 6;
1524
1525 glEnd ();
1526 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1527 glBegin (GL_QUADS);
1528
1529 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1530 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1531 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1532 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1533 } 1861 }
1534 } 1862 }
1535 }
1536 } 1863 }
1864 }
1865
1866 hv_clear (smooth);
1867 }
1537 1868
1538 glEnd (); 1869 glEnd ();
1539 1870
1540 glDisable (GL_TEXTURE_2D); 1871 glDisable (GL_TEXTURE_2D);
1541 glDisable (GL_BLEND); 1872 glDisable (GL_BLEND);
1542 1873
1543 // top layer: overlays such as the health bar 1874 // top layer: overlays such as the health bar
1544 for (y = 0; y < sh; y++) 1875 for (y = 0; y < sh; y++)
1545 if (0 <= y + vy && y + vy < self->rows) 1876 if (0 <= y + my && y + my < self->rows)
1546 { 1877 {
1547 maprow *row = self->row + (y + vy); 1878 maprow *row = self->row + (y + my);
1548 1879
1549 for (x = 0; x < sw; x++) 1880 for (x = 0; x < sw; x++)
1550 if (row->c0 <= x + vx && x + vx < row->c1) 1881 if (row->c0 <= x + mx && x + mx < row->c1)
1551 { 1882 {
1552 mapcell *cell = row->col + (x + vx - row->c0); 1883 mapcell *cell = row->col + (x + mx - row->c0);
1553 1884
1554 int px = x * 32; 1885 int px = x * T;
1555 int py = y * 32; 1886 int py = y * T;
1556 1887
1557 if (cell->stat_hp) 1888 if (cell->stat_hp)
1558 { 1889 {
1559 int width = cell->stat_width * 32; 1890 int width = cell->stat_width * T;
1560 int thick = sh / 28 + 1 + cell->stat_width; 1891 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1561 1892
1562 glColor3ub (0, 0, 0); 1893 glColor3ub (0, 0, 0);
1563 glRectf (px + 1, py - thick - 2, 1894 glRectf (px + 1, py - thick - 2,
1564 px + width - 1, py); 1895 px + width - 1, py);
1565 1896
1631 glDisable (GL_BLEND); 1962 glDisable (GL_BLEND);
1632 glDisable (GL_TEXTURE_2D); 1963 glDisable (GL_TEXTURE_2D);
1633} 1964}
1634 1965
1635void 1966void
1636fow_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)
1637 PPCODE: 1968 PPCODE:
1638{ 1969{
1639 int vx, vy;
1640 int x, y; 1970 int x, y;
1641 int sw4 = (sw + 3) & ~3; 1971 int sw4 = (sw + 3) & ~3;
1642 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1972 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1643 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1973 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1644 1974
1645 memset (darkness, 255, sw4 * sh); 1975 memset (darkness, 255, sw4 * sh);
1646 SvPOK_only (darkness_sv); 1976 SvPOK_only (darkness_sv);
1647 SvCUR_set (darkness_sv, sw4 * sh); 1977 SvCUR_set (darkness_sv, sw4 * sh);
1648 1978
1649 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1979 mx += self->x;
1650 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1980 my += self->y;
1651 1981
1652 for (y = 0; y < sh; y++) 1982 for (y = 0; y < sh; y++)
1653 if (0 <= y + vy && y + vy < self->rows) 1983 if (0 <= y + my && y + my < self->rows)
1654 { 1984 {
1655 maprow *row = self->row + (y + vy); 1985 maprow *row = self->row + (y + my);
1656 1986
1657 for (x = 0; x < sw; x++) 1987 for (x = 0; x < sw; x++)
1658 if (row->c0 <= x + vx && x + vx < row->c1) 1988 if (row->c0 <= x + mx && x + mx < row->c1)
1659 { 1989 {
1660 mapcell *cell = row->col + (x + vx - row->c0); 1990 mapcell *cell = row->col + (x + mx - row->c0);
1661 1991
1662 darkness[y * sw4 + x] = cell->darkness 1992 darkness[y * sw4 + x] = cell->darkness
1663 ? 255 - (cell->darkness - 1) 1993 ? 255 - (cell->darkness - 1)
1664 : 255 - FOW_DARKNESS; 1994 : 255 - FOW_DARKNESS;
1665 } 1995 }
1705 if (row && row->c0 <= x && x < row->c1) 2035 if (row && row->c0 <= x && x < row->c1)
1706 { 2036 {
1707 mapcell *cell = row->col + (x - row->c0); 2037 mapcell *cell = row->col + (x - row->c0);
1708 uint8_t flags = 0; 2038 uint8_t flags = 0;
1709 2039
1710 if (cell->face [0]) flags |= 1; 2040 if (cell->tile [0]) flags |= 1;
1711 if (cell->face [1]) flags |= 2; 2041 if (cell->tile [1]) flags |= 2;
1712 if (cell->face [2]) flags |= 4; 2042 if (cell->tile [2]) flags |= 4;
1713 2043
1714 *data++ = flags; 2044 *data++ = flags;
1715 2045
1716 if (flags & 1) 2046 if (flags & 1)
1717 { 2047 {
2048 tileid tile = cell->tile [0];
1718 *data++ = cell->face [0] >> 8; 2049 *data++ = tile >> 8;
1719 *data++ = cell->face [0]; 2050 *data++ = tile;
1720 } 2051 }
1721 2052
1722 if (flags & 2) 2053 if (flags & 2)
1723 { 2054 {
2055 tileid tile = cell->tile [1];
1724 *data++ = cell->face [1] >> 8; 2056 *data++ = tile >> 8;
1725 *data++ = cell->face [1]; 2057 *data++ = tile;
1726 } 2058 }
1727 2059
1728 if (flags & 4) 2060 if (flags & 4)
1729 { 2061 {
2062 tileid tile = cell->tile [2];
1730 *data++ = cell->face [2] >> 8; 2063 *data++ = tile >> 8;
1731 *data++ = cell->face [2]; 2064 *data++ = tile;
1732 } 2065 }
1733 } 2066 }
1734 else 2067 else
1735 *data++ = 0; 2068 *data++ = 0;
1736 } 2069 }
1776 { 2109 {
1777 uint8_t flags = *data++; 2110 uint8_t flags = *data++;
1778 2111
1779 if (flags) 2112 if (flags)
1780 { 2113 {
1781 mapface face[3] = { 0, 0, 0 };
1782
1783 mapcell *cell = row_get_cell (row, x); 2114 mapcell *cell = row_get_cell (row, x);
2115 tileid tile[3] = { 0, 0, 0 };
1784 2116
1785 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2117 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1786 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2118 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1787 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2119 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1788 2120
1789 if (cell->darkness == 0) 2121 if (cell->darkness == 0)
1790 { 2122 {
1791 cell->darkness = 0; 2123 cell->darkness = 0;
1792 2124
1793 for (z = 0; z <= 2; z++) 2125 for (z = 0; z <= 2; z++)
1794 { 2126 {
1795 cell->face[z] = face[z]; 2127 tileid t = tile [z];
1796 2128
1797 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2129 if (t >= self->texs || (t && !self->tex [t].name))
2130 {
1798 XPUSHs (sv_2mortal (newSViv (face[z]))); 2131 XPUSHs (sv_2mortal (newSViv (t)));
2132 need_texid (self, t);
2133 }
2134
2135 cell->tile [z] = t;
1799 } 2136 }
1800 } 2137 }
1801 } 2138 }
1802 } 2139 }
1803 } 2140 }
1838 CODE: 2175 CODE:
1839 RETVAL = Mix_VolumeMusic (volume); 2176 RETVAL = Mix_VolumeMusic (volume);
1840 OUTPUT: 2177 OUTPUT:
1841 RETVAL 2178 RETVAL
1842 2179
2180int
2181fade_out (int ms)
2182 CODE:
2183 RETVAL = Mix_FadeOutMusic (ms);
2184 OUTPUT:
2185 RETVAL
2186
1843CFPlus::MixMusic 2187CFPlus::MixMusic
1844new_from_file (SV *class, char *path) 2188new_from_file (SV *class, char *path)
1845 CODE: 2189 CODE:
1846 RETVAL = Mix_LoadMUS (path); 2190 RETVAL = Mix_LoadMUS (path);
1847 OUTPUT: 2191 OUTPUT:
1854 2198
1855int 2199int
1856play (CFPlus::MixMusic self, int loops = -1) 2200play (CFPlus::MixMusic self, int loops = -1)
1857 CODE: 2201 CODE:
1858 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);
1859 OUTPUT: 2210 OUTPUT:
1860 RETVAL 2211 RETVAL
1861 2212
1862MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2213MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1863 2214
1867 static const struct { 2218 static const struct {
1868 const char *name; 2219 const char *name;
1869 IV iv; 2220 IV iv;
1870 } *civ, const_iv[] = { 2221 } *civ, const_iv[] = {
1871# 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),
1872 const_iv (GL_COLOR_MATERIAL), 2226 const_iv (GL_COLOR_MATERIAL),
1873 const_iv (GL_SMOOTH), 2227 const_iv (GL_SMOOTH),
1874 const_iv (GL_FLAT), 2228 const_iv (GL_FLAT),
1875 const_iv (GL_DITHER), 2229 const_iv (GL_DITHER),
1876 const_iv (GL_BLEND), 2230 const_iv (GL_BLEND),
1903 const_iv (GL_LUMINANCE), 2257 const_iv (GL_LUMINANCE),
1904 const_iv (GL_LUMINANCE_ALPHA), 2258 const_iv (GL_LUMINANCE_ALPHA),
1905 const_iv (GL_FLOAT), 2259 const_iv (GL_FLOAT),
1906 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2260 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1907 const_iv (GL_COMPILE), 2261 const_iv (GL_COMPILE),
2262 const_iv (GL_PROXY_TEXTURE_1D),
2263 const_iv (GL_PROXY_TEXTURE_2D),
1908 const_iv (GL_TEXTURE_1D), 2264 const_iv (GL_TEXTURE_1D),
1909 const_iv (GL_TEXTURE_2D), 2265 const_iv (GL_TEXTURE_2D),
1910 const_iv (GL_TEXTURE_ENV), 2266 const_iv (GL_TEXTURE_ENV),
1911 const_iv (GL_TEXTURE_MAG_FILTER), 2267 const_iv (GL_TEXTURE_MAG_FILTER),
1912 const_iv (GL_TEXTURE_MIN_FILTER), 2268 const_iv (GL_TEXTURE_MIN_FILTER),
1952# undef const_iv 2308# undef const_iv
1953 }; 2309 };
1954 2310
1955 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; )
1956 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);
1957} 2316}
1958 2317
1959char * 2318char *
1960gl_vendor () 2319gl_vendor ()
1961 CODE: 2320 CODE:
1972 2331
1973char * 2332char *
1974gl_extensions () 2333gl_extensions ()
1975 CODE: 2334 CODE:
1976 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);
1977 OUTPUT: 2350 OUTPUT:
1978 RETVAL 2351 RETVAL
1979 2352
1980int glGetError () 2353int glGetError ()
1981 2354
2106 2479
2107void 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)
2108 2481
2109void glDrawPixels (int width, int height, int format, int type, char *pixels) 2482void glDrawPixels (int width, int height, int format, int type, char *pixels)
2110 2483
2484void glPixelZoom (float x, float y)
2485
2111void 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)
2112 2487
2113int glGenTexture () 2488int glGenTexture ()
2114 CODE: 2489 CODE:
2115{ 2490 RETVAL = gen_texture ();
2116 GLuint name;
2117 glGenTextures (1, &name);
2118 RETVAL = name;
2119}
2120 OUTPUT: 2491 OUTPUT:
2121 RETVAL 2492 RETVAL
2122 2493
2123void glDeleteTexture (int name) 2494void glDeleteTexture (int name)
2124 CODE: 2495 CODE:
2125{
2126 GLuint name_ = name;
2127 glDeleteTextures (1, &name_); 2496 del_texture (name);
2128} 2497
2129
2130int glGenList () 2498int glGenList ()
2131 CODE: 2499 CODE:
2132 RETVAL = glGenLists (1); 2500 RETVAL = glGenLists (1);
2133 OUTPUT: 2501 OUTPUT:
2134 RETVAL 2502 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines