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.208 by root, Sat Jul 21 16:07:53 2007 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC

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

Diff Legend

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