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.236 by root, Mon Oct 8 16:10:14 2007 UTC vs.
Revision 1.318 by root, Wed Dec 24 06:12:21 2014 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
73 123
74static AV *texture_av; 124static AV *texture_av;
75 125
76static struct 126static struct
77{ 127{
… …
120 170
121#include "pango-font.c" 171#include "pango-font.c"
122#include "pango-fontmap.c" 172#include "pango-fontmap.c"
123#include "pango-render.c" 173#include "pango-render.c"
124 174
125typedef IV CFPlus__Channel; 175typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 176typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 177typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 178typedef Mix_Music *DC__MixMusic;
129 179
130typedef PangoFontDescription *CFPlus__Font; 180typedef PangoFontDescription *DC__Font;
131 181
132static int 182static int
133shape_attr_p (PangoLayoutRun *run) 183shape_attr_p (PangoLayoutRun *run)
134{ 184{
135 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
… …
149 199
150typedef struct cf_layout { 200typedef struct cf_layout {
151 PangoLayout *pl; 201 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 202 float r, g, b, a; // default color for rgba mode
153 int base_height; 203 int base_height;
154 CFPlus__Font font; 204 DC__Font font;
155 rc_t *rc; 205 rc_t *rc;
156} *CFPlus__Layout; 206} *DC__Layout;
157 207
158static CFPlus__Font default_font; 208static DC__Font default_font;
159static PangoContext *opengl_context; 209static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
161 211
162static void 212static void
163substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
… …
168#endif 218#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 220}
171 221
172static void 222static void
173layout_update_font (CFPlus__Layout self) 223layout_update_font (DC__Layout self)
174{ 224{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 225 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
177 */ 227 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
179 229
180 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 232
183 pango_layout_set_font_description (self->pl, font); 233 pango_layout_set_font_description (self->pl, font);
184} 234}
185 235
186static void 236static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 237layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 238{
189 PangoRectangle rect; 239 PangoRectangle rect;
190 240
191 // get_pixel_* wrongly rounds down 241 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 242 pango_layout_get_extents (self->pl, 0, &rect);
… …
209 int w, h; 259 int w, h;
210 float s, t; 260 float s, t;
211 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
212 tileid smoothtile; 262 tileid smoothtile;
213 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
214} maptex; 265} maptex;
215 266
216typedef struct { 267typedef struct {
217 uint32_t player; 268 uint32_t player;
218 tileid tile[3]; 269 tileid tile[3];
… …
231 int faces; tileid *face2tile; // [faceid] 282 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 283 int texs; maptex *tex; // [tileid]
233 284
234 int32_t rows; 285 int32_t rows;
235 maprow *row; 286 maprow *row;
236} *CFPlus__Map; 287} *DC__Map;
237 288
238static char * 289static char *
239prepend (char *ptr, int sze, int inc) 290prepend (char *ptr, int sze, int inc)
240{ 291{
241 char *p; 292 char *p;
… …
279 self->texs *= 2; 330 self->texs *= 2;
280 } 331 }
281} 332}
282 333
283static maprow * 334static maprow *
284map_get_row (CFPlus__Map self, int y) 335map_get_row (DC__Map self, int y)
285{ 336{
286 if (0 > y) 337 if (0 > y)
287 { 338 {
288 int extend = - y + MAP_EXTEND_Y; 339 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 340 Prepend (maprow, self->row, self->rows, extend);
… …
327 378
328 return row->col + (x - row->c0); 379 return row->col + (x - row->c0);
329} 380}
330 381
331static mapcell * 382static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 383map_get_cell (DC__Map self, int x, int y)
333{ 384{
334 return row_get_cell (map_get_row (self, y), x); 385 return row_get_cell (map_get_row (self, y), x);
335} 386}
336 387
337static void 388static void
338map_clear (CFPlus__Map self) 389map_clear (DC__Map self)
339{ 390{
340 int r; 391 int r;
341 392
342 for (r = 0; r < self->rows; r++) 393 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 394 Safefree (self->row[r].col);
… …
350 self->oy = 0; 401 self->oy = 0;
351 self->row = 0; 402 self->row = 0;
352 self->rows = 0; 403 self->rows = 0;
353} 404}
354 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
355static void 416static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 418{
358 int x, y; 419 int x, y;
359 maprow *row; 420 maprow *row;
360 mapcell *cell; 421 mapcell *cell;
361 422
… …
373 if (x >= row->c1) 434 if (x >= row->c1)
374 break; 435 break;
375 436
376 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
377 438
378 cell->darkness = 0; 439 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 440 }
383 } 441 }
384} 442}
385 443
386typedef struct { 444typedef struct {
… …
421 ev.code = 1; 479 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 481 ev.data2 = 0;
424 482
425 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
426} 490}
427 491
428static unsigned int 492static unsigned int
429minpot (unsigned int n) 493minpot (unsigned int n)
430{ 494{
… …
498 return 0; 562 return 0;
499 563
500 return 1; 564 return 1;
501} 565}
502 566
503MODULE = CFPlus PACKAGE = CFPlus 567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main (SV *real_main)
583{
584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
588}
589
590#ifdef __MACOSX__
591 static SV *real_main;
592
593 /* to due surprising braindamage on the side of SDL design, we
594 * do some mind-boggling hack here: SDL requires a custom main()
595 * on OS X, so... we provide one and call the original main(), which,
596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
597 * and which calls our main (== SDL_main) back.
598 */
599 extern C_LINKAGE int
600 main (int argc, char *argv[])
601 {
602 deliantra_main (real_main);
603 }
604
605 #undef main
606
607 extern C_LINKAGE int main (int argc, char *argv[]);
608
609 static void
610 SDL_main_hack (SV *real_main_)
611 {
612 real_main = real_main_;
613
614 char *argv[] = { "deliantra client", 0 };
615 (main) (1, argv);
616 }
617#else
618 static void
619 SDL_main_hack (SV *real_main)
620 {
621 deliantra_main (real_main);
622 }
623#endif
624
625MODULE = Deliantra::Client PACKAGE = DC
504 626
505PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
506 628
507BOOT: 629BOOT:
508{ 630{
509 HV *stash = gv_stashpv ("CFPlus", 1); 631 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 632 static const struct {
511 const char *name; 633 const char *name;
512 IV iv; 634 IV iv;
513 } *civ, const_iv[] = { 635 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 636# define const_iv(name) { # name, (IV)name }
… …
535 const_iv (SDL_USEREVENT), 657 const_iv (SDL_USEREVENT),
536 658
537 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
540 712
541 const_iv (SDLK_FIRST), 713 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 714 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
624 796
797 const_iv (KMOD_LRAM),
798
625 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
800
801 const_iv (SDL_INIT_TIMER),
802 const_iv (SDL_INIT_AUDIO),
803 const_iv (SDL_INIT_VIDEO),
804 const_iv (SDL_INIT_CDROM),
805 const_iv (SDL_INIT_JOYSTICK),
806 const_iv (SDL_INIT_EVERYTHING),
807 const_iv (SDL_INIT_NOPARACHUTE),
808 const_iv (SDL_INIT_EVENTTHREAD),
809
810 const_iv (SDL_GL_RED_SIZE),
811 const_iv (SDL_GL_GREEN_SIZE),
812 const_iv (SDL_GL_BLUE_SIZE),
813 const_iv (SDL_GL_ALPHA_SIZE),
814 const_iv (SDL_GL_DOUBLEBUFFER),
815 const_iv (SDL_GL_BUFFER_SIZE),
816 const_iv (SDL_GL_DEPTH_SIZE),
817 const_iv (SDL_GL_STENCIL_SIZE),
818 const_iv (SDL_GL_ACCUM_RED_SIZE),
819 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
820 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
821 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
822 const_iv (SDL_GL_STEREO),
823 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
824 const_iv (SDL_GL_MULTISAMPLESAMPLES),
825 const_iv (SDL_GL_ACCELERATED_VISUAL),
826 const_iv (SDL_GL_SWAP_CONTROL),
827
828 const_iv (FOW_DARKNESS)
626# undef const_iv 829# undef const_iv
627 }; 830 };
628 831
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 834
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 837}
635 838
… …
652 855
653IV minpot (UV n) 856IV minpot (UV n)
654 857
655IV popcount (UV n) 858IV popcount (UV n)
656 859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
865
657void 866void
658pango_init () 867pango_init ()
659 CODE: 868 CODE:
660{ 869{
661 opengl_fontmap = pango_opengl_font_map_new (); 870 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 871 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 872 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
873 /*pango_context_set_font_description (opengl_context, default_font);*/
874#if PANGO_VERSION_CHECK (1, 15, 2)
875 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
876 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
877#endif
664} 878}
665 879
666char *
667SDL_GetError () 880char *SDL_GetError ()
668 881
669int 882void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
671 884
672void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
673SDL_Quit () 891void SDL_Quit ()
892
893int SDL_GL_SetAttribute (int attr, int value)
894
895int SDL_GL_GetAttribute (int attr)
896 CODE:
897 if (SDL_GL_GetAttribute (attr, &RETVAL))
898 XSRETURN_UNDEF;
899 OUTPUT:
900 RETVAL
674 901
675void 902void
676SDL_ListModes (int rgb, int alpha) 903SDL_ListModes (int rgb, int alpha)
677 PPCODE: 904 PPCODE:
678{ 905{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 917 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 920
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 921 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 922 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 923
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 924 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 925
702 if (m && m != (SDL_Rect **)-1) 926 if (m && m != (SDL_Rect **)-1)
703 while (*m) 927 while (*m)
704 { 928 {
705 if ((*m)->w >= 640 && (*m)->h >= 480) 929 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 930 {
707 AV *av = newAV (); 931 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 932 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 933 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 934 av_push (av, newSViv (rgb));
… …
733 ); 957 );
734 958
735 if (RETVAL) 959 if (RETVAL)
736 { 960 {
737 av_clear (texture_av); 961 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 963#include "glfunc.h"
742#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 967 }
744} 968}
745 OUTPUT: 969 OUTPUT:
746 RETVAL 970 RETVAL
747 971
748void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
749SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
750 977
751char * 978char *
752SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
753 980
754int 981int
755SDL_GetAppState () 982SDL_GetAppState ()
756 983
984int
985SDL_GetModState ()
986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
757void 991void
992SDL_PumpEvents ()
993
994void
758poll_events () 995peep_events ()
759 PPCODE: 996 PPCODE:
760{ 997{
761 SDL_Event ev; 998 SDL_Event ev;
762 999
763 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
… …
770 { 1007 {
771 case SDL_KEYDOWN: 1008 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1009 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1011 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1012 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1013 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1014 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1015 break;
779 1016
780 case SDL_ACTIVEEVENT: 1017 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1018 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 1036 x = ev.motion.x;
800 y = ev.motion.y; 1037 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1038 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1039 }
803 1040
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1041 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1042 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1043 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1044 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1045 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1046 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1047 }
811 break; 1048 break;
812 1049
813 case SDL_MOUSEBUTTONDOWN: 1050 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1051 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1052 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1053
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1054 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1055 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1056 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1057 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1062 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1063 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1064 break;
828 } 1065 }
829 1066
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1067 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1068 }
832} 1069}
1070
1071char *
1072SDL_AudioDriverName ()
1073 CODE:
1074{
1075 char buf [256];
1076 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1077 XSRETURN_UNDEF;
1078
1079 RETVAL = buf;
1080}
1081 OUTPUT:
1082 RETVAL
833 1083
834int 1084int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1085Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1086 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
… …
894 } 1144 }
895 } 1145 }
896#endif 1146#endif
897} 1147}
898 1148
899void 1149int
900add_font (char *file) 1150add_font (char *file)
901 CODE: 1151 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1153 OUTPUT:
1154 RETVAL
1155
1156void
1157IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1158
1159# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1160void
1161Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
903 1162
904void 1163void
905load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
906 ALIAS: 1165 ALIAS:
907 load_image_file = 1 1166 load_image_file = 1
… …
993void 1252void
994error (char *message) 1253error (char *message)
995 CODE: 1254 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1255 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1256#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1257 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1258#endif
1000 1259
1001void 1260void
1002fatal (char *message) 1261fatal (char *message)
1003 CODE: 1262 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1263 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1264#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1265 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1266#endif
1008 _exit (1); 1267 _exit (1);
1009 1268
1010void 1269void
1011_exit (int retval = 0) 1270_exit (int retval = 0)
… …
1023#if DEBUG 1282#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1283 VALGRIND_DO_LEAK_CHECK;
1025#endif 1284#endif
1026} 1285}
1027 1286
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1287int
1288SvREFCNT (SV *sv)
1289 CODE:
1290 RETVAL = SvREFCNT (sv);
1291 OUTPUT:
1292 RETVAL
1293
1294MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1295
1030PROTOTYPES: DISABLE 1296PROTOTYPES: DISABLE
1031 1297
1032CFPlus::Font 1298DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1299new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1300 CODE:
1035{ 1301{
1036 int count; 1302 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1303 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1040} 1306}
1041 OUTPUT: 1307 OUTPUT:
1042 RETVAL 1308 RETVAL
1043 1309
1044void 1310void
1045DESTROY (CFPlus::Font self) 1311DESTROY (DC::Font self)
1046 CODE: 1312 CODE:
1047 pango_font_description_free (self); 1313 pango_font_description_free (self);
1048 1314
1049void 1315void
1050make_default (CFPlus::Font self) 1316make_default (DC::Font self)
1051 PROTOTYPE: $ 1317 PROTOTYPE: $
1052 CODE: 1318 CODE:
1053 default_font = self; 1319 default_font = self;
1054 1320
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1321MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1322
1057PROTOTYPES: DISABLE 1323PROTOTYPES: DISABLE
1058 1324
1059void 1325void
1060reset_glyph_cache () 1326glyph_cache_backup ()
1061 PROTOTYPE: 1327 PROTOTYPE:
1062 CODE: 1328 CODE:
1329 tc_backup ();
1330
1331void
1332glyph_cache_restore ()
1333 PROTOTYPE:
1334 CODE:
1063 tc_clear (); 1335 tc_restore ();
1064 1336
1065CFPlus::Layout 1337DC::Layout
1066new (SV *class) 1338new (SV *class)
1067 CODE: 1339 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1340 New (0, RETVAL, 1, struct cf_layout);
1069 1341
1070 RETVAL->pl = pango_layout_new (opengl_context); 1342 RETVAL->pl = pango_layout_new (opengl_context);
… …
1080 layout_update_font (RETVAL); 1352 layout_update_font (RETVAL);
1081 OUTPUT: 1353 OUTPUT:
1082 RETVAL 1354 RETVAL
1083 1355
1084void 1356void
1085DESTROY (CFPlus::Layout self) 1357DESTROY (DC::Layout self)
1086 CODE: 1358 CODE:
1087 g_object_unref (self->pl); 1359 g_object_unref (self->pl);
1088 rc_free (self->rc); 1360 rc_free (self->rc);
1089 Safefree (self); 1361 Safefree (self);
1090 1362
1091void 1363void
1092set_text (CFPlus::Layout self, SV *text_) 1364set_text (DC::Layout self, SV *text_)
1093 CODE: 1365 CODE:
1094{ 1366{
1095 STRLEN textlen; 1367 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1368 char *text = SvPVutf8 (text_, textlen);
1097 1369
1098 pango_layout_set_text (self->pl, text, textlen); 1370 pango_layout_set_text (self->pl, text, textlen);
1099} 1371}
1100 1372
1101void 1373void
1102set_markup (CFPlus::Layout self, SV *text_) 1374set_markup (DC::Layout self, SV *text_)
1103 CODE: 1375 CODE:
1104{ 1376{
1105 STRLEN textlen; 1377 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1378 char *text = SvPVutf8 (text_, textlen);
1107 1379
1108 pango_layout_set_markup (self->pl, text, textlen); 1380 pango_layout_set_markup (self->pl, text, textlen);
1109} 1381}
1110 1382
1111void 1383void
1112set_shapes (CFPlus::Layout self, ...) 1384set_shapes (DC::Layout self, ...)
1113 CODE: 1385 CODE:
1114{ 1386{
1115 PangoAttrList *attrs = 0; 1387 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1389 const char *pos = text;
… …
1152 if (attrs) 1424 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1425 pango_layout_set_attributes (self->pl, attrs);
1154} 1426}
1155 1427
1156void 1428void
1157get_shapes (CFPlus::Layout self) 1429get_shapes (DC::Layout self)
1158 PPCODE: 1430 PPCODE:
1159{ 1431{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1432 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1433
1162 do 1434 do
1163 { 1435 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1436 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1437
1166 if (run && shape_attr_p (run)) 1438 if (run && shape_attr_p (run))
1167 { 1439 {
1168 PangoRectangle extents; 1440 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1441 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1177 1449
1178 pango_layout_iter_free (iter); 1450 pango_layout_iter_free (iter);
1179} 1451}
1180 1452
1181int 1453int
1182has_wrapped (CFPlus::Layout self) 1454has_wrapped (DC::Layout self)
1183 CODE: 1455 CODE:
1184{ 1456{
1185 int lines = 1; 1457 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1458 const char *text = pango_layout_get_text (self->pl);
1187 1459
… …
1192} 1464}
1193 OUTPUT: 1465 OUTPUT:
1194 RETVAL 1466 RETVAL
1195 1467
1196SV * 1468SV *
1197get_text (CFPlus::Layout self) 1469get_text (DC::Layout self)
1198 CODE: 1470 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1471 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1472 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1473 OUTPUT:
1202 RETVAL 1474 RETVAL
1203 1475
1204void 1476void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1477set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1478 CODE:
1207 self->r = r; 1479 self->r = r;
1208 self->g = g; 1480 self->g = g;
1209 self->b = b; 1481 self->b = b;
1210 self->a = a; 1482 self->a = a;
1211 1483
1212void 1484void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1485set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1486 CODE:
1215 if (self->font != font) 1487 if (self->font != font)
1216 { 1488 {
1217 self->font = font; 1489 self->font = font;
1218 layout_update_font (self); 1490 layout_update_font (self);
1219 } 1491 }
1220 1492
1221void 1493void
1222set_height (CFPlus::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1223 CODE: 1495 CODE:
1224 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1225 { 1497 {
1226 self->base_height = base_height; 1498 self->base_height = base_height;
1227 layout_update_font (self); 1499 layout_update_font (self);
1228 } 1500 }
1229 1501
1230void 1502void
1231set_width (CFPlus::Layout self, int max_width = -1) 1503set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1504 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1505 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1506
1235void 1507void
1236set_indent (CFPlus::Layout self, int indent) 1508set_indent (DC::Layout self, int indent)
1237 CODE: 1509 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1510 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1511
1240void 1512void
1241set_spacing (CFPlus::Layout self, int spacing) 1513set_spacing (DC::Layout self, int spacing)
1242 CODE: 1514 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1515 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1516
1245void 1517void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1518set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1519 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1520 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1521 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1522 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1523 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1524 : PANGO_ELLIPSIZE_NONE
1253 ); 1525 );
1254 1526
1255void 1527void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1528set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1529 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1530 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1531
1260void 1532void
1261size (CFPlus::Layout self) 1533size (DC::Layout self)
1262 PPCODE: 1534 PPCODE:
1263{ 1535{
1264 int w, h; 1536 int w, h;
1265 1537
1266 layout_get_pixel_size (self, &w, &h); 1538 layout_get_pixel_size (self, &w, &h);
… …
1269 PUSHs (sv_2mortal (newSViv (w))); 1541 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1542 PUSHs (sv_2mortal (newSViv (h)));
1271} 1543}
1272 1544
1273int 1545int
1274descent (CFPlus::Layout self) 1546descent (DC::Layout self)
1275 CODE: 1547 CODE:
1276{ 1548{
1277 PangoRectangle rect; 1549 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1550 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1551 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1552 RETVAL = PANGO_DESCENT (rect);
1281} 1553}
1282 OUTPUT: 1554 OUTPUT:
1283 RETVAL 1555 RETVAL
1284 1556
1285int 1557int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1558xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1559 CODE:
1288{ 1560{
1289 int index, trailing; 1561 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1562 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1563 RETVAL = index + trailing;
1292} 1564}
1293 OUTPUT: 1565 OUTPUT:
1294 RETVAL 1566 RETVAL
1295 1567
1296void 1568void
1297cursor_pos (CFPlus::Layout self, int index) 1569cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1570 PPCODE:
1299{ 1571{
1300 PangoRectangle strong_pos; 1572 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1573 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1574
1303 EXTEND (SP, 3); 1575 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1576 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1577 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1578 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1579}
1308 1580
1309void 1581void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1582index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1583 PPCODE:
1312{ 1584{
1313 int line, x; 1585 int line, x;
1314 1586
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1587 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1588#if !PANGO_VERSION_CHECK (1, 17, 3)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1589 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1590 --line;
1591#endif
1318 EXTEND (SP, 2); 1592 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1593 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1595}
1322 1596
1323void 1597void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1598line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1599 PPCODE:
1326{ 1600{
1327 PangoLayoutLine *lp; 1601 PangoLayoutLine *lp;
1328 int index, trailing; 1602 int index, trailing;
1329 1603
1330 if (line < 0) 1604 if (line < 0)
1331 XSRETURN_EMPTY; 1605 XSRETURN_EMPTY;
1332 1606
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1607 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1608 XSRETURN_EMPTY; /* do better */
1335 1609
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1610 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1611
1338 EXTEND (SP, 2); 1612 EXTEND (SP, 2);
… …
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1618 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1619 }
1346} 1620}
1347 1621
1348void 1622void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1623render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1624 CODE:
1351 rc_clear (self->rc); 1625 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1626 pango_opengl_render_layout_subpixel (
1353 self->pl, 1627 self->pl,
1354 self->rc, 1628 self->rc,
… …
1359 // we assume that context_change actually clears/frees stuff 1633 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1634 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1635 pango_layout_context_changed (self->pl);
1362 1636
1363void 1637void
1364draw (CFPlus::Layout self) 1638draw (DC::Layout self)
1365 CODE: 1639 CODE:
1366{ 1640{
1367 glEnable (GL_TEXTURE_2D); 1641 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1642 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1643 glEnable (GL_BLEND);
… …
1377 glDisable (GL_ALPHA_TEST); 1651 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1652 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1653 glDisable (GL_TEXTURE_2D);
1380} 1654}
1381 1655
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1656MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1657
1384PROTOTYPES: ENABLE 1658PROTOTYPES: ENABLE
1385 1659
1386void 1660void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1661pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1455 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1456 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1457 } 1731 }
1458} 1732}
1459 1733
1734void
1735draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1736 PROTOTYPE: @
1737 CODE:
1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1741 glEnable (GL_TEXTURE_2D);
1742 glBindTexture (GL_TEXTURE_2D, name1);
1743
1744 glColor3f (intensity, intensity, intensity);
1745 glPushMatrix ();
1746 glScalef (1./3, 1./3, 1.);
1747
1748 if (blend > 0.f)
1749 {
1750 float dx3 = dx * -3.f / w;
1751 float dy3 = dy * -3.f / h;
1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1753
1754 /* interpolate the two shadow textures */
1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1757
1758 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1759 gl.ActiveTexture (GL_TEXTURE1);
1760 glEnable (GL_TEXTURE_2D);
1761 glBindTexture (GL_TEXTURE_2D, name2);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1763
1764 /* rgb == rgb(glcolor) */
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1768
1769 /* alpha = interpolate t0, t1 by env_alpha */
1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1774 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1775
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1781
1782 glBegin (GL_QUADS);
1783 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1784 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1787 glEnd ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 gl.ActiveTexture (GL_TEXTURE0);
1791 }
1792 else
1793 {
1794 /* simple blending of one texture, also opengl <1.3 path */
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1796
1797 glBegin (GL_QUADS);
1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1799 glTexCoord2f (0, t); glVertex2f (0, h);
1800 glTexCoord2f (s, t); glVertex2f (w, h);
1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1802 glEnd ();
1803 }
1804
1805 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1806 {
1807 int x, y;
1808 int dx3 = dx * 3;
1809 int dy3 = dy * 3;
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1812 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1813 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1814 glTranslatef (-1., -1., 0);
1815 glBegin (GL_QUADS);
1816
1817 for (y = 1; y < h; y += 3)
1818 {
1819 int y1 = y - dy3;
1820 int y1valid = y1 >= 0 && y1 < h;
1821
1822 for (x = 1; x < w; x += 3)
1823 {
1824 int x1 = x - dx3;
1825 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1826 uint8_t h2;
1827
1828 if (y1valid && x1 >= 0 && x1 < w)
1829 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1830 else
1831 h2 = 1; /* out of range == invisible */
1832
1833 if (h1 || h2)
1834 {
1835 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1836 glColor4f (1., 1., 1., alpha);
1837
1838 glTexCoord2f (0, 0.); glVertex2i (x , y );
1839 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1840 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1841 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1842 }
1843 }
1844 }
1845 }
1846
1847 glEnd ();
1848
1849 glPopMatrix ();
1850
1851 glDisable (GL_TEXTURE_2D);
1852 glDisable (GL_BLEND);
1853}
1854
1460IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1855IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1461 CODE: 1856 CODE:
1462{ 1857{
1463 GLint width; 1858 GLint width;
1464 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1859 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1466 RETVAL = width > 0; 1861 RETVAL = width > 0;
1467} 1862}
1468 OUTPUT: 1863 OUTPUT:
1469 RETVAL 1864 RETVAL
1470 1865
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1866MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1867
1473PROTOTYPES: DISABLE 1868PROTOTYPES: DISABLE
1474 1869
1475CFPlus::Map 1870DC::Map
1476new (SV *class) 1871new (SV *class)
1477 CODE: 1872 CODE:
1478 New (0, RETVAL, 1, struct map); 1873 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1874 RETVAL->x = 0;
1480 RETVAL->y = 0; 1875 RETVAL->y = 0;
… …
1488 RETVAL->row = 0; 1883 RETVAL->row = 0;
1489 OUTPUT: 1884 OUTPUT:
1490 RETVAL 1885 RETVAL
1491 1886
1492void 1887void
1493DESTROY (CFPlus::Map self) 1888DESTROY (DC::Map self)
1494 CODE: 1889 CODE:
1495{ 1890{
1496 map_clear (self); 1891 map_clear (self);
1497 Safefree (self->face2tile); 1892 Safefree (self->face2tile);
1498 Safefree (self->tex); 1893 Safefree (self->tex);
1499 Safefree (self); 1894 Safefree (self);
1500} 1895}
1501 1896
1502void 1897void
1503resize (CFPlus::Map self, int map_width, int map_height) 1898resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1899 CODE:
1505 self->w = map_width; 1900 self->w = map_width;
1506 self->h = map_height; 1901 self->h = map_height;
1507 1902
1508void 1903void
1509clear (CFPlus::Map self) 1904clear (DC::Map self)
1510 CODE: 1905 CODE:
1511 map_clear (self); 1906 map_clear (self);
1512 1907
1513void 1908void
1514set_tileid (CFPlus::Map self, int face, int tile) 1909set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1910 CODE:
1516{ 1911{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1912 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1913 need_texid (self, tile);
1519} 1914}
1520 1915
1521void 1916void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1917set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1918 CODE:
1524{ 1919{
1525 tileid texid; 1920 tileid texid;
1526 maptex *tex; 1921 maptex *tex;
1527 1922
… …
1540 tex->smoothtile = self->face2tile [smooth]; 1935 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1936 tex->smoothlevel = level;
1542} 1937}
1543 1938
1544void 1939void
1545set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1940set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1546 CODE: 1941 CODE:
1547{ 1942{
1548 need_texid (self, texid); 1943 need_texid (self, texid);
1549 1944
1550 { 1945 {
… …
1569 // use uglier nearest interpolation because linear suffers 1964 // use uglier nearest interpolation because linear suffers
1570 // from transparent color bleeding and ugly wrapping effects. 1965 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1966 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1967}
1573 1968
1969void
1970expire_textures (DC::Map self, int texid, int count)
1971 PPCODE:
1972 for (; texid < self->texs && count; ++texid, --count)
1973 {
1974 maptex *tex = self->tex + texid;
1975
1976 if (tex->name)
1977 {
1978 if (tex->unused)
1979 {
1980 tex->name = 0;
1981 tex->unused = 0;
1982 XPUSHs (sv_2mortal (newSViv (texid)));
1983 }
1984 else
1985 tex->unused = 1;
1986 }
1987 }
1988
1574int 1989int
1575ox (CFPlus::Map self) 1990ox (DC::Map self)
1576 ALIAS: 1991 ALIAS:
1577 oy = 1 1992 oy = 1
1578 x = 2 1993 x = 2
1579 y = 3 1994 y = 3
1580 w = 4 1995 w = 4
… …
1591 } 2006 }
1592 OUTPUT: 2007 OUTPUT:
1593 RETVAL 2008 RETVAL
1594 2009
1595void 2010void
1596scroll (CFPlus::Map self, int dx, int dy) 2011scroll (DC::Map self, int dx, int dy)
1597 CODE: 2012 CODE:
1598{ 2013{
1599 if (dx > 0) 2014 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 2015 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 2016 else if (dx < 0)
… …
1617 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1618 } 2033 }
1619} 2034}
1620 2035
1621SV * 2036SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1623 CODE: 2038 CODE:
1624{ 2039{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 2042 mapcell *cell;
… …
1648 2063
1649 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
1650 2065
1651 if (flags & 8) 2066 if (flags & 8)
1652 { 2067 {
2068 uint8_t ext, cmd;
2069
1653 if (extmap) 2070 do
1654 { 2071 {
1655 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
1656 2074
1657 do 2075 if (cmd < 4)
2076 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2077 else if (cmd == 5) // health
1658 { 2078 {
1659 ext = *data++;
1660 cmd = ext & 0x3f;
1661
1662 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health
1665 {
1666 cell->stat_width = 1; 2079 cell->stat_width = 1;
1667 cell->stat_hp = *data++; 2080 cell->stat_hp = *data++;
1668 }
1669 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47)
1672 {
1673 if (*data == 4)
1674 ; // decode player count
1675
1676 data += *data + 1;
1677 }
1678 else if (cmd == 8) // cell flags
1679 cell->flags = *data++;
1680 else if (ext & 0x40) // unknown, multibyte => skip
1681 data += *data + 1;
1682 else
1683 data++;
1684 } 2081 }
1685 while (ext & 0x80); 2082 else if (cmd == 6) // monster width
2083 cell->stat_width = *data++ + 1;
2084 else if (cmd == 0x47)
2085 {
2086 if (*data == 1) cell->player = data [1];
2087 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2088 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2089 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2090
2091 data += *data + 1;
2092 }
2093 else if (cmd == 8) // cell flags
2094 cell->flags = *data++;
2095 else if (ext & 0x40) // unknown, multibyte => skip
2096 data += *data + 1;
2097 else
2098 data++;
1686 } 2099 }
1687 else 2100 while (ext & 0x80);
1688 cell->darkness = *data++ + 1;
1689 } 2101 }
1690 2102
1691 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
1692 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
1693 { 2105 {
… …
1696 cell->tile [z] = self->face2tile [face]; 2108 cell->tile [z] = self->face2tile [face];
1697 2109
1698 if (cell->tile [z]) 2110 if (cell->tile [z])
1699 { 2111 {
1700 maptex *tex = self->tex + cell->tile [z]; 2112 maptex *tex = self->tex + cell->tile [z];
2113 tex->unused = 0;
1701 if (!tex->name) 2114 if (!tex->name)
1702 av_push (missing, newSViv (cell->tile [z])); 2115 av_push (missing, newSViv (cell->tile [z]));
1703 2116
1704 if (tex->smoothtile) 2117 if (tex->smoothtile)
1705 { 2118 {
1706 maptex *smooth = self->tex + tex->smoothtile; 2119 maptex *smooth = self->tex + tex->smoothtile;
2120 smooth->unused = 0;
1707 if (!smooth->name) 2121 if (!smooth->name)
1708 av_push (missing, newSViv (tex->smoothtile)); 2122 av_push (missing, newSViv (tex->smoothtile));
1709 } 2123 }
1710 } 2124 }
1711 } 2125 }
1712 } 2126 }
1713 else 2127 else
1714 cell->darkness = 0; 2128 CELL_CLEAR (cell);
1715 } 2129 }
1716} 2130}
1717 OUTPUT: 2131 OUTPUT:
1718 RETVAL 2132 RETVAL
1719 2133
1720SV * 2134SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2135mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 2136 CODE:
1723{ 2137{
1724 int x1, x; 2138 int x1, x;
1725 int y1, y; 2139 int y1, y;
1726 int z; 2140 int z;
… …
1739 ? self->row + y 2153 ? self->row + y
1740 : 0; 2154 : 0;
1741 2155
1742 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
1743 { 2157 {
1744 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
1745 2159
1746 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
1747 { 2161 {
1748 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
1749 2163
… …
1751 { 2165 {
1752 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
1753 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
1754 int a1 = tex.a; 2168 int a1 = tex.a;
1755 2169
1756 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
1757 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
1758 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
1759 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
1760 } 2174 }
1761 } 2175 }
1762 2176
1763 *map++ = (r ) 2177 *map++ = (r )
1764 | (g << 8) 2178 | (g << 8)
… …
1771} 2185}
1772 OUTPUT: 2186 OUTPUT:
1773 RETVAL 2187 RETVAL
1774 2188
1775void 2189void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2190draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777 CODE: 2191 CODE:
1778{ 2192{
1779 int x, y, z; 2193 int x, y, z;
1780 2194
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2196 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2197 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784 smooth_key skey; 2198 smooth_key skey;
1785 2199 int pl_x, pl_y;
2200 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 2201 rc_t *rc = rc_alloc ();
2202 rc_t *rc_ov = rc_alloc ();
1787 rc_key_t key; 2203 rc_key_t key;
1788 rc_array_t *arr; 2204 rc_array_t *arr;
1789 2205
2206 pl_tex.name = 0;
2207
1790 // thats current max. sorry. 2208 // that's current max. sorry.
1791 if (sw > 255) sw = 255; 2209 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 2210 if (sh > 255) sh = 255;
1793 2211
1794 // clear key, in case of extra padding 2212 // clear key, in case of extra padding
1795 memset (&skey, 0, sizeof (skey)); 2213 memset (&skey, 0, sizeof (skey));
… …
1799 key.g = 255; 2217 key.g = 255;
1800 key.b = 255; 2218 key.b = 255;
1801 key.a = 255; 2219 key.a = 255;
1802 key.mode = GL_QUADS; 2220 key.mode = GL_QUADS;
1803 key.format = GL_T2F_V3F; 2221 key.format = GL_T2F_V3F;
1804 key.texname = -1;
1805 2222
1806 mx += self->x; 2223 mx += self->x;
1807 my += self->y; 2224 my += self->y;
1808 2225
1809 // first pass: determine smooth_max 2226 // first pass: determine smooth_max
… …
1833 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1834 2251
1835 for (z = 0; z <= 2; z++) 2252 for (z = 0; z <= 2; z++)
1836 { 2253 {
1837 memset (smooth_level, 0, sizeof (smooth_level)); 2254 memset (smooth_level, 0, sizeof (smooth_level));
2255 key.texname = -1;
1838 2256
1839 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1840 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1841 { 2259 {
1842 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
… …
1852 maptex tex = self->tex [tile]; 2270 maptex tex = self->tex [tile];
1853 int px, py; 2271 int px, py;
1854 2272
1855 if (key.texname != tex.name) 2273 if (key.texname != tex.name)
1856 { 2274 {
2275 self->tex [tile].unused = 0;
2276
1857 if (!tex.name) 2277 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2278 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1859 2279
1860 key.texname = tex.name; 2280 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
1862 } 2282 }
1863 2283
1864 px = (x + 1) * T - tex.w; 2284 px = (x + 1) * Th - tex.w;
1865 py = (y + 1) * T - tex.h; 2285 py = (y + 1) * Tw - tex.h;
2286
2287 if (expect_false (cell->player == player) && expect_false (z == 2))
2288 {
2289 pl_x = px;
2290 pl_y = py;
2291 pl_tex = tex;
2292 continue;
2293 }
1866 2294
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2297 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2298 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871
1872 if (cell->flags && z == 2)
1873 {
1874 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1)
1876 {
1877 maptex tex = self->tex [1];
1878 int px = x * T + T * 2 / 32;
1879 int py = y * T - T * 6 / 32;
1880
1881 if (tex.name)
1882 {
1883 if (key.texname != tex.name)
1884 {
1885 key.texname = tex.name;
1886 arr = rc_array (rc, &key);
1887 }
1888
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1893 }
1894 }
1895 }
1896 2299
1897 // update smooth hash 2300 // update smooth hash
1898 if (tex.smoothtile) 2301 if (tex.smoothtile)
1899 { 2302 {
1900 skey.tile = tex.smoothtile; 2303 skey.tile = tex.smoothtile;
… …
1929 // corners 2332 // corners
1930 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2333 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1931 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2334 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1932 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2335 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1933 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2336 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2337 }
2338 }
2339
2340 if (expect_false (z == 2) && expect_false (cell->flags))
2341 {
2342 // overlays such as the speech bubble, probably more to come
2343 if (cell->flags & 1)
2344 {
2345 rc_key_t key_ov = key;
2346 maptex tex = self->tex [TEXID_SPEECH];
2347 rc_array_t *arr;
2348 int px = x * Tw + Tw * 2 / 32;
2349 int py = y * Th - Th * 6 / 32;
2350
2351 key_ov.texname = tex.name;
2352 arr = rc_array (rc_ov, &key_ov);
2353
2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2355 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2356 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1934 } 2358 }
1935 } 2359 }
1936 } 2360 }
1937 } 2361 }
1938 2362
… …
1965 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
1966 && skey->level == level 2390 && skey->level == level
1967 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
1968 { 2392 {
1969 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
1970 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
1971 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
1972 int border = bits & 15; 2396 int border = bits & 15;
1973 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1974 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
1975 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
1976 2400
… …
1978 { 2402 {
1979 // this time avoiding texture state changes 2403 // this time avoiding texture state changes
1980 // save gobs of state changes. 2404 // save gobs of state changes.
1981 if (key.texname != tex.name) 2405 if (key.texname != tex.name)
1982 { 2406 {
2407 self->tex [skey->tile].unused = 0;
2408
1983 glEnd (); 2409 glEnd ();
1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2410 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1985 glBegin (GL_QUADS); 2411 glBegin (GL_QUADS);
1986 } 2412 }
1987 2413
1988 if (border) 2414 if (border)
1989 { 2415 {
1990 float ox = border * dx; 2416 float ox = border * dx;
1991 2417
1992 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1993 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1994 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1995 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1996 } 2422 }
1997 2423
1998 if (corner) 2424 if (corner)
1999 { 2425 {
2000 float ox = corner * dx; 2426 float ox = corner * dx;
2001 2427
2002 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2003 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2004 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2005 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2006 } 2432 }
2007 } 2433 }
2008 } 2434 }
2009 } 2435 }
2010 } 2436 }
… …
2016 } 2442 }
2017 2443
2018 hv_clear (smooth); 2444 hv_clear (smooth);
2019 } 2445 }
2020 2446
2447 if (pl_tex.name)
2448 {
2449 maptex tex = pl_tex;
2450 int px = pl_x + sdx;
2451 int py = pl_y + sdy;
2452
2453 key.texname = tex.name;
2454 arr = rc_array (rc, &key);
2455
2456 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2457 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2458 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2459 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2460
2461 rc_draw (rc);
2462 }
2463
2464 rc_draw (rc_ov);
2465 rc_clear (rc_ov);
2466
2021 glDisable (GL_BLEND); 2467 glDisable (GL_BLEND);
2022 rc_free (rc); 2468 rc_free (rc);
2469 rc_free (rc_ov);
2023 2470
2024 // top layer: overlays such as the health bar 2471 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2472 for (y = 0; y < sh; y++)
2026 if (0 <= y + my && y + my < self->rows) 2473 if (0 <= y + my && y + my < self->rows)
2027 { 2474 {
… …
2030 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2031 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2032 { 2479 {
2033 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2034 2481
2035 int px = x * T; 2482 int px = x * Tw;
2036 int py = y * T; 2483 int py = y * Th;
2484
2485 if (expect_false (cell->player == player))
2486 {
2487 px += sdx;
2488 py += sdy;
2489 }
2037 2490
2038 if (cell->stat_hp) 2491 if (cell->stat_hp)
2039 { 2492 {
2040 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2041 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2042 2495
2043 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2044 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2045 px + width - 1, py); 2498 px + width - 1, py);
2046 2499
… …
2052 } 2505 }
2053 } 2506 }
2054} 2507}
2055 2508
2056void 2509void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2510draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2058 CODE: 2511 CODE:
2059{ 2512{
2060 static float color[16][3] = { 2513 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2514 { 0.00f, 0.00f, 0.00f },
2062 { 1.00F, 1.00F, 1.00F }, 2515 { 1.00f, 1.00f, 1.00f },
2063 { 0.00F, 0.00F, 0.55F }, 2516 { 0.00f, 0.00f, 0.55f },
2064 { 1.00F, 0.00F, 0.00F }, 2517 { 1.00f, 0.00f, 0.00f },
2065 2518
2066 { 1.00F, 0.54F, 0.00F }, 2519 { 1.00f, 0.54f, 0.00f },
2067 { 0.11F, 0.56F, 1.00F }, 2520 { 0.11f, 0.56f, 1.00f },
2068 { 0.93F, 0.46F, 0.00F }, 2521 { 0.93f, 0.46f, 0.00f },
2069 { 0.18F, 0.54F, 0.34F }, 2522 { 0.18f, 0.54f, 0.34f },
2070 2523
2071 { 0.56F, 0.73F, 0.56F }, 2524 { 0.56f, 0.73f, 0.56f },
2072 { 0.80F, 0.80F, 0.80F }, 2525 { 0.80f, 0.80f, 0.80f },
2073 { 0.55F, 0.41F, 0.13F }, 2526 { 0.55f, 0.41f, 0.13f },
2074 { 0.99F, 0.77F, 0.26F }, 2527 { 0.99f, 0.77f, 0.26f },
2075 2528
2076 { 0.74F, 0.65F, 0.41F }, 2529 { 0.74f, 0.65f, 0.41f },
2077 2530
2078 { 0.00F, 1.00F, 1.00F }, 2531 { 0.00f, 1.00f, 1.00f },
2079 { 1.00F, 0.00F, 1.00F }, 2532 { 1.00f, 0.00f, 1.00f },
2080 { 1.00F, 1.00F, 0.00F }, 2533 { 1.00f, 1.00f, 0.00f },
2081 }; 2534 };
2082 2535
2083 int x, y; 2536 int x, y;
2084 2537
2085 glEnable (GL_TEXTURE_2D); 2538 glEnable (GL_TEXTURE_2D);
2539 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2540 * but the nvidia driver (185.18.14) mishandles alpha textures
2541 * and takes the colour from god knows where instead of using
2542 * Cp. MODULATE results in the same colour, but slightly different
2543 * alpha, but atcually gives us the correct colour with nvidia.
2544 */
2086 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2545 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2087 glEnable (GL_BLEND); 2546 glEnable (GL_BLEND);
2088 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2547 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2089 glBegin (GL_QUADS); 2548 glBegin (GL_QUADS);
2090 2549
2091 for (y = 0; y < h; y++) 2550 for (y = 0; y < h; y++)
… …
2095 2554
2096 if (m) 2555 if (m)
2097 { 2556 {
2098 float *c = color [m & 15]; 2557 float *c = color [m & 15];
2099 2558
2100 float tx1 = m & 0x40 ? 0.5 : 0.; 2559 float tx1 = m & 0x40 ? 0.5f : 0.f;
2101 float tx2 = tx1 + 0.5; 2560 float tx2 = tx1 + 0.5f;
2102 2561
2103 glColor4f (c[0], c[1], c[2], 0.75); 2562 glColor4f (c[0], c[1], c[2], 1);
2104 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2563 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2105 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2564 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2106 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2565 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2107 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2566 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2108 } 2567 }
… …
2112 glDisable (GL_BLEND); 2571 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2572 glDisable (GL_TEXTURE_2D);
2114} 2573}
2115 2574
2116void 2575void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2576fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2577 PPCODE:
2119{ 2578{
2120 int x, y; 2579 int x, y;
2121 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2123 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2124 int sw34 = (sw * 3 + 3) & ~3; 2583 int sw3 = sw * 3;
2584 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2585 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2125 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2126 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2587 memset (darkness1, 0, sw1*sh1);
2127 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2128 2588
2129 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2131 2591
2132 mx += self->x - 1; 2592 mx += self->x - 1;
2133 my += self->y - 1; 2593 my += self->y - 1;
2134
2135 memset (darkness1, 255, sw1 * sh1);
2136 2594
2137 for (y = 0; y < sh1; y++) 2595 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2596 if (0 <= y + my && y + my < self->rows)
2139 { 2597 {
2140 maprow *row = self->row + (y + my); 2598 maprow *row = self->row + (y + my);
… …
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2601 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2602 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2603 mapcell *cell = row->col + (x + mx - row->c0);
2146 2604
2147 darkness1 [y * sw1 + x] = cell->darkness 2605 darkness1 [y * sw1 + x] = cell->darkness
2148 ? 255 - (cell->darkness - 1) 2606 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2149 : 255 - FOW_DARKNESS; 2607 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2150 } 2608 }
2151 } 2609 }
2152 2610
2153 for (y = 0; y < sh; ++y) 2611 for (y = 0; y < sh; ++y)
2154 for (x = 0; x < sw; ++x) 2612 for (x = 0; x < sw; ++x)
… …
2173 2631
2174 uint8_t r13 = (d13 + d23 + d12) / 3; 2632 uint8_t r13 = (d13 + d23 + d12) / 3;
2175 uint8_t r23 = d23; 2633 uint8_t r23 = d23;
2176 uint8_t r33 = (d23 + d33 + d32) / 3; 2634 uint8_t r33 = (d23 + d33 + d32) / 3;
2177 2635
2178 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2179 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2637 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2180 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2181 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2182 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2640 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2183 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2184 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2185 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2643 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2186 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2187 } 2645 }
2188 2646
2189 free (darkness1); 2647 free (darkness1);
2190 2648
2191 EXTEND (SP, 3); 2649 EXTEND (SP, 3);
2192 PUSHs (sv_2mortal (newSViv (sw34))); 2650 PUSHs (sv_2mortal (newSViv (sw3)));
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2651 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2652 PUSHs (darkness3_sv);
2195} 2653}
2196 2654
2197SV * 2655SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2656get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2657 CODE:
2200{ 2658{
2201 int x, y, x1, y1; 2659 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2660 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2661 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2260 else 2718 else
2261 *data++ = 0; 2719 *data++ = 0;
2262 } 2720 }
2263 } 2721 }
2264 2722
2723 /* if size is w*h + 5 then no data has been found */
2724 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2725 {
2265 SvPOK_only (data_sv); 2726 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2727 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2728 }
2729
2267 RETVAL = data_sv; 2730 RETVAL = data_sv;
2268} 2731}
2269 OUTPUT: 2732 OUTPUT:
2270 RETVAL 2733 RETVAL
2271 2734
2272void 2735void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2736set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2737 PPCODE:
2275{ 2738{
2276 int x, y, z; 2739 int x, y, z;
2277 int w, h; 2740 int w, h;
2278 int x1, y1; 2741 int x1, y1;
2742 STRLEN len;
2743 uint8_t *data, *end;
2744
2745 len = SvLEN (data_sv);
2746 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2747 data = SvPVbyte_nolen (data_sv);
2748 end = data + len + 8;
2749
2750 if (len < 5)
2751 XSRETURN_EMPTY;
2279 2752
2280 if (*data++ != 0) 2753 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2754 XSRETURN_EMPTY; /* version mismatch */
2282 2755
2283 w = *data++ << 8; w |= *data++; 2756 w = *data++ << 8; w |= *data++;
… …
2298 { 2771 {
2299 maprow *row = map_get_row (self, y); 2772 maprow *row = map_get_row (self, y);
2300 2773
2301 for (x = x0; x < x1; x++) 2774 for (x = x0; x < x1; x++)
2302 { 2775 {
2776 uint8_t flags;
2777
2778 if (data + 7 >= end)
2779 XSRETURN_EMPTY;
2780
2303 uint8_t flags = *data++; 2781 flags = *data++;
2304 2782
2305 if (flags) 2783 if (flags)
2306 { 2784 {
2307 mapcell *cell = row_get_cell (row, x); 2785 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2786 tileid tile[3] = { 0, 0, 0 };
… …
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2789 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2790 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2791
2314 if (cell->darkness == 0) 2792 if (cell->darkness == 0)
2315 { 2793 {
2316 cell->darkness = 0; 2794 /*cell->darkness = 0;*/
2795 EXTEND (SP, 3);
2317 2796
2318 for (z = 0; z <= 2; z++) 2797 for (z = 0; z <= 2; z++)
2319 { 2798 {
2320 tileid t = tile [z]; 2799 tileid t = tile [z];
2321 2800
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2801 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2802 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2803 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2804 need_texid (self, t);
2326 } 2805 }
2327 2806
2328 cell->tile [z] = t; 2807 cell->tile [z] = t;
2329 } 2808 }
… …
2331 } 2810 }
2332 } 2811 }
2333 } 2812 }
2334} 2813}
2335 2814
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2815MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2816
2338CFPlus::RW 2817DC::RW
2339new (SV *class, SV *data_sv) 2818new (SV *class, SV *data_sv)
2340 CODE: 2819 CODE:
2341{ 2820{
2342 STRLEN datalen; 2821 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2822 char *data = SvPVbyte (data_sv, datalen);
… …
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2824 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2825}
2347 OUTPUT: 2826 OUTPUT:
2348 RETVAL 2827 RETVAL
2349 2828
2350CFPlus::RW 2829DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2830new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2831 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2832 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2833 OUTPUT:
2355 RETVAL 2834 RETVAL
2356 2835
2357# fails on win32: 2836# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2837# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2838#void
2360#close (CFPlus::RW self) 2839#close (DC::RW self)
2361# CODE: 2840# CODE:
2362# (self->(close)) (self); 2841# (self->(close)) (self);
2363 2842
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2843MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2844
2366PROTOTYPES: DISABLE 2845PROTOTYPES: DISABLE
2367 2846
2368CFPlus::Channel 2847DC::Channel
2369find () 2848find ()
2370 CODE: 2849 CODE:
2371{ 2850{
2372 RETVAL = Mix_GroupAvailable (-1); 2851 RETVAL = Mix_GroupAvailable (-1);
2373 2852
2374 if (RETVAL < 0) 2853 if (RETVAL < 0)
2375 { 2854 {
2376 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2377 2856
2378 if (RETVAL < 0) 2857 if (RETVAL < 0)
2858 {
2859 // happens sometimes, maybe it just stopped playing(?)
2860 RETVAL = Mix_GroupAvailable (-1);
2861
2862 if (RETVAL < 0)
2379 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2380 2864 }
2865 else
2381 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2382 } 2867 }
2383 2868
2384 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2385 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2386} 2871}
2387 OUTPUT: 2872 OUTPUT:
2388 RETVAL 2873 RETVAL
2389 2874
2390void 2875void
2391halt (CFPlus::Channel self) 2876halt (DC::Channel self)
2392 CODE: 2877 CODE:
2393 Mix_HaltChannel (self); 2878 Mix_HaltChannel (self);
2394 2879
2395void 2880void
2396expire (CFPlus::Channel self, int ticks = -1) 2881expire (DC::Channel self, int ticks = -1)
2397 CODE: 2882 CODE:
2398 Mix_ExpireChannel (self, ticks); 2883 Mix_ExpireChannel (self, ticks);
2399 2884
2400void 2885void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2886fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2887 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2888 Mix_FadeOutChannel (self, ticks);
2404 2889
2405int 2890int
2406volume (CFPlus::Channel self, int volume) 2891volume (DC::Channel self, int volume)
2407 CODE: 2892 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2893 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2894 OUTPUT:
2410 RETVAL 2895 RETVAL
2411 2896
2412void 2897void
2413unregister_all_effects (CFPlus::Channel self) 2898unregister_all_effects (DC::Channel self)
2414 CODE: 2899 CODE:
2415 Mix_UnregisterAllEffects (self); 2900 Mix_UnregisterAllEffects (self);
2416 2901
2417void 2902void
2418set_panning (CFPlus::Channel self, int left, int right) 2903set_panning (DC::Channel self, int left, int right)
2419 CODE: 2904 CODE:
2420 left = CLAMP (left , 0, 255); 2905 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2906 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2907 Mix_SetPanning (self, left, right);
2423 2908
2424void 2909void
2425set_distance (CFPlus::Channel self, int distance) 2910set_distance (DC::Channel self, int distance)
2426 CODE: 2911 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2912 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2913
2429void 2914void
2430set_position (CFPlus::Channel self, int angle, int distance) 2915set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2916 CODE:
2432 2917
2433void 2918void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2919set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2920 CODE:
2436{ 2921{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2922 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2923 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2924 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2925}
2441 2926
2442void 2927void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2928set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2929 CODE:
2445 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2446 2931
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2933
2449PROTOTYPES: DISABLE 2934PROTOTYPES: DISABLE
2450 2935
2936void
2937decoders ()
2938 PPCODE:
2939#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2940 int i, num = Mix_GetNumChunkDecoders ();
2941 EXTEND (SP, num);
2942 for (i = 0; i < num; ++i)
2943 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2944#else
2945 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2946#endif
2947
2451CFPlus::MixChunk 2948DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2949new (SV *class, DC::RW rwops)
2453 CODE: 2950 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2952 OUTPUT:
2456 RETVAL 2953 RETVAL
2457 2954
2458void 2955void
2459DESTROY (CFPlus::MixChunk self) 2956DESTROY (DC::MixChunk self)
2460 CODE: 2957 CODE:
2461 Mix_FreeChunk (self); 2958 Mix_FreeChunk (self);
2462 2959
2463int 2960int
2464volume (CFPlus::MixChunk self, int volume = -1) 2961volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2962 CODE:
2466 if (items > 1) 2963 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2964 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2965 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2966 OUTPUT:
2470 RETVAL 2967 RETVAL
2471 2968
2472CFPlus::Channel 2969DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2970play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2971 CODE:
2475{ 2972{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2973 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2974
2478 if (RETVAL < 0) 2975 if (RETVAL < 0)
… …
2485 } 2982 }
2486} 2983}
2487 OUTPUT: 2984 OUTPUT:
2488 RETVAL 2985 RETVAL
2489 2986
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2988
2989void
2990decoders ()
2991 PPCODE:
2992#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2993 int i, num = Mix_GetNumMusicDecoders ();
2994 EXTEND (SP, num);
2995 for (i = 0; i < num; ++i)
2996 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2997#else
2998 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2999#endif
2491 3000
2492int 3001int
2493volume (int volume = -1) 3002volume (int volume = -1)
2494 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2495 CODE: 3004 CODE:
… …
2507void 3016void
2508halt () 3017halt ()
2509 CODE: 3018 CODE:
2510 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
2511 3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
3027
2512CFPlus::MixMusic 3028DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 3029new (SV *class, DC::RW rwops)
2514 CODE: 3030 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 3032 OUTPUT:
2517 RETVAL 3033 RETVAL
2518 3034
2519void 3035void
2520DESTROY (CFPlus::MixMusic self) 3036DESTROY (DC::MixMusic self)
2521 CODE: 3037 CODE:
2522 Mix_FreeMusic (self); 3038 Mix_FreeMusic (self);
2523 3039
2524int 3040int
2525play (CFPlus::MixMusic self, int loops = -1) 3041play (DC::MixMusic self, int loops = -1)
2526 CODE: 3042 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 3043 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 3044 OUTPUT:
2529 RETVAL 3045 RETVAL
2530 3046
2531void 3047void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3048fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 3049 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 3050 Mix_FadeInMusicPos (self, loops, ms, position);
2535 3051
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3052MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 3053
2538PROTOTYPES: ENABLE 3054PROTOTYPES: ENABLE
2539 3055
2540BOOT: 3056BOOT:
2541{ 3057{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3058 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 3059 static const struct {
2544 const char *name; 3060 const char *name;
2545 IV iv; 3061 IV iv;
2546 } *civ, const_iv[] = { 3062 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 3063# define const_iv(name) { # name, (IV)name }
2548 const_iv (GL_VENDOR), 3064 const_iv (GL_VENDOR),
2549 const_iv (GL_VERSION), 3065 const_iv (GL_VERSION),
2550 const_iv (GL_EXTENSIONS), 3066 const_iv (GL_EXTENSIONS),
3067 const_iv (GL_MAX_TEXTURE_UNITS),
2551 const_iv (GL_COLOR_MATERIAL), 3068 const_iv (GL_COLOR_MATERIAL),
2552 const_iv (GL_SMOOTH), 3069 const_iv (GL_SMOOTH),
2553 const_iv (GL_FLAT), 3070 const_iv (GL_FLAT),
2554 const_iv (GL_DITHER), 3071 const_iv (GL_DITHER),
2555 const_iv (GL_BLEND), 3072 const_iv (GL_BLEND),
… …
2567 const_iv (GL_ZERO), 3084 const_iv (GL_ZERO),
2568 const_iv (GL_SRC_ALPHA), 3085 const_iv (GL_SRC_ALPHA),
2569 const_iv (GL_DST_ALPHA), 3086 const_iv (GL_DST_ALPHA),
2570 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3087 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2571 const_iv (GL_ONE_MINUS_DST_ALPHA), 3088 const_iv (GL_ONE_MINUS_DST_ALPHA),
3089 const_iv (GL_SRC_COLOR),
3090 const_iv (GL_DST_COLOR),
3091 const_iv (GL_ONE_MINUS_SRC_COLOR),
3092 const_iv (GL_ONE_MINUS_DST_COLOR),
2572 const_iv (GL_SRC_ALPHA_SATURATE), 3093 const_iv (GL_SRC_ALPHA_SATURATE),
2573 const_iv (GL_RGB), 3094 const_iv (GL_RGB),
2574 const_iv (GL_RGBA), 3095 const_iv (GL_RGBA),
2575 const_iv (GL_RGBA4), 3096 const_iv (GL_RGBA4),
2576 const_iv (GL_RGBA8), 3097 const_iv (GL_RGBA8),
… …
2644 const_iv (GL_NICEST), 3165 const_iv (GL_NICEST),
2645 const_iv (GL_V2F), 3166 const_iv (GL_V2F),
2646 const_iv (GL_V3F), 3167 const_iv (GL_V3F),
2647 const_iv (GL_T2F_V3F), 3168 const_iv (GL_T2F_V3F),
2648 const_iv (GL_T2F_N3F_V3F), 3169 const_iv (GL_T2F_N3F_V3F),
3170 const_iv (GL_FUNC_ADD),
3171 const_iv (GL_FUNC_SUBTRACT),
3172 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2649# undef const_iv 3173# undef const_iv
2650 }; 3174 };
2651 3175
2652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3176 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2654 3178
2655 texture_av = newAV (); 3179 texture_av = newAV ();
2656 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
2657} 3181}
2658 3182
2659void 3183void
2660disable_GL_EXT_blend_func_separate () 3184disable_GL_EXT_blend_func_separate ()
2661 CODE: 3185 CODE:
2662 gl.BlendFuncSeparate = 0; 3186 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0; 3187 gl.BlendFuncSeparateEXT = 0;
3188
3189void
3190apple_nvidia_bug (int enable)
2664 3191
2665char * 3192char *
2666gl_vendor () 3193gl_vendor ()
2667 CODE: 3194 CODE:
2668 RETVAL = (char *)glGetString (GL_VENDOR); 3195 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2699 3226
2700int glGetError () 3227int glGetError ()
2701 3228
2702void glFinish () 3229void glFinish ()
2703 3230
3231void glFlush ()
3232
2704void glClear (int mask) 3233void glClear (int mask)
2705 3234
2706void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
2707 PROTOTYPE: @ 3236 PROTOTYPE: @
2708 3237
… …
2717void glBlendFunc (int sfactor, int dfactor) 3246void glBlendFunc (int sfactor, int dfactor)
2718 3247
2719void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3248void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2720 CODE: 3249 CODE:
2721 gl_BlendFuncSeparate (sa, da, saa, daa); 3250 gl_BlendFuncSeparate (sa, da, saa, daa);
3251
3252# void glBlendEquation (int se)
2722 3253
2723void glDepthMask (int flag) 3254void glDepthMask (int flag)
2724 3255
2725void glLogicOp (int opcode) 3256void glLogicOp (int opcode)
2726 3257
… …
2761void glRotate (float angle, float x, float y, float z) 3292void glRotate (float angle, float x, float y, float z)
2762 CODE: 3293 CODE:
2763 glRotatef (angle, x, y, z); 3294 glRotatef (angle, x, y, z);
2764 3295
2765void glColor (float r, float g, float b, float a = 1.0) 3296void glColor (float r, float g, float b, float a = 1.0)
3297 PROTOTYPE: @
2766 ALIAS: 3298 ALIAS:
2767 glColor_premultiply = 1 3299 glColor_premultiply = 1
2768 CODE: 3300 CODE:
2769 if (ix) 3301 if (ix)
2770 { 3302 {
… …
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3372void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 3373 CODE:
2842 if (gl.SeparableFilter2D) 3374 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3375 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3376
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3377void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 3378
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3379void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 3380
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3381void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3382
… …
2876 3408
2877void glEndList () 3409void glEndList ()
2878 3410
2879void glCallList (int list) 3411void glCallList (int list)
2880 3412
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3413void c_init ()
3414 CODE:
3415 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3416 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3417
3418MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3419
2883PROTOTYPES: DISABLE 3420PROTOTYPES: DISABLE
2884 3421
2885void 3422void
2886find_widget (SV *self, NV x, NV y) 3423find_widget (SV *self, NV x, NV y)
… …
2890 XPUSHs (self); 3427 XPUSHs (self);
2891} 3428}
2892 3429
2893BOOT: 3430BOOT:
2894{ 3431{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3432 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3433
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3434 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3435 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3436 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3437 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3438}
2902 3439
2903void 3440void
2904draw (SV *self) 3441draw (SV *self)
2905 CODE: 3442 CODE:
… …
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3449 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3450 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3451 double draw_x, draw_y;
2915 3452
2916 if (!SvROK (self)) 3453 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3454 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3455
2919 hv = (HV *)SvRV (self); 3456 hv = (HV *)SvRV (self);
2920 3457
2921 if (SvTYPE (hv) != SVt_PVHV) 3458 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3459 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3460
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3461 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3462 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3463
2927 if (!h || !w) 3464 if (!h || !w)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines