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

Diff Legend

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