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.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.307 by root, Thu Oct 14 03:44:18 2010 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
27#include <stdio.h> 31#include <stdio.h>
28#include <stdlib.h> 32#include <stdlib.h>
33
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 35
30#include <SDL.h> 36#include <SDL.h>
31#include <SDL_thread.h> 37#include <SDL_thread.h>
32#include <SDL_endian.h> 38#include <SDL_endian.h>
33#include <SDL_image.h> 39#include <SDL_image.h>
34#include <SDL_mixer.h> 40#include <SDL_mixer.h>
35#include <SDL_opengl.h> 41#include <SDL_opengl.h>
36 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
37#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
39 52
40#include <glib/gmacros.h> 53#include <glib/gmacros.h>
41 54
42#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
43 67
44#ifndef _WIN32 68#ifndef _WIN32
45# include <sys/types.h> 69# include <sys/types.h>
46# include <sys/socket.h> 70# include <sys/socket.h>
47# include <netinet/in.h> 71# include <netinet/in.h>
48# include <netinet/tcp.h> 72# include <netinet/tcp.h>
49# include <inttypes.h> 73# include <inttypes.h>
50#endif 74#endif
51 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
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 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 */
54#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
55 91
56#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
58 94
59#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
60 96
61#if 0 97/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 99
64# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
65#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}
66 123
67static AV *texture_av; 124static AV *texture_av;
68 125
69static struct 126static struct
70{ 127{
107 av_push (texture_av, (SV *)(size_t)name); 164 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 165 glDeleteTextures (1, &name);
109} 166}
110 167
111#include "texcache.c" 168#include "texcache.c"
169#include "rendercache.c"
112 170
113#include "pango-font.c" 171#include "pango-font.c"
114#include "pango-fontmap.c" 172#include "pango-fontmap.c"
115#include "pango-render.c" 173#include "pango-render.c"
116 174
175typedef IV DC__Channel;
176typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 177typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 178typedef Mix_Music *DC__MixMusic;
119 179
120typedef PangoFontDescription *CFPlus__Font; 180typedef PangoFontDescription *DC__Font;
121 181
122static int 182static int
123shape_attr_p (PangoLayoutRun *run) 183shape_attr_p (PangoLayoutRun *run)
124{ 184{
125 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
139 199
140typedef struct cf_layout { 200typedef struct cf_layout {
141 PangoLayout *pl; 201 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 202 float r, g, b, a; // default color for rgba mode
143 int base_height; 203 int base_height;
144 CFPlus__Font font; 204 DC__Font font;
205 rc_t *rc;
145} *CFPlus__Layout; 206} *DC__Layout;
146 207
147static CFPlus__Font default_font; 208static DC__Font default_font;
148static PangoContext *opengl_context; 209static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
150 211
151static void 212static void
152substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
157#endif 218#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 220}
160 221
161static void 222static void
162layout_update_font (CFPlus__Layout self) 223layout_update_font (DC__Layout self)
163{ 224{
164 /* 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
165 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
166 */ 227 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
168 229
169 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 232
172 pango_layout_set_font_description (self->pl, font); 233 pango_layout_set_font_description (self->pl, font);
173} 234}
174 235
175static void 236static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 237layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 238{
178 PangoRectangle rect; 239 PangoRectangle rect;
179 240
180 // get_pixel_* wrongly rounds down 241 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 242 pango_layout_get_extents (self->pl, 0, &rect);
192 253
193typedef uint16_t tileid; 254typedef uint16_t tileid;
194typedef uint16_t faceid; 255typedef uint16_t faceid;
195 256
196typedef struct { 257typedef struct {
197 int name; 258 GLuint name;
198 int w, h; 259 int w, h;
199 float s, t; 260 float s, t;
200 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
201 tileid smoothtile; 262 tileid smoothtile;
202 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
203} maptex; 265} maptex;
204 266
205typedef struct { 267typedef struct {
206 uint32_t player; 268 uint32_t player;
207 tileid tile[3]; 269 tileid tile[3];
220 int faces; tileid *face2tile; // [faceid] 282 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 283 int texs; maptex *tex; // [tileid]
222 284
223 int32_t rows; 285 int32_t rows;
224 maprow *row; 286 maprow *row;
225} *CFPlus__Map; 287} *DC__Map;
226 288
227static char * 289static char *
228prepend (char *ptr, int sze, int inc) 290prepend (char *ptr, int sze, int inc)
229{ 291{
230 char *p; 292 char *p;
268 self->texs *= 2; 330 self->texs *= 2;
269 } 331 }
270} 332}
271 333
272static maprow * 334static maprow *
273map_get_row (CFPlus__Map self, int y) 335map_get_row (DC__Map self, int y)
274{ 336{
275 if (0 > y) 337 if (0 > y)
276 { 338 {
277 int extend = - y + MAP_EXTEND_Y; 339 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 340 Prepend (maprow, self->row, self->rows, extend);
316 378
317 return row->col + (x - row->c0); 379 return row->col + (x - row->c0);
318} 380}
319 381
320static mapcell * 382static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 383map_get_cell (DC__Map self, int x, int y)
322{ 384{
323 return row_get_cell (map_get_row (self, y), x); 385 return row_get_cell (map_get_row (self, y), x);
324} 386}
325 387
326static void 388static void
327map_clear (CFPlus__Map self) 389map_clear (DC__Map self)
328{ 390{
329 int r; 391 int r;
330 392
331 for (r = 0; r < self->rows; r++) 393 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 394 Safefree (self->row[r].col);
339 self->oy = 0; 401 self->oy = 0;
340 self->row = 0; 402 self->row = 0;
341 self->rows = 0; 403 self->rows = 0;
342} 404}
343 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
344static void 416static void
345map_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)
346{ 418{
347 int x, y; 419 int x, y;
348 maprow *row; 420 maprow *row;
349 mapcell *cell; 421 mapcell *cell;
350 422
362 if (x >= row->c1) 434 if (x >= row->c1)
363 break; 435 break;
364 436
365 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
366 438
367 cell->darkness = 0; 439 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 440 }
372 } 441 }
373} 442}
374 443
375typedef struct { 444typedef struct {
410 ev.code = 1; 479 ev.code = 1;
411 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
412 ev.data2 = 0; 481 ev.data2 = 0;
413 482
414 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;
415} 490}
416 491
417static unsigned int 492static unsigned int
418minpot (unsigned int n) 493minpot (unsigned int n)
419{ 494{
429 n |= n >> 16; 504 n |= n >> 16;
430 505
431 return n + 1; 506 return n + 1;
432} 507}
433 508
509static unsigned int
510popcount (unsigned int n)
511{
512 n -= (n >> 1) & 0x55555555U;
513 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
514 n = ((n >> 4) + n) & 0x0f0f0f0fU;
515 n *= 0x01010101U;
516
517 return n >> 24;
518}
519
434/* SDL should provide this, really. */ 520/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 521#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 522#define SDLK_MODIFIER_MAX 314
437 523
438/******************************************************************************/ 524/******************************************************************************/
476 return 0; 562 return 0;
477 563
478 return 1; 564 return 1;
479} 565}
480 566
481MODULE = 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 ()
583{
584 char *argv[] = { 0 };
585 call_argv ("::main", G_DISCARD | G_VOID, argv);
586}
587
588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which,
592 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back.
594 */
595 extern C_LINKAGE int
596 main (int argc, char *argv[])
597 {
598 deliantra_main ();
599 }
600
601 #undef main
602
603 extern C_LINKAGE int main (int argc, char *argv[]);
604
605 static void
606 SDL_braino (void)
607 {
608 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv);
610 }
611#else
612 static void
613 SDL_braino (void)
614 {
615 deliantra_main ();
616 }
617#endif
618
619MODULE = Deliantra::Client PACKAGE = DC
482 620
483PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
484 622
485BOOT: 623BOOT:
486{ 624{
487 HV *stash = gv_stashpv ("CFPlus", 1); 625 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 626 static const struct {
489 const char *name; 627 const char *name;
490 IV iv; 628 IV iv;
491 } *civ, const_iv[] = { 629 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 630# define const_iv(name) { # name, (IV)name }
514 652
515 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 655 const_iv (SDL_APPACTIVE),
518 656
657
658 const_iv (SDLK_UNKNOWN),
659 const_iv (SDLK_FIRST),
660 const_iv (SDLK_BACKSPACE),
661 const_iv (SDLK_TAB),
662 const_iv (SDLK_CLEAR),
663 const_iv (SDLK_RETURN),
664 const_iv (SDLK_PAUSE),
665 const_iv (SDLK_ESCAPE),
666 const_iv (SDLK_SPACE),
667 const_iv (SDLK_EXCLAIM),
668 const_iv (SDLK_QUOTEDBL),
669 const_iv (SDLK_HASH),
670 const_iv (SDLK_DOLLAR),
671 const_iv (SDLK_AMPERSAND),
672 const_iv (SDLK_QUOTE),
673 const_iv (SDLK_LEFTPAREN),
674 const_iv (SDLK_RIGHTPAREN),
675 const_iv (SDLK_ASTERISK),
676 const_iv (SDLK_PLUS),
677 const_iv (SDLK_COMMA),
678 const_iv (SDLK_MINUS),
679 const_iv (SDLK_PERIOD),
680 const_iv (SDLK_SLASH),
681 const_iv (SDLK_0),
682 const_iv (SDLK_1),
683 const_iv (SDLK_2),
684 const_iv (SDLK_3),
685 const_iv (SDLK_4),
686 const_iv (SDLK_5),
687 const_iv (SDLK_6),
688 const_iv (SDLK_7),
689 const_iv (SDLK_8),
690 const_iv (SDLK_9),
691 const_iv (SDLK_COLON),
692 const_iv (SDLK_SEMICOLON),
693 const_iv (SDLK_LESS),
694 const_iv (SDLK_EQUALS),
695 const_iv (SDLK_GREATER),
696 const_iv (SDLK_QUESTION),
697 const_iv (SDLK_AT),
698
699 const_iv (SDLK_LEFTBRACKET),
700 const_iv (SDLK_BACKSLASH),
701 const_iv (SDLK_RIGHTBRACKET),
702 const_iv (SDLK_CARET),
703 const_iv (SDLK_UNDERSCORE),
704 const_iv (SDLK_BACKQUOTE),
705 const_iv (SDLK_DELETE),
706
707 const_iv (SDLK_FIRST),
708 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 711 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 712 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 713 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 785 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
790
791 const_iv (KMOD_LRAM),
792
793 const_iv (MIX_DEFAULT_FORMAT),
794
795 const_iv (SDL_INIT_TIMER),
796 const_iv (SDL_INIT_AUDIO),
797 const_iv (SDL_INIT_VIDEO),
798 const_iv (SDL_INIT_CDROM),
799 const_iv (SDL_INIT_JOYSTICK),
800 const_iv (SDL_INIT_EVERYTHING),
801 const_iv (SDL_INIT_NOPARACHUTE),
802 const_iv (SDL_INIT_EVENTTHREAD),
803
804 const_iv (SDL_GL_RED_SIZE),
805 const_iv (SDL_GL_GREEN_SIZE),
806 const_iv (SDL_GL_BLUE_SIZE),
807 const_iv (SDL_GL_ALPHA_SIZE),
808 const_iv (SDL_GL_DOUBLEBUFFER),
809 const_iv (SDL_GL_BUFFER_SIZE),
810 const_iv (SDL_GL_DEPTH_SIZE),
811 const_iv (SDL_GL_STENCIL_SIZE),
812 const_iv (SDL_GL_ACCUM_RED_SIZE),
813 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
814 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
815 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
816 const_iv (SDL_GL_STEREO),
817 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
818 const_iv (SDL_GL_MULTISAMPLESAMPLES),
819 const_iv (SDL_GL_ACCELERATED_VISUAL),
820 const_iv (SDL_GL_SWAP_CONTROL),
821
822 const_iv (FOW_DARKNESS)
600# undef const_iv 823# undef const_iv
601 }; 824 };
602 825
603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 845
623NV floor (NV x) 846NV floor (NV x)
624 847
625NV ceil (NV x) 848NV ceil (NV x)
626 849
850IV minpot (UV n)
851
852IV popcount (UV n)
853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
859
627void 860void
628pango_init () 861pango_init ()
629 CODE: 862 CODE:
630{ 863{
631 opengl_fontmap = pango_opengl_font_map_new (); 864 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 865 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 866 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
867 /*pango_context_set_font_description (opengl_context, default_font);*/
868#if PANGO_VERSION_CHECK (1, 15, 2)
869 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
871#endif
634} 872}
635 873
636char *
637SDL_GetError () 874char *SDL_GetError ()
638 875
639int 876void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 877
642void 878int SDL_Init (U32 flags)
879
880int SDL_InitSubSystem (U32 flags)
881
882void SDL_QuitSubSystem (U32 flags)
883
643SDL_Quit () 884void SDL_Quit ()
885
886int SDL_GL_SetAttribute (int attr, int value)
887
888int SDL_GL_GetAttribute (int attr)
889 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL))
891 XSRETURN_UNDEF;
892 OUTPUT:
893 RETVAL
644 894
645void 895void
646SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
647 PPCODE: 897 PPCODE:
648{ 898{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 913
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 916
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 918
672 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
673 while (*m) 920 while (*m)
674 { 921 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 922 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 923 {
677 AV *av = newAV (); 924 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
704 951
705 if (RETVAL) 952 if (RETVAL)
706 { 953 {
707 av_clear (texture_av); 954 av_clear (texture_av);
708 955
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 958#include "glfunc.h"
712#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
713 } 963 }
714} 964}
715 OUTPUT: 965 OUTPUT:
716 RETVAL 966 RETVAL
717 967
721char * 971char *
722SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
723 973
724int 974int
725SDL_GetAppState () 975SDL_GetAppState ()
976
977int
978SDL_GetModState ()
726 979
727void 980void
728poll_events () 981poll_events ()
729 PPCODE: 982 PPCODE:
730{ 983{
740 { 993 {
741 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
742 case SDL_KEYUP: 995 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 998 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 999 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 1001 break;
749 1002
750 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 1022 x = ev.motion.x;
770 y = ev.motion.y; 1023 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 1025 }
773 1026
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 1033 }
781 break; 1034 break;
782 1035
783 case SDL_MOUSEBUTTONDOWN: 1036 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1037 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1038 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1039
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1040 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1042 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1043 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1048 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1049 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1050 break;
798 } 1051 }
799 1052
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 1054 }
802} 1055}
1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
803 1069
804int 1070int
805Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1072 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
809 1075
810void 1076void
1077Mix_QuerySpec ()
1078 PPCODE:
1079{
1080 int freq, channels;
1081 Uint16 format;
1082
1083 if (Mix_QuerySpec (&freq, &format, &channels))
1084 {
1085 EXTEND (SP, 3);
1086 PUSHs (sv_2mortal (newSViv (freq)));
1087 PUSHs (sv_2mortal (newSViv (format)));
1088 PUSHs (sv_2mortal (newSViv (channels)));
1089 }
1090}
1091
1092void
811Mix_CloseAudio () 1093Mix_CloseAudio ()
812 1094
813int 1095int
814Mix_AllocateChannels (int numchans = -1) 1096Mix_AllocateChannels (int numchans = -1)
1097
1098const char *
1099Mix_GetError ()
815 1100
816void 1101void
817lowdelay (int fd, int val = 1) 1102lowdelay (int fd, int val = 1)
818 CODE: 1103 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1104 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1130 }
846 } 1131 }
847#endif 1132#endif
848} 1133}
849 1134
850void 1135int
851add_font (char *file) 1136add_font (char *file)
852 CODE: 1137 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1139 OUTPUT:
1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
854 1144
855void 1145void
856load_image_inline (SV *image_) 1146load_image_inline (SV *image_)
857 ALIAS: 1147 ALIAS:
858 load_image_file = 1 1148 load_image_file = 1
861 STRLEN image_len; 1151 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1152 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1153 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1154 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1155 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1156 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1157 : SDL_RWFromConstMem (image, image_len);
868 1158
869 if (!rw) 1159 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1160 croak ("load_image: %s", SDL_GetError ());
871 1161
944void 1234void
945error (char *message) 1235error (char *message)
946 CODE: 1236 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1237 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1238#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1239 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1240#endif
951 1241
952void 1242void
953fatal (char *message) 1243fatal (char *message)
954 CODE: 1244 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1245 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1246#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1247 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1248#endif
959 _exit (1); 1249 _exit (1);
960 1250
961void 1251void
962_exit (int retval = 0) 1252_exit (int retval = 0)
974#if DEBUG 1264#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1265 VALGRIND_DO_LEAK_CHECK;
976#endif 1266#endif
977} 1267}
978 1268
979MODULE = CFPlus PACKAGE = CFPlus::Font 1269int
1270SvREFCNT (SV *sv)
1271 CODE:
1272 RETVAL = SvREFCNT (sv);
1273 OUTPUT:
1274 RETVAL
1275
1276MODULE = Deliantra::Client PACKAGE = DC::Font
980 1277
981PROTOTYPES: DISABLE 1278PROTOTYPES: DISABLE
982 1279
983CFPlus::Font 1280DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1281new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1282 CODE:
986{ 1283{
987 int count; 1284 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1285 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1288}
992 OUTPUT: 1289 OUTPUT:
993 RETVAL 1290 RETVAL
994 1291
995void 1292void
996DESTROY (CFPlus::Font self) 1293DESTROY (DC::Font self)
997 CODE: 1294 CODE:
998 pango_font_description_free (self); 1295 pango_font_description_free (self);
999 1296
1000void 1297void
1001make_default (CFPlus::Font self) 1298make_default (DC::Font self)
1002 PROTOTYPE: $ 1299 PROTOTYPE: $
1003 CODE: 1300 CODE:
1004 default_font = self; 1301 default_font = self;
1005 1302
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1303MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1304
1008PROTOTYPES: DISABLE 1305PROTOTYPES: DISABLE
1009 1306
1010void 1307void
1011reset_glyph_cache () 1308glyph_cache_backup ()
1012 PROTOTYPE: 1309 PROTOTYPE:
1013 CODE: 1310 CODE:
1311 tc_backup ();
1312
1313void
1314glyph_cache_restore ()
1315 PROTOTYPE:
1316 CODE:
1014 tc_clear (); 1317 tc_restore ();
1015 1318
1016CFPlus::Layout 1319DC::Layout
1017new (SV *class) 1320new (SV *class)
1018 CODE: 1321 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1322 New (0, RETVAL, 1, struct cf_layout);
1020 1323
1021 RETVAL->pl = pango_layout_new (opengl_context); 1324 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1326 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1327 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1328 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1329 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1330 RETVAL->font = 0;
1331 RETVAL->rc = rc_alloc ();
1028 1332
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1333 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1334 layout_update_font (RETVAL);
1031 OUTPUT: 1335 OUTPUT:
1032 RETVAL 1336 RETVAL
1033 1337
1034void 1338void
1035DESTROY (CFPlus::Layout self) 1339DESTROY (DC::Layout self)
1036 CODE: 1340 CODE:
1037 g_object_unref (self->pl); 1341 g_object_unref (self->pl);
1342 rc_free (self->rc);
1038 Safefree (self); 1343 Safefree (self);
1039 1344
1040void 1345void
1041set_text (CFPlus::Layout self, SV *text_) 1346set_text (DC::Layout self, SV *text_)
1042 CODE: 1347 CODE:
1043{ 1348{
1044 STRLEN textlen; 1349 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1350 char *text = SvPVutf8 (text_, textlen);
1046 1351
1047 pango_layout_set_text (self->pl, text, textlen); 1352 pango_layout_set_text (self->pl, text, textlen);
1048} 1353}
1049 1354
1050void 1355void
1051set_markup (CFPlus::Layout self, SV *text_) 1356set_markup (DC::Layout self, SV *text_)
1052 CODE: 1357 CODE:
1053{ 1358{
1054 STRLEN textlen; 1359 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1360 char *text = SvPVutf8 (text_, textlen);
1056 1361
1057 pango_layout_set_markup (self->pl, text, textlen); 1362 pango_layout_set_markup (self->pl, text, textlen);
1058} 1363}
1059 1364
1060void 1365void
1061set_shapes (CFPlus::Layout self, ...) 1366set_shapes (DC::Layout self, ...)
1062 CODE: 1367 CODE:
1063{ 1368{
1064 PangoAttrList *attrs = 0; 1369 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1370 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1371 const char *pos = text;
1101 if (attrs) 1406 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1407 pango_layout_set_attributes (self->pl, attrs);
1103} 1408}
1104 1409
1105void 1410void
1106get_shapes (CFPlus::Layout self) 1411get_shapes (DC::Layout self)
1107 PPCODE: 1412 PPCODE:
1108{ 1413{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1414 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1415
1111 do 1416 do
1112 { 1417 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1418 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1419
1115 if (run && shape_attr_p (run)) 1420 if (run && shape_attr_p (run))
1116 { 1421 {
1117 PangoRectangle extents; 1422 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1423 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1431
1127 pango_layout_iter_free (iter); 1432 pango_layout_iter_free (iter);
1128} 1433}
1129 1434
1130int 1435int
1131has_wrapped (CFPlus::Layout self) 1436has_wrapped (DC::Layout self)
1132 CODE: 1437 CODE:
1133{ 1438{
1134 int lines = 1; 1439 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1440 const char *text = pango_layout_get_text (self->pl);
1136 1441
1141} 1446}
1142 OUTPUT: 1447 OUTPUT:
1143 RETVAL 1448 RETVAL
1144 1449
1145SV * 1450SV *
1146get_text (CFPlus::Layout self) 1451get_text (DC::Layout self)
1147 CODE: 1452 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1453 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1454 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1455 OUTPUT:
1151 RETVAL 1456 RETVAL
1152 1457
1153void 1458void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1459set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1460 CODE:
1156 self->r = r; 1461 self->r = r;
1157 self->g = g; 1462 self->g = g;
1158 self->b = b; 1463 self->b = b;
1159 self->a = a; 1464 self->a = a;
1160 1465
1161void 1466void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1467set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1468 CODE:
1164 if (self->font != font) 1469 if (self->font != font)
1165 { 1470 {
1166 self->font = font; 1471 self->font = font;
1167 layout_update_font (self); 1472 layout_update_font (self);
1168 } 1473 }
1169 1474
1170void 1475void
1171set_height (CFPlus::Layout self, int base_height) 1476set_height (DC::Layout self, int base_height)
1172 CODE: 1477 CODE:
1173 if (self->base_height != base_height) 1478 if (self->base_height != base_height)
1174 { 1479 {
1175 self->base_height = base_height; 1480 self->base_height = base_height;
1176 layout_update_font (self); 1481 layout_update_font (self);
1177 } 1482 }
1178 1483
1179void 1484void
1180set_width (CFPlus::Layout self, int max_width = -1) 1485set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1486 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1487 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1488
1184void 1489void
1185set_indent (CFPlus::Layout self, int indent) 1490set_indent (DC::Layout self, int indent)
1186 CODE: 1491 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1492 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1493
1189void 1494void
1190set_spacing (CFPlus::Layout self, int spacing) 1495set_spacing (DC::Layout self, int spacing)
1191 CODE: 1496 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1497 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1498
1194void 1499void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1500set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1501 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1502 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1503 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1504 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1505 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1506 : PANGO_ELLIPSIZE_NONE
1202 ); 1507 );
1203 1508
1204void 1509void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1510set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1511 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1512 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1513
1209void 1514void
1210size (CFPlus::Layout self) 1515size (DC::Layout self)
1211 PPCODE: 1516 PPCODE:
1212{ 1517{
1213 int w, h; 1518 int w, h;
1214 1519
1215 layout_get_pixel_size (self, &w, &h); 1520 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1523 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1524 PUSHs (sv_2mortal (newSViv (h)));
1220} 1525}
1221 1526
1222int 1527int
1223descent (CFPlus::Layout self) 1528descent (DC::Layout self)
1224 CODE: 1529 CODE:
1225{ 1530{
1226 PangoRectangle rect; 1531 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1532 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1533 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1534 RETVAL = PANGO_DESCENT (rect);
1230} 1535}
1231 OUTPUT: 1536 OUTPUT:
1232 RETVAL 1537 RETVAL
1233 1538
1234int 1539int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1540xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1541 CODE:
1237{ 1542{
1238 int index, trailing; 1543 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1544 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1545 RETVAL = index + trailing;
1241} 1546}
1242 OUTPUT: 1547 OUTPUT:
1243 RETVAL 1548 RETVAL
1244 1549
1245void 1550void
1246cursor_pos (CFPlus::Layout self, int index) 1551cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1552 PPCODE:
1248{ 1553{
1249 PangoRectangle strong_pos; 1554 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1555 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1556
1252 EXTEND (SP, 3); 1557 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1558 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1559 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1560 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1561}
1257 1562
1258void 1563void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1564index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1565 PPCODE:
1261{ 1566{
1262 int line, x; 1567 int line, x;
1263 1568
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1569 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1570#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1571 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1572 --line;
1573#endif
1267 EXTEND (SP, 2); 1574 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1575 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1576 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1577}
1271 1578
1272void 1579void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1580line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1581 PPCODE:
1275{ 1582{
1276 PangoLayoutLine *lp; 1583 PangoLayoutLine *lp;
1277 int index, trailing; 1584 int index, trailing;
1278 1585
1279 if (line < 0) 1586 if (line < 0)
1280 XSRETURN_EMPTY; 1587 XSRETURN_EMPTY;
1281 1588
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1589 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1590 XSRETURN_EMPTY; /* do better */
1284 1591
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1592 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1593
1287 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1600 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1601 }
1295} 1602}
1296 1603
1297void 1604void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1605render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1606 CODE:
1607 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1608 pango_opengl_render_layout_subpixel (
1301 self->pl, 1609 self->pl,
1610 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1611 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1612 self->r, self->g, self->b, self->a,
1304 flags 1613 flags
1305 ); 1614 );
1615 // we assume that context_change actually clears/frees stuff
1616 // and does not do any recomputation...
1617 pango_layout_context_changed (self->pl);
1306 1618
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1619void
1620draw (DC::Layout self)
1621 CODE:
1622{
1623 glEnable (GL_TEXTURE_2D);
1624 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1625 glEnable (GL_BLEND);
1626 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1627 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1628 glEnable (GL_ALPHA_TEST);
1629 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1630
1631 rc_draw (self->rc);
1632
1633 glDisable (GL_ALPHA_TEST);
1634 glDisable (GL_BLEND);
1635 glDisable (GL_TEXTURE_2D);
1636}
1637
1638MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1639
1309PROTOTYPES: ENABLE 1640PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1641
1313void 1642void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1643pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1644 CODE:
1316{ 1645{
1343 HV *hv = (HV *)SvRV (self); 1672 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1673 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1674 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1675 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1676
1677 if (name <= 0)
1678 XSRETURN_EMPTY;
1679
1348 if (items < 5) 1680 if (items < 5)
1349 { 1681 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1682 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1683 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1684 }
1379 glDisable (GL_ALPHA_TEST); 1711 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1712 glDisable (GL_BLEND);
1381 } 1713 }
1382} 1714}
1383 1715
1716void
1717draw_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)
1718 PROTOTYPE: @
1719 CODE:
1720{
1721 glEnable (GL_BLEND);
1722 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1723 glEnable (GL_TEXTURE_2D);
1724 glBindTexture (GL_TEXTURE_2D, name1);
1725
1726 glColor3f (intensity, intensity, intensity);
1727 glPushMatrix ();
1728 glScalef (1./3, 1./3, 1.);
1729
1730 if (blend > 0.f)
1731 {
1732 float dx3 = dx * -3.f / w;
1733 float dy3 = dy * -3.f / h;
1734 GLfloat env_color[4] = { 0., 0., 0., blend };
1735
1736 /* interpolate the two shadow textures */
1737 /* stage 0 == rgb(glcolor) + alpha(t0) */
1738 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1739
1740 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1741 gl.ActiveTexture (GL_TEXTURE1);
1742 glEnable (GL_TEXTURE_2D);
1743 glBindTexture (GL_TEXTURE_2D, name2);
1744 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1745
1746 /* rgb == rgb(glcolor) */
1747 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1748 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1749 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1750
1751 /* alpha = interpolate t0, t1 by env_alpha */
1752 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1753
1754 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1755 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1756 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1757
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1763
1764 glBegin (GL_QUADS);
1765 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1766 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1767 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1769 glEnd ();
1770
1771 glDisable (GL_TEXTURE_2D);
1772 gl.ActiveTexture (GL_TEXTURE0);
1773 }
1774 else
1775 {
1776 /* simple blending of one texture, also opengl <1.3 path */
1777 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1778
1779 glBegin (GL_QUADS);
1780 glTexCoord2f (0, 0); glVertex2f (0, 0);
1781 glTexCoord2f (0, t); glVertex2f (0, h);
1782 glTexCoord2f (s, t); glVertex2f (w, h);
1783 glTexCoord2f (s, 0); glVertex2f (w, 0);
1784 glEnd ();
1785 }
1786
1787 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1788 {
1789 int x, y;
1790 int dx3 = dx * 3;
1791 int dy3 = dy * 3;
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1794 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1795 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1796 glTranslatef (-1., -1., 0);
1797 glBegin (GL_QUADS);
1798
1799 for (y = 1; y < h; y += 3)
1800 {
1801 int y1 = y - dy3;
1802 int y1valid = y1 >= 0 && y1 < h;
1803
1804 for (x = 1; x < w; x += 3)
1805 {
1806 int x1 = x - dx3;
1807 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1808 uint8_t h2;
1809
1810 if (y1valid && x1 >= 0 && x1 < w)
1811 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1812 else
1813 h2 = 1; /* out of range == invisible */
1814
1815 if (h1 || h2)
1816 {
1817 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1818 glColor4f (1., 1., 1., alpha);
1819
1820 glTexCoord2f (0, 0.); glVertex2i (x , y );
1821 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1822 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1823 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1824 }
1825 }
1826 }
1827 }
1828
1829 glEnd ();
1830
1831 glPopMatrix ();
1832
1833 glDisable (GL_TEXTURE_2D);
1834 glDisable (GL_BLEND);
1835}
1836
1384IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1837IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1385 CODE: 1838 CODE:
1386{ 1839{
1387 GLint width; 1840 GLint width;
1388 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1841 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1390 RETVAL = width > 0; 1843 RETVAL = width > 0;
1391} 1844}
1392 OUTPUT: 1845 OUTPUT:
1393 RETVAL 1846 RETVAL
1394 1847
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1848MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1849
1397PROTOTYPES: DISABLE 1850PROTOTYPES: DISABLE
1398 1851
1399CFPlus::Map 1852DC::Map
1400new (SV *class) 1853new (SV *class)
1401 CODE: 1854 CODE:
1402 New (0, RETVAL, 1, struct map); 1855 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1856 RETVAL->x = 0;
1404 RETVAL->y = 0; 1857 RETVAL->y = 0;
1412 RETVAL->row = 0; 1865 RETVAL->row = 0;
1413 OUTPUT: 1866 OUTPUT:
1414 RETVAL 1867 RETVAL
1415 1868
1416void 1869void
1417DESTROY (CFPlus::Map self) 1870DESTROY (DC::Map self)
1418 CODE: 1871 CODE:
1419{ 1872{
1420 map_clear (self); 1873 map_clear (self);
1421 Safefree (self->face2tile); 1874 Safefree (self->face2tile);
1422 Safefree (self->tex); 1875 Safefree (self->tex);
1423 Safefree (self); 1876 Safefree (self);
1424} 1877}
1425 1878
1426void 1879void
1427resize (CFPlus::Map self, int map_width, int map_height) 1880resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1881 CODE:
1429 self->w = map_width; 1882 self->w = map_width;
1430 self->h = map_height; 1883 self->h = map_height;
1431 1884
1432void 1885void
1433clear (CFPlus::Map self) 1886clear (DC::Map self)
1434 CODE: 1887 CODE:
1435 map_clear (self); 1888 map_clear (self);
1436 1889
1437void 1890void
1438set_tileid (CFPlus::Map self, int face, int tile) 1891set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1892 CODE:
1440{ 1893{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1894 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1895 need_texid (self, tile);
1443} 1896}
1444 1897
1445void 1898void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1899set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1900 CODE:
1448{ 1901{
1449 tileid texid; 1902 tileid texid;
1450 maptex *tex; 1903 maptex *tex;
1451 1904
1464 tex->smoothtile = self->face2tile [smooth]; 1917 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1918 tex->smoothlevel = level;
1466} 1919}
1467 1920
1468void 1921void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1922set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1923 CODE:
1471{ 1924{
1472 need_texid (self, texid); 1925 need_texid (self, texid);
1473 1926
1474 { 1927 {
1493 // use uglier nearest interpolation because linear suffers 1946 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1947 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1948 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1949}
1497 1950
1951void
1952expire_textures (DC::Map self, int texid, int count)
1953 PPCODE:
1954 for (; texid < self->texs && count; ++texid, --count)
1955 {
1956 maptex *tex = self->tex + texid;
1957
1958 if (tex->name)
1959 {
1960 if (tex->unused)
1961 {
1962 tex->name = 0;
1963 tex->unused = 0;
1964 XPUSHs (sv_2mortal (newSViv (texid)));
1965 }
1966 else
1967 tex->unused = 1;
1968 }
1969 }
1970
1498int 1971int
1499ox (CFPlus::Map self) 1972ox (DC::Map self)
1500 ALIAS: 1973 ALIAS:
1501 oy = 1 1974 oy = 1
1502 x = 2 1975 x = 2
1503 y = 3 1976 y = 3
1504 w = 4 1977 w = 4
1515 } 1988 }
1516 OUTPUT: 1989 OUTPUT:
1517 RETVAL 1990 RETVAL
1518 1991
1519void 1992void
1520scroll (CFPlus::Map self, int dx, int dy) 1993scroll (DC::Map self, int dx, int dy)
1521 CODE: 1994 CODE:
1522{ 1995{
1523 if (dx > 0) 1996 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1997 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1998 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 2013 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 2014 self->y += MAP_EXTEND_Y;
1542 } 2015 }
1543} 2016}
1544 2017
1545void 2018SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 2019map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 2020 CODE:
1548{ 2021{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2022 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 2023 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 2024 mapcell *cell;
1552 int x, y, flags; 2025 int x, y, z, flags;
2026 AV *missing = newAV ();
2027 RETVAL = newRV_noinc ((SV *)missing);
1553 2028
1554 while (data < data_end - 1) 2029 while (data < data_end - 1)
1555 { 2030 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 2031 flags = (data [0] << 8) + data [1]; data += 2;
1557 2032
1577 uint8_t ext, cmd; 2052 uint8_t ext, cmd;
1578 2053
1579 do 2054 do
1580 { 2055 {
1581 ext = *data++; 2056 ext = *data++;
1582 cmd = ext & 0x3f; 2057 cmd = ext & 0x7f;
1583 2058
1584 if (cmd < 4) 2059 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 2060 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1586 else if (cmd == 5) // health 2061 else if (cmd == 5) // health
1587 { 2062 {
1588 cell->stat_width = 1; 2063 cell->stat_width = 1;
1589 cell->stat_hp = *data++; 2064 cell->stat_hp = *data++;
1590 } 2065 }
1591 else if (cmd == 6) // monster width 2066 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 2067 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 2068 else if (cmd == 0x47)
1594 { 2069 {
1595 if (*data == 4) 2070 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 2071 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2072 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2073 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 2074
1598 data += *data + 1; 2075 data += *data + 1;
1599 } 2076 }
1600 else if (cmd == 8) // cell flags 2077 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 2078 cell->flags = *data++;
1608 } 2085 }
1609 else 2086 else
1610 cell->darkness = *data++ + 1; 2087 cell->darkness = *data++ + 1;
1611 } 2088 }
1612 2089
2090 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 2091 if (flags & (4 >> z))
1614 { 2092 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 2093 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 2094 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 2095 cell->tile [z] = self->face2tile [face];
2096
2097 if (cell->tile [z])
2098 {
2099 maptex *tex = self->tex + cell->tile [z];
2100 tex->unused = 0;
2101 if (!tex->name)
2102 av_push (missing, newSViv (cell->tile [z]));
2103
2104 if (tex->smoothtile)
2105 {
2106 maptex *smooth = self->tex + tex->smoothtile;
2107 smooth->unused = 0;
2108 if (!smooth->name)
2109 av_push (missing, newSViv (tex->smoothtile));
2110 }
2111 }
1618 } 2112 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 2113 }
1634 else 2114 else
1635 cell->darkness = 0; 2115 CELL_CLEAR (cell);
1636 } 2116 }
1637} 2117}
2118 OUTPUT:
2119 RETVAL
1638 2120
1639SV * 2121SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2122mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 2123 CODE:
1642{ 2124{
1643 int x1, x; 2125 int x1, x;
1644 int y1, y; 2126 int y1, y;
1645 int z; 2127 int z;
1658 ? self->row + y 2140 ? self->row + y
1659 : 0; 2141 : 0;
1660 2142
1661 for (x = x0; x < x1; x++) 2143 for (x = x0; x < x1; x++)
1662 { 2144 {
1663 int r = 32, g = 32, b = 32, a = 192; 2145 unsigned int r = 32, g = 32, b = 32, a = 192;
1664 2146
1665 if (row && row->c0 <= x && x < row->c1) 2147 if (row && row->c0 <= x && x < row->c1)
1666 { 2148 {
1667 mapcell *cell = row->col + (x - row->c0); 2149 mapcell *cell = row->col + (x - row->c0);
1668 2150
1670 { 2152 {
1671 maptex tex = self->tex [cell->tile [z]]; 2153 maptex tex = self->tex [cell->tile [z]];
1672 int a0 = 255 - tex.a; 2154 int a0 = 255 - tex.a;
1673 int a1 = tex.a; 2155 int a1 = tex.a;
1674 2156
1675 r = (r * a0 + tex.r * a1) / 255; 2157 r = div255 (r * a0 + tex.r * a1);
1676 g = (g * a0 + tex.g * a1) / 255; 2158 g = div255 (g * a0 + tex.g * a1);
1677 b = (b * a0 + tex.b * a1) / 255; 2159 b = div255 (b * a0 + tex.b * a1);
1678 a = (a * a0 + tex.a * a1) / 255; 2160 a = div255 (a * a0 + tex.a * a1);
1679 } 2161 }
1680 } 2162 }
1681 2163
1682 *map++ = (r ) 2164 *map++ = (r )
1683 | (g << 8) 2165 | (g << 8)
1690} 2172}
1691 OUTPUT: 2173 OUTPUT:
1692 RETVAL 2174 RETVAL
1693 2175
1694void 2176void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2177draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 2178 CODE:
1697{ 2179{
2180 int x, y, z;
2181
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2183 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2184 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 2185 smooth_key skey;
1702 int x, y, z; 2186 int pl_x, pl_y;
1703 int last_name; 2187 maptex pl_tex;
2188 rc_t *rc = rc_alloc ();
2189 rc_t *rc_ov = rc_alloc ();
2190 rc_key_t key;
2191 rc_array_t *arr;
1704 2192
2193 pl_tex.name = 0;
2194
1705 // thats current max. sorry. 2195 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2196 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2197 if (sh > 255) sh = 255;
1708 2198
1709 // clear key, in case of extra padding 2199 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2200 memset (&skey, 0, sizeof (skey));
1711 2201
1712 glColor4ub (255, 255, 255, 255); 2202 memset (&key, 0, sizeof (key));
1713 2203 key.r = 255;
1714 glEnable (GL_BLEND); 2204 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2205 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 2206 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2207 key.mode = GL_QUADS;
1718 2208 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2209
1723 mx += self->x; 2210 mx += self->x;
1724 my += self->y; 2211 my += self->y;
1725 2212
1726 // first pass: determine smooth_max 2213 // first pass: determine smooth_max
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2230 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2231 self->tex [cell->tile [2]].smoothlevel));
1745 } 2232 }
1746 } 2233 }
1747 2234
2235 glEnable (GL_BLEND);
2236 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2238
1748 for (z = 0; z <= 2; z++) 2239 for (z = 0; z <= 2; z++)
1749 { 2240 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2241 memset (smooth_level, 0, sizeof (smooth_level));
2242 key.texname = -1;
1751 2243
1752 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1754 { 2246 {
1755 maprow *row = self->row + (y + my); 2247 maprow *row = self->row + (y + my);
1761 tileid tile = cell->tile [z]; 2253 tileid tile = cell->tile [z];
1762 2254
1763 if (tile) 2255 if (tile)
1764 { 2256 {
1765 maptex tex = self->tex [tile]; 2257 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2258 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2259
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2260 if (key.texname != tex.name)
1772 { 2261 {
2262 self->tex [tile].unused = 0;
2263
1773 if (!tex.name) 2264 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2265 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2266
1776 glEnd (); 2267 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2268 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2269 }
1780 2270
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2271 px = (x + 1) * Th - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2272 py = (y + 1) * Tw - tex.h;
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785 2273
1786 if (cell->flags && z == 2) 2274 if (expect_false (cell->player == player) && expect_false (z == 2))
1787 { 2275 {
1788 if (cell->flags & 1) 2276 pl_x = px;
2277 pl_y = py;
2278 pl_tex = tex;
1789 { 2279 continue;
1790 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32;
1793
1794 glEnd ();
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1796 glBegin (GL_QUADS);
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 }
1803 } 2280 }
2281
2282 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2283 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2284 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2285 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1804 2286
1805 // update smooth hash 2287 // update smooth hash
1806 if (tex.smoothtile) 2288 if (tex.smoothtile)
1807 { 2289 {
1808 skey.tile = tex.smoothtile; 2290 skey.tile = tex.smoothtile;
1839 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2321 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1840 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2322 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1841 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2323 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1842 } 2324 }
1843 } 2325 }
2326
2327 if (expect_false (z == 2) && expect_false (cell->flags))
2328 {
2329 // overlays such as the speech bubble, probably more to come
2330 if (cell->flags & 1)
2331 {
2332 rc_key_t key_ov = key;
2333 maptex tex = self->tex [TEXID_SPEECH];
2334 rc_array_t *arr;
2335 int px = x * Tw + Tw * 2 / 32;
2336 int py = y * Th - Th * 6 / 32;
2337
2338 key_ov.texname = tex.name;
2339 arr = rc_array (rc_ov, &key_ov);
2340
2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2342 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2343 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2345 }
2346 }
1844 } 2347 }
1845 } 2348 }
2349
2350 rc_draw (rc);
2351 rc_clear (rc);
1846 2352
1847 // go through all smoothlevels, lowest to highest, then draw. 2353 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2354 // this is basically counting sort
1849 { 2355 {
1850 int w, b; 2356 int w, b;
1851 2357
2358 glEnable (GL_TEXTURE_2D);
2359 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2360 for (w = 0; w < 256 / 32; ++w)
1853 { 2361 {
1854 uint32_t smask = smooth_level [w]; 2362 uint32_t smask = smooth_level [w];
1855 if (smask) 2363 if (smask)
1856 for (b = 0; b < 32; ++b) 2364 for (b = 0; b < 32; ++b)
1868 if (!(bits & 0x1000) 2376 if (!(bits & 0x1000)
1869 && skey->level == level 2377 && skey->level == level
1870 && level > smooth_max [skey->x][skey->y]) 2378 && level > smooth_max [skey->x][skey->y])
1871 { 2379 {
1872 maptex tex = self->tex [skey->tile]; 2380 maptex tex = self->tex [skey->tile];
1873 int px = (((int)skey->x) - 1) * T; 2381 int px = (((int)skey->x) - 1) * Tw;
1874 int py = (((int)skey->y) - 1) * T; 2382 int py = (((int)skey->y) - 1) * Th;
1875 int border = bits & 15; 2383 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2385 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2386 float dy = tex.t * .5f ; // 2 images/column
1879 2387
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2388 if (tex.name)
1883 { 2389 {
2390 // this time avoiding texture state changes
2391 // save gobs of state changes.
1884 if (!tex.name) 2392 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2393 {
2394 self->tex [skey->tile].unused = 0;
1886 2395
1887 glEnd (); 2396 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2397 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2398 glBegin (GL_QUADS);
1890 } 2399 }
1891 2400
1892 if (border) 2401 if (border)
1893 { 2402 {
1894 float ox = border * dx; 2403 float ox = border * dx;
1895 2404
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1900 } 2409 }
1901 2410
1902 if (corner) 2411 if (corner)
1903 { 2412 {
1904 float ox = corner * dx; 2413 float ox = corner * dx;
1905 2414
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2415 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2419 }
1910 } 2420 }
1911 } 2421 }
1912 } 2422 }
1913 } 2423 }
1914 } 2424 }
2425
2426 glEnd ();
2427 glDisable (GL_TEXTURE_2D);
2428 key.texname = -1;
1915 } 2429 }
1916 2430
1917 hv_clear (smooth); 2431 hv_clear (smooth);
1918 } 2432 }
1919 2433
1920 glEnd (); 2434 if (pl_tex.name)
2435 {
2436 maptex tex = pl_tex;
2437 int px = pl_x + sdx;
2438 int py = pl_y + sdy;
1921 2439
1922 glDisable (GL_TEXTURE_2D); 2440 key.texname = tex.name;
2441 arr = rc_array (rc, &key);
2442
2443 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2444 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2445 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2446 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2447
2448 rc_draw (rc);
2449 }
2450
2451 rc_draw (rc_ov);
2452 rc_clear (rc_ov);
2453
1923 glDisable (GL_BLEND); 2454 glDisable (GL_BLEND);
2455 rc_free (rc);
2456 rc_free (rc_ov);
1924 2457
1925 // top layer: overlays such as the health bar 2458 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2459 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2460 if (0 <= y + my && y + my < self->rows)
1928 { 2461 {
1931 for (x = 0; x < sw; x++) 2464 for (x = 0; x < sw; x++)
1932 if (row->c0 <= x + mx && x + mx < row->c1) 2465 if (row->c0 <= x + mx && x + mx < row->c1)
1933 { 2466 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2467 mapcell *cell = row->col + (x + mx - row->c0);
1935 2468
1936 int px = x * T; 2469 int px = x * Tw;
1937 int py = y * T; 2470 int py = y * Th;
2471
2472 if (expect_false (cell->player == player))
2473 {
2474 px += sdx;
2475 py += sdy;
2476 }
1938 2477
1939 if (cell->stat_hp) 2478 if (cell->stat_hp)
1940 { 2479 {
1941 int width = cell->stat_width * T; 2480 int width = cell->stat_width * Tw;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2481 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1943 2482
1944 glColor3ub (0, 0, 0); 2483 glColor3ub (0, 0, 0);
1945 glRectf (px + 1, py - thick - 2, 2484 glRectf (px + 1, py - thick - 2,
1946 px + width - 1, py); 2485 px + width - 1, py);
1947 2486
1953 } 2492 }
1954 } 2493 }
1955} 2494}
1956 2495
1957void 2496void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2497draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1959 CODE: 2498 CODE:
1960{ 2499{
1961 static float color[16][3] = { 2500 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2501 { 0.00f, 0.00f, 0.00f },
1963 { 1.00F, 1.00F, 1.00F }, 2502 { 1.00f, 1.00f, 1.00f },
1964 { 0.00F, 0.00F, 0.55F }, 2503 { 0.00f, 0.00f, 0.55f },
1965 { 1.00F, 0.00F, 0.00F }, 2504 { 1.00f, 0.00f, 0.00f },
1966 2505
1967 { 1.00F, 0.54F, 0.00F }, 2506 { 1.00f, 0.54f, 0.00f },
1968 { 0.11F, 0.56F, 1.00F }, 2507 { 0.11f, 0.56f, 1.00f },
1969 { 0.93F, 0.46F, 0.00F }, 2508 { 0.93f, 0.46f, 0.00f },
1970 { 0.18F, 0.54F, 0.34F }, 2509 { 0.18f, 0.54f, 0.34f },
1971 2510
1972 { 0.56F, 0.73F, 0.56F }, 2511 { 0.56f, 0.73f, 0.56f },
1973 { 0.80F, 0.80F, 0.80F }, 2512 { 0.80f, 0.80f, 0.80f },
1974 { 0.55F, 0.41F, 0.13F }, 2513 { 0.55f, 0.41f, 0.13f },
1975 { 0.99F, 0.77F, 0.26F }, 2514 { 0.99f, 0.77f, 0.26f },
1976 2515
1977 { 0.74F, 0.65F, 0.41F }, 2516 { 0.74f, 0.65f, 0.41f },
1978 2517
1979 { 0.00F, 1.00F, 1.00F }, 2518 { 0.00f, 1.00f, 1.00f },
1980 { 1.00F, 0.00F, 1.00F }, 2519 { 1.00f, 0.00f, 1.00f },
1981 { 1.00F, 1.00F, 0.00F }, 2520 { 1.00f, 1.00f, 0.00f },
1982 }; 2521 };
1983 2522
1984 int x, y; 2523 int x, y;
1985 2524
1986 glEnable (GL_TEXTURE_2D); 2525 glEnable (GL_TEXTURE_2D);
2526 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2527 * but the nvidia driver (185.18.14) mishandles alpha textures
2528 * and takes the colour from god knows where instead of using
2529 * Cp. MODULATE results in the same colour, but slightly different
2530 * alpha, but atcually gives us the correct colour with nvidia.
2531 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2533 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2535 glBegin (GL_QUADS);
1991 2536
1992 for (y = 0; y < h; y++) 2537 for (y = 0; y < h; y++)
1996 2541
1997 if (m) 2542 if (m)
1998 { 2543 {
1999 float *c = color [m & 15]; 2544 float *c = color [m & 15];
2000 2545
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2546 float tx1 = m & 0x40 ? 0.5f : 0.f;
2002 float tx2 = tx1 + 0.5; 2547 float tx2 = tx1 + 0.5f;
2003 2548
2004 glColor4f (c[0], c[1], c[2], 0.75); 2549 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2554 }
2013 glDisable (GL_BLEND); 2558 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2559 glDisable (GL_TEXTURE_2D);
2015} 2560}
2016 2561
2017void 2562void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2563fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2564 PPCODE:
2020{ 2565{
2021 int x, y; 2566 int x, y;
2022 int sw1 = sw + 2; 2567 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2568 int sh1 = sh + 2;
2024 int sh3 = sh * 3; 2569 int sh3 = sh * 3;
2025 int sw34 = (sw * 3 + 3) & ~3; 2570 int sw3 = sw * 3;
2571 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2572 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2573 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2574 memset (darkness1, 0, sw1*sh1);
2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2029 2575
2030 SvPOK_only (darkness3_sv); 2576 SvPOK_only (darkness3_sv);
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2577 SvCUR_set (darkness3_sv, sw3 * sh3);
2032 2578
2033 mx += self->x - 1; 2579 mx += self->x - 1;
2034 my += self->y - 1; 2580 my += self->y - 1;
2035
2036 memset (darkness1, 255, sw1 * sh1);
2037 2581
2038 for (y = 0; y < sh1; y++) 2582 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2583 if (0 <= y + my && y + my < self->rows)
2040 { 2584 {
2041 maprow *row = self->row + (y + my); 2585 maprow *row = self->row + (y + my);
2044 if (row->c0 <= x + mx && x + mx < row->c1) 2588 if (row->c0 <= x + mx && x + mx < row->c1)
2045 { 2589 {
2046 mapcell *cell = row->col + (x + mx - row->c0); 2590 mapcell *cell = row->col + (x + mx - row->c0);
2047 2591
2048 darkness1 [y * sw1 + x] = cell->darkness 2592 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1) 2593 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2050 : 255 - FOW_DARKNESS; 2594 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2051 } 2595 }
2052 } 2596 }
2053 2597
2054 for (y = 0; y < sh; ++y) 2598 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x) 2599 for (x = 0; x < sw; ++x)
2074 2618
2075 uint8_t r13 = (d13 + d23 + d12) / 3; 2619 uint8_t r13 = (d13 + d23 + d12) / 3;
2076 uint8_t r23 = d23; 2620 uint8_t r23 = d23;
2077 uint8_t r33 = (d23 + d33 + d32) / 3; 2621 uint8_t r33 = (d23 + d33 + d32) / 3;
2078 2622
2079 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2623 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2080 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2624 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2081 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2625 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2082 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2626 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2083 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2627 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2084 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2628 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2085 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2629 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2086 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2630 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2087 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2631 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2088 } 2632 }
2089 2633
2090 free (darkness1); 2634 free (darkness1);
2091 2635
2092 EXTEND (SP, 3); 2636 EXTEND (SP, 3);
2093 PUSHs (sv_2mortal (newSViv (sw34))); 2637 PUSHs (sv_2mortal (newSViv (sw3)));
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2638 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2639 PUSHs (darkness3_sv);
2096} 2640}
2097 2641
2098SV * 2642SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2643get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2644 CODE:
2101{ 2645{
2102 int x, y, x1, y1; 2646 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2647 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2648 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2705 else
2162 *data++ = 0; 2706 *data++ = 0;
2163 } 2707 }
2164 } 2708 }
2165 2709
2710 /* if size is w*h + 5 then no data has been found */
2711 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2712 {
2166 SvPOK_only (data_sv); 2713 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2714 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2715 }
2716
2168 RETVAL = data_sv; 2717 RETVAL = data_sv;
2169} 2718}
2170 OUTPUT: 2719 OUTPUT:
2171 RETVAL 2720 RETVAL
2172 2721
2173void 2722void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2723set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2724 PPCODE:
2176{ 2725{
2177 int x, y, z; 2726 int x, y, z;
2178 int w, h; 2727 int w, h;
2179 int x1, y1; 2728 int x1, y1;
2729 STRLEN len;
2730 uint8_t *data, *end;
2731
2732 len = SvLEN (data_sv);
2733 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2734 data = SvPVbyte_nolen (data_sv);
2735 end = data + len + 8;
2736
2737 if (len < 5)
2738 XSRETURN_EMPTY;
2180 2739
2181 if (*data++ != 0) 2740 if (*data++ != 0)
2182 return; /* version mismatch */ 2741 XSRETURN_EMPTY; /* version mismatch */
2183 2742
2184 w = *data++ << 8; w |= *data++; 2743 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2744 h = *data++ << 8; h |= *data++;
2186 2745
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2746 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2758 {
2200 maprow *row = map_get_row (self, y); 2759 maprow *row = map_get_row (self, y);
2201 2760
2202 for (x = x0; x < x1; x++) 2761 for (x = x0; x < x1; x++)
2203 { 2762 {
2763 uint8_t flags;
2764
2765 if (data + 7 >= end)
2766 XSRETURN_EMPTY;
2767
2204 uint8_t flags = *data++; 2768 flags = *data++;
2205 2769
2206 if (flags) 2770 if (flags)
2207 { 2771 {
2208 mapcell *cell = row_get_cell (row, x); 2772 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2773 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2776 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2777 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2778
2215 if (cell->darkness == 0) 2779 if (cell->darkness == 0)
2216 { 2780 {
2217 cell->darkness = 0; 2781 /*cell->darkness = 0;*/
2782 EXTEND (SP, 3);
2218 2783
2219 for (z = 0; z <= 2; z++) 2784 for (z = 0; z <= 2; z++)
2220 { 2785 {
2221 tileid t = tile [z]; 2786 tileid t = tile [z];
2222 2787
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2788 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2789 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2790 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2791 need_texid (self, t);
2227 } 2792 }
2228 2793
2229 cell->tile [z] = t; 2794 cell->tile [z] = t;
2230 } 2795 }
2232 } 2797 }
2233 } 2798 }
2234 } 2799 }
2235} 2800}
2236 2801
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2802MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2803
2239PROTOTYPES: DISABLE 2804DC::RW
2240
2241CFPlus::MixChunk
2242new (SV *class, SV *data_sv) 2805new (SV *class, SV *data_sv)
2243 CODE: 2806 CODE:
2244{ 2807{
2245 STRLEN datalen; 2808 STRLEN datalen;
2246 char *data = SvPVbyte (data_sv, datalen); 2809 char *data = SvPVbyte (data_sv, datalen);
2247 2810
2248 RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1); 2811 RETVAL = SDL_RWFromConstMem (data, datalen);
2249} 2812}
2250 OUTPUT: 2813 OUTPUT:
2251 RETVAL 2814 RETVAL
2252 2815
2253CFPlus::MixChunk 2816DC::RW
2254new_from_file (SV *class, char *path) 2817new_from_file (SV *class, const char *path, const char *mode = "rb")
2255 CODE: 2818 CODE:
2256 RETVAL = Mix_LoadWAV (path); 2819 RETVAL = SDL_RWFromFile (path, mode);
2257 OUTPUT: 2820 OUTPUT:
2258 RETVAL 2821 RETVAL
2259 2822
2823# fails on win32:
2824# dc.xs(2268) : error C2059: syntax error : '('
2260void 2825#void
2826#close (DC::RW self)
2827# CODE:
2828# (self->(close)) (self);
2829
2830MODULE = Deliantra::Client PACKAGE = DC::Channel
2831
2832PROTOTYPES: DISABLE
2833
2834DC::Channel
2835find ()
2836 CODE:
2837{
2838 RETVAL = Mix_GroupAvailable (-1);
2839
2840 if (RETVAL < 0)
2841 {
2842 RETVAL = Mix_GroupOldest (-1);
2843
2844 if (RETVAL < 0)
2845 {
2846 // happens sometimes, maybe it just stopped playing(?)
2847 RETVAL = Mix_GroupAvailable (-1);
2848
2849 if (RETVAL < 0)
2850 XSRETURN_UNDEF;
2851 }
2852 else
2853 Mix_HaltChannel (RETVAL);
2854 }
2855
2856 Mix_UnregisterAllEffects (RETVAL);
2857 Mix_Volume (RETVAL, 128);
2858}
2859 OUTPUT:
2860 RETVAL
2861
2862void
2863halt (DC::Channel self)
2864 CODE:
2865 Mix_HaltChannel (self);
2866
2867void
2868expire (DC::Channel self, int ticks = -1)
2869 CODE:
2870 Mix_ExpireChannel (self, ticks);
2871
2872void
2873fade_out (DC::Channel self, int ticks = -1)
2874 CODE:
2875 Mix_FadeOutChannel (self, ticks);
2876
2877int
2878volume (DC::Channel self, int volume)
2879 CODE:
2880 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2881 OUTPUT:
2882 RETVAL
2883
2884void
2885unregister_all_effects (DC::Channel self)
2886 CODE:
2887 Mix_UnregisterAllEffects (self);
2888
2889void
2890set_panning (DC::Channel self, int left, int right)
2891 CODE:
2892 left = CLAMP (left , 0, 255);
2893 right = CLAMP (right, 0, 255);
2894 Mix_SetPanning (self, left, right);
2895
2896void
2897set_distance (DC::Channel self, int distance)
2898 CODE:
2899 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2900
2901void
2902set_position (DC::Channel self, int angle, int distance)
2903 CODE:
2904
2905void
2906set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2907 CODE:
2908{
2909 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2910 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2911 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2912}
2913
2914void
2915set_reverse_stereo (DC::Channel self, int flip)
2916 CODE:
2917 Mix_SetReverseStereo (self, flip);
2918
2919MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2920
2921PROTOTYPES: DISABLE
2922
2923void
2924decoders ()
2925 PPCODE:
2926#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2927 int i, num = Mix_GetNumChunkDecoders ();
2928 EXTEND (SP, num);
2929 for (i = 0; i < num; ++i)
2930 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2931#else
2932 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2933#endif
2934
2935DC::MixChunk
2936new (SV *class, DC::RW rwops)
2937 CODE:
2938 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2939 OUTPUT:
2940 RETVAL
2941
2942void
2261DESTROY (CFPlus::MixChunk self) 2943DESTROY (DC::MixChunk self)
2262 CODE: 2944 CODE:
2263 Mix_FreeChunk (self); 2945 Mix_FreeChunk (self);
2264 2946
2265int 2947int
2266volume (CFPlus::MixChunk self, int volume = -1) 2948volume (DC::MixChunk self, int volume = -1)
2267 CODE: 2949 CODE:
2950 if (items > 1)
2951 volume = CLAMP (volume, 0, 128);
2268 RETVAL = Mix_VolumeChunk (self, volume); 2952 RETVAL = Mix_VolumeChunk (self, volume);
2269 OUTPUT: 2953 OUTPUT:
2270 RETVAL 2954 RETVAL
2271 2955
2272int 2956DC::Channel
2273play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2957play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2274 CODE: 2958 CODE:
2959{
2275 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2960 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2961
2962 if (RETVAL < 0)
2963 XSRETURN_UNDEF;
2964
2965 if (channel < 0)
2966 {
2967 Mix_UnregisterAllEffects (RETVAL);
2968 Mix_Volume (RETVAL, 128);
2969 }
2970}
2276 OUTPUT: 2971 OUTPUT:
2277 RETVAL 2972 RETVAL
2278 2973
2279MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2974MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2975
2976void
2977decoders ()
2978 PPCODE:
2979#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2980 int i, num = Mix_GetNumMusicDecoders ();
2981 EXTEND (SP, num);
2982 for (i = 0; i < num; ++i)
2983 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2984#else
2985 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2986#endif
2280 2987
2281int 2988int
2282volume (int volume = -1) 2989volume (int volume = -1)
2283 PROTOTYPE: ;$ 2990 PROTOTYPE: ;$
2284 CODE: 2991 CODE:
2992 if (items > 0)
2993 volume = CLAMP (volume, 0, 128);
2285 RETVAL = Mix_VolumeMusic (volume); 2994 RETVAL = Mix_VolumeMusic (volume);
2286 OUTPUT: 2995 OUTPUT:
2287 RETVAL 2996 RETVAL
2288 2997
2998void
2999fade_out (int ms)
3000 CODE:
3001 Mix_FadeOutMusic (ms);
3002
3003void
3004halt ()
3005 CODE:
3006 Mix_HaltMusic ();
3007
2289int 3008int
2290fade_out (int ms) 3009playing ()
2291 CODE: 3010 CODE:
2292 RETVAL = Mix_FadeOutMusic (ms); 3011 RETVAL = Mix_PlayingMusic ();
2293 OUTPUT: 3012 OUTPUT:
2294 RETVAL 3013 RETVAL
2295 3014
2296CFPlus::MixMusic 3015DC::MixMusic
2297new_from_file (SV *class, char *path) 3016new (SV *class, DC::RW rwops)
2298 CODE: 3017 CODE:
2299 RETVAL = Mix_LoadMUS (path); 3018 RETVAL = Mix_LoadMUS_RW (rwops);
2300 OUTPUT: 3019 OUTPUT:
2301 RETVAL 3020 RETVAL
2302 3021
2303void 3022void
2304DESTROY (CFPlus::MixMusic self) 3023DESTROY (DC::MixMusic self)
2305 CODE: 3024 CODE:
2306 Mix_FreeMusic (self); 3025 Mix_FreeMusic (self);
2307 3026
2308int 3027int
2309play (CFPlus::MixMusic self, int loops = -1) 3028play (DC::MixMusic self, int loops = -1)
2310 CODE: 3029 CODE:
2311 RETVAL = Mix_PlayMusic (self, loops); 3030 RETVAL = Mix_PlayMusic (self, loops);
2312 OUTPUT: 3031 OUTPUT:
2313 RETVAL 3032 RETVAL
2314 3033
2315int 3034void
2316fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3035fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2317 CODE: 3036 CODE:
2318 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3037 Mix_FadeInMusicPos (self, loops, ms, position);
2319 OUTPUT:
2320 RETVAL
2321 3038
2322MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3039MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2323 3040
2324PROTOTYPES: ENABLE 3041PROTOTYPES: ENABLE
2325 3042
2326BOOT: 3043BOOT:
2327{ 3044{
2328 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3045 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2329 static const struct { 3046 static const struct {
2330 const char *name; 3047 const char *name;
2331 IV iv; 3048 IV iv;
2332 } *civ, const_iv[] = { 3049 } *civ, const_iv[] = {
2333# define const_iv(name) { # name, (IV)name } 3050# define const_iv(name) { # name, (IV)name }
2334 const_iv (GL_VENDOR), 3051 const_iv (GL_VENDOR),
2335 const_iv (GL_VERSION), 3052 const_iv (GL_VERSION),
2336 const_iv (GL_EXTENSIONS), 3053 const_iv (GL_EXTENSIONS),
3054 const_iv (GL_MAX_TEXTURE_UNITS),
2337 const_iv (GL_COLOR_MATERIAL), 3055 const_iv (GL_COLOR_MATERIAL),
2338 const_iv (GL_SMOOTH), 3056 const_iv (GL_SMOOTH),
2339 const_iv (GL_FLAT), 3057 const_iv (GL_FLAT),
2340 const_iv (GL_DITHER), 3058 const_iv (GL_DITHER),
2341 const_iv (GL_BLEND), 3059 const_iv (GL_BLEND),
2353 const_iv (GL_ZERO), 3071 const_iv (GL_ZERO),
2354 const_iv (GL_SRC_ALPHA), 3072 const_iv (GL_SRC_ALPHA),
2355 const_iv (GL_DST_ALPHA), 3073 const_iv (GL_DST_ALPHA),
2356 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3074 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2357 const_iv (GL_ONE_MINUS_DST_ALPHA), 3075 const_iv (GL_ONE_MINUS_DST_ALPHA),
3076 const_iv (GL_SRC_COLOR),
3077 const_iv (GL_DST_COLOR),
3078 const_iv (GL_ONE_MINUS_SRC_COLOR),
3079 const_iv (GL_ONE_MINUS_DST_COLOR),
2358 const_iv (GL_SRC_ALPHA_SATURATE), 3080 const_iv (GL_SRC_ALPHA_SATURATE),
2359 const_iv (GL_RGB), 3081 const_iv (GL_RGB),
2360 const_iv (GL_RGBA), 3082 const_iv (GL_RGBA),
2361 const_iv (GL_RGBA4), 3083 const_iv (GL_RGBA4),
2362 const_iv (GL_RGBA8), 3084 const_iv (GL_RGBA8),
2368 const_iv (GL_INTENSITY), 3090 const_iv (GL_INTENSITY),
2369 const_iv (GL_LUMINANCE), 3091 const_iv (GL_LUMINANCE),
2370 const_iv (GL_LUMINANCE_ALPHA), 3092 const_iv (GL_LUMINANCE_ALPHA),
2371 const_iv (GL_FLOAT), 3093 const_iv (GL_FLOAT),
2372 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3094 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3095 const_iv (GL_COMPRESSED_ALPHA_ARB),
3096 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3097 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3098 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3099 const_iv (GL_COMPRESSED_RGB_ARB),
3100 const_iv (GL_COMPRESSED_RGBA_ARB),
2373 const_iv (GL_COMPILE), 3101 const_iv (GL_COMPILE),
2374 const_iv (GL_PROXY_TEXTURE_1D), 3102 const_iv (GL_PROXY_TEXTURE_1D),
2375 const_iv (GL_PROXY_TEXTURE_2D), 3103 const_iv (GL_PROXY_TEXTURE_2D),
2376 const_iv (GL_TEXTURE_1D), 3104 const_iv (GL_TEXTURE_1D),
2377 const_iv (GL_TEXTURE_2D), 3105 const_iv (GL_TEXTURE_2D),
2416 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3144 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2417 const_iv (GL_POINT_SMOOTH_HINT), 3145 const_iv (GL_POINT_SMOOTH_HINT),
2418 const_iv (GL_LINE_SMOOTH_HINT), 3146 const_iv (GL_LINE_SMOOTH_HINT),
2419 const_iv (GL_POLYGON_SMOOTH_HINT), 3147 const_iv (GL_POLYGON_SMOOTH_HINT),
2420 const_iv (GL_GENERATE_MIPMAP_HINT), 3148 const_iv (GL_GENERATE_MIPMAP_HINT),
3149 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2421 const_iv (GL_FASTEST), 3150 const_iv (GL_FASTEST),
2422 const_iv (GL_DONT_CARE), 3151 const_iv (GL_DONT_CARE),
2423 const_iv (GL_NICEST), 3152 const_iv (GL_NICEST),
2424 const_iv (GL_V2F), 3153 const_iv (GL_V2F),
2425 const_iv (GL_V3F), 3154 const_iv (GL_V3F),
2426 const_iv (GL_T2F_V3F), 3155 const_iv (GL_T2F_V3F),
2427 const_iv (GL_T2F_N3F_V3F), 3156 const_iv (GL_T2F_N3F_V3F),
3157 const_iv (GL_FUNC_ADD),
3158 const_iv (GL_FUNC_SUBTRACT),
3159 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2428# undef const_iv 3160# undef const_iv
2429 }; 3161 };
2430 3162
2431 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3163 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2432 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3164 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2433 3165
2434 texture_av = newAV (); 3166 texture_av = newAV ();
2435 AvREAL_off (texture_av); 3167 AvREAL_off (texture_av);
2436} 3168}
2437 3169
3170void
3171disable_GL_EXT_blend_func_separate ()
3172 CODE:
3173 gl.BlendFuncSeparate = 0;
3174 gl.BlendFuncSeparateEXT = 0;
3175
3176void
3177apple_nvidia_bug (int enable)
3178
2438char * 3179char *
2439gl_vendor () 3180gl_vendor ()
2440 CODE: 3181 CODE:
2441 RETVAL = (char *)glGetString (GL_VENDOR); 3182 RETVAL = (char *)glGetString (GL_VENDOR);
2442 OUTPUT: 3183 OUTPUT:
2472 3213
2473int glGetError () 3214int glGetError ()
2474 3215
2475void glFinish () 3216void glFinish ()
2476 3217
3218void glFlush ()
3219
2477void glClear (int mask) 3220void glClear (int mask)
2478 3221
2479void glClearColor (float r, float g, float b, float a = 1.0) 3222void glClearColor (float r, float g, float b, float a = 1.0)
2480 PROTOTYPE: @ 3223 PROTOTYPE: @
2481 3224
2490void glBlendFunc (int sfactor, int dfactor) 3233void glBlendFunc (int sfactor, int dfactor)
2491 3234
2492void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3235void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2493 CODE: 3236 CODE:
2494 gl_BlendFuncSeparate (sa, da, saa, daa); 3237 gl_BlendFuncSeparate (sa, da, saa, daa);
3238
3239# void glBlendEquation (int se)
2495 3240
2496void glDepthMask (int flag) 3241void glDepthMask (int flag)
2497 3242
2498void glLogicOp (int opcode) 3243void glLogicOp (int opcode)
2499 3244
2534void glRotate (float angle, float x, float y, float z) 3279void glRotate (float angle, float x, float y, float z)
2535 CODE: 3280 CODE:
2536 glRotatef (angle, x, y, z); 3281 glRotatef (angle, x, y, z);
2537 3282
2538void glColor (float r, float g, float b, float a = 1.0) 3283void glColor (float r, float g, float b, float a = 1.0)
3284 PROTOTYPE: @
2539 ALIAS: 3285 ALIAS:
2540 glColor_premultiply = 1 3286 glColor_premultiply = 1
2541 CODE: 3287 CODE:
2542 if (ix) 3288 if (ix)
2543 { 3289 {
2563 3309
2564void glRect (float x1, float y1, float x2, float y2) 3310void glRect (float x1, float y1, float x2, float y2)
2565 CODE: 3311 CODE:
2566 glRectf (x1, y1, x2, y2); 3312 glRectf (x1, y1, x2, y2);
2567 3313
3314void glRect_lineloop (float x1, float y1, float x2, float y2)
3315 CODE:
3316 glBegin (GL_LINE_LOOP);
3317 glVertex2f (x1, y1);
3318 glVertex2f (x2, y1);
3319 glVertex2f (x2, y2);
3320 glVertex2f (x1, y2);
3321 glEnd ();
3322
2568PROTOTYPES: ENABLE 3323PROTOTYPES: ENABLE
2569 3324
2570void glBegin (int mode) 3325void glBegin (int mode)
2571 3326
2572void glEnd () 3327void glEnd ()
2604void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3359void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2605 CODE: 3360 CODE:
2606 if (gl.SeparableFilter2D) 3361 if (gl.SeparableFilter2D)
2607 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3362 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2608 3363
2609void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3364void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2610 3365
2611void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3366void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2612 3367
2613void glDrawPixels (int width, int height, int format, int type, char *pixels) 3368void glDrawPixels (int width, int height, int format, int type, char *pixels)
2614 3369
2640 3395
2641void glEndList () 3396void glEndList ()
2642 3397
2643void glCallList (int list) 3398void glCallList (int list)
2644 3399
2645MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3400void c_init ()
3401 CODE:
3402 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3403 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3404
3405MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2646 3406
2647PROTOTYPES: DISABLE 3407PROTOTYPES: DISABLE
2648 3408
2649void 3409void
2650find_widget (SV *self, NV x, NV y) 3410find_widget (SV *self, NV x, NV y)
2654 XPUSHs (self); 3414 XPUSHs (self);
2655} 3415}
2656 3416
2657BOOT: 3417BOOT:
2658{ 3418{
2659 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3419 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2660 3420
2661 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3421 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2662 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3422 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2663 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3423 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2664 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3424 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2665} 3425}
2666 3426
2667void 3427void
2668draw (SV *self) 3428draw (SV *self)
2669 CODE: 3429 CODE:
2673 NV x, y, w, h; 3433 NV x, y, w, h;
2674 SV *draw_x_sv = GvSV (draw_x_gv); 3434 SV *draw_x_sv = GvSV (draw_x_gv);
2675 SV *draw_y_sv = GvSV (draw_y_gv); 3435 SV *draw_y_sv = GvSV (draw_y_gv);
2676 SV *draw_w_sv = GvSV (draw_w_gv); 3436 SV *draw_w_sv = GvSV (draw_w_gv);
2677 SV *draw_h_sv = GvSV (draw_h_gv); 3437 SV *draw_h_sv = GvSV (draw_h_gv);
2678 SV *hover;
2679 double draw_x, draw_y, draw_w, draw_h; 3438 double draw_x, draw_y;
2680 3439
2681 if (!SvROK (self)) 3440 if (!SvROK (self))
2682 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3441 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2683 3442
2684 hv = (HV *)SvRV (self); 3443 hv = (HV *)SvRV (self);
2685 3444
2686 if (SvTYPE (hv) != SVt_PVHV) 3445 if (SvTYPE (hv) != SVt_PVHV)
2687 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3446 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2688 3447
2689 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3448 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2690 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3449 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2691 3450
2692 if (!h || !w) 3451 if (!h || !w)
2712 { 3471 {
2713 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3472 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2714 3473
2715 if (svp && SvTRUE (*svp)) 3474 if (svp && SvTRUE (*svp))
2716 { 3475 {
2717 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3476 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2718 glEnable (GL_BLEND); 3477 glEnable (GL_BLEND);
2719 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3478 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2720 glBegin (GL_QUADS); 3479 glBegin (GL_QUADS);
2721 glVertex2f (0, 0); 3480 glVertex2f (0, 0);
2722 glVertex2f (w, 0); 3481 glVertex2f (w, 0);
2725 glEnd (); 3484 glEnd ();
2726 glDisable (GL_BLEND); 3485 glDisable (GL_BLEND);
2727 } 3486 }
2728 } 3487 }
2729#if 0 3488#if 0
2730 if ($ENV{CFPLUS_DEBUG} & 1) { 3489 // draw borders, for debugging
2731 glPushMatrix; 3490 glPushMatrix ();
2732 glColor 1, 1, 0, 1; 3491 glColor4f (1., 1., 0., 1.);
2733 glTranslate 0.375, 0.375; 3492 glTranslatef (.5, .5, 0.);
2734 glBegin GL_LINE_LOOP; 3493 glBegin (GL_LINE_LOOP);
2735 glVertex 0 , 0; 3494 glVertex2f (0 , 0);
2736 glVertex $self->{w} - 1, 0; 3495 glVertex2f (w - 1, 0);
2737 glVertex $self->{w} - 1, $self->{h} - 1; 3496 glVertex2f (w - 1, h - 1);
2738 glVertex 0 , $self->{h} - 1; 3497 glVertex2f (0 , h - 1);
2739 glEnd; 3498 glEnd ();
2740 glPopMatrix; 3499 glPopMatrix ();
2741 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2742 }
2743#endif 3500#endif
2744 PUSHMARK (SP); 3501 PUSHMARK (SP);
2745 XPUSHs (self); 3502 XPUSHs (self);
2746 PUTBACK; 3503 PUTBACK;
2747 call_method ("_draw", G_VOID | G_DISCARD); 3504 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines