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.198 by root, Sun Jul 15 21:42:02 2007 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 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>
29 33
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35
30#include <SDL.h> 36#include <SDL.h>
37#include <SDL_thread.h>
31#include <SDL_endian.h> 38#include <SDL_endian.h>
32#include <SDL_image.h> 39#include <SDL_image.h>
33#include <SDL_mixer.h> 40#include <SDL_mixer.h>
34#include <SDL_opengl.h> 41#include <SDL_opengl.h>
35 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
36#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
38 52
39#include <glib/gmacros.h> 53#include <glib/gmacros.h>
40 54
41#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
42 67
43#ifndef _WIN32 68#ifndef _WIN32
44# include <sys/types.h> 69# include <sys/types.h>
45# include <sys/socket.h> 70# include <sys/socket.h>
46# include <netinet/in.h> 71# include <netinet/in.h>
47# include <netinet/tcp.h> 72# include <netinet/tcp.h>
48# include <inttypes.h> 73# include <inttypes.h>
49#endif 74#endif
50 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
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 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 */
53#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
54 91
55#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
57 94
58#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
59 96
60#if 0 97/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else 99
63# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
64#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
65 104
66static AV *texture_av; 105static AV *texture_av;
67 106
68static struct 107static struct
69{ 108{
… …
106 av_push (texture_av, (SV *)(size_t)name); 145 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name); 146 glDeleteTextures (1, &name);
108} 147}
109 148
110#include "texcache.c" 149#include "texcache.c"
150#include "rendercache.c"
111 151
112#include "pango-font.c" 152#include "pango-font.c"
113#include "pango-fontmap.c" 153#include "pango-fontmap.c"
114#include "pango-render.c" 154#include "pango-render.c"
115 155
156typedef IV DC__Channel;
157typedef SDL_RWops *DC__RW;
116typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
117typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
118 160
119typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
120 162
121static int 163static int
122shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
123{ 165{
124 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
… …
138 180
139typedef struct cf_layout { 181typedef struct cf_layout {
140 PangoLayout *pl; 182 PangoLayout *pl;
141 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
142 int base_height; 184 int base_height;
143 CFPlus__Font font; 185 DC__Font font;
186 rc_t *rc;
144} *CFPlus__Layout; 187} *DC__Layout;
145 188
146static CFPlus__Font default_font; 189static DC__Font default_font;
147static PangoContext *opengl_context; 190static PangoContext *opengl_context;
148static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
149 192
150static void 193static void
151substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
… …
156#endif 199#endif
157 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
158} 201}
159 202
160static void 203static void
161layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
162{ 205{
163 /* 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
164 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
165 */ 208 */
166 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
167 210
168 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
169 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
170 213
171 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
172} 215}
173 216
174static void 217static void
175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
176{ 219{
177 PangoRectangle rect; 220 PangoRectangle rect;
178 221
179 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
180 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
… …
191 234
192typedef uint16_t tileid; 235typedef uint16_t tileid;
193typedef uint16_t faceid; 236typedef uint16_t faceid;
194 237
195typedef struct { 238typedef struct {
196 int name; 239 GLuint name;
197 int w, h; 240 int w, h;
198 float s, t; 241 float s, t;
199 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
200 tileid smoothtile; 243 tileid smoothtile;
201 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
202} maptex; 246} maptex;
203 247
204typedef struct { 248typedef struct {
205 uint32_t player; 249 uint32_t player;
206 tileid tile[3]; 250 tileid tile[3];
… …
219 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
220 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
221 265
222 int32_t rows; 266 int32_t rows;
223 maprow *row; 267 maprow *row;
224} *CFPlus__Map; 268} *DC__Map;
225 269
226static char * 270static char *
227prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
228{ 272{
229 char *p; 273 char *p;
… …
267 self->texs *= 2; 311 self->texs *= 2;
268 } 312 }
269} 313}
270 314
271static maprow * 315static maprow *
272map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
273{ 317{
274 if (0 > y) 318 if (0 > y)
275 { 319 {
276 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
277 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
… …
315 359
316 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
317} 361}
318 362
319static mapcell * 363static mapcell *
320map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
321{ 365{
322 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
323} 367}
324 368
325static void 369static void
326map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
327{ 371{
328 int r; 372 int r;
329 373
330 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
331 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
… …
338 self->oy = 0; 382 self->oy = 0;
339 self->row = 0; 383 self->row = 0;
340 self->rows = 0; 384 self->rows = 0;
341} 385}
342 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
343static void 397static void
344map_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)
345{ 399{
346 int x, y; 400 int x, y;
347 maprow *row; 401 maprow *row;
348 mapcell *cell; 402 mapcell *cell;
349 403
… …
361 if (x >= row->c1) 415 if (x >= row->c1)
362 break; 416 break;
363 417
364 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
365 419
366 cell->darkness = 0; 420 CELL_CLEAR (cell);
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
370 } 421 }
371 } 422 }
372} 423}
373 424
374typedef struct { 425typedef struct {
… …
428 n |= n >> 16; 479 n |= n >> 16;
429 480
430 return n + 1; 481 return n + 1;
431} 482}
432 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
433/* SDL should provide this, really. */ 495/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 496#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314 497#define SDLK_MODIFIER_MAX 314
436 498
437MODULE = 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
438 595
439PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
440 597
441BOOT: 598BOOT:
442{ 599{
443 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
444 static const struct { 601 static const struct {
445 const char *name; 602 const char *name;
446 IV iv; 603 IV iv;
447 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
448# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
… …
470 627
471 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
474 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),
475 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 686 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 687 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 688 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 760 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
555 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)
556# undef const_iv 798# undef const_iv
557 }; 799 };
558 800
559 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; )
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
578 820
579NV floor (NV x) 821NV floor (NV x)
580 822
581NV ceil (NV x) 823NV ceil (NV x)
582 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
583void 835void
584pango_init () 836pango_init ()
585 CODE: 837 CODE:
586{ 838{
587 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
588 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);
589 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
590} 847}
591 848
592int 849char *SDL_GetError ()
593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
594 850
595void 851void SDL_braino ()
852
853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
596SDL_Quit () 859void SDL_Quit ()
597 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
869
598void 870void
599SDL_ListModes () 871SDL_ListModes (int rgb, int alpha)
600 PPCODE: 872 PPCODE:
601{ 873{
602 SDL_Rect **m; 874 SDL_Rect **m;
603 875
604 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 876 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 877 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 878 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 879 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
608 880
609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 881 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
611 883
612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
616 888
617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
622
623 SDL_EnableUNICODE (1);
624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
625 891
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 893
628 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
629 while (*m) 895 while (*m)
630 { 896 {
897 if ((*m)->w >= 400 && (*m)->h >= 300)
898 {
631 AV *av = newAV (); 899 AV *av = newAV ();
632 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
633 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
902 av_push (av, newSViv (rgb));
903 av_push (av, newSViv (alpha));
634 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 904 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
905 }
635 906
636 ++m; 907 ++m;
637 } 908 }
638} 909}
639 910
640char *
641SDL_GetError ()
642
643int 911int
644SDL_SetVideoMode (int w, int h, int fullscreen) 912SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
645 CODE: 913 CODE:
914{
915 SDL_EnableUNICODE (1);
916 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
917
918 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
919 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
920 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
921 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
922
646 RETVAL = !!SDL_SetVideoMode ( 923 RETVAL = !!SDL_SetVideoMode (
647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 924 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
648 ); 925 );
926
649 if (RETVAL) 927 if (RETVAL)
650 { 928 {
651 av_clear (texture_av); 929 av_clear (texture_av);
652 930
653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
654# 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);
655# include "glfunc.h" 933#include "glfunc.h"
656# undef GL_FUNC 934#undef GL_FUNC
657
658 } 935 }
936}
659 OUTPUT: 937 OUTPUT:
660 RETVAL 938 RETVAL
661 939
662void 940void
663SDL_GL_SwapBuffers () 941SDL_GL_SwapBuffers ()
… …
665char * 943char *
666SDL_GetKeyName (int sym) 944SDL_GetKeyName (int sym)
667 945
668int 946int
669SDL_GetAppState () 947SDL_GetAppState ()
948
949int
950SDL_GetModState ()
670 951
671void 952void
672poll_events () 953poll_events ()
673 PPCODE: 954 PPCODE:
674{ 955{
… …
684 { 965 {
685 case SDL_KEYDOWN: 966 case SDL_KEYDOWN:
686 case SDL_KEYUP: 967 case SDL_KEYUP:
687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 968 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 969 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 970 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
690 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 971 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 972 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
692 break; 973 break;
693 974
694 case SDL_ACTIVEEVENT: 975 case SDL_ACTIVEEVENT:
695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 976 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
713 x = ev.motion.x; 994 x = ev.motion.x;
714 y = ev.motion.y; 995 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 996 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 } 997 }
717 998
718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 999 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
719 hv_store (hv, "state", 5, newSViv (state), 0); 1000 hv_store (hv, "state", 5, newSViv (state), 0);
720 hv_store (hv, "x", 1, newSViv (x), 0); 1001 hv_store (hv, "x", 1, newSViv (x), 0);
721 hv_store (hv, "y", 1, newSViv (y), 0); 1002 hv_store (hv, "y", 1, newSViv (y), 0);
722 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1003 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
723 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1004 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 } 1005 }
725 break; 1006 break;
726 1007
727 case SDL_MOUSEBUTTONDOWN: 1008 case SDL_MOUSEBUTTONDOWN:
728 case SDL_MOUSEBUTTONUP: 1009 case SDL_MOUSEBUTTONUP:
729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1010 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
730 1011
731 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1012 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
732 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
733 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1014 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
734 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1015 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
739 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1020 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
740 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1021 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
741 break; 1022 break;
742 } 1023 }
743 1024
744 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1025 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
745 } 1026 }
746} 1027}
747 1028
748int 1029int
749Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1030Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
750 POSTCALL: 1031 POSTCALL:
751 Mix_HookMusicFinished (music_finished); 1032 Mix_HookMusicFinished (music_finished);
752 Mix_ChannelFinished (channel_finished); 1033 Mix_ChannelFinished (channel_finished);
753 1034
754void 1035void
1036Mix_QuerySpec ()
1037 PPCODE:
1038{
1039 int freq, channels;
1040 Uint16 format;
1041
1042 if (Mix_QuerySpec (&freq, &format, &channels))
1043 {
1044 EXTEND (SP, 3);
1045 PUSHs (sv_2mortal (newSViv (freq)));
1046 PUSHs (sv_2mortal (newSViv (format)));
1047 PUSHs (sv_2mortal (newSViv (channels)));
1048 }
1049}
1050
1051void
755Mix_CloseAudio () 1052Mix_CloseAudio ()
756 1053
757int 1054int
758Mix_AllocateChannels (int numchans = -1) 1055Mix_AllocateChannels (int numchans = -1)
1056
1057const char *
1058Mix_GetError ()
759 1059
760void 1060void
761lowdelay (int fd, int val = 1) 1061lowdelay (int fd, int val = 1)
762 CODE: 1062 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1063 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
789 } 1089 }
790 } 1090 }
791#endif 1091#endif
792} 1092}
793 1093
794void 1094int
795add_font (char *file) 1095add_font (char *file)
796 CODE: 1096 CODE:
797 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1097 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098 OUTPUT:
1099 RETVAL
798 1100
799void 1101void
800load_image_inline (SV *image_) 1102load_image_inline (SV *image_)
801 ALIAS: 1103 ALIAS:
802 load_image_file = 1 1104 load_image_file = 1
… …
805 STRLEN image_len; 1107 STRLEN image_len;
806 char *image = (char *)SvPVbyte (image_, image_len); 1108 char *image = (char *)SvPVbyte (image_, image_len);
807 SDL_Surface *surface, *surface2; 1109 SDL_Surface *surface, *surface2;
808 SDL_PixelFormat fmt; 1110 SDL_PixelFormat fmt;
809 SDL_RWops *rw = ix 1111 SDL_RWops *rw = ix
810 ? SDL_RWFromFile (image, "r") 1112 ? SDL_RWFromFile (image, "rb")
811 : SDL_RWFromConstMem (image, image_len); 1113 : SDL_RWFromConstMem (image, image_len);
812 1114
813 if (!rw) 1115 if (!rw)
814 croak ("load_image: %s", SDL_GetError ()); 1116 croak ("load_image: %s", SDL_GetError ());
815 1117
… …
888void 1190void
889error (char *message) 1191error (char *message)
890 CODE: 1192 CODE:
891 fprintf (stderr, "ERROR: %s\n", message); 1193 fprintf (stderr, "ERROR: %s\n", message);
892#ifdef _WIN32 1194#ifdef _WIN32
893 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1195 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
894#endif 1196#endif
895 1197
896void 1198void
897fatal (char *message) 1199fatal (char *message)
898 CODE: 1200 CODE:
899 fprintf (stderr, "FATAL: %s\n", message); 1201 fprintf (stderr, "FATAL: %s\n", message);
900#ifdef _WIN32 1202#ifdef _WIN32
901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1203 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
902#endif 1204#endif
903 _exit (1); 1205 _exit (1);
904 1206
905void 1207void
906_exit (int retval = 0) 1208_exit (int retval = 0)
… …
918#if DEBUG 1220#if DEBUG
919 VALGRIND_DO_LEAK_CHECK; 1221 VALGRIND_DO_LEAK_CHECK;
920#endif 1222#endif
921} 1223}
922 1224
923MODULE = CFPlus PACKAGE = CFPlus::Font 1225int
1226SvREFCNT (SV *sv)
1227 CODE:
1228 RETVAL = SvREFCNT (sv);
1229 OUTPUT:
1230 RETVAL
924 1231
925CFPlus::Font 1232MODULE = Deliantra::Client PACKAGE = DC::Font
1233
1234PROTOTYPES: DISABLE
1235
1236DC::Font
926new_from_file (SV *class, char *path, int id = 0) 1237new_from_file (SV *class, char *path, int id = 0)
927 CODE: 1238 CODE:
928{ 1239{
929 int count; 1240 int count;
930 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1241 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
933} 1244}
934 OUTPUT: 1245 OUTPUT:
935 RETVAL 1246 RETVAL
936 1247
937void 1248void
938DESTROY (CFPlus::Font self) 1249DESTROY (DC::Font self)
939 CODE: 1250 CODE:
940 pango_font_description_free (self); 1251 pango_font_description_free (self);
941 1252
942void 1253void
943make_default (CFPlus::Font self) 1254make_default (DC::Font self)
1255 PROTOTYPE: $
944 CODE: 1256 CODE:
945 default_font = self; 1257 default_font = self;
946 1258
947MODULE = CFPlus PACKAGE = CFPlus::Layout 1259MODULE = Deliantra::Client PACKAGE = DC::Layout
948 1260
1261PROTOTYPES: DISABLE
1262
949void 1263void
950reset_glyph_cache () 1264glyph_cache_backup ()
1265 PROTOTYPE:
951 CODE: 1266 CODE:
1267 tc_backup ();
1268
1269void
1270glyph_cache_restore ()
1271 PROTOTYPE:
1272 CODE:
952 tc_clear (); 1273 tc_restore ();
953 1274
954CFPlus::Layout 1275DC::Layout
955new (SV *class) 1276new (SV *class)
956 CODE: 1277 CODE:
957 New (0, RETVAL, 1, struct cf_layout); 1278 New (0, RETVAL, 1, struct cf_layout);
958 1279
959 RETVAL->pl = pango_layout_new (opengl_context); 1280 RETVAL->pl = pango_layout_new (opengl_context);
… …
961 RETVAL->g = 1.; 1282 RETVAL->g = 1.;
962 RETVAL->b = 1.; 1283 RETVAL->b = 1.;
963 RETVAL->a = 1.; 1284 RETVAL->a = 1.;
964 RETVAL->base_height = MIN_FONT_HEIGHT; 1285 RETVAL->base_height = MIN_FONT_HEIGHT;
965 RETVAL->font = 0; 1286 RETVAL->font = 0;
1287 RETVAL->rc = rc_alloc ();
966 1288
967 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1289 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
968 layout_update_font (RETVAL); 1290 layout_update_font (RETVAL);
969 OUTPUT: 1291 OUTPUT:
970 RETVAL 1292 RETVAL
971 1293
972void 1294void
973DESTROY (CFPlus::Layout self) 1295DESTROY (DC::Layout self)
974 CODE: 1296 CODE:
975 g_object_unref (self->pl); 1297 g_object_unref (self->pl);
1298 rc_free (self->rc);
976 Safefree (self); 1299 Safefree (self);
977 1300
978void 1301void
979set_text (CFPlus::Layout self, SV *text_) 1302set_text (DC::Layout self, SV *text_)
980 CODE: 1303 CODE:
981{ 1304{
982 STRLEN textlen; 1305 STRLEN textlen;
983 char *text = SvPVutf8 (text_, textlen); 1306 char *text = SvPVutf8 (text_, textlen);
984 1307
985 pango_layout_set_text (self->pl, text, textlen); 1308 pango_layout_set_text (self->pl, text, textlen);
986} 1309}
987 1310
988void 1311void
989set_markup (CFPlus::Layout self, SV *text_) 1312set_markup (DC::Layout self, SV *text_)
990 CODE: 1313 CODE:
991{ 1314{
992 STRLEN textlen; 1315 STRLEN textlen;
993 char *text = SvPVutf8 (text_, textlen); 1316 char *text = SvPVutf8 (text_, textlen);
994 1317
995 pango_layout_set_markup (self->pl, text, textlen); 1318 pango_layout_set_markup (self->pl, text, textlen);
996} 1319}
997 1320
998void 1321void
999set_shapes (CFPlus::Layout self, ...) 1322set_shapes (DC::Layout self, ...)
1000 CODE: 1323 CODE:
1001{ 1324{
1002 PangoAttrList *attrs = 0; 1325 PangoAttrList *attrs = 0;
1003 const char *text = pango_layout_get_text (self->pl); 1326 const char *text = pango_layout_get_text (self->pl);
1004 const char *pos = text; 1327 const char *pos = text;
… …
1039 if (attrs) 1362 if (attrs)
1040 pango_layout_set_attributes (self->pl, attrs); 1363 pango_layout_set_attributes (self->pl, attrs);
1041} 1364}
1042 1365
1043void 1366void
1044get_shapes (CFPlus::Layout self) 1367get_shapes (DC::Layout self)
1045 PPCODE: 1368 PPCODE:
1046{ 1369{
1047 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1370 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1048 1371
1049 do 1372 do
1050 { 1373 {
1051 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1374 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1052 1375
1053 if (run && shape_attr_p (run)) 1376 if (run && shape_attr_p (run))
1054 { 1377 {
1055 PangoRectangle extents; 1378 PangoRectangle extents;
1056 pango_layout_iter_get_run_extents (iter, 0, &extents); 1379 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1064 1387
1065 pango_layout_iter_free (iter); 1388 pango_layout_iter_free (iter);
1066} 1389}
1067 1390
1068int 1391int
1069has_wrapped (CFPlus::Layout self) 1392has_wrapped (DC::Layout self)
1070 CODE: 1393 CODE:
1071{ 1394{
1072 int lines = 1; 1395 int lines = 1;
1073 const char *text = pango_layout_get_text (self->pl); 1396 const char *text = pango_layout_get_text (self->pl);
1074 1397
… …
1079} 1402}
1080 OUTPUT: 1403 OUTPUT:
1081 RETVAL 1404 RETVAL
1082 1405
1083SV * 1406SV *
1084get_text (CFPlus::Layout self) 1407get_text (DC::Layout self)
1085 CODE: 1408 CODE:
1086 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1409 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1087 sv_utf8_decode (RETVAL); 1410 sv_utf8_decode (RETVAL);
1088 OUTPUT: 1411 OUTPUT:
1089 RETVAL 1412 RETVAL
1090 1413
1091void 1414void
1092set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1415set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1093 CODE: 1416 CODE:
1094 self->r = r; 1417 self->r = r;
1095 self->g = g; 1418 self->g = g;
1096 self->b = b; 1419 self->b = b;
1097 self->a = a; 1420 self->a = a;
1098 1421
1099void 1422void
1100set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1423set_font (DC::Layout self, DC::Font font = 0)
1101 CODE: 1424 CODE:
1102 if (self->font != font) 1425 if (self->font != font)
1103 { 1426 {
1104 self->font = font; 1427 self->font = font;
1105 layout_update_font (self); 1428 layout_update_font (self);
1106 } 1429 }
1107 1430
1108void 1431void
1109set_height (CFPlus::Layout self, int base_height) 1432set_height (DC::Layout self, int base_height)
1110 CODE: 1433 CODE:
1111 if (self->base_height != base_height) 1434 if (self->base_height != base_height)
1112 { 1435 {
1113 self->base_height = base_height; 1436 self->base_height = base_height;
1114 layout_update_font (self); 1437 layout_update_font (self);
1115 } 1438 }
1116 1439
1117void 1440void
1118set_width (CFPlus::Layout self, int max_width = -1) 1441set_width (DC::Layout self, int max_width = -1)
1119 CODE: 1442 CODE:
1120 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1443 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1121 1444
1122void 1445void
1123set_indent (CFPlus::Layout self, int indent) 1446set_indent (DC::Layout self, int indent)
1124 CODE: 1447 CODE:
1125 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1448 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1126 1449
1127void 1450void
1128set_spacing (CFPlus::Layout self, int spacing) 1451set_spacing (DC::Layout self, int spacing)
1129 CODE: 1452 CODE:
1130 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1453 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1131 1454
1132void 1455void
1133set_ellipsise (CFPlus::Layout self, int ellipsise) 1456set_ellipsise (DC::Layout self, int ellipsise)
1134 CODE: 1457 CODE:
1135 pango_layout_set_ellipsize (self->pl, 1458 pango_layout_set_ellipsize (self->pl,
1136 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1459 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1137 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1460 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1138 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1461 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1139 : PANGO_ELLIPSIZE_NONE 1462 : PANGO_ELLIPSIZE_NONE
1140 ); 1463 );
1141 1464
1142void 1465void
1143set_single_paragraph_mode (CFPlus::Layout self, int spm) 1466set_single_paragraph_mode (DC::Layout self, int spm)
1144 CODE: 1467 CODE:
1145 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1468 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1146 1469
1147void 1470void
1148size (CFPlus::Layout self) 1471size (DC::Layout self)
1149 PPCODE: 1472 PPCODE:
1150{ 1473{
1151 int w, h; 1474 int w, h;
1152 1475
1153 layout_get_pixel_size (self, &w, &h); 1476 layout_get_pixel_size (self, &w, &h);
… …
1156 PUSHs (sv_2mortal (newSViv (w))); 1479 PUSHs (sv_2mortal (newSViv (w)));
1157 PUSHs (sv_2mortal (newSViv (h))); 1480 PUSHs (sv_2mortal (newSViv (h)));
1158} 1481}
1159 1482
1160int 1483int
1161descent (CFPlus::Layout self) 1484descent (DC::Layout self)
1162 CODE: 1485 CODE:
1163{ 1486{
1164 PangoRectangle rect; 1487 PangoRectangle rect;
1165 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1488 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1166 pango_layout_line_get_pixel_extents (line, 0, &rect); 1489 pango_layout_line_get_pixel_extents (line, 0, &rect);
1167 RETVAL = PANGO_DESCENT (rect); 1490 RETVAL = PANGO_DESCENT (rect);
1168} 1491}
1169 OUTPUT: 1492 OUTPUT:
1170 RETVAL 1493 RETVAL
1171 1494
1172int 1495int
1173xy_to_index (CFPlus::Layout self, int x, int y) 1496xy_to_index (DC::Layout self, int x, int y)
1174 CODE: 1497 CODE:
1175{ 1498{
1176 int index, trailing; 1499 int index, trailing;
1177 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1500 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1178 RETVAL = index + trailing; 1501 RETVAL = index + trailing;
1179} 1502}
1180 OUTPUT: 1503 OUTPUT:
1181 RETVAL 1504 RETVAL
1182 1505
1183void 1506void
1184cursor_pos (CFPlus::Layout self, int index) 1507cursor_pos (DC::Layout self, int index)
1185 PPCODE: 1508 PPCODE:
1186{ 1509{
1187 PangoRectangle strong_pos; 1510 PangoRectangle pos;
1188 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1511 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1189 1512
1190 EXTEND (SP, 3); 1513 EXTEND (SP, 3);
1191 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1515 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1516 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1194} 1517}
1195 1518
1196void 1519void
1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1520index_to_line_x (DC::Layout self, int index, int trailing = 0)
1198 PPCODE: 1521 PPCODE:
1199{ 1522{
1200 int line, x; 1523 int line, x;
1201 1524
1202 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1525 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1526#if !PANGO_VERSION_CHECK (1, 17, 3)
1203 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1527 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1204 1528 --line;
1529#endif
1205 EXTEND (SP, 2); 1530 EXTEND (SP, 2);
1206 PUSHs (sv_2mortal (newSViv (line - 1))); 1531 PUSHs (sv_2mortal (newSViv (line)));
1207 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1208} 1533}
1209 1534
1210void 1535void
1211line_x_to_index (CFPlus::Layout self, int line, int x) 1536line_x_to_index (DC::Layout self, int line, int x)
1212 PPCODE: 1537 PPCODE:
1213{ 1538{
1214 PangoLayoutLine *lp; 1539 PangoLayoutLine *lp;
1215 int index, trailing; 1540 int index, trailing;
1216 1541
1217 if (line < 0) 1542 if (line < 0)
1218 XSRETURN_EMPTY; 1543 XSRETURN_EMPTY;
1219 1544
1220 if (!(lp = pango_layout_get_line (self->pl, line))) 1545 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1221 XSRETURN_EMPTY; /* do better */ 1546 XSRETURN_EMPTY; /* do better */
1222 1547
1223 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1548 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1224 1549
1225 EXTEND (SP, 2); 1550 EXTEND (SP, 2);
… …
1231 PUSHs (sv_2mortal (newSViv (trailing))); 1556 PUSHs (sv_2mortal (newSViv (trailing)));
1232 } 1557 }
1233} 1558}
1234 1559
1235void 1560void
1236render (CFPlus::Layout self, float x, float y, int flags = 0) 1561render (DC::Layout self, float x, float y, int flags = 0)
1237 PPCODE: 1562 CODE:
1563 rc_clear (self->rc);
1238 pango_opengl_render_layout_subpixel ( 1564 pango_opengl_render_layout_subpixel (
1239 self->pl, 1565 self->pl,
1566 self->rc,
1240 x * PANGO_SCALE, y * PANGO_SCALE, 1567 x * PANGO_SCALE, y * PANGO_SCALE,
1241 self->r, self->g, self->b, self->a, 1568 self->r, self->g, self->b, self->a,
1242 flags 1569 flags
1243 ); 1570 );
1571 // we assume that context_change actually clears/frees stuff
1572 // and does not do any recomputation...
1573 pango_layout_context_changed (self->pl);
1244 1574
1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1246
1247void 1575void
1248pad2pot (SV *data_, SV *w_, SV *h_) 1576draw (DC::Layout self)
1249 CODE: 1577 CODE:
1250{ 1578{
1251 int ow = SvIV (w_); 1579 glEnable (GL_TEXTURE_2D);
1252 int oh = SvIV (h_); 1580 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1581 glEnable (GL_BLEND);
1582 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1583 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1584 glEnable (GL_ALPHA_TEST);
1585 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1253 1586
1254 if (ow && oh) 1587 rc_draw (self->rc);
1588
1589 glDisable (GL_ALPHA_TEST);
1590 glDisable (GL_BLEND);
1591 glDisable (GL_TEXTURE_2D);
1592}
1593
1594MODULE = Deliantra::Client PACKAGE = DC::Texture
1595
1596PROTOTYPES: ENABLE
1597
1598void
1599pad (SV *data_, int ow, int oh, int nw, int nh)
1600 CODE:
1601{
1602 if ((nw != ow || nh != oh) && SvOK (data_))
1255 { 1603 {
1256 int nw = minpot (ow);
1257 int nh = minpot (oh);
1258
1259 if (nw != ow || nh != oh)
1260 {
1261 if (SvOK (data_))
1262 {
1263 STRLEN datalen; 1604 STRLEN datalen;
1264 char *data = SvPVbyte (data_, datalen); 1605 char *data = SvPVbyte (data_, datalen);
1265 int bpp = datalen / (ow * oh); 1606 int bpp = datalen / (ow * oh);
1266 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1607 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1267 1608
1268 SvPOK_only (result_); 1609 SvPOK_only (result_);
1269 SvCUR_set (result_, nw * nh * bpp); 1610 SvCUR_set (result_, nw * nh * bpp);
1270 1611
1271 memset (SvPVX (result_), 0, nw * nh * bpp); 1612 memset (SvPVX (result_), 0, nw * nh * bpp);
1272 while (oh--) 1613 while (oh--)
1273 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1614 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1274 1615
1275 sv_setsv (data_, result_); 1616 sv_setsv (data_, result_);
1276 }
1277
1278 sv_setiv (w_, nw);
1279 sv_setiv (h_, nh);
1280 }
1281 } 1617 }
1282} 1618}
1283 1619
1284void 1620void
1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1621draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1291{ 1627{
1292 HV *hv = (HV *)SvRV (self); 1628 HV *hv = (HV *)SvRV (self);
1293 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1629 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1294 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1630 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1295 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1631 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1632
1633 if (name <= 0)
1634 XSRETURN_EMPTY;
1296 1635
1297 if (items < 5) 1636 if (items < 5)
1298 { 1637 {
1299 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1638 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1300 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1639 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1328 glDisable (GL_ALPHA_TEST); 1667 glDisable (GL_ALPHA_TEST);
1329 glDisable (GL_BLEND); 1668 glDisable (GL_BLEND);
1330 } 1669 }
1331} 1670}
1332 1671
1333MODULE = CFPlus PACKAGE = CFPlus::Map 1672void
1673draw_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)
1674 PROTOTYPE: @
1675 CODE:
1676{
1677 glEnable (GL_TEXTURE_2D);
1678 glEnable (GL_BLEND);
1679 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680 glBindTexture (GL_TEXTURE_2D, name1);
1334 1681
1335CFPlus::Map 1682 glColor3f (intensity, intensity, intensity);
1683 glPushMatrix ();
1684 glScalef (1./3, 1./3, 1.);
1685
1686 if (blend > 0.f)
1687 {
1688 float dx3 = dx * -3.f / w;
1689 float dy3 = dy * -3.f / h;
1690 GLfloat env_color[4] = { 0., 0., 0., blend };
1691
1692 /* interpolate the two shadow textures */
1693 /* stage 0 == rgb(glcolor) + alpha(t0) */
1694 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1695
1696 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1697 gl.ActiveTexture (GL_TEXTURE1);
1698 glEnable (GL_TEXTURE_2D);
1699 glBindTexture (GL_TEXTURE_2D, name2);
1700 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701
1702 /* rgb == rgb(glcolor) */
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706
1707 /* alpha = interpolate t0, t1 by env_alpha */
1708 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1712 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1713
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1719
1720 glBegin (GL_QUADS);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1723 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1725 glEnd ();
1726
1727 glDisable (GL_TEXTURE_2D);
1728 gl.ActiveTexture (GL_TEXTURE0);
1729 }
1730 else
1731 {
1732 /* simple blending of one texture, also opengl <1.3 path */
1733 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1734
1735 glBegin (GL_QUADS);
1736 glTexCoord2f (0, 0); glVertex2f (0, 0);
1737 glTexCoord2f (0, t); glVertex2f (0, h);
1738 glTexCoord2f (s, t); glVertex2f (w, h);
1739 glTexCoord2f (s, 0); glVertex2f (w, 0);
1740 glEnd ();
1741 }
1742
1743 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1744 {
1745 int x, y;
1746 int dx3 = dx * 3;
1747 int dy3 = dy * 3;
1748
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1750 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1751 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1752 glTranslatef (-1., -1., 0);
1753 glBegin (GL_QUADS);
1754
1755 for (y = 1; y < h; y += 3)
1756 {
1757 int y1 = y - dy3;
1758 int y1valid = y1 >= 0 && y1 < h;
1759
1760 for (x = 1; x < w; x += 3)
1761 {
1762 int x1 = x - dx3;
1763 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1764 uint8_t h2;
1765
1766 if (y1valid && x1 >= 0 && x1 < w)
1767 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1768 else
1769 h2 = 1; /* out of range == invisible */
1770
1771 if (h1 || h2)
1772 {
1773 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1774 glColor4f (1., 1., 1., alpha);
1775
1776 glTexCoord2f (0, 0.); glVertex2i (x , y );
1777 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1778 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1779 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1780 }
1781 }
1782 }
1783 }
1784
1785 glEnd ();
1786
1787 glPopMatrix ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 glDisable (GL_BLEND);
1791}
1792
1793IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1794 CODE:
1795{
1796 GLint width;
1797 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1798 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1799 RETVAL = width > 0;
1800}
1801 OUTPUT:
1802 RETVAL
1803
1804MODULE = Deliantra::Client PACKAGE = DC::Map
1805
1806PROTOTYPES: DISABLE
1807
1808DC::Map
1336new (SV *class) 1809new (SV *class)
1337 CODE: 1810 CODE:
1338 New (0, RETVAL, 1, struct map); 1811 New (0, RETVAL, 1, struct map);
1339 RETVAL->x = 0; 1812 RETVAL->x = 0;
1340 RETVAL->y = 0; 1813 RETVAL->y = 0;
… …
1348 RETVAL->row = 0; 1821 RETVAL->row = 0;
1349 OUTPUT: 1822 OUTPUT:
1350 RETVAL 1823 RETVAL
1351 1824
1352void 1825void
1353DESTROY (CFPlus::Map self) 1826DESTROY (DC::Map self)
1354 CODE: 1827 CODE:
1355{ 1828{
1356 map_clear (self); 1829 map_clear (self);
1357 Safefree (self->face2tile); 1830 Safefree (self->face2tile);
1358 Safefree (self->tex); 1831 Safefree (self->tex);
1359 Safefree (self); 1832 Safefree (self);
1360} 1833}
1361 1834
1362void 1835void
1363resize (CFPlus::Map self, int map_width, int map_height) 1836resize (DC::Map self, int map_width, int map_height)
1364 CODE: 1837 CODE:
1365 self->w = map_width; 1838 self->w = map_width;
1366 self->h = map_height; 1839 self->h = map_height;
1367 1840
1368void 1841void
1369clear (CFPlus::Map self) 1842clear (DC::Map self)
1370 CODE: 1843 CODE:
1371 map_clear (self); 1844 map_clear (self);
1372 1845
1373void 1846void
1374set_tileid (CFPlus::Map self, int face, int tile) 1847set_tileid (DC::Map self, int face, int tile)
1375 CODE: 1848 CODE:
1376{ 1849{
1377 need_facenum (self, face); self->face2tile [face] = tile; 1850 need_facenum (self, face); self->face2tile [face] = tile;
1378 need_texid (self, tile); 1851 need_texid (self, tile);
1379} 1852}
1380 1853
1381void 1854void
1382set_smooth (CFPlus::Map self, int face, int smooth, int level) 1855set_smooth (DC::Map self, int face, int smooth, int level)
1383 CODE: 1856 CODE:
1384{ 1857{
1385 tileid texid; 1858 tileid texid;
1386 maptex *tex; 1859 maptex *tex;
1387 1860
… …
1400 tex->smoothtile = self->face2tile [smooth]; 1873 tex->smoothtile = self->face2tile [smooth];
1401 tex->smoothlevel = level; 1874 tex->smoothlevel = level;
1402} 1875}
1403 1876
1404void 1877void
1405set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1878set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1406 CODE: 1879 CODE:
1407{ 1880{
1408 need_texid (self, texid); 1881 need_texid (self, texid);
1409 1882
1410 { 1883 {
… …
1429 // use uglier nearest interpolation because linear suffers 1902 // use uglier nearest interpolation because linear suffers
1430 // from transparent color bleeding and ugly wrapping effects. 1903 // from transparent color bleeding and ugly wrapping effects.
1431 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1904 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1432} 1905}
1433 1906
1907void
1908expire_textures (DC::Map self, int texid, int count)
1909 PPCODE:
1910 for (; texid < self->texs && count; ++texid, --count)
1911 {
1912 maptex *tex = self->tex + texid;
1913
1914 if (tex->name)
1915 {
1916 if (tex->unused)
1917 {
1918 tex->name = 0;
1919 tex->unused = 0;
1920 XPUSHs (sv_2mortal (newSViv (texid)));
1921 }
1922 else
1923 tex->unused = 1;
1924 }
1925 }
1926
1434int 1927int
1435ox (CFPlus::Map self) 1928ox (DC::Map self)
1436 ALIAS: 1929 ALIAS:
1437 oy = 1 1930 oy = 1
1438 x = 2 1931 x = 2
1439 y = 3 1932 y = 3
1440 w = 4 1933 w = 4
… …
1451 } 1944 }
1452 OUTPUT: 1945 OUTPUT:
1453 RETVAL 1946 RETVAL
1454 1947
1455void 1948void
1456scroll (CFPlus::Map self, int dx, int dy) 1949scroll (DC::Map self, int dx, int dy)
1457 CODE: 1950 CODE:
1458{ 1951{
1459 if (dx > 0) 1952 if (dx > 0)
1460 map_blank (self, self->x, self->y, dx, self->h); 1953 map_blank (self, self->x, self->y, dx, self->h);
1461 else if (dx < 0) 1954 else if (dx < 0)
… …
1476 self->rows += MAP_EXTEND_Y; 1969 self->rows += MAP_EXTEND_Y;
1477 self->y += MAP_EXTEND_Y; 1970 self->y += MAP_EXTEND_Y;
1478 } 1971 }
1479} 1972}
1480 1973
1481void 1974SV *
1482map1a_update (CFPlus::Map self, SV *data_, int extmap) 1975map1a_update (DC::Map self, SV *data_, int extmap)
1483 CODE: 1976 CODE:
1484{ 1977{
1485 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1978 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1486 uint8_t *data_end = (uint8_t *)SvEND (data_); 1979 uint8_t *data_end = (uint8_t *)SvEND (data_);
1487 mapcell *cell; 1980 mapcell *cell;
1488 int x, y, flags; 1981 int x, y, z, flags;
1982 AV *missing = newAV ();
1983 RETVAL = newRV_noinc ((SV *)missing);
1489 1984
1490 while (data < data_end - 1) 1985 while (data < data_end - 1)
1491 { 1986 {
1492 flags = (data [0] << 8) + data [1]; data += 2; 1987 flags = (data [0] << 8) + data [1]; data += 2;
1493 1988
… …
1513 uint8_t ext, cmd; 2008 uint8_t ext, cmd;
1514 2009
1515 do 2010 do
1516 { 2011 {
1517 ext = *data++; 2012 ext = *data++;
1518 cmd = ext & 0x3f; 2013 cmd = ext & 0x7f;
1519 2014
1520 if (cmd < 4) 2015 if (cmd < 4)
1521 cell->darkness = 255 - ext * 64 + 1; 2016 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1522 else if (cmd == 5) // health 2017 else if (cmd == 5) // health
1523 { 2018 {
1524 cell->stat_width = 1; 2019 cell->stat_width = 1;
1525 cell->stat_hp = *data++; 2020 cell->stat_hp = *data++;
1526 } 2021 }
1527 else if (cmd == 6) // monster width 2022 else if (cmd == 6) // monster width
1528 cell->stat_width = *data++ + 1; 2023 cell->stat_width = *data++ + 1;
1529 else if (cmd == 0x47) 2024 else if (cmd == 0x47)
1530 { 2025 {
1531 if (*data == 4) 2026 if (*data == 1) cell->player = data [1];
1532 ; // decode player count 2027 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2028 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2029 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1533 2030
1534 data += *data + 1; 2031 data += *data + 1;
1535 } 2032 }
1536 else if (cmd == 8) // cell flags 2033 else if (cmd == 8) // cell flags
1537 cell->flags = *data++; 2034 cell->flags = *data++;
… …
1544 } 2041 }
1545 else 2042 else
1546 cell->darkness = *data++ + 1; 2043 cell->darkness = *data++ + 1;
1547 } 2044 }
1548 2045
2046 for (z = 0; z <= 2; ++z)
1549 if (flags & 4) 2047 if (flags & (4 >> z))
1550 { 2048 {
1551 faceid face = (data [0] << 8) + data [1]; data += 2; 2049 faceid face = (data [0] << 8) + data [1]; data += 2;
1552 need_facenum (self, face); 2050 need_facenum (self, face);
1553 cell->tile [0] = self->face2tile [face]; 2051 cell->tile [z] = self->face2tile [face];
2052
2053 if (cell->tile [z])
2054 {
2055 maptex *tex = self->tex + cell->tile [z];
2056 tex->unused = 0;
2057 if (!tex->name)
2058 av_push (missing, newSViv (cell->tile [z]));
2059
2060 if (tex->smoothtile)
2061 {
2062 maptex *smooth = self->tex + tex->smoothtile;
2063 smooth->unused = 0;
2064 if (!smooth->name)
2065 av_push (missing, newSViv (tex->smoothtile));
2066 }
2067 }
1554 } 2068 }
1555
1556 if (flags & 2)
1557 {
1558 faceid face = (data [0] << 8) + data [1]; data += 2;
1559 need_facenum (self, face);
1560 cell->tile [1] = self->face2tile [face];
1561 }
1562
1563 if (flags & 1)
1564 {
1565 faceid face = (data [0] << 8) + data [1]; data += 2;
1566 need_facenum (self, face);
1567 cell->tile [2] = self->face2tile [face];
1568 }
1569 } 2069 }
1570 else 2070 else
1571 cell->darkness = 0; 2071 CELL_CLEAR (cell);
1572 } 2072 }
1573} 2073}
2074 OUTPUT:
2075 RETVAL
1574 2076
1575SV * 2077SV *
1576mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2078mapmap (DC::Map self, int x0, int y0, int w, int h)
1577 CODE: 2079 CODE:
1578{ 2080{
1579 int x1, x; 2081 int x1, x;
1580 int y1, y; 2082 int y1, y;
1581 int z; 2083 int z;
… …
1626} 2128}
1627 OUTPUT: 2129 OUTPUT:
1628 RETVAL 2130 RETVAL
1629 2131
1630void 2132void
1631draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2133draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1632 CODE: 2134 CODE:
1633{ 2135{
2136 int x, y, z;
2137
1634 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2138 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1635 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2139 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1636 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2140 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1637 smooth_key skey; 2141 smooth_key skey;
1638 int x, y, z; 2142 int pl_x, pl_y;
1639 int last_name; 2143 maptex pl_tex;
2144 rc_t *rc = rc_alloc ();
2145 rc_t *rc_ov = rc_alloc ();
2146 rc_key_t key;
2147 rc_array_t *arr;
1640 2148
2149 pl_tex.name = 0;
2150
1641 // thats current max. sorry. 2151 // that's current max. sorry.
1642 if (sw > 255) sw = 255; 2152 if (sw > 255) sw = 255;
1643 if (sh > 255) sh = 255; 2153 if (sh > 255) sh = 255;
1644 2154
1645 // clear key, in case of extra padding 2155 // clear key, in case of extra padding
1646 memset (&skey, 0, sizeof (skey)); 2156 memset (&skey, 0, sizeof (skey));
1647 2157
1648 glColor4ub (255, 255, 255, 255); 2158 memset (&key, 0, sizeof (key));
1649 2159 key.r = 255;
1650 glEnable (GL_BLEND); 2160 key.g = 255;
1651 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2161 key.b = 255;
1652 glEnable (GL_TEXTURE_2D); 2162 key.a = 255;
1653 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2163 key.mode = GL_QUADS;
1654 2164 key.format = GL_T2F_V3F;
1655 glBegin (GL_QUADS);
1656
1657 last_name = 0;
1658 2165
1659 mx += self->x; 2166 mx += self->x;
1660 my += self->y; 2167 my += self->y;
1661 2168
1662 // first pass: determine smooth_max 2169 // first pass: determine smooth_max
… …
1679 MAX (self->tex [cell->tile [1]].smoothlevel, 2186 MAX (self->tex [cell->tile [1]].smoothlevel,
1680 self->tex [cell->tile [2]].smoothlevel)); 2187 self->tex [cell->tile [2]].smoothlevel));
1681 } 2188 }
1682 } 2189 }
1683 2190
2191 glEnable (GL_BLEND);
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2194
1684 for (z = 0; z <= 2; z++) 2195 for (z = 0; z <= 2; z++)
1685 { 2196 {
1686 memset (smooth_level, 0, sizeof (smooth_level)); 2197 memset (smooth_level, 0, sizeof (smooth_level));
2198 key.texname = -1;
1687 2199
1688 for (y = 0; y < sh; y++) 2200 for (y = 0; y < sh; y++)
1689 if (0 <= y + my && y + my < self->rows) 2201 if (0 <= y + my && y + my < self->rows)
1690 { 2202 {
1691 maprow *row = self->row + (y + my); 2203 maprow *row = self->row + (y + my);
… …
1697 tileid tile = cell->tile [z]; 2209 tileid tile = cell->tile [z];
1698 2210
1699 if (tile) 2211 if (tile)
1700 { 2212 {
1701 maptex tex = self->tex [tile]; 2213 maptex tex = self->tex [tile];
1702 int px = (x + 1) * T - tex.w; 2214 int px, py;
1703 int py = (y + 1) * T - tex.h;
1704 2215
1705 // suppressing texture state switches here
1706 // is only moderately effective, but worth the extra effort
1707 if (last_name != tex.name) 2216 if (key.texname != tex.name)
1708 { 2217 {
2218 self->tex [tile].unused = 0;
2219
1709 if (!tex.name) 2220 if (!tex.name)
1710 tex = self->tex [2]; /* missing, replace by noface */ 2221 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1711 2222
1712 glEnd (); 2223 key.texname = tex.name;
1713 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2224 arr = rc_array (rc, &key);
1714 glBegin (GL_QUADS);
1715 } 2225 }
1716 2226
1717 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2227 px = (x + 1) * T - tex.w;
1718 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2228 py = (y + 1) * T - tex.h;
1719 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1720 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1721 2229
1722 if (cell->flags && z == 2) 2230 if (expect_false (cell->player == player) && expect_false (z == 2))
1723 { 2231 {
1724 if (cell->flags & 1) 2232 pl_x = px;
2233 pl_y = py;
2234 pl_tex = tex;
1725 { 2235 continue;
1726 maptex tex = self->tex [1];
1727 int px = x * T + T * 2 / 32;
1728 int py = y * T - T * 6 / 32;
1729
1730 glEnd ();
1731 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1732 glBegin (GL_QUADS);
1733
1734 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1735 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1736 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1737 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1738 }
1739 } 2236 }
2237
2238 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2239 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2240 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2241 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1740 2242
1741 // update smooth hash 2243 // update smooth hash
1742 if (tex.smoothtile) 2244 if (tex.smoothtile)
1743 { 2245 {
1744 skey.tile = tex.smoothtile; 2246 skey.tile = tex.smoothtile;
… …
1775 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2277 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1776 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2278 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1777 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2279 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1778 } 2280 }
1779 } 2281 }
2282
2283 if (expect_false (z == 2) && expect_false (cell->flags))
2284 {
2285 // overlays such as the speech bubble, probably more to come
2286 if (cell->flags & 1)
2287 {
2288 rc_key_t key_ov = key;
2289 maptex tex = self->tex [TEXID_SPEECH];
2290 rc_array_t *arr;
2291 int px = x * T + T * 2 / 32;
2292 int py = y * T - T * 6 / 32;
2293
2294 key_ov.texname = tex.name;
2295 arr = rc_array (rc_ov, &key_ov);
2296
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2301 }
2302 }
1780 } 2303 }
1781 } 2304 }
2305
2306 rc_draw (rc);
2307 rc_clear (rc);
1782 2308
1783 // go through all smoothlevels, lowest to highest, then draw. 2309 // go through all smoothlevels, lowest to highest, then draw.
1784 // this is basically counting sort 2310 // this is basically counting sort
1785 { 2311 {
1786 int w, b; 2312 int w, b;
1787 2313
2314 glEnable (GL_TEXTURE_2D);
2315 glBegin (GL_QUADS);
1788 for (w = 0; w < 256 / 32; ++w) 2316 for (w = 0; w < 256 / 32; ++w)
1789 { 2317 {
1790 uint32_t smask = smooth_level [w]; 2318 uint32_t smask = smooth_level [w];
1791 if (smask) 2319 if (smask)
1792 for (b = 0; b < 32; ++b) 2320 for (b = 0; b < 32; ++b)
… …
1811 int border = bits & 15; 2339 int border = bits & 15;
1812 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2340 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1813 float dx = tex.s * .0625f; // 16 images/row 2341 float dx = tex.s * .0625f; // 16 images/row
1814 float dy = tex.t * .5f ; // 2 images/column 2342 float dy = tex.t * .5f ; // 2 images/column
1815 2343
1816 // this time naively avoiding texture state changes
1817 // save gobs of state changes.
1818 if (last_name != tex.name) 2344 if (tex.name)
1819 { 2345 {
2346 // this time avoiding texture state changes
2347 // save gobs of state changes.
1820 if (!tex.name) 2348 if (key.texname != tex.name)
1821 continue; // smoothing not yet available 2349 {
2350 self->tex [skey->tile].unused = 0;
1822 2351
1823 glEnd (); 2352 glEnd ();
1824 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2353 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1825 glBegin (GL_QUADS); 2354 glBegin (GL_QUADS);
1826 } 2355 }
1827 2356
1828 if (border) 2357 if (border)
1829 { 2358 {
1830 float ox = border * dx; 2359 float ox = border * dx;
1831 2360
1832 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2361 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1833 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2362 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1834 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2363 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1835 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2364 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1836 } 2365 }
1837 2366
1838 if (corner) 2367 if (corner)
1839 { 2368 {
1840 float ox = corner * dx; 2369 float ox = corner * dx;
1841 2370
1842 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2371 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1843 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2372 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1844 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2373 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2374 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2375 }
1846 } 2376 }
1847 } 2377 }
1848 } 2378 }
1849 } 2379 }
1850 } 2380 }
2381
2382 glEnd ();
2383 glDisable (GL_TEXTURE_2D);
2384 key.texname = -1;
1851 } 2385 }
1852 2386
1853 hv_clear (smooth); 2387 hv_clear (smooth);
1854 } 2388 }
1855 2389
1856 glEnd (); 2390 if (pl_tex.name)
2391 {
2392 maptex tex = pl_tex;
2393 int px = pl_x + sdx;
2394 int py = pl_y + sdy;
1857 2395
1858 glDisable (GL_TEXTURE_2D); 2396 key.texname = tex.name;
2397 arr = rc_array (rc, &key);
2398
2399 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2400 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2401 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2402 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2403
2404 rc_draw (rc);
2405 }
2406
2407 rc_draw (rc_ov);
2408 rc_clear (rc_ov);
2409
1859 glDisable (GL_BLEND); 2410 glDisable (GL_BLEND);
2411 rc_free (rc);
2412 rc_free (rc_ov);
1860 2413
1861 // top layer: overlays such as the health bar 2414 // top layer: overlays such as the health bar
1862 for (y = 0; y < sh; y++) 2415 for (y = 0; y < sh; y++)
1863 if (0 <= y + my && y + my < self->rows) 2416 if (0 <= y + my && y + my < self->rows)
1864 { 2417 {
… …
1869 { 2422 {
1870 mapcell *cell = row->col + (x + mx - row->c0); 2423 mapcell *cell = row->col + (x + mx - row->c0);
1871 2424
1872 int px = x * T; 2425 int px = x * T;
1873 int py = y * T; 2426 int py = y * T;
2427
2428 if (expect_false (cell->player == player))
2429 {
2430 px += sdx;
2431 py += sdy;
2432 }
1874 2433
1875 if (cell->stat_hp) 2434 if (cell->stat_hp)
1876 { 2435 {
1877 int width = cell->stat_width * T; 2436 int width = cell->stat_width * T;
1878 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2437 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1889 } 2448 }
1890 } 2449 }
1891} 2450}
1892 2451
1893void 2452void
1894draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2453draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1895 CODE: 2454 CODE:
1896{ 2455{
1897 static float color[16][3] = { 2456 static float color[16][3] = {
1898 { 0.00F, 0.00F, 0.00F }, 2457 { 0.00f, 0.00f, 0.00f },
1899 { 1.00F, 1.00F, 1.00F }, 2458 { 1.00f, 1.00f, 1.00f },
1900 { 0.00F, 0.00F, 0.55F }, 2459 { 0.00f, 0.00f, 0.55f },
1901 { 1.00F, 0.00F, 0.00F }, 2460 { 1.00f, 0.00f, 0.00f },
1902 2461
1903 { 1.00F, 0.54F, 0.00F }, 2462 { 1.00f, 0.54f, 0.00f },
1904 { 0.11F, 0.56F, 1.00F }, 2463 { 0.11f, 0.56f, 1.00f },
1905 { 0.93F, 0.46F, 0.00F }, 2464 { 0.93f, 0.46f, 0.00f },
1906 { 0.18F, 0.54F, 0.34F }, 2465 { 0.18f, 0.54f, 0.34f },
1907 2466
1908 { 0.56F, 0.73F, 0.56F }, 2467 { 0.56f, 0.73f, 0.56f },
1909 { 0.80F, 0.80F, 0.80F }, 2468 { 0.80f, 0.80f, 0.80f },
1910 { 0.55F, 0.41F, 0.13F }, 2469 { 0.55f, 0.41f, 0.13f },
1911 { 0.99F, 0.77F, 0.26F }, 2470 { 0.99f, 0.77f, 0.26f },
1912 2471
1913 { 0.74F, 0.65F, 0.41F }, 2472 { 0.74f, 0.65f, 0.41f },
1914 2473
1915 { 0.00F, 1.00F, 1.00F }, 2474 { 0.00f, 1.00f, 1.00f },
1916 { 1.00F, 0.00F, 1.00F }, 2475 { 1.00f, 0.00f, 1.00f },
1917 { 1.00F, 1.00F, 0.00F }, 2476 { 1.00f, 1.00f, 0.00f },
1918 }; 2477 };
1919 2478
1920 int x, y; 2479 int x, y;
1921 2480
1922 glEnable (GL_TEXTURE_2D); 2481 glEnable (GL_TEXTURE_2D);
2482 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2483 * but the nvidia driver (185.18.14) mishandles alpha textures
2484 * and takes the colour from god knows where instead of using
2485 * Cp. MODULATE results in the same colour, but slightly different
2486 * alpha, but atcually gives us the correct colour with nvidia.
2487 */
1923 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2488 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1924 glEnable (GL_BLEND); 2489 glEnable (GL_BLEND);
1925 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2490 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1926 glBegin (GL_QUADS); 2491 glBegin (GL_QUADS);
1927 2492
1928 for (y = 0; y < h; y++) 2493 for (y = 0; y < h; y++)
… …
1932 2497
1933 if (m) 2498 if (m)
1934 { 2499 {
1935 float *c = color [m & 15]; 2500 float *c = color [m & 15];
1936 2501
1937 float tx1 = m & 0x40 ? 0.5 : 0.; 2502 float tx1 = m & 0x40 ? 0.5f : 0.f;
1938 float tx2 = tx1 + 0.5; 2503 float tx2 = tx1 + 0.5f;
1939 2504
1940 glColor4f (c[0], c[1], c[2], 0.75); 2505 glColor4f (c[0], c[1], c[2], 1);
1941 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2506 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1942 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2507 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1943 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2508 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1944 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2509 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1945 } 2510 }
… …
1949 glDisable (GL_BLEND); 2514 glDisable (GL_BLEND);
1950 glDisable (GL_TEXTURE_2D); 2515 glDisable (GL_TEXTURE_2D);
1951} 2516}
1952 2517
1953void 2518void
1954fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2519fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1955 PPCODE: 2520 PPCODE:
1956{ 2521{
1957 int x, y; 2522 int x, y;
1958 int sw4 = (sw + 3) & ~3; 2523 int sw1 = sw + 2;
2524 int sh1 = sh + 2;
2525 int sh3 = sh * 3;
2526 int sw3 = sw * 3;
2527 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1959 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2528 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1960 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2529 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1961 2530
1962 memset (darkness, 255, sw4 * sh);
1963 SvPOK_only (darkness_sv); 2531 SvPOK_only (darkness3_sv);
1964 SvCUR_set (darkness_sv, sw4 * sh); 2532 SvCUR_set (darkness3_sv, sw3 * sh3);
1965 2533
1966 mx += self->x; 2534 mx += self->x - 1;
1967 my += self->y; 2535 my += self->y - 1;
1968 2536
1969 for (y = 0; y < sh; y++) 2537 for (y = 0; y < sh1; y++)
1970 if (0 <= y + my && y + my < self->rows) 2538 if (0 <= y + my && y + my < self->rows)
1971 { 2539 {
1972 maprow *row = self->row + (y + my); 2540 maprow *row = self->row + (y + my);
1973 2541
1974 for (x = 0; x < sw; x++) 2542 for (x = 0; x < sw1; x++)
1975 if (row->c0 <= x + mx && x + mx < row->c1) 2543 if (row->c0 <= x + mx && x + mx < row->c1)
1976 { 2544 {
1977 mapcell *cell = row->col + (x + mx - row->c0); 2545 mapcell *cell = row->col + (x + mx - row->c0);
1978 2546
1979 darkness[y * sw4 + x] = cell->darkness 2547 darkness1 [y * sw1 + x] = cell->darkness
1980 ? 255 - (cell->darkness - 1) 2548 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
1981 : 255 - FOW_DARKNESS; 2549 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
1982 } 2550 }
1983 } 2551 }
1984 2552
2553 for (y = 0; y < sh; ++y)
2554 for (x = 0; x < sw; ++x)
2555 {
2556 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2557 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2558 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2559 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2560 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2561 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2562 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2563 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2564 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2565
2566 uint8_t r11 = (d11 + d21 + d12) / 3;
2567 uint8_t r21 = d21;
2568 uint8_t r31 = (d21 + d31 + d32) / 3;
2569
2570 uint8_t r12 = d12;
2571 uint8_t r22 = d22;
2572 uint8_t r32 = d32;
2573
2574 uint8_t r13 = (d13 + d23 + d12) / 3;
2575 uint8_t r23 = d23;
2576 uint8_t r33 = (d23 + d33 + d32) / 3;
2577
2578 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2579 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2580 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2582 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2585 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2587 }
2588
2589 free (darkness1);
2590
1985 EXTEND (SP, 3); 2591 EXTEND (SP, 3);
1986 PUSHs (sv_2mortal (newSViv (sw4))); 2592 PUSHs (sv_2mortal (newSViv (sw3)));
1987 PUSHs (sv_2mortal (newSViv (sh))); 2593 PUSHs (sv_2mortal (newSViv (sh3)));
1988 PUSHs (darkness_sv); 2594 PUSHs (darkness3_sv);
1989} 2595}
1990 2596
1991SV * 2597SV *
1992get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2598get_rect (DC::Map self, int x0, int y0, int w, int h)
1993 CODE: 2599 CODE:
1994{ 2600{
1995 int x, y, x1, y1; 2601 int x, y, x1, y1;
1996 SV *data_sv = newSV (w * h * 7 + 5); 2602 SV *data_sv = newSV (w * h * 7 + 5);
1997 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2603 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2054 else 2660 else
2055 *data++ = 0; 2661 *data++ = 0;
2056 } 2662 }
2057 } 2663 }
2058 2664
2665 /* if size is w*h + 5 then no data has been found */
2666 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2667 {
2059 SvPOK_only (data_sv); 2668 SvPOK_only (data_sv);
2060 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2669 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2670 }
2671
2061 RETVAL = data_sv; 2672 RETVAL = data_sv;
2062} 2673}
2063 OUTPUT: 2674 OUTPUT:
2064 RETVAL 2675 RETVAL
2065 2676
2066void 2677void
2067set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2678set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2068 PPCODE: 2679 PPCODE:
2069{ 2680{
2070 int x, y, z; 2681 int x, y, z;
2071 int w, h; 2682 int w, h;
2072 int x1, y1; 2683 int x1, y1;
2684 STRLEN len;
2685 uint8_t *data, *end;
2686
2687 len = SvLEN (data_sv);
2688 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2689 data = SvPVbyte_nolen (data_sv);
2690 end = data + len + 8;
2691
2692 if (len < 5)
2693 XSRETURN_EMPTY;
2073 2694
2074 if (*data++ != 0) 2695 if (*data++ != 0)
2075 return; /* version mismatch */ 2696 XSRETURN_EMPTY; /* version mismatch */
2076 2697
2077 w = *data++ << 8; w |= *data++; 2698 w = *data++ << 8; w |= *data++;
2078 h = *data++ << 8; h |= *data++; 2699 h = *data++ << 8; h |= *data++;
2079 2700
2080 // we need to do this 'cause we don't keep an absolute coord system for rows 2701 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2092 { 2713 {
2093 maprow *row = map_get_row (self, y); 2714 maprow *row = map_get_row (self, y);
2094 2715
2095 for (x = x0; x < x1; x++) 2716 for (x = x0; x < x1; x++)
2096 { 2717 {
2718 uint8_t flags;
2719
2720 if (data + 7 >= end)
2721 XSRETURN_EMPTY;
2722
2097 uint8_t flags = *data++; 2723 flags = *data++;
2098 2724
2099 if (flags) 2725 if (flags)
2100 { 2726 {
2101 mapcell *cell = row_get_cell (row, x); 2727 mapcell *cell = row_get_cell (row, x);
2102 tileid tile[3] = { 0, 0, 0 }; 2728 tileid tile[3] = { 0, 0, 0 };
… …
2105 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2731 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2106 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2732 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2107 2733
2108 if (cell->darkness == 0) 2734 if (cell->darkness == 0)
2109 { 2735 {
2110 cell->darkness = 0; 2736 /*cell->darkness = 0;*/
2737 EXTEND (SP, 3);
2111 2738
2112 for (z = 0; z <= 2; z++) 2739 for (z = 0; z <= 2; z++)
2113 { 2740 {
2114 tileid t = tile [z]; 2741 tileid t = tile [z];
2115 2742
2116 if (t >= self->texs || (t && !self->tex [t].name)) 2743 if (t >= self->texs || (t && !self->tex [t].name))
2117 { 2744 {
2118 XPUSHs (sv_2mortal (newSViv (t))); 2745 PUSHs (sv_2mortal (newSViv (t)));
2119 need_texid (self, t); 2746 need_texid (self, t);
2120 } 2747 }
2121 2748
2122 cell->tile [z] = t; 2749 cell->tile [z] = t;
2123 } 2750 }
… …
2125 } 2752 }
2126 } 2753 }
2127 } 2754 }
2128} 2755}
2129 2756
2130MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2757MODULE = Deliantra::Client PACKAGE = DC::RW
2131 2758
2132CFPlus::MixChunk 2759DC::RW
2133new_from_file (SV *class, char *path) 2760new (SV *class, SV *data_sv)
2134 CODE: 2761 CODE:
2135 RETVAL = Mix_LoadWAV (path); 2762{
2763 STRLEN datalen;
2764 char *data = SvPVbyte (data_sv, datalen);
2765
2766 RETVAL = SDL_RWFromConstMem (data, datalen);
2767}
2136 OUTPUT: 2768 OUTPUT:
2137 RETVAL 2769 RETVAL
2138 2770
2771DC::RW
2772new_from_file (SV *class, const char *path, const char *mode = "rb")
2773 CODE:
2774 RETVAL = SDL_RWFromFile (path, mode);
2775 OUTPUT:
2776 RETVAL
2777
2778# fails on win32:
2779# dc.xs(2268) : error C2059: syntax error : '('
2139void 2780#void
2781#close (DC::RW self)
2782# CODE:
2783# (self->(close)) (self);
2784
2785MODULE = Deliantra::Client PACKAGE = DC::Channel
2786
2787PROTOTYPES: DISABLE
2788
2789DC::Channel
2790find ()
2791 CODE:
2792{
2793 RETVAL = Mix_GroupAvailable (-1);
2794
2795 if (RETVAL < 0)
2796 {
2797 RETVAL = Mix_GroupOldest (-1);
2798
2799 if (RETVAL < 0)
2800 XSRETURN_UNDEF;
2801
2802 Mix_HaltChannel (RETVAL);
2803 }
2804
2805 Mix_UnregisterAllEffects (RETVAL);
2806 Mix_Volume (RETVAL, 128);
2807}
2808 OUTPUT:
2809 RETVAL
2810
2811void
2812halt (DC::Channel self)
2813 CODE:
2814 Mix_HaltChannel (self);
2815
2816void
2817expire (DC::Channel self, int ticks = -1)
2818 CODE:
2819 Mix_ExpireChannel (self, ticks);
2820
2821void
2822fade_out (DC::Channel self, int ticks = -1)
2823 CODE:
2824 Mix_FadeOutChannel (self, ticks);
2825
2826int
2827volume (DC::Channel self, int volume)
2828 CODE:
2829 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2830 OUTPUT:
2831 RETVAL
2832
2833void
2834unregister_all_effects (DC::Channel self)
2835 CODE:
2836 Mix_UnregisterAllEffects (self);
2837
2838void
2839set_panning (DC::Channel self, int left, int right)
2840 CODE:
2841 left = CLAMP (left , 0, 255);
2842 right = CLAMP (right, 0, 255);
2843 Mix_SetPanning (self, left, right);
2844
2845void
2846set_distance (DC::Channel self, int distance)
2847 CODE:
2848 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2849
2850void
2851set_position (DC::Channel self, int angle, int distance)
2852 CODE:
2853
2854void
2855set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2856 CODE:
2857{
2858 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2859 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2860 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2861}
2862
2863void
2864set_reverse_stereo (DC::Channel self, int flip)
2865 CODE:
2866 Mix_SetReverseStereo (self, flip);
2867
2868MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2869
2870PROTOTYPES: DISABLE
2871
2872DC::MixChunk
2873new (SV *class, DC::RW rwops)
2874 CODE:
2875 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2876 OUTPUT:
2877 RETVAL
2878
2879void
2140DESTROY (CFPlus::MixChunk self) 2880DESTROY (DC::MixChunk self)
2141 CODE: 2881 CODE:
2142 Mix_FreeChunk (self); 2882 Mix_FreeChunk (self);
2143 2883
2144int 2884int
2145volume (CFPlus::MixChunk self, int volume = -1) 2885volume (DC::MixChunk self, int volume = -1)
2146 CODE: 2886 CODE:
2887 if (items > 1)
2888 volume = CLAMP (volume, 0, 128);
2147 RETVAL = Mix_VolumeChunk (self, volume); 2889 RETVAL = Mix_VolumeChunk (self, volume);
2148 OUTPUT: 2890 OUTPUT:
2149 RETVAL 2891 RETVAL
2150 2892
2151int 2893DC::Channel
2152play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2894play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2153 CODE: 2895 CODE:
2896{
2154 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2897 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2898
2899 if (RETVAL < 0)
2900 XSRETURN_UNDEF;
2901
2902 if (channel < 0)
2903 {
2904 Mix_UnregisterAllEffects (RETVAL);
2905 Mix_Volume (RETVAL, 128);
2906 }
2907}
2155 OUTPUT: 2908 OUTPUT:
2156 RETVAL 2909 RETVAL
2157 2910
2158MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2911MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2159 2912
2160int 2913int
2161volume (int volume = -1) 2914volume (int volume = -1)
2915 PROTOTYPE: ;$
2162 CODE: 2916 CODE:
2917 if (items > 0)
2918 volume = CLAMP (volume, 0, 128);
2163 RETVAL = Mix_VolumeMusic (volume); 2919 RETVAL = Mix_VolumeMusic (volume);
2164 OUTPUT: 2920 OUTPUT:
2165 RETVAL 2921 RETVAL
2166 2922
2167int 2923void
2168fade_out (int ms) 2924fade_out (int ms)
2169 CODE: 2925 CODE:
2170 RETVAL = Mix_FadeOutMusic (ms); 2926 Mix_FadeOutMusic (ms);
2927
2928void
2929halt ()
2930 CODE:
2931 Mix_HaltMusic ();
2932
2933DC::MixMusic
2934new (SV *class, DC::RW rwops)
2935 CODE:
2936 RETVAL = Mix_LoadMUS_RW (rwops);
2171 OUTPUT: 2937 OUTPUT:
2172 RETVAL 2938 RETVAL
2173 2939
2174CFPlus::MixMusic
2175new_from_file (SV *class, char *path)
2176 CODE:
2177 RETVAL = Mix_LoadMUS (path);
2178 OUTPUT:
2179 RETVAL
2180
2181void 2940void
2182DESTROY (CFPlus::MixMusic self) 2941DESTROY (DC::MixMusic self)
2183 CODE: 2942 CODE:
2184 Mix_FreeMusic (self); 2943 Mix_FreeMusic (self);
2185 2944
2186int 2945int
2187play (CFPlus::MixMusic self, int loops = -1) 2946play (DC::MixMusic self, int loops = -1)
2188 CODE: 2947 CODE:
2189 RETVAL = Mix_PlayMusic (self, loops); 2948 RETVAL = Mix_PlayMusic (self, loops);
2190 OUTPUT: 2949 OUTPUT:
2191 RETVAL 2950 RETVAL
2192 2951
2193int 2952void
2194fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2953fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2195 CODE: 2954 CODE:
2196 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2955 Mix_FadeInMusicPos (self, loops, ms, position);
2197 OUTPUT:
2198 RETVAL
2199 2956
2200MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2957MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2958
2959PROTOTYPES: ENABLE
2201 2960
2202BOOT: 2961BOOT:
2203{ 2962{
2204 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2963 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2205 static const struct { 2964 static const struct {
2206 const char *name; 2965 const char *name;
2207 IV iv; 2966 IV iv;
2208 } *civ, const_iv[] = { 2967 } *civ, const_iv[] = {
2209# define const_iv(name) { # name, (IV)name } 2968# define const_iv(name) { # name, (IV)name }
2969 const_iv (GL_VENDOR),
2970 const_iv (GL_VERSION),
2971 const_iv (GL_EXTENSIONS),
2972 const_iv (GL_MAX_TEXTURE_UNITS),
2210 const_iv (GL_COLOR_MATERIAL), 2973 const_iv (GL_COLOR_MATERIAL),
2211 const_iv (GL_SMOOTH), 2974 const_iv (GL_SMOOTH),
2212 const_iv (GL_FLAT), 2975 const_iv (GL_FLAT),
2213 const_iv (GL_DITHER), 2976 const_iv (GL_DITHER),
2214 const_iv (GL_BLEND), 2977 const_iv (GL_BLEND),
… …
2218 const_iv (GL_ALPHA_TEST), 2981 const_iv (GL_ALPHA_TEST),
2219 const_iv (GL_NORMALIZE), 2982 const_iv (GL_NORMALIZE),
2220 const_iv (GL_RESCALE_NORMAL), 2983 const_iv (GL_RESCALE_NORMAL),
2221 const_iv (GL_FRONT), 2984 const_iv (GL_FRONT),
2222 const_iv (GL_BACK), 2985 const_iv (GL_BACK),
2986 const_iv (GL_AUX0),
2223 const_iv (GL_AND), 2987 const_iv (GL_AND),
2224 const_iv (GL_ONE), 2988 const_iv (GL_ONE),
2225 const_iv (GL_ZERO), 2989 const_iv (GL_ZERO),
2226 const_iv (GL_SRC_ALPHA), 2990 const_iv (GL_SRC_ALPHA),
2227 const_iv (GL_DST_ALPHA), 2991 const_iv (GL_DST_ALPHA),
2228 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2992 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2229 const_iv (GL_ONE_MINUS_DST_ALPHA), 2993 const_iv (GL_ONE_MINUS_DST_ALPHA),
2994 const_iv (GL_SRC_COLOR),
2995 const_iv (GL_DST_COLOR),
2996 const_iv (GL_ONE_MINUS_SRC_COLOR),
2997 const_iv (GL_ONE_MINUS_DST_COLOR),
2230 const_iv (GL_SRC_ALPHA_SATURATE), 2998 const_iv (GL_SRC_ALPHA_SATURATE),
2231 const_iv (GL_RGB), 2999 const_iv (GL_RGB),
2232 const_iv (GL_RGBA), 3000 const_iv (GL_RGBA),
2233 const_iv (GL_RGBA4), 3001 const_iv (GL_RGBA4),
2234 const_iv (GL_RGBA8), 3002 const_iv (GL_RGBA8),
… …
2240 const_iv (GL_INTENSITY), 3008 const_iv (GL_INTENSITY),
2241 const_iv (GL_LUMINANCE), 3009 const_iv (GL_LUMINANCE),
2242 const_iv (GL_LUMINANCE_ALPHA), 3010 const_iv (GL_LUMINANCE_ALPHA),
2243 const_iv (GL_FLOAT), 3011 const_iv (GL_FLOAT),
2244 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3012 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3013 const_iv (GL_COMPRESSED_ALPHA_ARB),
3014 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3015 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3016 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3017 const_iv (GL_COMPRESSED_RGB_ARB),
3018 const_iv (GL_COMPRESSED_RGBA_ARB),
2245 const_iv (GL_COMPILE), 3019 const_iv (GL_COMPILE),
3020 const_iv (GL_PROXY_TEXTURE_1D),
3021 const_iv (GL_PROXY_TEXTURE_2D),
2246 const_iv (GL_TEXTURE_1D), 3022 const_iv (GL_TEXTURE_1D),
2247 const_iv (GL_TEXTURE_2D), 3023 const_iv (GL_TEXTURE_2D),
2248 const_iv (GL_TEXTURE_ENV), 3024 const_iv (GL_TEXTURE_ENV),
2249 const_iv (GL_TEXTURE_MAG_FILTER), 3025 const_iv (GL_TEXTURE_MAG_FILTER),
2250 const_iv (GL_TEXTURE_MIN_FILTER), 3026 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2271 const_iv (GL_COLOR_LOGIC_OP), 3047 const_iv (GL_COLOR_LOGIC_OP),
2272 const_iv (GL_SEPARABLE_2D), 3048 const_iv (GL_SEPARABLE_2D),
2273 const_iv (GL_CONVOLUTION_2D), 3049 const_iv (GL_CONVOLUTION_2D),
2274 const_iv (GL_CONVOLUTION_BORDER_MODE), 3050 const_iv (GL_CONVOLUTION_BORDER_MODE),
2275 const_iv (GL_CONSTANT_BORDER), 3051 const_iv (GL_CONSTANT_BORDER),
3052 const_iv (GL_POINTS),
2276 const_iv (GL_LINES), 3053 const_iv (GL_LINES),
2277 const_iv (GL_LINE_STRIP), 3054 const_iv (GL_LINE_STRIP),
2278 const_iv (GL_LINE_LOOP), 3055 const_iv (GL_LINE_LOOP),
2279 const_iv (GL_QUADS), 3056 const_iv (GL_QUADS),
2280 const_iv (GL_QUAD_STRIP), 3057 const_iv (GL_QUAD_STRIP),
2281 const_iv (GL_TRIANGLES), 3058 const_iv (GL_TRIANGLES),
2282 const_iv (GL_TRIANGLE_STRIP), 3059 const_iv (GL_TRIANGLE_STRIP),
2283 const_iv (GL_TRIANGLE_FAN), 3060 const_iv (GL_TRIANGLE_FAN),
3061 const_iv (GL_POLYGON),
2284 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3062 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3063 const_iv (GL_POINT_SMOOTH_HINT),
3064 const_iv (GL_LINE_SMOOTH_HINT),
3065 const_iv (GL_POLYGON_SMOOTH_HINT),
3066 const_iv (GL_GENERATE_MIPMAP_HINT),
3067 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2285 const_iv (GL_FASTEST), 3068 const_iv (GL_FASTEST),
3069 const_iv (GL_DONT_CARE),
3070 const_iv (GL_NICEST),
2286 const_iv (GL_V2F), 3071 const_iv (GL_V2F),
2287 const_iv (GL_V3F), 3072 const_iv (GL_V3F),
2288 const_iv (GL_T2F_V3F), 3073 const_iv (GL_T2F_V3F),
2289 const_iv (GL_T2F_N3F_V3F), 3074 const_iv (GL_T2F_N3F_V3F),
3075 const_iv (GL_FUNC_ADD),
3076 const_iv (GL_FUNC_SUBTRACT),
3077 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2290# undef const_iv 3078# undef const_iv
2291 }; 3079 };
2292 3080
2293 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3081 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2294 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3082 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2295 3083
2296 texture_av = newAV (); 3084 texture_av = newAV ();
2297 AvREAL_off (texture_av); 3085 AvREAL_off (texture_av);
2298} 3086}
2299 3087
3088void
3089disable_GL_EXT_blend_func_separate ()
3090 CODE:
3091 gl.BlendFuncSeparate = 0;
3092 gl.BlendFuncSeparateEXT = 0;
3093
3094void
3095apple_nvidia_bug (int enable)
3096
2300char * 3097char *
2301gl_vendor () 3098gl_vendor ()
2302 CODE: 3099 CODE:
2303 RETVAL = (char *)glGetString (GL_VENDOR); 3100 RETVAL = (char *)glGetString (GL_VENDOR);
2304 OUTPUT: 3101 OUTPUT:
… …
2316 CODE: 3113 CODE:
2317 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3114 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2318 OUTPUT: 3115 OUTPUT:
2319 RETVAL 3116 RETVAL
2320 3117
3118const char *glGetString (GLenum pname)
3119
3120GLint glGetInteger (GLenum pname)
3121 CODE:
3122 glGetIntegerv (pname, &RETVAL);
3123 OUTPUT:
3124 RETVAL
3125
3126GLdouble glGetDouble (GLenum pname)
3127 CODE:
3128 glGetDoublev (pname, &RETVAL);
3129 OUTPUT:
3130 RETVAL
3131
2321int glGetError () 3132int glGetError ()
2322 3133
2323void glFinish () 3134void glFinish ()
2324 3135
2325void glClear (int mask) 3136void glClear (int mask)
… …
2339 3150
2340void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3151void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2341 CODE: 3152 CODE:
2342 gl_BlendFuncSeparate (sa, da, saa, daa); 3153 gl_BlendFuncSeparate (sa, da, saa, daa);
2343 3154
3155# void glBlendEquation (int se)
3156
2344void glDepthMask (int flag) 3157void glDepthMask (int flag)
2345 3158
2346void glLogicOp (int opcode) 3159void glLogicOp (int opcode)
2347 3160
2348void glColorMask (int red, int green, int blue, int alpha) 3161void glColorMask (int red, int green, int blue, int alpha)
… …
2362# near_ and far_ are due to microsofts buggy "c" compiler 3175# near_ and far_ are due to microsofts buggy "c" compiler
2363void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3176void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2364 3177
2365# near_ and far_ are due to microsofts buggy "c" compiler 3178# near_ and far_ are due to microsofts buggy "c" compiler
2366void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3179void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3180
3181PROTOTYPES: DISABLE
2367 3182
2368void glViewport (int x, int y, int width, int height) 3183void glViewport (int x, int y, int width, int height)
2369 3184
2370void glScissor (int x, int y, int width, int height) 3185void glScissor (int x, int y, int width, int height)
2371 3186
… …
2379 3194
2380void glRotate (float angle, float x, float y, float z) 3195void glRotate (float angle, float x, float y, float z)
2381 CODE: 3196 CODE:
2382 glRotatef (angle, x, y, z); 3197 glRotatef (angle, x, y, z);
2383 3198
2384void glBegin (int mode)
2385
2386void glEnd ()
2387
2388void glColor (float r, float g, float b, float a = 1.0) 3199void glColor (float r, float g, float b, float a = 1.0)
2389 PROTOTYPE: @ 3200 PROTOTYPE: @
2390 ALIAS: 3201 ALIAS:
2391 glColor_premultiply = 1 3202 glColor_premultiply = 1
2392 CODE: 3203 CODE:
2393 if (ix) 3204 if (ix)
2394 { 3205 {
… …
2397 b *= a; 3208 b *= a;
2398 } 3209 }
2399 // microsoft visual "c" rounds instead of truncating... 3210 // microsoft visual "c" rounds instead of truncating...
2400 glColor4f (r, g, b, a); 3211 glColor4f (r, g, b, a);
2401 3212
2402void glInterleavedArrays (int format, int stride, char *data)
2403
2404void glDrawElements (int mode, int count, int type, char *indices)
2405
2406# 1.2 void glDrawRangeElements (int mode, int start, int end
2407
2408void glRasterPos (float x, float y, float z = 0.) 3213void glRasterPos (float x, float y, float z = 0.)
2409 CODE: 3214 CODE:
2410 glRasterPos3f (0, 0, z); 3215 glRasterPos3f (0, 0, z);
2411 glBitmap (0, 0, 0, 0, x, y, 0); 3216 glBitmap (0, 0, 0, 0, x, y, 0);
2412 3217
… …
2416 3221
2417void glTexCoord (float s, float t) 3222void glTexCoord (float s, float t)
2418 CODE: 3223 CODE:
2419 glTexCoord2f (s, t); 3224 glTexCoord2f (s, t);
2420 3225
3226void glRect (float x1, float y1, float x2, float y2)
3227 CODE:
3228 glRectf (x1, y1, x2, y2);
3229
3230void glRect_lineloop (float x1, float y1, float x2, float y2)
3231 CODE:
3232 glBegin (GL_LINE_LOOP);
3233 glVertex2f (x1, y1);
3234 glVertex2f (x2, y1);
3235 glVertex2f (x2, y2);
3236 glVertex2f (x1, y2);
3237 glEnd ();
3238
3239PROTOTYPES: ENABLE
3240
3241void glBegin (int mode)
3242
3243void glEnd ()
3244
3245void glPointSize (GLfloat size)
3246
3247void glLineWidth (GLfloat width)
3248
3249void glInterleavedArrays (int format, int stride, char *data)
3250
3251void glDrawElements (int mode, int count, int type, char *indices)
3252
3253# 1.2 void glDrawRangeElements (int mode, int start, int end
3254
2421void glTexEnv (int target, int pname, float param) 3255void glTexEnv (int target, int pname, float param)
2422 CODE: 3256 CODE:
2423 glTexEnvf (target, pname, param); 3257 glTexEnvf (target, pname, param);
2424 3258
2425void glTexParameter (int target, int pname, float param) 3259void glTexParameter (int target, int pname, float param)
… …
2441void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3275void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2442 CODE: 3276 CODE:
2443 if (gl.SeparableFilter2D) 3277 if (gl.SeparableFilter2D)
2444 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3278 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2445 3279
2446void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3280void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2447 3281
2448void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3282void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2449 3283
2450void glDrawPixels (int width, int height, int format, int type, char *pixels) 3284void glDrawPixels (int width, int height, int format, int type, char *pixels)
3285
3286void glPixelZoom (float x, float y)
2451 3287
2452void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3288void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2453 3289
2454int glGenTexture () 3290int glGenTexture ()
2455 CODE: 3291 CODE:
… …
2475 3311
2476void glEndList () 3312void glEndList ()
2477 3313
2478void glCallList (int list) 3314void glCallList (int list)
2479 3315
3316void c_init ()
3317 CODE:
3318 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3319 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3320
3321MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3322
3323PROTOTYPES: DISABLE
3324
3325void
3326find_widget (SV *self, NV x, NV y)
3327 PPCODE:
3328{
3329 if (within_widget (self, x, y))
3330 XPUSHs (self);
3331}
3332
3333BOOT:
3334{
3335 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3336
3337 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3338 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3339 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3340 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3341}
3342
3343void
3344draw (SV *self)
3345 CODE:
3346{
3347 HV *hv;
3348 SV **svp;
3349 NV x, y, w, h;
3350 SV *draw_x_sv = GvSV (draw_x_gv);
3351 SV *draw_y_sv = GvSV (draw_y_gv);
3352 SV *draw_w_sv = GvSV (draw_w_gv);
3353 SV *draw_h_sv = GvSV (draw_h_gv);
3354 double draw_x, draw_y;
3355
3356 if (!SvROK (self))
3357 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3358
3359 hv = (HV *)SvRV (self);
3360
3361 if (SvTYPE (hv) != SVt_PVHV)
3362 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3363
3364 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3365 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3366
3367 if (!h || !w)
3368 XSRETURN_EMPTY;
3369
3370 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3371 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3372
3373 draw_x = SvNV (draw_x_sv) + x;
3374 draw_y = SvNV (draw_y_sv) + y;
3375
3376 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3377 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3378 XSRETURN_EMPTY;
3379
3380 sv_setnv (draw_x_sv, draw_x);
3381 sv_setnv (draw_y_sv, draw_y);
3382
3383 glPushMatrix ();
3384 glTranslated (x, y, 0);
3385
3386 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3387 {
3388 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3389
3390 if (svp && SvTRUE (*svp))
3391 {
3392 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3393 glEnable (GL_BLEND);
3394 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3395 glBegin (GL_QUADS);
3396 glVertex2f (0, 0);
3397 glVertex2f (w, 0);
3398 glVertex2f (w, h);
3399 glVertex2f (0, h);
3400 glEnd ();
3401 glDisable (GL_BLEND);
3402 }
3403 }
3404#if 0
3405 // draw borders, for debugging
3406 glPushMatrix ();
3407 glColor4f (1., 1., 0., 1.);
3408 glTranslatef (.5, .5, 0.);
3409 glBegin (GL_LINE_LOOP);
3410 glVertex2f (0 , 0);
3411 glVertex2f (w - 1, 0);
3412 glVertex2f (w - 1, h - 1);
3413 glVertex2f (0 , h - 1);
3414 glEnd ();
3415 glPopMatrix ();
3416#endif
3417 PUSHMARK (SP);
3418 XPUSHs (self);
3419 PUTBACK;
3420 call_method ("_draw", G_VOID | G_DISCARD);
3421 SPAGAIN;
3422
3423 glPopMatrix ();
3424
3425 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3426 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3427}
3428

Diff Legend

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