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.204 by root, Thu Jul 19 14:54:50 2007 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 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
66 104
67static AV *texture_av; 105static AV *texture_av;
68 106
69static struct 107static struct
70{ 108{
… …
107 av_push (texture_av, (SV *)(size_t)name); 145 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 146 glDeleteTextures (1, &name);
109} 147}
110 148
111#include "texcache.c" 149#include "texcache.c"
150#include "rendercache.c"
112 151
113#include "pango-font.c" 152#include "pango-font.c"
114#include "pango-fontmap.c" 153#include "pango-fontmap.c"
115#include "pango-render.c" 154#include "pango-render.c"
116 155
156typedef IV DC__Channel;
157typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
119 160
120typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
121 162
122static int 163static int
123shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
124{ 165{
125 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
… …
139 180
140typedef struct cf_layout { 181typedef struct cf_layout {
141 PangoLayout *pl; 182 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
143 int base_height; 184 int base_height;
144 CFPlus__Font font; 185 DC__Font font;
186 rc_t *rc;
145} *CFPlus__Layout; 187} *DC__Layout;
146 188
147static CFPlus__Font default_font; 189static DC__Font default_font;
148static PangoContext *opengl_context; 190static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
150 192
151static void 193static void
152substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
… …
157#endif 199#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 201}
160 202
161static void 203static void
162layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
163{ 205{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
166 */ 208 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
168 210
169 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 213
172 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
173} 215}
174 216
175static void 217static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 219{
178 PangoRectangle rect; 220 PangoRectangle rect;
179 221
180 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
… …
192 234
193typedef uint16_t tileid; 235typedef uint16_t tileid;
194typedef uint16_t faceid; 236typedef uint16_t faceid;
195 237
196typedef struct { 238typedef struct {
197 int name; 239 GLuint name;
198 int w, h; 240 int w, h;
199 float s, t; 241 float s, t;
200 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
201 tileid smoothtile; 243 tileid smoothtile;
202 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
203} maptex; 246} maptex;
204 247
205typedef struct { 248typedef struct {
206 uint32_t player; 249 uint32_t player;
207 tileid tile[3]; 250 tileid tile[3];
… …
220 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
222 265
223 int32_t rows; 266 int32_t rows;
224 maprow *row; 267 maprow *row;
225} *CFPlus__Map; 268} *DC__Map;
226 269
227static char * 270static char *
228prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
229{ 272{
230 char *p; 273 char *p;
… …
268 self->texs *= 2; 311 self->texs *= 2;
269 } 312 }
270} 313}
271 314
272static maprow * 315static maprow *
273map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
274{ 317{
275 if (0 > y) 318 if (0 > y)
276 { 319 {
277 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
… …
316 359
317 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
318} 361}
319 362
320static mapcell * 363static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
322{ 365{
323 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
324} 367}
325 368
326static void 369static void
327map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
328{ 371{
329 int r; 372 int r;
330 373
331 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
… …
339 self->oy = 0; 382 self->oy = 0;
340 self->row = 0; 383 self->row = 0;
341 self->rows = 0; 384 self->rows = 0;
342} 385}
343 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
344static void 397static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 399{
347 int x, y; 400 int x, y;
348 maprow *row; 401 maprow *row;
349 mapcell *cell; 402 mapcell *cell;
350 403
… …
362 if (x >= row->c1) 415 if (x >= row->c1)
363 break; 416 break;
364 417
365 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
366 419
367 cell->darkness = 0; 420 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 421 }
372 } 422 }
373} 423}
374 424
375typedef struct { 425typedef struct {
… …
429 n |= n >> 16; 479 n |= n >> 16;
430 480
431 return n + 1; 481 return n + 1;
432} 482}
433 483
484static unsigned int
485popcount (unsigned int n)
486{
487 n -= (n >> 1) & 0x55555555U;
488 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
489 n = ((n >> 4) + n) & 0x0f0f0f0fU;
490 n *= 0x01010101U;
491
492 return n >> 24;
493}
494
434/* SDL should provide this, really. */ 495/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 496#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 497#define SDLK_MODIFIER_MAX 314
437 498
438MODULE = CFPlus PACKAGE = CFPlus 499/******************************************************************************/
500
501static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
502static GV *hover_gv;
503
504static int
505within_widget (SV *widget, NV x, NV y)
506{
507 HV *self;
508 SV **svp;
509 NV wx, ww, wy, wh;
510
511 if (!SvROK (widget))
512 return 0;
513
514 self = (HV *)SvRV (widget);
515
516 if (SvTYPE (self) != SVt_PVHV)
517 return 0;
518
519 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
520 if (y < wy)
521 return 0;
522
523 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
524 if (y >= wy + wh)
525 return 0;
526
527 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
528 if (x < wx)
529 return 0;
530
531 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
532 if (x >= wx + ww)
533 return 0;
534
535 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
536 if (!svp || !SvTRUE (*svp))
537 return 0;
538
539 return 1;
540}
541
542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
593
594MODULE = Deliantra::Client PACKAGE = DC
439 595
440PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
441 597
442BOOT: 598BOOT:
443{ 599{
444 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
445 static const struct { 601 static const struct {
446 const char *name; 602 const char *name;
447 IV iv; 603 IV iv;
448 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
449# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
… …
471 627
472 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
475 631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
681
682 const_iv (SDLK_FIRST),
683 const_iv (SDLK_LAST),
476 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
477 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
478 const_iv (SDLK_KP2), 686 const_iv (SDLK_KP2),
479 const_iv (SDLK_KP3), 687 const_iv (SDLK_KP3),
480 const_iv (SDLK_KP4), 688 const_iv (SDLK_KP4),
… …
552 const_iv (KMOD_LMETA), 760 const_iv (KMOD_LMETA),
553 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
554 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
555 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
556 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
765
766 const_iv (KMOD_LRAM),
767
768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
557# undef const_iv 798# undef const_iv
558 }; 799 };
559 800
560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
579 820
580NV floor (NV x) 821NV floor (NV x)
581 822
582NV ceil (NV x) 823NV ceil (NV x)
583 824
825IV minpot (UV n)
826
827IV popcount (UV n)
828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
584void 835void
585pango_init () 836pango_init ()
586 CODE: 837 CODE:
587{ 838{
588 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
842 /*pango_context_set_font_description (opengl_context, default_font);*/
843#if PANGO_VERSION_CHECK (1, 15, 2)
844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
846#endif
591} 847}
592 848
593char *
594SDL_GetError () 849char *SDL_GetError ()
595 850
596int 851void SDL_braino ()
597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
598 852
599void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
600SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
601 869
602void 870void
603SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
604 PPCODE: 872 PPCODE:
605{ 873{
… …
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
620 888
621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
622#if SDL_VERSION_ATLEAST(1,2,10)
623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
626 891
627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
628 893
629 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
630 while (*m) 895 while (*m)
631 { 896 {
632 if ((*m)->w >= 640 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
633 { 898 {
634 AV *av = newAV (); 899 AV *av = newAV ();
635 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
636 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
… …
661 926
662 if (RETVAL) 927 if (RETVAL)
663 { 928 {
664 av_clear (texture_av); 929 av_clear (texture_av);
665 930
666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
668#include "glfunc.h" 933#include "glfunc.h"
669#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
670 } 938 }
671} 939}
672 OUTPUT: 940 OUTPUT:
673 RETVAL 941 RETVAL
674 942
… …
678char * 946char *
679SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
680 948
681int 949int
682SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
683 954
684void 955void
685poll_events () 956poll_events ()
686 PPCODE: 957 PPCODE:
687{ 958{
… …
697 { 968 {
698 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
699 case SDL_KEYUP: 970 case SDL_KEYUP:
700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
705 break; 976 break;
706 977
707 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
726 x = ev.motion.x; 997 x = ev.motion.x;
727 y = ev.motion.y; 998 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 } 1000 }
730 1001
731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
732 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
733 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
734 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
735 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
736 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 } 1008 }
738 break; 1009 break;
739 1010
740 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
741 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
743 1014
744 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
745 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
746 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
747 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
754 break; 1025 break;
755 } 1026 }
756 1027
757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
758 } 1029 }
759} 1030}
760 1031
1032char *
1033SDL_AudioDriverName ()
1034 CODE:
1035{
1036 char buf [256];
1037 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1038 XSRETURN_UNDEF;
1039
1040 RETVAL = buf;
1041}
1042 OUTPUT:
1043 RETVAL
1044
761int 1045int
762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
763 POSTCALL: 1047 POSTCALL:
764 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
765 Mix_ChannelFinished (channel_finished); 1049 Mix_ChannelFinished (channel_finished);
766 1050
767void 1051void
1052Mix_QuerySpec ()
1053 PPCODE:
1054{
1055 int freq, channels;
1056 Uint16 format;
1057
1058 if (Mix_QuerySpec (&freq, &format, &channels))
1059 {
1060 EXTEND (SP, 3);
1061 PUSHs (sv_2mortal (newSViv (freq)));
1062 PUSHs (sv_2mortal (newSViv (format)));
1063 PUSHs (sv_2mortal (newSViv (channels)));
1064 }
1065}
1066
1067void
768Mix_CloseAudio () 1068Mix_CloseAudio ()
769 1069
770int 1070int
771Mix_AllocateChannels (int numchans = -1) 1071Mix_AllocateChannels (int numchans = -1)
1072
1073const char *
1074Mix_GetError ()
772 1075
773void 1076void
774lowdelay (int fd, int val = 1) 1077lowdelay (int fd, int val = 1)
775 CODE: 1078 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1079 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
802 } 1105 }
803 } 1106 }
804#endif 1107#endif
805} 1108}
806 1109
807void 1110int
808add_font (char *file) 1111add_font (char *file)
809 CODE: 1112 CODE:
810 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT:
1115 RETVAL
1116
1117void
1118IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
811 1119
812void 1120void
813load_image_inline (SV *image_) 1121load_image_inline (SV *image_)
814 ALIAS: 1122 ALIAS:
815 load_image_file = 1 1123 load_image_file = 1
… …
818 STRLEN image_len; 1126 STRLEN image_len;
819 char *image = (char *)SvPVbyte (image_, image_len); 1127 char *image = (char *)SvPVbyte (image_, image_len);
820 SDL_Surface *surface, *surface2; 1128 SDL_Surface *surface, *surface2;
821 SDL_PixelFormat fmt; 1129 SDL_PixelFormat fmt;
822 SDL_RWops *rw = ix 1130 SDL_RWops *rw = ix
823 ? SDL_RWFromFile (image, "r") 1131 ? SDL_RWFromFile (image, "rb")
824 : SDL_RWFromConstMem (image, image_len); 1132 : SDL_RWFromConstMem (image, image_len);
825 1133
826 if (!rw) 1134 if (!rw)
827 croak ("load_image: %s", SDL_GetError ()); 1135 croak ("load_image: %s", SDL_GetError ());
828 1136
… …
901void 1209void
902error (char *message) 1210error (char *message)
903 CODE: 1211 CODE:
904 fprintf (stderr, "ERROR: %s\n", message); 1212 fprintf (stderr, "ERROR: %s\n", message);
905#ifdef _WIN32 1213#ifdef _WIN32
906 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1214 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
907#endif 1215#endif
908 1216
909void 1217void
910fatal (char *message) 1218fatal (char *message)
911 CODE: 1219 CODE:
912 fprintf (stderr, "FATAL: %s\n", message); 1220 fprintf (stderr, "FATAL: %s\n", message);
913#ifdef _WIN32 1221#ifdef _WIN32
914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1222 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
915#endif 1223#endif
916 _exit (1); 1224 _exit (1);
917 1225
918void 1226void
919_exit (int retval = 0) 1227_exit (int retval = 0)
… …
931#if DEBUG 1239#if DEBUG
932 VALGRIND_DO_LEAK_CHECK; 1240 VALGRIND_DO_LEAK_CHECK;
933#endif 1241#endif
934} 1242}
935 1243
936MODULE = CFPlus PACKAGE = CFPlus::Font 1244int
1245SvREFCNT (SV *sv)
1246 CODE:
1247 RETVAL = SvREFCNT (sv);
1248 OUTPUT:
1249 RETVAL
937 1250
938CFPlus::Font 1251MODULE = Deliantra::Client PACKAGE = DC::Font
1252
1253PROTOTYPES: DISABLE
1254
1255DC::Font
939new_from_file (SV *class, char *path, int id = 0) 1256new_from_file (SV *class, char *path, int id = 0)
940 CODE: 1257 CODE:
941{ 1258{
942 int count; 1259 int count;
943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1260 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
946} 1263}
947 OUTPUT: 1264 OUTPUT:
948 RETVAL 1265 RETVAL
949 1266
950void 1267void
951DESTROY (CFPlus::Font self) 1268DESTROY (DC::Font self)
952 CODE: 1269 CODE:
953 pango_font_description_free (self); 1270 pango_font_description_free (self);
954 1271
955void 1272void
956make_default (CFPlus::Font self) 1273make_default (DC::Font self)
1274 PROTOTYPE: $
957 CODE: 1275 CODE:
958 default_font = self; 1276 default_font = self;
959 1277
960MODULE = CFPlus PACKAGE = CFPlus::Layout 1278MODULE = Deliantra::Client PACKAGE = DC::Layout
961 1279
1280PROTOTYPES: DISABLE
1281
962void 1282void
963reset_glyph_cache () 1283glyph_cache_backup ()
1284 PROTOTYPE:
964 CODE: 1285 CODE:
1286 tc_backup ();
1287
1288void
1289glyph_cache_restore ()
1290 PROTOTYPE:
1291 CODE:
965 tc_clear (); 1292 tc_restore ();
966 1293
967CFPlus::Layout 1294DC::Layout
968new (SV *class) 1295new (SV *class)
969 CODE: 1296 CODE:
970 New (0, RETVAL, 1, struct cf_layout); 1297 New (0, RETVAL, 1, struct cf_layout);
971 1298
972 RETVAL->pl = pango_layout_new (opengl_context); 1299 RETVAL->pl = pango_layout_new (opengl_context);
… …
974 RETVAL->g = 1.; 1301 RETVAL->g = 1.;
975 RETVAL->b = 1.; 1302 RETVAL->b = 1.;
976 RETVAL->a = 1.; 1303 RETVAL->a = 1.;
977 RETVAL->base_height = MIN_FONT_HEIGHT; 1304 RETVAL->base_height = MIN_FONT_HEIGHT;
978 RETVAL->font = 0; 1305 RETVAL->font = 0;
1306 RETVAL->rc = rc_alloc ();
979 1307
980 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1308 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
981 layout_update_font (RETVAL); 1309 layout_update_font (RETVAL);
982 OUTPUT: 1310 OUTPUT:
983 RETVAL 1311 RETVAL
984 1312
985void 1313void
986DESTROY (CFPlus::Layout self) 1314DESTROY (DC::Layout self)
987 CODE: 1315 CODE:
988 g_object_unref (self->pl); 1316 g_object_unref (self->pl);
1317 rc_free (self->rc);
989 Safefree (self); 1318 Safefree (self);
990 1319
991void 1320void
992set_text (CFPlus::Layout self, SV *text_) 1321set_text (DC::Layout self, SV *text_)
993 CODE: 1322 CODE:
994{ 1323{
995 STRLEN textlen; 1324 STRLEN textlen;
996 char *text = SvPVutf8 (text_, textlen); 1325 char *text = SvPVutf8 (text_, textlen);
997 1326
998 pango_layout_set_text (self->pl, text, textlen); 1327 pango_layout_set_text (self->pl, text, textlen);
999} 1328}
1000 1329
1001void 1330void
1002set_markup (CFPlus::Layout self, SV *text_) 1331set_markup (DC::Layout self, SV *text_)
1003 CODE: 1332 CODE:
1004{ 1333{
1005 STRLEN textlen; 1334 STRLEN textlen;
1006 char *text = SvPVutf8 (text_, textlen); 1335 char *text = SvPVutf8 (text_, textlen);
1007 1336
1008 pango_layout_set_markup (self->pl, text, textlen); 1337 pango_layout_set_markup (self->pl, text, textlen);
1009} 1338}
1010 1339
1011void 1340void
1012set_shapes (CFPlus::Layout self, ...) 1341set_shapes (DC::Layout self, ...)
1013 CODE: 1342 CODE:
1014{ 1343{
1015 PangoAttrList *attrs = 0; 1344 PangoAttrList *attrs = 0;
1016 const char *text = pango_layout_get_text (self->pl); 1345 const char *text = pango_layout_get_text (self->pl);
1017 const char *pos = text; 1346 const char *pos = text;
… …
1052 if (attrs) 1381 if (attrs)
1053 pango_layout_set_attributes (self->pl, attrs); 1382 pango_layout_set_attributes (self->pl, attrs);
1054} 1383}
1055 1384
1056void 1385void
1057get_shapes (CFPlus::Layout self) 1386get_shapes (DC::Layout self)
1058 PPCODE: 1387 PPCODE:
1059{ 1388{
1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1389 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1061 1390
1062 do 1391 do
1063 { 1392 {
1064 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1393 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1065 1394
1066 if (run && shape_attr_p (run)) 1395 if (run && shape_attr_p (run))
1067 { 1396 {
1068 PangoRectangle extents; 1397 PangoRectangle extents;
1069 pango_layout_iter_get_run_extents (iter, 0, &extents); 1398 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1077 1406
1078 pango_layout_iter_free (iter); 1407 pango_layout_iter_free (iter);
1079} 1408}
1080 1409
1081int 1410int
1082has_wrapped (CFPlus::Layout self) 1411has_wrapped (DC::Layout self)
1083 CODE: 1412 CODE:
1084{ 1413{
1085 int lines = 1; 1414 int lines = 1;
1086 const char *text = pango_layout_get_text (self->pl); 1415 const char *text = pango_layout_get_text (self->pl);
1087 1416
… …
1092} 1421}
1093 OUTPUT: 1422 OUTPUT:
1094 RETVAL 1423 RETVAL
1095 1424
1096SV * 1425SV *
1097get_text (CFPlus::Layout self) 1426get_text (DC::Layout self)
1098 CODE: 1427 CODE:
1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1428 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1100 sv_utf8_decode (RETVAL); 1429 sv_utf8_decode (RETVAL);
1101 OUTPUT: 1430 OUTPUT:
1102 RETVAL 1431 RETVAL
1103 1432
1104void 1433void
1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1434set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1106 CODE: 1435 CODE:
1107 self->r = r; 1436 self->r = r;
1108 self->g = g; 1437 self->g = g;
1109 self->b = b; 1438 self->b = b;
1110 self->a = a; 1439 self->a = a;
1111 1440
1112void 1441void
1113set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1442set_font (DC::Layout self, DC::Font font = 0)
1114 CODE: 1443 CODE:
1115 if (self->font != font) 1444 if (self->font != font)
1116 { 1445 {
1117 self->font = font; 1446 self->font = font;
1118 layout_update_font (self); 1447 layout_update_font (self);
1119 } 1448 }
1120 1449
1121void 1450void
1122set_height (CFPlus::Layout self, int base_height) 1451set_height (DC::Layout self, int base_height)
1123 CODE: 1452 CODE:
1124 if (self->base_height != base_height) 1453 if (self->base_height != base_height)
1125 { 1454 {
1126 self->base_height = base_height; 1455 self->base_height = base_height;
1127 layout_update_font (self); 1456 layout_update_font (self);
1128 } 1457 }
1129 1458
1130void 1459void
1131set_width (CFPlus::Layout self, int max_width = -1) 1460set_width (DC::Layout self, int max_width = -1)
1132 CODE: 1461 CODE:
1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1462 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1134 1463
1135void 1464void
1136set_indent (CFPlus::Layout self, int indent) 1465set_indent (DC::Layout self, int indent)
1137 CODE: 1466 CODE:
1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1467 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1139 1468
1140void 1469void
1141set_spacing (CFPlus::Layout self, int spacing) 1470set_spacing (DC::Layout self, int spacing)
1142 CODE: 1471 CODE:
1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1472 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1144 1473
1145void 1474void
1146set_ellipsise (CFPlus::Layout self, int ellipsise) 1475set_ellipsise (DC::Layout self, int ellipsise)
1147 CODE: 1476 CODE:
1148 pango_layout_set_ellipsize (self->pl, 1477 pango_layout_set_ellipsize (self->pl,
1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1478 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1479 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1480 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1152 : PANGO_ELLIPSIZE_NONE 1481 : PANGO_ELLIPSIZE_NONE
1153 ); 1482 );
1154 1483
1155void 1484void
1156set_single_paragraph_mode (CFPlus::Layout self, int spm) 1485set_single_paragraph_mode (DC::Layout self, int spm)
1157 CODE: 1486 CODE:
1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1487 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1159 1488
1160void 1489void
1161size (CFPlus::Layout self) 1490size (DC::Layout self)
1162 PPCODE: 1491 PPCODE:
1163{ 1492{
1164 int w, h; 1493 int w, h;
1165 1494
1166 layout_get_pixel_size (self, &w, &h); 1495 layout_get_pixel_size (self, &w, &h);
… …
1169 PUSHs (sv_2mortal (newSViv (w))); 1498 PUSHs (sv_2mortal (newSViv (w)));
1170 PUSHs (sv_2mortal (newSViv (h))); 1499 PUSHs (sv_2mortal (newSViv (h)));
1171} 1500}
1172 1501
1173int 1502int
1174descent (CFPlus::Layout self) 1503descent (DC::Layout self)
1175 CODE: 1504 CODE:
1176{ 1505{
1177 PangoRectangle rect; 1506 PangoRectangle rect;
1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1507 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1179 pango_layout_line_get_pixel_extents (line, 0, &rect); 1508 pango_layout_line_get_pixel_extents (line, 0, &rect);
1180 RETVAL = PANGO_DESCENT (rect); 1509 RETVAL = PANGO_DESCENT (rect);
1181} 1510}
1182 OUTPUT: 1511 OUTPUT:
1183 RETVAL 1512 RETVAL
1184 1513
1185int 1514int
1186xy_to_index (CFPlus::Layout self, int x, int y) 1515xy_to_index (DC::Layout self, int x, int y)
1187 CODE: 1516 CODE:
1188{ 1517{
1189 int index, trailing; 1518 int index, trailing;
1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1519 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1191 RETVAL = index + trailing; 1520 RETVAL = index + trailing;
1192} 1521}
1193 OUTPUT: 1522 OUTPUT:
1194 RETVAL 1523 RETVAL
1195 1524
1196void 1525void
1197cursor_pos (CFPlus::Layout self, int index) 1526cursor_pos (DC::Layout self, int index)
1198 PPCODE: 1527 PPCODE:
1199{ 1528{
1200 PangoRectangle strong_pos; 1529 PangoRectangle pos;
1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1530 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1202 1531
1203 EXTEND (SP, 3); 1532 EXTEND (SP, 3);
1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1533 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1534 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1535 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1207} 1536}
1208 1537
1209void 1538void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1539index_to_line_x (DC::Layout self, int index, int trailing = 0)
1211 PPCODE: 1540 PPCODE:
1212{ 1541{
1213 int line, x; 1542 int line, x;
1214 1543
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1544 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1545#if !PANGO_VERSION_CHECK (1, 17, 3)
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1546 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217 1547 --line;
1548#endif
1218 EXTEND (SP, 2); 1549 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1))); 1550 PUSHs (sv_2mortal (newSViv (line)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1551 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221} 1552}
1222 1553
1223void 1554void
1224line_x_to_index (CFPlus::Layout self, int line, int x) 1555line_x_to_index (DC::Layout self, int line, int x)
1225 PPCODE: 1556 PPCODE:
1226{ 1557{
1227 PangoLayoutLine *lp; 1558 PangoLayoutLine *lp;
1228 int index, trailing; 1559 int index, trailing;
1229 1560
1230 if (line < 0) 1561 if (line < 0)
1231 XSRETURN_EMPTY; 1562 XSRETURN_EMPTY;
1232 1563
1233 if (!(lp = pango_layout_get_line (self->pl, line))) 1564 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */ 1565 XSRETURN_EMPTY; /* do better */
1235 1566
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1567 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237 1568
1238 EXTEND (SP, 2); 1569 EXTEND (SP, 2);
… …
1244 PUSHs (sv_2mortal (newSViv (trailing))); 1575 PUSHs (sv_2mortal (newSViv (trailing)));
1245 } 1576 }
1246} 1577}
1247 1578
1248void 1579void
1249render (CFPlus::Layout self, float x, float y, int flags = 0) 1580render (DC::Layout self, float x, float y, int flags = 0)
1250 PPCODE: 1581 CODE:
1582 rc_clear (self->rc);
1251 pango_opengl_render_layout_subpixel ( 1583 pango_opengl_render_layout_subpixel (
1252 self->pl, 1584 self->pl,
1585 self->rc,
1253 x * PANGO_SCALE, y * PANGO_SCALE, 1586 x * PANGO_SCALE, y * PANGO_SCALE,
1254 self->r, self->g, self->b, self->a, 1587 self->r, self->g, self->b, self->a,
1255 flags 1588 flags
1256 ); 1589 );
1590 // we assume that context_change actually clears/frees stuff
1591 // and does not do any recomputation...
1592 pango_layout_context_changed (self->pl);
1257 1593
1258MODULE = CFPlus PACKAGE = CFPlus::Texture 1594void
1595draw (DC::Layout self)
1596 CODE:
1597{
1598 glEnable (GL_TEXTURE_2D);
1599 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1600 glEnable (GL_BLEND);
1601 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1602 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1603 glEnable (GL_ALPHA_TEST);
1604 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1259 1605
1260int minpot (int n) 1606 rc_draw (self->rc);
1607
1608 glDisable (GL_ALPHA_TEST);
1609 glDisable (GL_BLEND);
1610 glDisable (GL_TEXTURE_2D);
1611}
1612
1613MODULE = Deliantra::Client PACKAGE = DC::Texture
1614
1615PROTOTYPES: ENABLE
1261 1616
1262void 1617void
1263pad (SV *data_, int ow, int oh, int nw, int nh) 1618pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE: 1619 CODE:
1265{ 1620{
… …
1292 HV *hv = (HV *)SvRV (self); 1647 HV *hv = (HV *)SvRV (self);
1293 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1648 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1294 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1649 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1295 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1650 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1296 1651
1652 if (name <= 0)
1653 XSRETURN_EMPTY;
1654
1297 if (items < 5) 1655 if (items < 5)
1298 { 1656 {
1299 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1657 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1300 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1658 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1301 } 1659 }
… …
1328 glDisable (GL_ALPHA_TEST); 1686 glDisable (GL_ALPHA_TEST);
1329 glDisable (GL_BLEND); 1687 glDisable (GL_BLEND);
1330 } 1688 }
1331} 1689}
1332 1690
1691void
1692draw_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)
1693 PROTOTYPE: @
1694 CODE:
1695{
1696 glEnable (GL_BLEND);
1697 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1698 glEnable (GL_TEXTURE_2D);
1699 glBindTexture (GL_TEXTURE_2D, name1);
1700
1701 glColor3f (intensity, intensity, intensity);
1702 glPushMatrix ();
1703 glScalef (1./3, 1./3, 1.);
1704
1705 if (blend > 0.f)
1706 {
1707 float dx3 = dx * -3.f / w;
1708 float dy3 = dy * -3.f / h;
1709 GLfloat env_color[4] = { 0., 0., 0., blend };
1710
1711 /* interpolate the two shadow textures */
1712 /* stage 0 == rgb(glcolor) + alpha(t0) */
1713 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1714
1715 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1716 gl.ActiveTexture (GL_TEXTURE1);
1717 glEnable (GL_TEXTURE_2D);
1718 glBindTexture (GL_TEXTURE_2D, name2);
1719 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1720
1721 /* rgb == rgb(glcolor) */
1722 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1723 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1724 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1725
1726 /* alpha = interpolate t0, t1 by env_alpha */
1727 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1728
1729 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1735
1736 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1737 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1738
1739 glBegin (GL_QUADS);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1741 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1742 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1743 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1744 glEnd ();
1745
1746 glDisable (GL_TEXTURE_2D);
1747 gl.ActiveTexture (GL_TEXTURE0);
1748 }
1749 else
1750 {
1751 /* simple blending of one texture, also opengl <1.3 path */
1752 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1753
1754 glBegin (GL_QUADS);
1755 glTexCoord2f (0, 0); glVertex2f (0, 0);
1756 glTexCoord2f (0, t); glVertex2f (0, h);
1757 glTexCoord2f (s, t); glVertex2f (w, h);
1758 glTexCoord2f (s, 0); glVertex2f (w, 0);
1759 glEnd ();
1760 }
1761
1762 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1763 {
1764 int x, y;
1765 int dx3 = dx * 3;
1766 int dy3 = dy * 3;
1767
1768 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1769 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1770 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1771 glTranslatef (-1., -1., 0);
1772 glBegin (GL_QUADS);
1773
1774 for (y = 1; y < h; y += 3)
1775 {
1776 int y1 = y - dy3;
1777 int y1valid = y1 >= 0 && y1 < h;
1778
1779 for (x = 1; x < w; x += 3)
1780 {
1781 int x1 = x - dx3;
1782 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1783 uint8_t h2;
1784
1785 if (y1valid && x1 >= 0 && x1 < w)
1786 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1787 else
1788 h2 = 1; /* out of range == invisible */
1789
1790 if (h1 || h2)
1791 {
1792 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1793 glColor4f (1., 1., 1., alpha);
1794
1795 glTexCoord2f (0, 0.); glVertex2i (x , y );
1796 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1797 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1798 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1799 }
1800 }
1801 }
1802 }
1803
1804 glEnd ();
1805
1806 glPopMatrix ();
1807
1808 glDisable (GL_TEXTURE_2D);
1809 glDisable (GL_BLEND);
1810}
1811
1333IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1812IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1334 CODE: 1813 CODE:
1335{ 1814{
1336 GLint width; 1815 GLint width;
1337 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1816 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1339 RETVAL = width > 0; 1818 RETVAL = width > 0;
1340} 1819}
1341 OUTPUT: 1820 OUTPUT:
1342 RETVAL 1821 RETVAL
1343 1822
1344MODULE = CFPlus PACKAGE = CFPlus::Map 1823MODULE = Deliantra::Client PACKAGE = DC::Map
1345 1824
1346CFPlus::Map 1825PROTOTYPES: DISABLE
1826
1827DC::Map
1347new (SV *class) 1828new (SV *class)
1348 CODE: 1829 CODE:
1349 New (0, RETVAL, 1, struct map); 1830 New (0, RETVAL, 1, struct map);
1350 RETVAL->x = 0; 1831 RETVAL->x = 0;
1351 RETVAL->y = 0; 1832 RETVAL->y = 0;
… …
1359 RETVAL->row = 0; 1840 RETVAL->row = 0;
1360 OUTPUT: 1841 OUTPUT:
1361 RETVAL 1842 RETVAL
1362 1843
1363void 1844void
1364DESTROY (CFPlus::Map self) 1845DESTROY (DC::Map self)
1365 CODE: 1846 CODE:
1366{ 1847{
1367 map_clear (self); 1848 map_clear (self);
1368 Safefree (self->face2tile); 1849 Safefree (self->face2tile);
1369 Safefree (self->tex); 1850 Safefree (self->tex);
1370 Safefree (self); 1851 Safefree (self);
1371} 1852}
1372 1853
1373void 1854void
1374resize (CFPlus::Map self, int map_width, int map_height) 1855resize (DC::Map self, int map_width, int map_height)
1375 CODE: 1856 CODE:
1376 self->w = map_width; 1857 self->w = map_width;
1377 self->h = map_height; 1858 self->h = map_height;
1378 1859
1379void 1860void
1380clear (CFPlus::Map self) 1861clear (DC::Map self)
1381 CODE: 1862 CODE:
1382 map_clear (self); 1863 map_clear (self);
1383 1864
1384void 1865void
1385set_tileid (CFPlus::Map self, int face, int tile) 1866set_tileid (DC::Map self, int face, int tile)
1386 CODE: 1867 CODE:
1387{ 1868{
1388 need_facenum (self, face); self->face2tile [face] = tile; 1869 need_facenum (self, face); self->face2tile [face] = tile;
1389 need_texid (self, tile); 1870 need_texid (self, tile);
1390} 1871}
1391 1872
1392void 1873void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level) 1874set_smooth (DC::Map self, int face, int smooth, int level)
1394 CODE: 1875 CODE:
1395{ 1876{
1396 tileid texid; 1877 tileid texid;
1397 maptex *tex; 1878 maptex *tex;
1398 1879
… …
1411 tex->smoothtile = self->face2tile [smooth]; 1892 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level; 1893 tex->smoothlevel = level;
1413} 1894}
1414 1895
1415void 1896void
1416set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1897set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1417 CODE: 1898 CODE:
1418{ 1899{
1419 need_texid (self, texid); 1900 need_texid (self, texid);
1420 1901
1421 { 1902 {
… …
1440 // use uglier nearest interpolation because linear suffers 1921 // use uglier nearest interpolation because linear suffers
1441 // from transparent color bleeding and ugly wrapping effects. 1922 // from transparent color bleeding and ugly wrapping effects.
1442 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1923 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1443} 1924}
1444 1925
1926void
1927expire_textures (DC::Map self, int texid, int count)
1928 PPCODE:
1929 for (; texid < self->texs && count; ++texid, --count)
1930 {
1931 maptex *tex = self->tex + texid;
1932
1933 if (tex->name)
1934 {
1935 if (tex->unused)
1936 {
1937 tex->name = 0;
1938 tex->unused = 0;
1939 XPUSHs (sv_2mortal (newSViv (texid)));
1940 }
1941 else
1942 tex->unused = 1;
1943 }
1944 }
1945
1445int 1946int
1446ox (CFPlus::Map self) 1947ox (DC::Map self)
1447 ALIAS: 1948 ALIAS:
1448 oy = 1 1949 oy = 1
1449 x = 2 1950 x = 2
1450 y = 3 1951 y = 3
1451 w = 4 1952 w = 4
… …
1462 } 1963 }
1463 OUTPUT: 1964 OUTPUT:
1464 RETVAL 1965 RETVAL
1465 1966
1466void 1967void
1467scroll (CFPlus::Map self, int dx, int dy) 1968scroll (DC::Map self, int dx, int dy)
1468 CODE: 1969 CODE:
1469{ 1970{
1470 if (dx > 0) 1971 if (dx > 0)
1471 map_blank (self, self->x, self->y, dx, self->h); 1972 map_blank (self, self->x, self->y, dx, self->h);
1472 else if (dx < 0) 1973 else if (dx < 0)
… …
1487 self->rows += MAP_EXTEND_Y; 1988 self->rows += MAP_EXTEND_Y;
1488 self->y += MAP_EXTEND_Y; 1989 self->y += MAP_EXTEND_Y;
1489 } 1990 }
1490} 1991}
1491 1992
1492void 1993SV *
1493map1a_update (CFPlus::Map self, SV *data_, int extmap) 1994map1a_update (DC::Map self, SV *data_, int extmap)
1494 CODE: 1995 CODE:
1495{ 1996{
1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1997 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1497 uint8_t *data_end = (uint8_t *)SvEND (data_); 1998 uint8_t *data_end = (uint8_t *)SvEND (data_);
1498 mapcell *cell; 1999 mapcell *cell;
1499 int x, y, flags; 2000 int x, y, z, flags;
2001 AV *missing = newAV ();
2002 RETVAL = newRV_noinc ((SV *)missing);
1500 2003
1501 while (data < data_end - 1) 2004 while (data < data_end - 1)
1502 { 2005 {
1503 flags = (data [0] << 8) + data [1]; data += 2; 2006 flags = (data [0] << 8) + data [1]; data += 2;
1504 2007
… …
1524 uint8_t ext, cmd; 2027 uint8_t ext, cmd;
1525 2028
1526 do 2029 do
1527 { 2030 {
1528 ext = *data++; 2031 ext = *data++;
1529 cmd = ext & 0x3f; 2032 cmd = ext & 0x7f;
1530 2033
1531 if (cmd < 4) 2034 if (cmd < 4)
1532 cell->darkness = 255 - ext * 64 + 1; 2035 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1533 else if (cmd == 5) // health 2036 else if (cmd == 5) // health
1534 { 2037 {
1535 cell->stat_width = 1; 2038 cell->stat_width = 1;
1536 cell->stat_hp = *data++; 2039 cell->stat_hp = *data++;
1537 } 2040 }
1538 else if (cmd == 6) // monster width 2041 else if (cmd == 6) // monster width
1539 cell->stat_width = *data++ + 1; 2042 cell->stat_width = *data++ + 1;
1540 else if (cmd == 0x47) 2043 else if (cmd == 0x47)
1541 { 2044 {
1542 if (*data == 4) 2045 if (*data == 1) cell->player = data [1];
1543 ; // decode player count 2046 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2047 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2048 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1544 2049
1545 data += *data + 1; 2050 data += *data + 1;
1546 } 2051 }
1547 else if (cmd == 8) // cell flags 2052 else if (cmd == 8) // cell flags
1548 cell->flags = *data++; 2053 cell->flags = *data++;
… …
1555 } 2060 }
1556 else 2061 else
1557 cell->darkness = *data++ + 1; 2062 cell->darkness = *data++ + 1;
1558 } 2063 }
1559 2064
2065 for (z = 0; z <= 2; ++z)
1560 if (flags & 4) 2066 if (flags & (4 >> z))
1561 { 2067 {
1562 faceid face = (data [0] << 8) + data [1]; data += 2; 2068 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face); 2069 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face]; 2070 cell->tile [z] = self->face2tile [face];
2071
2072 if (cell->tile [z])
2073 {
2074 maptex *tex = self->tex + cell->tile [z];
2075 tex->unused = 0;
2076 if (!tex->name)
2077 av_push (missing, newSViv (cell->tile [z]));
2078
2079 if (tex->smoothtile)
2080 {
2081 maptex *smooth = self->tex + tex->smoothtile;
2082 smooth->unused = 0;
2083 if (!smooth->name)
2084 av_push (missing, newSViv (tex->smoothtile));
2085 }
2086 }
1565 } 2087 }
1566
1567 if (flags & 2)
1568 {
1569 faceid face = (data [0] << 8) + data [1]; data += 2;
1570 need_facenum (self, face);
1571 cell->tile [1] = self->face2tile [face];
1572 }
1573
1574 if (flags & 1)
1575 {
1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [2] = self->face2tile [face];
1579 }
1580 } 2088 }
1581 else 2089 else
1582 cell->darkness = 0; 2090 CELL_CLEAR (cell);
1583 } 2091 }
1584} 2092}
2093 OUTPUT:
2094 RETVAL
1585 2095
1586SV * 2096SV *
1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2097mapmap (DC::Map self, int x0, int y0, int w, int h)
1588 CODE: 2098 CODE:
1589{ 2099{
1590 int x1, x; 2100 int x1, x;
1591 int y1, y; 2101 int y1, y;
1592 int z; 2102 int z;
… …
1637} 2147}
1638 OUTPUT: 2148 OUTPUT:
1639 RETVAL 2149 RETVAL
1640 2150
1641void 2151void
1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2152draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1643 CODE: 2153 CODE:
1644{ 2154{
2155 int x, y, z;
2156
1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2157 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2158 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1647 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2159 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1648 smooth_key skey; 2160 smooth_key skey;
1649 int x, y, z; 2161 int pl_x, pl_y;
1650 int last_name; 2162 maptex pl_tex;
2163 rc_t *rc = rc_alloc ();
2164 rc_t *rc_ov = rc_alloc ();
2165 rc_key_t key;
2166 rc_array_t *arr;
1651 2167
2168 pl_tex.name = 0;
2169
1652 // thats current max. sorry. 2170 // that's current max. sorry.
1653 if (sw > 255) sw = 255; 2171 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255; 2172 if (sh > 255) sh = 255;
1655 2173
1656 // clear key, in case of extra padding 2174 // clear key, in case of extra padding
1657 memset (&skey, 0, sizeof (skey)); 2175 memset (&skey, 0, sizeof (skey));
1658 2176
1659 glColor4ub (255, 255, 255, 255); 2177 memset (&key, 0, sizeof (key));
1660 2178 key.r = 255;
1661 glEnable (GL_BLEND); 2179 key.g = 255;
1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2180 key.b = 255;
1663 glEnable (GL_TEXTURE_2D); 2181 key.a = 255;
1664 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2182 key.mode = GL_QUADS;
1665 2183 key.format = GL_T2F_V3F;
1666 glBegin (GL_QUADS);
1667
1668 last_name = 0;
1669 2184
1670 mx += self->x; 2185 mx += self->x;
1671 my += self->y; 2186 my += self->y;
1672 2187
1673 // first pass: determine smooth_max 2188 // first pass: determine smooth_max
… …
1690 MAX (self->tex [cell->tile [1]].smoothlevel, 2205 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel)); 2206 self->tex [cell->tile [2]].smoothlevel));
1692 } 2207 }
1693 } 2208 }
1694 2209
2210 glEnable (GL_BLEND);
2211 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2212 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2213
1695 for (z = 0; z <= 2; z++) 2214 for (z = 0; z <= 2; z++)
1696 { 2215 {
1697 memset (smooth_level, 0, sizeof (smooth_level)); 2216 memset (smooth_level, 0, sizeof (smooth_level));
2217 key.texname = -1;
1698 2218
1699 for (y = 0; y < sh; y++) 2219 for (y = 0; y < sh; y++)
1700 if (0 <= y + my && y + my < self->rows) 2220 if (0 <= y + my && y + my < self->rows)
1701 { 2221 {
1702 maprow *row = self->row + (y + my); 2222 maprow *row = self->row + (y + my);
… …
1708 tileid tile = cell->tile [z]; 2228 tileid tile = cell->tile [z];
1709 2229
1710 if (tile) 2230 if (tile)
1711 { 2231 {
1712 maptex tex = self->tex [tile]; 2232 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w; 2233 int px, py;
1714 int py = (y + 1) * T - tex.h;
1715 2234
1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name) 2235 if (key.texname != tex.name)
1719 { 2236 {
2237 self->tex [tile].unused = 0;
2238
1720 if (!tex.name) 2239 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */ 2240 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1722 2241
1723 glEnd (); 2242 key.texname = tex.name;
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2243 arr = rc_array (rc, &key);
1725 glBegin (GL_QUADS);
1726 } 2244 }
1727 2245
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2246 px = (x + 1) * T - tex.w;
1729 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2247 py = (y + 1) * T - tex.h;
1730 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1731 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1732 2248
1733 if (cell->flags && z == 2) 2249 if (expect_false (cell->player == player) && expect_false (z == 2))
1734 { 2250 {
1735 if (cell->flags & 1) 2251 pl_x = px;
2252 pl_y = py;
2253 pl_tex = tex;
1736 { 2254 continue;
1737 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32;
1740
1741 glEnd ();
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1743 glBegin (GL_QUADS);
1744
1745 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1746 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1747 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1748 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1749 }
1750 } 2255 }
2256
2257 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2258 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2259 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2260 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1751 2261
1752 // update smooth hash 2262 // update smooth hash
1753 if (tex.smoothtile) 2263 if (tex.smoothtile)
1754 { 2264 {
1755 skey.tile = tex.smoothtile; 2265 skey.tile = tex.smoothtile;
… …
1786 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2296 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1787 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2297 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1788 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2298 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1789 } 2299 }
1790 } 2300 }
2301
2302 if (expect_false (z == 2) && expect_false (cell->flags))
2303 {
2304 // overlays such as the speech bubble, probably more to come
2305 if (cell->flags & 1)
2306 {
2307 rc_key_t key_ov = key;
2308 maptex tex = self->tex [TEXID_SPEECH];
2309 rc_array_t *arr;
2310 int px = x * T + T * 2 / 32;
2311 int py = y * T - T * 6 / 32;
2312
2313 key_ov.texname = tex.name;
2314 arr = rc_array (rc_ov, &key_ov);
2315
2316 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2317 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2318 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2319 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2320 }
2321 }
1791 } 2322 }
1792 } 2323 }
2324
2325 rc_draw (rc);
2326 rc_clear (rc);
1793 2327
1794 // go through all smoothlevels, lowest to highest, then draw. 2328 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort 2329 // this is basically counting sort
1796 { 2330 {
1797 int w, b; 2331 int w, b;
1798 2332
2333 glEnable (GL_TEXTURE_2D);
2334 glBegin (GL_QUADS);
1799 for (w = 0; w < 256 / 32; ++w) 2335 for (w = 0; w < 256 / 32; ++w)
1800 { 2336 {
1801 uint32_t smask = smooth_level [w]; 2337 uint32_t smask = smooth_level [w];
1802 if (smask) 2338 if (smask)
1803 for (b = 0; b < 32; ++b) 2339 for (b = 0; b < 32; ++b)
… …
1822 int border = bits & 15; 2358 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2359 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row 2360 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column 2361 float dy = tex.t * .5f ; // 2 images/column
1826 2362
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name) 2363 if (tex.name)
1830 { 2364 {
2365 // this time avoiding texture state changes
2366 // save gobs of state changes.
1831 if (!tex.name) 2367 if (key.texname != tex.name)
1832 continue; // smoothing not yet available 2368 {
2369 self->tex [skey->tile].unused = 0;
1833 2370
1834 glEnd (); 2371 glEnd ();
1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2372 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1836 glBegin (GL_QUADS); 2373 glBegin (GL_QUADS);
1837 } 2374 }
1838 2375
1839 if (border) 2376 if (border)
1840 { 2377 {
1841 float ox = border * dx; 2378 float ox = border * dx;
1842 2379
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2380 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2381 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2382 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2383 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1847 } 2384 }
1848 2385
1849 if (corner) 2386 if (corner)
1850 { 2387 {
1851 float ox = corner * dx; 2388 float ox = corner * dx;
1852 2389
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2390 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2391 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2392 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2393 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2394 }
1857 } 2395 }
1858 } 2396 }
1859 } 2397 }
1860 } 2398 }
1861 } 2399 }
2400
2401 glEnd ();
2402 glDisable (GL_TEXTURE_2D);
2403 key.texname = -1;
1862 } 2404 }
1863 2405
1864 hv_clear (smooth); 2406 hv_clear (smooth);
1865 } 2407 }
1866 2408
1867 glEnd (); 2409 if (pl_tex.name)
2410 {
2411 maptex tex = pl_tex;
2412 int px = pl_x + sdx;
2413 int py = pl_y + sdy;
1868 2414
1869 glDisable (GL_TEXTURE_2D); 2415 key.texname = tex.name;
2416 arr = rc_array (rc, &key);
2417
2418 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2419 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2420 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2421 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2422
2423 rc_draw (rc);
2424 }
2425
2426 rc_draw (rc_ov);
2427 rc_clear (rc_ov);
2428
1870 glDisable (GL_BLEND); 2429 glDisable (GL_BLEND);
2430 rc_free (rc);
2431 rc_free (rc_ov);
1871 2432
1872 // top layer: overlays such as the health bar 2433 // top layer: overlays such as the health bar
1873 for (y = 0; y < sh; y++) 2434 for (y = 0; y < sh; y++)
1874 if (0 <= y + my && y + my < self->rows) 2435 if (0 <= y + my && y + my < self->rows)
1875 { 2436 {
… …
1880 { 2441 {
1881 mapcell *cell = row->col + (x + mx - row->c0); 2442 mapcell *cell = row->col + (x + mx - row->c0);
1882 2443
1883 int px = x * T; 2444 int px = x * T;
1884 int py = y * T; 2445 int py = y * T;
2446
2447 if (expect_false (cell->player == player))
2448 {
2449 px += sdx;
2450 py += sdy;
2451 }
1885 2452
1886 if (cell->stat_hp) 2453 if (cell->stat_hp)
1887 { 2454 {
1888 int width = cell->stat_width * T; 2455 int width = cell->stat_width * T;
1889 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2456 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1900 } 2467 }
1901 } 2468 }
1902} 2469}
1903 2470
1904void 2471void
1905draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2472draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1906 CODE: 2473 CODE:
1907{ 2474{
1908 static float color[16][3] = { 2475 static float color[16][3] = {
1909 { 0.00F, 0.00F, 0.00F }, 2476 { 0.00f, 0.00f, 0.00f },
1910 { 1.00F, 1.00F, 1.00F }, 2477 { 1.00f, 1.00f, 1.00f },
1911 { 0.00F, 0.00F, 0.55F }, 2478 { 0.00f, 0.00f, 0.55f },
1912 { 1.00F, 0.00F, 0.00F }, 2479 { 1.00f, 0.00f, 0.00f },
1913 2480
1914 { 1.00F, 0.54F, 0.00F }, 2481 { 1.00f, 0.54f, 0.00f },
1915 { 0.11F, 0.56F, 1.00F }, 2482 { 0.11f, 0.56f, 1.00f },
1916 { 0.93F, 0.46F, 0.00F }, 2483 { 0.93f, 0.46f, 0.00f },
1917 { 0.18F, 0.54F, 0.34F }, 2484 { 0.18f, 0.54f, 0.34f },
1918 2485
1919 { 0.56F, 0.73F, 0.56F }, 2486 { 0.56f, 0.73f, 0.56f },
1920 { 0.80F, 0.80F, 0.80F }, 2487 { 0.80f, 0.80f, 0.80f },
1921 { 0.55F, 0.41F, 0.13F }, 2488 { 0.55f, 0.41f, 0.13f },
1922 { 0.99F, 0.77F, 0.26F }, 2489 { 0.99f, 0.77f, 0.26f },
1923 2490
1924 { 0.74F, 0.65F, 0.41F }, 2491 { 0.74f, 0.65f, 0.41f },
1925 2492
1926 { 0.00F, 1.00F, 1.00F }, 2493 { 0.00f, 1.00f, 1.00f },
1927 { 1.00F, 0.00F, 1.00F }, 2494 { 1.00f, 0.00f, 1.00f },
1928 { 1.00F, 1.00F, 0.00F }, 2495 { 1.00f, 1.00f, 0.00f },
1929 }; 2496 };
1930 2497
1931 int x, y; 2498 int x, y;
1932 2499
1933 glEnable (GL_TEXTURE_2D); 2500 glEnable (GL_TEXTURE_2D);
2501 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2502 * but the nvidia driver (185.18.14) mishandles alpha textures
2503 * and takes the colour from god knows where instead of using
2504 * Cp. MODULATE results in the same colour, but slightly different
2505 * alpha, but atcually gives us the correct colour with nvidia.
2506 */
1934 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2507 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1935 glEnable (GL_BLEND); 2508 glEnable (GL_BLEND);
1936 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2509 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1937 glBegin (GL_QUADS); 2510 glBegin (GL_QUADS);
1938 2511
1939 for (y = 0; y < h; y++) 2512 for (y = 0; y < h; y++)
… …
1943 2516
1944 if (m) 2517 if (m)
1945 { 2518 {
1946 float *c = color [m & 15]; 2519 float *c = color [m & 15];
1947 2520
1948 float tx1 = m & 0x40 ? 0.5 : 0.; 2521 float tx1 = m & 0x40 ? 0.5f : 0.f;
1949 float tx2 = tx1 + 0.5; 2522 float tx2 = tx1 + 0.5f;
1950 2523
1951 glColor4f (c[0], c[1], c[2], 0.75); 2524 glColor4f (c[0], c[1], c[2], 1);
1952 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2525 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1953 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2526 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1954 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2527 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1955 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2528 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1956 } 2529 }
… …
1960 glDisable (GL_BLEND); 2533 glDisable (GL_BLEND);
1961 glDisable (GL_TEXTURE_2D); 2534 glDisable (GL_TEXTURE_2D);
1962} 2535}
1963 2536
1964void 2537void
1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2538fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1966 PPCODE: 2539 PPCODE:
1967{ 2540{
1968 int x, y; 2541 int x, y;
1969 int sw1 = sw + 2; 2542 int sw1 = sw + 2;
1970 int sh1 = sh + 2; 2543 int sh1 = sh + 2;
1971 int sh3 = sh * 3; 2544 int sh3 = sh * 3;
1972 int sw34 = (sw * 3 + 3) & ~3; 2545 int sw3 = sw * 3;
1973 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2546 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1974 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2547 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1975 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2548 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1976 2549
1977 SvPOK_only (darkness3_sv); 2550 SvPOK_only (darkness3_sv);
1978 SvCUR_set (darkness3_sv, sw34 * sh3); 2551 SvCUR_set (darkness3_sv, sw3 * sh3);
1979 2552
1980 mx += self->x - 1; 2553 mx += self->x - 1;
1981 my += self->y - 1; 2554 my += self->y - 1;
1982
1983 memset (darkness1, 255, sw1 * sh1);
1984 2555
1985 for (y = 0; y < sh1; y++) 2556 for (y = 0; y < sh1; y++)
1986 if (0 <= y + my && y + my < self->rows) 2557 if (0 <= y + my && y + my < self->rows)
1987 { 2558 {
1988 maprow *row = self->row + (y + my); 2559 maprow *row = self->row + (y + my);
… …
1991 if (row->c0 <= x + mx && x + mx < row->c1) 2562 if (row->c0 <= x + mx && x + mx < row->c1)
1992 { 2563 {
1993 mapcell *cell = row->col + (x + mx - row->c0); 2564 mapcell *cell = row->col + (x + mx - row->c0);
1994 2565
1995 darkness1 [y * sw1 + x] = cell->darkness 2566 darkness1 [y * sw1 + x] = cell->darkness
1996 ? 255 - (cell->darkness - 1) 2567 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
1997 : 255 - FOW_DARKNESS; 2568 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
1998 } 2569 }
1999 } 2570 }
2000 2571
2001 for (y = 0; y < sh; ++y) 2572 for (y = 0; y < sh; ++y)
2002 for (x = 0; x < sw; ++x) 2573 for (x = 0; x < sw; ++x)
… …
2021 2592
2022 uint8_t r13 = (d13 + d23 + d12) / 3; 2593 uint8_t r13 = (d13 + d23 + d12) / 3;
2023 uint8_t r23 = d23; 2594 uint8_t r23 = d23;
2024 uint8_t r33 = (d23 + d33 + d32) / 3; 2595 uint8_t r33 = (d23 + d33 + d32) / 3;
2025 2596
2026 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2597 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2027 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2598 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2028 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2599 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2029 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2600 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2030 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2601 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2031 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2602 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2032 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2603 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2033 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2604 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2034 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2605 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2035 } 2606 }
2036 2607
2037 free (darkness1); 2608 free (darkness1);
2038 2609
2039 EXTEND (SP, 3); 2610 EXTEND (SP, 3);
2040 PUSHs (sv_2mortal (newSViv (sw34))); 2611 PUSHs (sv_2mortal (newSViv (sw3)));
2041 PUSHs (sv_2mortal (newSViv (sh3))); 2612 PUSHs (sv_2mortal (newSViv (sh3)));
2042 PUSHs (darkness3_sv); 2613 PUSHs (darkness3_sv);
2043} 2614}
2044 2615
2045SV * 2616SV *
2046get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2617get_rect (DC::Map self, int x0, int y0, int w, int h)
2047 CODE: 2618 CODE:
2048{ 2619{
2049 int x, y, x1, y1; 2620 int x, y, x1, y1;
2050 SV *data_sv = newSV (w * h * 7 + 5); 2621 SV *data_sv = newSV (w * h * 7 + 5);
2051 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2622 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2108 else 2679 else
2109 *data++ = 0; 2680 *data++ = 0;
2110 } 2681 }
2111 } 2682 }
2112 2683
2684 /* if size is w*h + 5 then no data has been found */
2685 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2686 {
2113 SvPOK_only (data_sv); 2687 SvPOK_only (data_sv);
2114 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2688 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2689 }
2690
2115 RETVAL = data_sv; 2691 RETVAL = data_sv;
2116} 2692}
2117 OUTPUT: 2693 OUTPUT:
2118 RETVAL 2694 RETVAL
2119 2695
2120void 2696void
2121set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2697set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2122 PPCODE: 2698 PPCODE:
2123{ 2699{
2124 int x, y, z; 2700 int x, y, z;
2125 int w, h; 2701 int w, h;
2126 int x1, y1; 2702 int x1, y1;
2703 STRLEN len;
2704 uint8_t *data, *end;
2705
2706 len = SvLEN (data_sv);
2707 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2708 data = SvPVbyte_nolen (data_sv);
2709 end = data + len + 8;
2710
2711 if (len < 5)
2712 XSRETURN_EMPTY;
2127 2713
2128 if (*data++ != 0) 2714 if (*data++ != 0)
2129 return; /* version mismatch */ 2715 XSRETURN_EMPTY; /* version mismatch */
2130 2716
2131 w = *data++ << 8; w |= *data++; 2717 w = *data++ << 8; w |= *data++;
2132 h = *data++ << 8; h |= *data++; 2718 h = *data++ << 8; h |= *data++;
2133 2719
2134 // we need to do this 'cause we don't keep an absolute coord system for rows 2720 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2146 { 2732 {
2147 maprow *row = map_get_row (self, y); 2733 maprow *row = map_get_row (self, y);
2148 2734
2149 for (x = x0; x < x1; x++) 2735 for (x = x0; x < x1; x++)
2150 { 2736 {
2737 uint8_t flags;
2738
2739 if (data + 7 >= end)
2740 XSRETURN_EMPTY;
2741
2151 uint8_t flags = *data++; 2742 flags = *data++;
2152 2743
2153 if (flags) 2744 if (flags)
2154 { 2745 {
2155 mapcell *cell = row_get_cell (row, x); 2746 mapcell *cell = row_get_cell (row, x);
2156 tileid tile[3] = { 0, 0, 0 }; 2747 tileid tile[3] = { 0, 0, 0 };
… …
2159 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2750 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2160 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2751 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2161 2752
2162 if (cell->darkness == 0) 2753 if (cell->darkness == 0)
2163 { 2754 {
2164 cell->darkness = 0; 2755 /*cell->darkness = 0;*/
2756 EXTEND (SP, 3);
2165 2757
2166 for (z = 0; z <= 2; z++) 2758 for (z = 0; z <= 2; z++)
2167 { 2759 {
2168 tileid t = tile [z]; 2760 tileid t = tile [z];
2169 2761
2170 if (t >= self->texs || (t && !self->tex [t].name)) 2762 if (t >= self->texs || (t && !self->tex [t].name))
2171 { 2763 {
2172 XPUSHs (sv_2mortal (newSViv (t))); 2764 PUSHs (sv_2mortal (newSViv (t)));
2173 need_texid (self, t); 2765 need_texid (self, t);
2174 } 2766 }
2175 2767
2176 cell->tile [z] = t; 2768 cell->tile [z] = t;
2177 } 2769 }
… …
2179 } 2771 }
2180 } 2772 }
2181 } 2773 }
2182} 2774}
2183 2775
2184MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2776MODULE = Deliantra::Client PACKAGE = DC::RW
2185 2777
2186CFPlus::MixChunk 2778DC::RW
2187new_from_file (SV *class, char *path) 2779new (SV *class, SV *data_sv)
2188 CODE: 2780 CODE:
2189 RETVAL = Mix_LoadWAV (path); 2781{
2782 STRLEN datalen;
2783 char *data = SvPVbyte (data_sv, datalen);
2784
2785 RETVAL = SDL_RWFromConstMem (data, datalen);
2786}
2190 OUTPUT: 2787 OUTPUT:
2191 RETVAL 2788 RETVAL
2192 2789
2790DC::RW
2791new_from_file (SV *class, const char *path, const char *mode = "rb")
2792 CODE:
2793 RETVAL = SDL_RWFromFile (path, mode);
2794 OUTPUT:
2795 RETVAL
2796
2797# fails on win32:
2798# dc.xs(2268) : error C2059: syntax error : '('
2193void 2799#void
2800#close (DC::RW self)
2801# CODE:
2802# (self->(close)) (self);
2803
2804MODULE = Deliantra::Client PACKAGE = DC::Channel
2805
2806PROTOTYPES: DISABLE
2807
2808DC::Channel
2809find ()
2810 CODE:
2811{
2812 RETVAL = Mix_GroupAvailable (-1);
2813
2814 if (RETVAL < 0)
2815 {
2816 RETVAL = Mix_GroupOldest (-1);
2817
2818 if (RETVAL < 0)
2819 {
2820 // happens sometimes, maybe it just stopped playing(?)
2821 RETVAL = Mix_GroupAvailable (-1);
2822
2823 if (RETVAL < 0)
2824 XSRETURN_UNDEF;
2825 }
2826 else
2827 Mix_HaltChannel (RETVAL);
2828 }
2829
2830 Mix_UnregisterAllEffects (RETVAL);
2831 Mix_Volume (RETVAL, 128);
2832}
2833 OUTPUT:
2834 RETVAL
2835
2836void
2837halt (DC::Channel self)
2838 CODE:
2839 Mix_HaltChannel (self);
2840
2841void
2842expire (DC::Channel self, int ticks = -1)
2843 CODE:
2844 Mix_ExpireChannel (self, ticks);
2845
2846void
2847fade_out (DC::Channel self, int ticks = -1)
2848 CODE:
2849 Mix_FadeOutChannel (self, ticks);
2850
2851int
2852volume (DC::Channel self, int volume)
2853 CODE:
2854 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2855 OUTPUT:
2856 RETVAL
2857
2858void
2859unregister_all_effects (DC::Channel self)
2860 CODE:
2861 Mix_UnregisterAllEffects (self);
2862
2863void
2864set_panning (DC::Channel self, int left, int right)
2865 CODE:
2866 left = CLAMP (left , 0, 255);
2867 right = CLAMP (right, 0, 255);
2868 Mix_SetPanning (self, left, right);
2869
2870void
2871set_distance (DC::Channel self, int distance)
2872 CODE:
2873 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2874
2875void
2876set_position (DC::Channel self, int angle, int distance)
2877 CODE:
2878
2879void
2880set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2881 CODE:
2882{
2883 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2884 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2885 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2886}
2887
2888void
2889set_reverse_stereo (DC::Channel self, int flip)
2890 CODE:
2891 Mix_SetReverseStereo (self, flip);
2892
2893MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2894
2895PROTOTYPES: DISABLE
2896
2897void
2898decoders ()
2899 PPCODE:
2900#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2901 int i, num = Mix_GetNumChunkDecoders ();
2902 EXTEND (SP, num);
2903 for (i = 0; i < num; ++i)
2904 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2905#else
2906 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2907#endif
2908
2909DC::MixChunk
2910new (SV *class, DC::RW rwops)
2911 CODE:
2912 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2913 OUTPUT:
2914 RETVAL
2915
2916void
2194DESTROY (CFPlus::MixChunk self) 2917DESTROY (DC::MixChunk self)
2195 CODE: 2918 CODE:
2196 Mix_FreeChunk (self); 2919 Mix_FreeChunk (self);
2197 2920
2198int 2921int
2199volume (CFPlus::MixChunk self, int volume = -1) 2922volume (DC::MixChunk self, int volume = -1)
2200 CODE: 2923 CODE:
2924 if (items > 1)
2925 volume = CLAMP (volume, 0, 128);
2201 RETVAL = Mix_VolumeChunk (self, volume); 2926 RETVAL = Mix_VolumeChunk (self, volume);
2202 OUTPUT: 2927 OUTPUT:
2203 RETVAL 2928 RETVAL
2204 2929
2205int 2930DC::Channel
2206play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2931play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2207 CODE: 2932 CODE:
2933{
2208 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2934 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2935
2936 if (RETVAL < 0)
2937 XSRETURN_UNDEF;
2938
2939 if (channel < 0)
2940 {
2941 Mix_UnregisterAllEffects (RETVAL);
2942 Mix_Volume (RETVAL, 128);
2943 }
2944}
2209 OUTPUT: 2945 OUTPUT:
2210 RETVAL 2946 RETVAL
2211 2947
2212MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2948MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2949
2950void
2951decoders ()
2952 PPCODE:
2953#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2954 int i, num = Mix_GetNumMusicDecoders ();
2955 EXTEND (SP, num);
2956 for (i = 0; i < num; ++i)
2957 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2958#else
2959 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2960#endif
2213 2961
2214int 2962int
2215volume (int volume = -1) 2963volume (int volume = -1)
2964 PROTOTYPE: ;$
2216 CODE: 2965 CODE:
2966 if (items > 0)
2967 volume = CLAMP (volume, 0, 128);
2217 RETVAL = Mix_VolumeMusic (volume); 2968 RETVAL = Mix_VolumeMusic (volume);
2218 OUTPUT: 2969 OUTPUT:
2219 RETVAL 2970 RETVAL
2220 2971
2972void
2973fade_out (int ms)
2974 CODE:
2975 Mix_FadeOutMusic (ms);
2976
2977void
2978halt ()
2979 CODE:
2980 Mix_HaltMusic ();
2981
2221int 2982int
2222fade_out (int ms) 2983playing ()
2223 CODE: 2984 CODE:
2224 RETVAL = Mix_FadeOutMusic (ms); 2985 RETVAL = Mix_PlayingMusic ();
2225 OUTPUT: 2986 OUTPUT:
2226 RETVAL 2987 RETVAL
2227 2988
2228CFPlus::MixMusic 2989DC::MixMusic
2229new_from_file (SV *class, char *path) 2990new (SV *class, DC::RW rwops)
2230 CODE: 2991 CODE:
2231 RETVAL = Mix_LoadMUS (path); 2992 RETVAL = Mix_LoadMUS_RW (rwops);
2232 OUTPUT: 2993 OUTPUT:
2233 RETVAL 2994 RETVAL
2234 2995
2235void 2996void
2236DESTROY (CFPlus::MixMusic self) 2997DESTROY (DC::MixMusic self)
2237 CODE: 2998 CODE:
2238 Mix_FreeMusic (self); 2999 Mix_FreeMusic (self);
2239 3000
2240int 3001int
2241play (CFPlus::MixMusic self, int loops = -1) 3002play (DC::MixMusic self, int loops = -1)
2242 CODE: 3003 CODE:
2243 RETVAL = Mix_PlayMusic (self, loops); 3004 RETVAL = Mix_PlayMusic (self, loops);
2244 OUTPUT: 3005 OUTPUT:
2245 RETVAL 3006 RETVAL
2246 3007
2247int 3008void
2248fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3009fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2249 CODE: 3010 CODE:
2250 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3011 Mix_FadeInMusicPos (self, loops, ms, position);
2251 OUTPUT:
2252 RETVAL
2253 3012
2254MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3013MODULE = Deliantra::Client PACKAGE = DC::OpenGL
3014
3015PROTOTYPES: ENABLE
2255 3016
2256BOOT: 3017BOOT:
2257{ 3018{
2258 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3019 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2259 static const struct { 3020 static const struct {
2260 const char *name; 3021 const char *name;
2261 IV iv; 3022 IV iv;
2262 } *civ, const_iv[] = { 3023 } *civ, const_iv[] = {
2263# define const_iv(name) { # name, (IV)name } 3024# define const_iv(name) { # name, (IV)name }
2264 const_iv (GL_VENDOR), 3025 const_iv (GL_VENDOR),
2265 const_iv (GL_VERSION), 3026 const_iv (GL_VERSION),
2266 const_iv (GL_EXTENSIONS), 3027 const_iv (GL_EXTENSIONS),
3028 const_iv (GL_MAX_TEXTURE_UNITS),
2267 const_iv (GL_COLOR_MATERIAL), 3029 const_iv (GL_COLOR_MATERIAL),
2268 const_iv (GL_SMOOTH), 3030 const_iv (GL_SMOOTH),
2269 const_iv (GL_FLAT), 3031 const_iv (GL_FLAT),
2270 const_iv (GL_DITHER), 3032 const_iv (GL_DITHER),
2271 const_iv (GL_BLEND), 3033 const_iv (GL_BLEND),
… …
2275 const_iv (GL_ALPHA_TEST), 3037 const_iv (GL_ALPHA_TEST),
2276 const_iv (GL_NORMALIZE), 3038 const_iv (GL_NORMALIZE),
2277 const_iv (GL_RESCALE_NORMAL), 3039 const_iv (GL_RESCALE_NORMAL),
2278 const_iv (GL_FRONT), 3040 const_iv (GL_FRONT),
2279 const_iv (GL_BACK), 3041 const_iv (GL_BACK),
3042 const_iv (GL_AUX0),
2280 const_iv (GL_AND), 3043 const_iv (GL_AND),
2281 const_iv (GL_ONE), 3044 const_iv (GL_ONE),
2282 const_iv (GL_ZERO), 3045 const_iv (GL_ZERO),
2283 const_iv (GL_SRC_ALPHA), 3046 const_iv (GL_SRC_ALPHA),
2284 const_iv (GL_DST_ALPHA), 3047 const_iv (GL_DST_ALPHA),
2285 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3048 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2286 const_iv (GL_ONE_MINUS_DST_ALPHA), 3049 const_iv (GL_ONE_MINUS_DST_ALPHA),
3050 const_iv (GL_SRC_COLOR),
3051 const_iv (GL_DST_COLOR),
3052 const_iv (GL_ONE_MINUS_SRC_COLOR),
3053 const_iv (GL_ONE_MINUS_DST_COLOR),
2287 const_iv (GL_SRC_ALPHA_SATURATE), 3054 const_iv (GL_SRC_ALPHA_SATURATE),
2288 const_iv (GL_RGB), 3055 const_iv (GL_RGB),
2289 const_iv (GL_RGBA), 3056 const_iv (GL_RGBA),
2290 const_iv (GL_RGBA4), 3057 const_iv (GL_RGBA4),
2291 const_iv (GL_RGBA8), 3058 const_iv (GL_RGBA8),
… …
2297 const_iv (GL_INTENSITY), 3064 const_iv (GL_INTENSITY),
2298 const_iv (GL_LUMINANCE), 3065 const_iv (GL_LUMINANCE),
2299 const_iv (GL_LUMINANCE_ALPHA), 3066 const_iv (GL_LUMINANCE_ALPHA),
2300 const_iv (GL_FLOAT), 3067 const_iv (GL_FLOAT),
2301 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3068 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3069 const_iv (GL_COMPRESSED_ALPHA_ARB),
3070 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3071 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3072 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3073 const_iv (GL_COMPRESSED_RGB_ARB),
3074 const_iv (GL_COMPRESSED_RGBA_ARB),
2302 const_iv (GL_COMPILE), 3075 const_iv (GL_COMPILE),
2303 const_iv (GL_PROXY_TEXTURE_1D), 3076 const_iv (GL_PROXY_TEXTURE_1D),
2304 const_iv (GL_PROXY_TEXTURE_2D), 3077 const_iv (GL_PROXY_TEXTURE_2D),
2305 const_iv (GL_TEXTURE_1D), 3078 const_iv (GL_TEXTURE_1D),
2306 const_iv (GL_TEXTURE_2D), 3079 const_iv (GL_TEXTURE_2D),
… …
2330 const_iv (GL_COLOR_LOGIC_OP), 3103 const_iv (GL_COLOR_LOGIC_OP),
2331 const_iv (GL_SEPARABLE_2D), 3104 const_iv (GL_SEPARABLE_2D),
2332 const_iv (GL_CONVOLUTION_2D), 3105 const_iv (GL_CONVOLUTION_2D),
2333 const_iv (GL_CONVOLUTION_BORDER_MODE), 3106 const_iv (GL_CONVOLUTION_BORDER_MODE),
2334 const_iv (GL_CONSTANT_BORDER), 3107 const_iv (GL_CONSTANT_BORDER),
3108 const_iv (GL_POINTS),
2335 const_iv (GL_LINES), 3109 const_iv (GL_LINES),
2336 const_iv (GL_LINE_STRIP), 3110 const_iv (GL_LINE_STRIP),
2337 const_iv (GL_LINE_LOOP), 3111 const_iv (GL_LINE_LOOP),
2338 const_iv (GL_QUADS), 3112 const_iv (GL_QUADS),
2339 const_iv (GL_QUAD_STRIP), 3113 const_iv (GL_QUAD_STRIP),
2340 const_iv (GL_TRIANGLES), 3114 const_iv (GL_TRIANGLES),
2341 const_iv (GL_TRIANGLE_STRIP), 3115 const_iv (GL_TRIANGLE_STRIP),
2342 const_iv (GL_TRIANGLE_FAN), 3116 const_iv (GL_TRIANGLE_FAN),
3117 const_iv (GL_POLYGON),
2343 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3118 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3119 const_iv (GL_POINT_SMOOTH_HINT),
3120 const_iv (GL_LINE_SMOOTH_HINT),
3121 const_iv (GL_POLYGON_SMOOTH_HINT),
3122 const_iv (GL_GENERATE_MIPMAP_HINT),
3123 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2344 const_iv (GL_FASTEST), 3124 const_iv (GL_FASTEST),
3125 const_iv (GL_DONT_CARE),
3126 const_iv (GL_NICEST),
2345 const_iv (GL_V2F), 3127 const_iv (GL_V2F),
2346 const_iv (GL_V3F), 3128 const_iv (GL_V3F),
2347 const_iv (GL_T2F_V3F), 3129 const_iv (GL_T2F_V3F),
2348 const_iv (GL_T2F_N3F_V3F), 3130 const_iv (GL_T2F_N3F_V3F),
3131 const_iv (GL_FUNC_ADD),
3132 const_iv (GL_FUNC_SUBTRACT),
3133 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2349# undef const_iv 3134# undef const_iv
2350 }; 3135 };
2351 3136
2352 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3137 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2353 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3138 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2354 3139
2355 texture_av = newAV (); 3140 texture_av = newAV ();
2356 AvREAL_off (texture_av); 3141 AvREAL_off (texture_av);
2357} 3142}
2358 3143
3144void
3145disable_GL_EXT_blend_func_separate ()
3146 CODE:
3147 gl.BlendFuncSeparate = 0;
3148 gl.BlendFuncSeparateEXT = 0;
3149
3150void
3151apple_nvidia_bug (int enable)
3152
2359char * 3153char *
2360gl_vendor () 3154gl_vendor ()
2361 CODE: 3155 CODE:
2362 RETVAL = (char *)glGetString (GL_VENDOR); 3156 RETVAL = (char *)glGetString (GL_VENDOR);
2363 OUTPUT: 3157 OUTPUT:
… …
2393 3187
2394int glGetError () 3188int glGetError ()
2395 3189
2396void glFinish () 3190void glFinish ()
2397 3191
3192void glFlush ()
3193
2398void glClear (int mask) 3194void glClear (int mask)
2399 3195
2400void glClearColor (float r, float g, float b, float a = 1.0) 3196void glClearColor (float r, float g, float b, float a = 1.0)
2401 PROTOTYPE: @ 3197 PROTOTYPE: @
2402 3198
… …
2412 3208
2413void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3209void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2414 CODE: 3210 CODE:
2415 gl_BlendFuncSeparate (sa, da, saa, daa); 3211 gl_BlendFuncSeparate (sa, da, saa, daa);
2416 3212
3213# void glBlendEquation (int se)
3214
2417void glDepthMask (int flag) 3215void glDepthMask (int flag)
2418 3216
2419void glLogicOp (int opcode) 3217void glLogicOp (int opcode)
2420 3218
2421void glColorMask (int red, int green, int blue, int alpha) 3219void glColorMask (int red, int green, int blue, int alpha)
… …
2435# near_ and far_ are due to microsofts buggy "c" compiler 3233# near_ and far_ are due to microsofts buggy "c" compiler
2436void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3234void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2437 3235
2438# near_ and far_ are due to microsofts buggy "c" compiler 3236# near_ and far_ are due to microsofts buggy "c" compiler
2439void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3237void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3238
3239PROTOTYPES: DISABLE
2440 3240
2441void glViewport (int x, int y, int width, int height) 3241void glViewport (int x, int y, int width, int height)
2442 3242
2443void glScissor (int x, int y, int width, int height) 3243void glScissor (int x, int y, int width, int height)
2444 3244
… …
2452 3252
2453void glRotate (float angle, float x, float y, float z) 3253void glRotate (float angle, float x, float y, float z)
2454 CODE: 3254 CODE:
2455 glRotatef (angle, x, y, z); 3255 glRotatef (angle, x, y, z);
2456 3256
2457void glBegin (int mode)
2458
2459void glEnd ()
2460
2461void glColor (float r, float g, float b, float a = 1.0) 3257void glColor (float r, float g, float b, float a = 1.0)
2462 PROTOTYPE: @ 3258 PROTOTYPE: @
2463 ALIAS: 3259 ALIAS:
2464 glColor_premultiply = 1 3260 glColor_premultiply = 1
2465 CODE: 3261 CODE:
2466 if (ix) 3262 if (ix)
2467 { 3263 {
… …
2470 b *= a; 3266 b *= a;
2471 } 3267 }
2472 // microsoft visual "c" rounds instead of truncating... 3268 // microsoft visual "c" rounds instead of truncating...
2473 glColor4f (r, g, b, a); 3269 glColor4f (r, g, b, a);
2474 3270
2475void glInterleavedArrays (int format, int stride, char *data)
2476
2477void glDrawElements (int mode, int count, int type, char *indices)
2478
2479# 1.2 void glDrawRangeElements (int mode, int start, int end
2480
2481void glRasterPos (float x, float y, float z = 0.) 3271void glRasterPos (float x, float y, float z = 0.)
2482 CODE: 3272 CODE:
2483 glRasterPos3f (0, 0, z); 3273 glRasterPos3f (0, 0, z);
2484 glBitmap (0, 0, 0, 0, x, y, 0); 3274 glBitmap (0, 0, 0, 0, x, y, 0);
2485 3275
… …
2489 3279
2490void glTexCoord (float s, float t) 3280void glTexCoord (float s, float t)
2491 CODE: 3281 CODE:
2492 glTexCoord2f (s, t); 3282 glTexCoord2f (s, t);
2493 3283
3284void glRect (float x1, float y1, float x2, float y2)
3285 CODE:
3286 glRectf (x1, y1, x2, y2);
3287
3288void glRect_lineloop (float x1, float y1, float x2, float y2)
3289 CODE:
3290 glBegin (GL_LINE_LOOP);
3291 glVertex2f (x1, y1);
3292 glVertex2f (x2, y1);
3293 glVertex2f (x2, y2);
3294 glVertex2f (x1, y2);
3295 glEnd ();
3296
3297PROTOTYPES: ENABLE
3298
3299void glBegin (int mode)
3300
3301void glEnd ()
3302
3303void glPointSize (GLfloat size)
3304
3305void glLineWidth (GLfloat width)
3306
3307void glInterleavedArrays (int format, int stride, char *data)
3308
3309void glDrawElements (int mode, int count, int type, char *indices)
3310
3311# 1.2 void glDrawRangeElements (int mode, int start, int end
3312
2494void glTexEnv (int target, int pname, float param) 3313void glTexEnv (int target, int pname, float param)
2495 CODE: 3314 CODE:
2496 glTexEnvf (target, pname, param); 3315 glTexEnvf (target, pname, param);
2497 3316
2498void glTexParameter (int target, int pname, float param) 3317void glTexParameter (int target, int pname, float param)
… …
2514void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3333void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2515 CODE: 3334 CODE:
2516 if (gl.SeparableFilter2D) 3335 if (gl.SeparableFilter2D)
2517 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3336 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2518 3337
2519void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3338void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2520 3339
2521void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3340void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2522 3341
2523void glDrawPixels (int width, int height, int format, int type, char *pixels) 3342void glDrawPixels (int width, int height, int format, int type, char *pixels)
2524 3343
… …
2550 3369
2551void glEndList () 3370void glEndList ()
2552 3371
2553void glCallList (int list) 3372void glCallList (int list)
2554 3373
3374void c_init ()
3375 CODE:
3376 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3377 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3378
3379MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3380
3381PROTOTYPES: DISABLE
3382
3383void
3384find_widget (SV *self, NV x, NV y)
3385 PPCODE:
3386{
3387 if (within_widget (self, x, y))
3388 XPUSHs (self);
3389}
3390
3391BOOT:
3392{
3393 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3394
3395 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3396 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3397 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3398 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3399}
3400
3401void
3402draw (SV *self)
3403 CODE:
3404{
3405 HV *hv;
3406 SV **svp;
3407 NV x, y, w, h;
3408 SV *draw_x_sv = GvSV (draw_x_gv);
3409 SV *draw_y_sv = GvSV (draw_y_gv);
3410 SV *draw_w_sv = GvSV (draw_w_gv);
3411 SV *draw_h_sv = GvSV (draw_h_gv);
3412 double draw_x, draw_y;
3413
3414 if (!SvROK (self))
3415 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3416
3417 hv = (HV *)SvRV (self);
3418
3419 if (SvTYPE (hv) != SVt_PVHV)
3420 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3421
3422 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3423 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3424
3425 if (!h || !w)
3426 XSRETURN_EMPTY;
3427
3428 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3429 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3430
3431 draw_x = SvNV (draw_x_sv) + x;
3432 draw_y = SvNV (draw_y_sv) + y;
3433
3434 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3435 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3436 XSRETURN_EMPTY;
3437
3438 sv_setnv (draw_x_sv, draw_x);
3439 sv_setnv (draw_y_sv, draw_y);
3440
3441 glPushMatrix ();
3442 glTranslated (x, y, 0);
3443
3444 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3445 {
3446 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3447
3448 if (svp && SvTRUE (*svp))
3449 {
3450 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3451 glEnable (GL_BLEND);
3452 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3453 glBegin (GL_QUADS);
3454 glVertex2f (0, 0);
3455 glVertex2f (w, 0);
3456 glVertex2f (w, h);
3457 glVertex2f (0, h);
3458 glEnd ();
3459 glDisable (GL_BLEND);
3460 }
3461 }
3462#if 0
3463 // draw borders, for debugging
3464 glPushMatrix ();
3465 glColor4f (1., 1., 0., 1.);
3466 glTranslatef (.5, .5, 0.);
3467 glBegin (GL_LINE_LOOP);
3468 glVertex2f (0 , 0);
3469 glVertex2f (w - 1, 0);
3470 glVertex2f (w - 1, h - 1);
3471 glVertex2f (0 , h - 1);
3472 glEnd ();
3473 glPopMatrix ();
3474#endif
3475 PUSHMARK (SP);
3476 XPUSHs (self);
3477 PUTBACK;
3478 call_method ("_draw", G_VOID | G_DISCARD);
3479 SPAGAIN;
3480
3481 glPopMatrix ();
3482
3483 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3484 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3485}
3486

Diff Legend

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