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.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC

… …
15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
61
62#ifndef PANGO_VERSION_CHECK
63# define PANGO_VERSION_CHECK(a,b,c) 0
64#endif
65
66#if !PANGO_VERSION_CHECK (1, 15, 2)
67# define pango_layout_get_line_readonly pango_layout_get_line
68# define pango_layout_get_lines_readonly pango_layout_get_lines
69# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
70# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
71#endif
50 72
51#ifndef _WIN32 73#ifndef _WIN32
52# include <sys/types.h> 74# include <sys/types.h>
53# include <sys/socket.h> 75# include <sys/socket.h>
54# include <netinet/in.h> 76# include <netinet/in.h>
55# include <netinet/tcp.h> 77# include <netinet/tcp.h>
56# include <inttypes.h> 78# include <inttypes.h>
57#endif 79#endif
58 80
81#if __GNUC__ >= 4
82# define expect(expr,value) __builtin_expect ((expr),(value))
83#else
84# define expect(expr,value) (expr)
85#endif
86
87#define expect_false(expr) expect ((expr) != 0, 0)
88#define expect_true(expr) expect ((expr) != 0, 1)
89
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
62 96
63#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
65 99
66#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
67 101
68#if 0 102/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 104
71# define PARACHUTE 0 105#define KMOD_LRAM 0x10000 // our extension
72#endif 106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
73 128
74static AV *texture_av; 129static AV *texture_av;
75 130
76static struct 131static struct
77{ 132{
… …
120 175
121#include "pango-font.c" 176#include "pango-font.c"
122#include "pango-fontmap.c" 177#include "pango-fontmap.c"
123#include "pango-render.c" 178#include "pango-render.c"
124 179
125typedef IV CFPlus__Channel; 180typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 181typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 182typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 183typedef Mix_Music *DC__MixMusic;
129 184
130typedef PangoFontDescription *CFPlus__Font; 185typedef PangoFontDescription *DC__Font;
131 186
132static int 187static int
133shape_attr_p (PangoLayoutRun *run) 188shape_attr_p (PangoLayoutRun *run)
134{ 189{
135 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
136 191
137 while (attrs) 192 while (attrs)
138 { 193 {
139 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 195
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 197 return 1;
143 198
144 attrs = attrs->next; 199 attrs = attrs->next;
145 } 200 }
146 201
147 return 0; 202 return 0;
148} 203}
149 204
150typedef struct cf_layout { 205struct cf_layout {
151 PangoLayout *pl; 206 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
153 int base_height; 208 int base_height;
154 CFPlus__Font font; 209 DC__Font font;
155 rc_t *rc; 210 rc_t *rc;
156} *CFPlus__Layout; 211};
157 212
213typedef cf_layout *DC__Layout;
214
158static CFPlus__Font default_font; 215static DC__Font default_font;
159static PangoContext *opengl_context; 216static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
161 218
162static void 219static void
163substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
164{ 221{
165 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
166#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
167 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
168#endif 225#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 227}
171 228
172static void 229static void
173layout_update_font (CFPlus__Layout self) 230layout_update_font (DC__Layout self)
174{ 231{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 232 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
177 */ 234 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
179 236
180 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 239
183 pango_layout_set_font_description (self->pl, font); 240 pango_layout_set_font_description (self->pl, font);
184} 241}
185 242
186static void 243static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 244layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 245{
189 PangoRectangle rect; 246 PangoRectangle rect;
190 247
191 // get_pixel_* wrongly rounds down 248 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 249 pango_layout_get_extents (self->pl, 0, &rect);
… …
202} 259}
203 260
204typedef uint16_t tileid; 261typedef uint16_t tileid;
205typedef uint16_t faceid; 262typedef uint16_t faceid;
206 263
207typedef struct { 264struct maptex
265{
208 GLuint name; 266 GLuint name;
209 int w, h; 267 int w, h;
210 float s, t; 268 float s, t;
211 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
212 tileid smoothtile; 270 tileid smoothtile;
213 uint8_t smoothlevel; 271 uint8_t smoothlevel;
214} maptex; 272 uint8_t unused; /* set to zero on use */
273};
215 274
216typedef struct { 275struct mapcell
276{
217 uint32_t player; 277 uint32_t player;
218 tileid tile[3]; 278 tileid tile[3];
219 uint16_t darkness; 279 uint16_t darkness;
220 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
221} mapcell; 281};
222 282
223typedef struct { 283struct maprow
284{
224 int32_t c0, c1; 285 int32_t c0, c1;
225 mapcell *col; 286 mapcell *col;
226} maprow; 287};
227 288
228typedef struct map { 289struct mapgrid {
229 int x, y, w, h; 290 int x, y, w, h;
230 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
231 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
233 294
234 int32_t rows; 295 int32_t rows;
235 maprow *row; 296 maprow *row;
236} *CFPlus__Map; 297};
298
299typedef mapgrid *DC__Map;
237 300
238static char * 301static char *
239prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
240{ 303{
241 char *p; 304 char *p;
… …
259 322
260#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
261#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
262 325
263static void 326static void
264need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
265{ 328{
266 while (self->faces <= face) 329 while (self->faces <= face)
267 { 330 {
268 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
269 self->faces *= 2; 332 self->faces *= 2;
270 } 333 }
271} 334}
272 335
273static void 336static void
274need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
275{ 338{
276 while (self->texs <= texid) 339 while (self->texs <= texid)
277 { 340 {
278 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
279 self->texs *= 2; 342 self->texs *= 2;
280 } 343 }
281} 344}
282 345
283static maprow * 346static maprow *
284map_get_row (CFPlus__Map self, int y) 347map_get_row (mapgrid *self, int y)
285{ 348{
286 if (0 > y) 349 if (0 > y)
287 { 350 {
288 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
… …
327 390
328 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
329} 392}
330 393
331static mapcell * 394static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
333{ 396{
334 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
335} 398}
336 399
337static void 400static void
338map_clear (CFPlus__Map self) 401map_clear (mapgrid *self)
339{ 402{
340 int r; 403 int r;
341 404
342 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
… …
350 self->oy = 0; 413 self->oy = 0;
351 self->row = 0; 414 self->row = 0;
352 self->rows = 0; 415 self->rows = 0;
353} 416}
354 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
355static void 428static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
357{ 430{
358 int x, y; 431 int x, y;
359 maprow *row; 432 maprow *row;
360 mapcell *cell; 433 mapcell *cell;
361 434
… …
373 if (x >= row->c1) 446 if (x >= row->c1)
374 break; 447 break;
375 448
376 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
377 450
378 cell->darkness = 0; 451 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 452 }
383 } 453 }
384} 454}
385 455
386typedef struct { 456struct smooth_key
457{
387 tileid tile; 458 tileid tile;
388 uint8_t x, y, level; 459 uint8_t x, y, level;
389} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
390 479
391static void 480static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
393{ 482{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
395 484
396 if (SvIOK (*sv)) 485 if (it == h.end ())
397 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
398 else 487 else
399 sv_setiv (*sv, bits); 488 it->second |= bits;
400} 489}
401 490
402static void 491static void
403music_finished (void) 492music_finished (void)
404{ 493{
… …
421 ev.code = 1; 510 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 512 ev.data2 = 0;
424 513
425 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
426} 522}
427 523
428static unsigned int 524static unsigned int
429minpot (unsigned int n) 525minpot (unsigned int n)
430{ 526{
… …
498 return 0; 594 return 0;
499 595
500 return 1; 596 return 1;
501} 597}
502 598
503MODULE = CFPlus PACKAGE = CFPlus 599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
656
657MODULE = Deliantra::Client PACKAGE = DC
504 658
505PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
506 660
507BOOT: 661BOOT:
508{ 662{
509 HV *stash = gv_stashpv ("CFPlus", 1); 663 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 664 static const struct {
511 const char *name; 665 const char *name;
512 IV iv; 666 IV iv;
513 } *civ, const_iv[] = { 667 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 668# define const_iv(name) { # name, (IV)name }
… …
535 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
536 690
537 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
540 744
541 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
624 828
829 const_iv (KMOD_LRAM),
830
625 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
832
833 const_iv (SDL_INIT_TIMER),
834 const_iv (SDL_INIT_AUDIO),
835 const_iv (SDL_INIT_VIDEO),
836 const_iv (SDL_INIT_CDROM),
837 const_iv (SDL_INIT_JOYSTICK),
838 const_iv (SDL_INIT_EVERYTHING),
839 const_iv (SDL_INIT_NOPARACHUTE),
840 const_iv (SDL_INIT_EVENTTHREAD),
841
842 const_iv (SDL_GL_RED_SIZE),
843 const_iv (SDL_GL_GREEN_SIZE),
844 const_iv (SDL_GL_BLUE_SIZE),
845 const_iv (SDL_GL_ALPHA_SIZE),
846 const_iv (SDL_GL_DOUBLEBUFFER),
847 const_iv (SDL_GL_BUFFER_SIZE),
848 const_iv (SDL_GL_DEPTH_SIZE),
849 const_iv (SDL_GL_STENCIL_SIZE),
850 const_iv (SDL_GL_ACCUM_RED_SIZE),
851 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
852 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
854 const_iv (SDL_GL_STEREO),
855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
857 const_iv (SDL_GL_ACCELERATED_VISUAL),
858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
626# undef const_iv 861# undef const_iv
627 }; 862 };
628 863
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 866
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 869}
635 870
… …
651NV ceil (NV x) 886NV ceil (NV x)
652 887
653IV minpot (UV n) 888IV minpot (UV n)
654 889
655IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
656 897
657void 898void
658pango_init () 899pango_init ()
659 CODE: 900 CODE:
660{ 901{
661 opengl_fontmap = pango_opengl_font_map_new (); 902 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 903 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 904 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
905 /*pango_context_set_font_description (opengl_context, default_font);*/
906#if PANGO_VERSION_CHECK (1, 15, 2)
907 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
908 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
909#endif
664} 910}
665 911
666char *
667SDL_GetError () 912char *SDL_GetError ()
668 913
669int 914void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
671 916
672void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
673SDL_Quit () 923void SDL_Quit ()
924
925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
927
928int SDL_GL_GetAttribute (int attr)
929 CODE:
930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
931 XSRETURN_UNDEF;
932 OUTPUT:
933 RETVAL
674 934
675void 935void
676SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
677 PPCODE: 937 PPCODE:
678{ 938{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 953
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 956
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 958
702 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
703 while (*m) 960 while (*m)
704 { 961 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 963 {
707 AV *av = newAV (); 964 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
… …
733 ); 990 );
734 991
735 if (RETVAL) 992 if (RETVAL)
736 { 993 {
737 av_clear (texture_av); 994 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 996#include "glfunc.h"
742#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 1000 }
744} 1001}
745 OUTPUT: 1002 OUTPUT:
746 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
747 1007
748void 1008void
749SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
750 1010
751char * 1011char *
752SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
753 1014
754int 1015int
755SDL_GetAppState () 1016SDL_GetAppState ()
756 1017
1018int
1019SDL_GetModState ()
1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
757void 1025void
1026SDL_PumpEvents ()
1027
1028void
758poll_events () 1029peep_events ()
759 PPCODE: 1030 PPCODE:
760{ 1031{
761 SDL_Event ev; 1032 SDL_Event ev;
762 1033
763 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
… …
770 { 1041 {
771 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1043 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1049 break;
779 1050
780 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 1070 x = ev.motion.x;
800 y = ev.motion.y; 1071 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1073 }
803 1074
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1081 }
811 break; 1082 break;
812 1083
813 case SDL_MOUSEBUTTONDOWN: 1084 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1085 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1086 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1087
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1088 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1089 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1090 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1091 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1096 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1097 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1098 break;
828 } 1099 }
829 1100
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1102 }
832} 1103}
1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
833 1117
834int 1118int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1120 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
838 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
839 1123
840void 1124void
841Mix_QuerySpec () 1125Mix_QuerySpec ()
… …
894 } 1178 }
895 } 1179 }
896#endif 1180#endif
897} 1181}
898 1182
899void 1183int
900add_font (char *file) 1184add_font (char *file)
901 CODE: 1185 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1187 OUTPUT:
1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
903 1196
904void 1197void
905load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
906 ALIAS: 1199 ALIAS:
907 load_image_file = 1 1200 load_image_file = 1
… …
953 1246
954 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
955 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
956 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
957 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
958 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
959 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
960 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
961 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
962 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
963 1256
… …
1023#if DEBUG 1316#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1025#endif 1318#endif
1026} 1319}
1027 1320
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1328MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1329
1030PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1031 1331
1032CFPlus::Font 1332DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1034 CODE: 1334 CODE:
1035{ 1335{
1036 int count; 1336 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1038 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1040} 1340}
1041 OUTPUT: 1341 OUTPUT:
1042 RETVAL 1342 RETVAL
1043 1343
1044void 1344void
1045DESTROY (CFPlus::Font self) 1345DESTROY (DC::Font self)
1046 CODE: 1346 CODE:
1047 pango_font_description_free (self); 1347 pango_font_description_free (self);
1048 1348
1049void 1349void
1050make_default (CFPlus::Font self) 1350make_default (DC::Font self)
1051 PROTOTYPE: $ 1351 PROTOTYPE: $
1052 CODE: 1352 CODE:
1053 default_font = self; 1353 default_font = self;
1054 1354
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1355MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1356
1057PROTOTYPES: DISABLE 1357PROTOTYPES: DISABLE
1058 1358
1059void 1359void
1060glyph_cache_backup () 1360glyph_cache_backup ()
… …
1066glyph_cache_restore () 1366glyph_cache_restore ()
1067 PROTOTYPE: 1367 PROTOTYPE:
1068 CODE: 1368 CODE:
1069 tc_restore (); 1369 tc_restore ();
1070 1370
1071CFPlus::Layout 1371DC::Layout
1072new (SV *class) 1372new (SV *klass)
1073 CODE: 1373 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1075 1375
1076 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1077 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
… …
1086 layout_update_font (RETVAL); 1386 layout_update_font (RETVAL);
1087 OUTPUT: 1387 OUTPUT:
1088 RETVAL 1388 RETVAL
1089 1389
1090void 1390void
1091DESTROY (CFPlus::Layout self) 1391DESTROY (DC::Layout self)
1092 CODE: 1392 CODE:
1093 g_object_unref (self->pl); 1393 g_object_unref (self->pl);
1094 rc_free (self->rc); 1394 rc_free (self->rc);
1095 Safefree (self); 1395 Safefree (self);
1096 1396
1097void 1397void
1098set_text (CFPlus::Layout self, SV *text_) 1398set_text (DC::Layout self, SV *text_)
1099 CODE: 1399 CODE:
1100{ 1400{
1101 STRLEN textlen; 1401 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1402 char *text = SvPVutf8 (text_, textlen);
1103 1403
1104 pango_layout_set_text (self->pl, text, textlen); 1404 pango_layout_set_text (self->pl, text, textlen);
1105} 1405}
1106 1406
1107void 1407void
1108set_markup (CFPlus::Layout self, SV *text_) 1408set_markup (DC::Layout self, SV *text_)
1109 CODE: 1409 CODE:
1110{ 1410{
1111 STRLEN textlen; 1411 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1412 char *text = SvPVutf8 (text_, textlen);
1113 1413
1114 pango_layout_set_markup (self->pl, text, textlen); 1414 pango_layout_set_markup (self->pl, text, textlen);
1115} 1415}
1116 1416
1117void 1417void
1118set_shapes (CFPlus::Layout self, ...) 1418set_shapes (DC::Layout self, ...)
1119 CODE: 1419 CODE:
1120{ 1420{
1121 PangoAttrList *attrs = 0; 1421 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1422 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1423 const char *pos = text;
… …
1158 if (attrs) 1458 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1459 pango_layout_set_attributes (self->pl, attrs);
1160} 1460}
1161 1461
1162void 1462void
1163get_shapes (CFPlus::Layout self) 1463get_shapes (DC::Layout self)
1164 PPCODE: 1464 PPCODE:
1165{ 1465{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1466 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1467
1168 do 1468 do
1169 { 1469 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1470 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1471
1172 if (run && shape_attr_p (run)) 1472 if (run && shape_attr_p (run))
1173 { 1473 {
1174 PangoRectangle extents; 1474 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1475 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1183 1483
1184 pango_layout_iter_free (iter); 1484 pango_layout_iter_free (iter);
1185} 1485}
1186 1486
1187int 1487int
1188has_wrapped (CFPlus::Layout self) 1488has_wrapped (DC::Layout self)
1189 CODE: 1489 CODE:
1190{ 1490{
1191 int lines = 1; 1491 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1492 const char *text = pango_layout_get_text (self->pl);
1193 1493
… …
1198} 1498}
1199 OUTPUT: 1499 OUTPUT:
1200 RETVAL 1500 RETVAL
1201 1501
1202SV * 1502SV *
1203get_text (CFPlus::Layout self) 1503get_text (DC::Layout self)
1204 CODE: 1504 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1505 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1506 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1507 OUTPUT:
1208 RETVAL 1508 RETVAL
1209 1509
1210void 1510void
1211set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1511set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1512 CODE:
1213 self->r = r; 1513 self->r = r;
1214 self->g = g; 1514 self->g = g;
1215 self->b = b; 1515 self->b = b;
1216 self->a = a; 1516 self->a = a;
1217 1517
1218void 1518void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1519set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1520 CODE:
1221 if (self->font != font) 1521 if (self->font != font)
1222 { 1522 {
1223 self->font = font; 1523 self->font = font;
1224 layout_update_font (self); 1524 layout_update_font (self);
1225 } 1525 }
1226 1526
1227void 1527void
1228set_height (CFPlus::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1229 CODE: 1529 CODE:
1230 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1231 { 1531 {
1232 self->base_height = base_height; 1532 self->base_height = base_height;
1233 layout_update_font (self); 1533 layout_update_font (self);
1234 } 1534 }
1235 1535
1236void 1536void
1237set_width (CFPlus::Layout self, int max_width = -1) 1537set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1538 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1539 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1540
1241void 1541void
1242set_indent (CFPlus::Layout self, int indent) 1542set_indent (DC::Layout self, int indent)
1243 CODE: 1543 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1544 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1545
1246void 1546void
1247set_spacing (CFPlus::Layout self, int spacing) 1547set_spacing (DC::Layout self, int spacing)
1248 CODE: 1548 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1549 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1550
1251void 1551void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1552set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1553 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1554 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1555 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1556 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1557 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1558 : PANGO_ELLIPSIZE_NONE
1259 ); 1559 );
1260 1560
1261void 1561void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1562set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1563 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1564 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1565
1266void 1566void
1267size (CFPlus::Layout self) 1567size (DC::Layout self)
1268 PPCODE: 1568 PPCODE:
1269{ 1569{
1270 int w, h; 1570 int w, h;
1271 1571
1272 layout_get_pixel_size (self, &w, &h); 1572 layout_get_pixel_size (self, &w, &h);
… …
1275 PUSHs (sv_2mortal (newSViv (w))); 1575 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1576 PUSHs (sv_2mortal (newSViv (h)));
1277} 1577}
1278 1578
1279int 1579int
1280descent (CFPlus::Layout self) 1580descent (DC::Layout self)
1281 CODE: 1581 CODE:
1282{ 1582{
1283 PangoRectangle rect; 1583 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1584 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1585 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1586 RETVAL = PANGO_DESCENT (rect);
1287} 1587}
1288 OUTPUT: 1588 OUTPUT:
1289 RETVAL 1589 RETVAL
1290 1590
1291int 1591int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1592xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1593 CODE:
1294{ 1594{
1295 int index, trailing; 1595 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1596 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1597 RETVAL = index + trailing;
1298} 1598}
1299 OUTPUT: 1599 OUTPUT:
1300 RETVAL 1600 RETVAL
1301 1601
1302void 1602void
1303cursor_pos (CFPlus::Layout self, int index) 1603cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1604 PPCODE:
1305{ 1605{
1306 PangoRectangle strong_pos; 1606 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1607 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1608
1309 EXTEND (SP, 3); 1609 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1612 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1613}
1314 1614
1315void 1615void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1616index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1617 PPCODE:
1318{ 1618{
1319 int line, x; 1619 int line, x;
1320 1620
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1621 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1622#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1623 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1624 --line;
1625#endif
1324 EXTEND (SP, 2); 1626 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1627 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1628 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1629}
1328 1630
1329void 1631void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1632line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1633 PPCODE:
1332{ 1634{
1333 PangoLayoutLine *lp; 1635 PangoLayoutLine *lp;
1334 int index, trailing; 1636 int index, trailing;
1335 1637
1336 if (line < 0) 1638 if (line < 0)
1337 XSRETURN_EMPTY; 1639 XSRETURN_EMPTY;
1338 1640
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1641 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1642 XSRETURN_EMPTY; /* do better */
1341 1643
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1644 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1645
1344 EXTEND (SP, 2); 1646 EXTEND (SP, 2);
… …
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1652 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1653 }
1352} 1654}
1353 1655
1354void 1656void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1657render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1658 CODE:
1357 rc_clear (self->rc); 1659 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1660 pango_opengl_render_layout_subpixel (
1359 self->pl, 1661 self->pl,
1360 self->rc, 1662 self->rc,
… …
1365 // we assume that context_change actually clears/frees stuff 1667 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1668 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1669 pango_layout_context_changed (self->pl);
1368 1670
1369void 1671void
1370draw (CFPlus::Layout self) 1672draw (DC::Layout self)
1371 CODE: 1673 CODE:
1372{ 1674{
1373 glEnable (GL_TEXTURE_2D); 1675 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1676 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1677 glEnable (GL_BLEND);
… …
1383 glDisable (GL_ALPHA_TEST); 1685 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1686 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1687 glDisable (GL_TEXTURE_2D);
1386} 1688}
1387 1689
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1690MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1691
1390PROTOTYPES: ENABLE 1692PROTOTYPES: ENABLE
1391 1693
1392void 1694void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1695pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1461 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1463 } 1765 }
1464} 1766}
1465 1767
1768void
1769draw_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)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1466IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467 CODE: 1890 CODE:
1468{ 1891{
1469 GLint width; 1892 GLint width;
1470 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1472 RETVAL = width > 0; 1895 RETVAL = width > 0;
1473} 1896}
1474 OUTPUT: 1897 OUTPUT:
1475 RETVAL 1898 RETVAL
1476 1899
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1901
1479PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1480 1903
1481CFPlus::Map 1904DC::Map
1482new (SV *class) 1905new (SV *klass)
1483 CODE: 1906 CODE:
1484 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1485 RETVAL->x = 0; 1908 RETVAL->x = 0;
1486 RETVAL->y = 0; 1909 RETVAL->y = 0;
1487 RETVAL->w = 0; 1910 RETVAL->w = 0;
1488 RETVAL->h = 0; 1911 RETVAL->h = 0;
1489 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
… …
1494 RETVAL->row = 0; 1917 RETVAL->row = 0;
1495 OUTPUT: 1918 OUTPUT:
1496 RETVAL 1919 RETVAL
1497 1920
1498void 1921void
1499DESTROY (CFPlus::Map self) 1922DESTROY (DC::Map self)
1500 CODE: 1923 CODE:
1501{ 1924{
1502 map_clear (self); 1925 map_clear (self);
1503 Safefree (self->face2tile); 1926 Safefree (self->face2tile);
1504 Safefree (self->tex); 1927 Safefree (self->tex);
1505 Safefree (self); 1928 Safefree (self);
1506} 1929}
1507 1930
1508void 1931void
1509resize (CFPlus::Map self, int map_width, int map_height) 1932resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1933 CODE:
1511 self->w = map_width; 1934 self->w = map_width;
1512 self->h = map_height; 1935 self->h = map_height;
1513 1936
1514void 1937void
1515clear (CFPlus::Map self) 1938clear (DC::Map self)
1516 CODE: 1939 CODE:
1517 map_clear (self); 1940 map_clear (self);
1518 1941
1519void 1942void
1520set_tileid (CFPlus::Map self, int face, int tile) 1943set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1944 CODE:
1522{ 1945{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1946 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1947 need_texid (self, tile);
1525} 1948}
1526 1949
1527void 1950void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1952 CODE:
1530{ 1953{
1531 tileid texid; 1954 tileid texid;
1532 maptex *tex; 1955 maptex *tex;
1533 1956
1534 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1535 return; 1958 return;
1536 1959
1537 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1538 return; 1961 return;
1539 1962
1540 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1541 1964
1542 if (!texid) 1965 if (!texid)
1543 return; 1966 return;
1544 1967
1545 tex = self->tex + texid; 1968 tex = self->tex + texid;
1546 tex->smoothtile = self->face2tile [smooth]; 1969 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1970 tex->smoothlevel = level;
1548} 1971}
1549 1972
1550void 1973void
1551set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1974set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1552 CODE: 1975 CODE:
1553{ 1976{
1554 need_texid (self, texid); 1977 need_texid (self, texid);
1555 1978
1556 { 1979 {
… …
1575 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 2001}
1579 2002
2003void
2004expire_textures (DC::Map self, int texid, int count)
2005 PPCODE:
2006 for (; texid < self->texs && count; ++texid, --count)
2007 {
2008 maptex *tex = self->tex + texid;
2009
2010 if (tex->name)
2011 {
2012 if (tex->unused)
2013 {
2014 tex->name = 0;
2015 tex->unused = 0;
2016 XPUSHs (sv_2mortal (newSViv (texid)));
2017 }
2018 else
2019 tex->unused = 1;
2020 }
2021 }
2022
1580int 2023int
1581ox (CFPlus::Map self) 2024ox (DC::Map self)
1582 ALIAS: 2025 ALIAS:
1583 oy = 1 2026 oy = 1
1584 x = 2 2027 x = 2
1585 y = 3 2028 y = 3
1586 w = 4 2029 w = 4
… …
1597 } 2040 }
1598 OUTPUT: 2041 OUTPUT:
1599 RETVAL 2042 RETVAL
1600 2043
1601void 2044void
1602scroll (CFPlus::Map self, int dx, int dy) 2045scroll (DC::Map self, int dx, int dy)
1603 CODE: 2046 CODE:
1604{ 2047{
1605 if (dx > 0) 2048 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 2049 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 2050 else if (dx < 0)
… …
1623 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1624 } 2067 }
1625} 2068}
1626 2069
1627SV * 2070SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1629 CODE: 2072 CODE:
1630{ 2073{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 2076 mapcell *cell;
… …
1654 2097
1655 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1656 2099
1657 if (flags & 8) 2100 if (flags & 8)
1658 { 2101 {
2102 uint8_t ext, cmd;
2103
1659 if (extmap) 2104 do
1660 { 2105 {
1661 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1662 2108
1663 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1664 { 2112 {
1665 ext = *data++;
1666 cmd = ext & 0x3f;
1667
1668 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health
1671 {
1672 cell->stat_width = 1; 2113 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1674 }
1675 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47)
1678 {
1679 if (*data == 4)
1680 ; // decode player count
1681
1682 data += *data + 1;
1683 }
1684 else if (cmd == 8) // cell flags
1685 cell->flags = *data++;
1686 else if (ext & 0x40) // unknown, multibyte => skip
1687 data += *data + 1;
1688 else
1689 data++;
1690 } 2115 }
1691 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
1692 } 2133 }
1693 else 2134 while (ext & 0x80);
1694 cell->darkness = *data++ + 1;
1695 } 2135 }
1696 2136
1697 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1698 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1699 { 2139 {
… …
1702 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1703 2143
1704 if (cell->tile [z]) 2144 if (cell->tile [z])
1705 { 2145 {
1706 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1707 if (!tex->name) 2148 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1709 2150
1710 if (tex->smoothtile) 2151 if (tex->smoothtile)
1711 { 2152 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1713 if (!smooth->name) 2155 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1715 } 2157 }
1716 } 2158 }
1717 } 2159 }
1718 } 2160 }
1719 else 2161 else
1720 cell->darkness = 0; 2162 CELL_CLEAR (cell);
1721 } 2163 }
1722} 2164}
1723 OUTPUT: 2165 OUTPUT:
1724 RETVAL 2166 RETVAL
1725 2167
1726SV * 2168SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2169mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2170 CODE:
1729{ 2171{
1730 int x1, x; 2172 int x1, x;
1731 int y1, y; 2173 int y1, y;
1732 int z; 2174 int z;
… …
1745 ? self->row + y 2187 ? self->row + y
1746 : 0; 2188 : 0;
1747 2189
1748 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1749 { 2191 {
1750 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1751 2193
1752 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1753 { 2195 {
1754 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1755 2197
… …
1757 { 2199 {
1758 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1759 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1760 int a1 = tex.a; 2202 int a1 = tex.a;
1761 2203
1762 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1763 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1764 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1765 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1766 } 2208 }
1767 } 2209 }
1768 2210
1769 *map++ = (r ) 2211 *map++ = (r )
1770 | (g << 8) 2212 | (g << 8)
1771 | (b << 16) 2213 | (b << 16)
1772 | (a << 24); 2214 | (a << 24);
1773 } 2215 }
1774 } 2216 }
1775 2217
1776 RETVAL = map_sv; 2218 RETVAL = map_sv;
1777} 2219}
1778 OUTPUT: 2220 OUTPUT:
1779 RETVAL 2221 RETVAL
1780 2222
1781void 2223void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 2225 CODE:
1784{ 2226{
1785 int x, y, z; 2227 int x, y, z;
1786 2228
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1790 smooth_key skey; 2230 int pl_x, pl_y;
1791 2231 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2234 rc_key_t key;
1794 rc_array_t *arr; 2235 rc_array_t *arr;
1795 2236
2237 pl_tex.name = 0;
2238
1796 // thats current max. sorry. 2239 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1799
1800 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey));
1802 2242
1803 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1804 key.r = 255; 2244 key.r = 255;
1805 key.g = 255; 2245 key.g = 255;
1806 key.b = 255; 2246 key.b = 255;
1807 key.a = 255; 2247 key.a = 255;
1808 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2250
1812 mx += self->x; 2251 mx += self->x;
1813 my += self->y; 2252 my += self->y;
1814 2253
1815 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1816 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1817 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1818 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1819 2258
1820 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1821 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1822 { 2261 {
1823 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
… …
1838 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2279
1841 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1842 { 2281 {
2282 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2285 memset (smooth_level, 0, sizeof (smooth_level));
2286 key.texname = -1;
1844 2287
1845 for (y = 0; y < sh; y++) 2288 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
1847 { 2290 {
1848 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
… …
1858 maptex tex = self->tex [tile]; 2301 maptex tex = self->tex [tile];
1859 int px, py; 2302 int px, py;
1860 2303
1861 if (key.texname != tex.name) 2304 if (key.texname != tex.name)
1862 { 2305 {
2306 self->tex [tile].unused = 0;
2307
1863 if (!tex.name) 2308 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2309 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2310
1866 key.texname = tex.name; 2311 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2312 arr = rc_array (rc, &key);
1868 } 2313 }
1869 2314
1870 px = (x + 1) * T - tex.w; 2315 px = (x + 1) * Th - tex.w;
1871 py = (y + 1) * T - tex.h; 2316 py = (y + 1) * Tw - tex.h;
2317
2318 if (expect_false (cell->player == player) && expect_false (z == 2))
2319 {
2320 pl_x = px;
2321 pl_y = py;
2322 pl_tex = tex;
2323 continue;
2324 }
1872 2325
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2326 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2327 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2328 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2329 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2330
1903 // update smooth hash 2331 // update smooth hash
1904 if (tex.smoothtile) 2332 if (tex.smoothtile)
1905 { 2333 {
1906 skey.tile = tex.smoothtile; 2334 skey.tile = tex.smoothtile;
… …
1922 2350
1923 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2351 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1924 // ·· ·· ·┏ ┓· 2352 // ·· ·· ·┏ ┓·
1925 2353
1926 // full tile 2354 // full tile
1927 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2355 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1928 2356
1929 // borders 2357 // borders
1930 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2358 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1931 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2359 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1932 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2360 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1933 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2361 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1934 2362
1935 // corners 2363 // corners
1936 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2364 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1937 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2365 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1938 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2366 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1939 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2367 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2368 }
2369 }
2370
2371 if (expect_false (z == 2) && expect_false (cell->flags))
2372 {
2373 // overlays such as the speech bubble, probably more to come
2374 if (cell->flags & 1)
2375 {
2376 rc_key_t key_ov = key;
2377 maptex tex = self->tex [TEXID_SPEECH];
2378 rc_array_t *arr;
2379 int px = x * Tw + Tw * 2 / 32;
2380 int py = y * Th - Th * 6 / 32;
2381
2382 key_ov.texname = tex.name;
2383 arr = rc_array (rc_ov, &key_ov);
2384
2385 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2386 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2388 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1940 } 2389 }
1941 } 2390 }
1942 } 2391 }
1943 } 2392 }
1944 2393
… …
1960 if (smask & (((uint32_t)1) << b)) 2409 if (smask & (((uint32_t)1) << b))
1961 { 2410 {
1962 int level = (w << 5) | b; 2411 int level = (w << 5) | b;
1963 HE *he; 2412 HE *he;
1964 2413
1965 hv_iterinit (smooth); 2414 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1966 while ((he = hv_iternext (smooth)))
1967 { 2415 {
1968 smooth_key *skey = (smooth_key *)HeKEY (he); 2416 smooth_key &skey = it->first;
1969 IV bits = SvIVX (HeVAL (he)); 2417 IV bits = it->second;
1970 2418
1971 if (!(bits & 0x1000) 2419 if (!(bits & 0x1000)
1972 && skey->level == level 2420 && skey.level == level
1973 && level > smooth_max [skey->x][skey->y]) 2421 && level > smooth_max [skey.x][skey.y])
1974 { 2422 {
1975 maptex tex = self->tex [skey->tile]; 2423 maptex tex = self->tex [skey.tile];
1976 int px = (((int)skey->x) - 1) * T; 2424 int px = (((int)skey.x) - 1) * Tw;
1977 int py = (((int)skey->y) - 1) * T; 2425 int py = (((int)skey.y) - 1) * Th;
1978 int border = bits & 15; 2426 int border = bits & 15;
1979 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2427 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1980 float dx = tex.s * .0625f; // 16 images/row 2428 float dx = tex.s * .0625f; // 16 images/row
1981 float dy = tex.t * .5f ; // 2 images/column 2429 float dy = tex.t * .5f ; // 2 images/column
1982 2430
… …
1984 { 2432 {
1985 // this time avoiding texture state changes 2433 // this time avoiding texture state changes
1986 // save gobs of state changes. 2434 // save gobs of state changes.
1987 if (key.texname != tex.name) 2435 if (key.texname != tex.name)
1988 { 2436 {
2437 self->tex [skey.tile].unused = 0;
2438
1989 glEnd (); 2439 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2440 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2441 glBegin (GL_QUADS);
1992 } 2442 }
1993 2443
1994 if (border) 2444 if (border)
1995 { 2445 {
1996 float ox = border * dx; 2446 float ox = border * dx;
1997 2447
1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2448 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2450 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2451 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2002 } 2452 }
2003 2453
2004 if (corner) 2454 if (corner)
2005 { 2455 {
2006 float ox = corner * dx; 2456 float ox = corner * dx;
2007 2457
2008 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2458 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2459 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2460 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2461 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2012 } 2462 }
2013 } 2463 }
2014 } 2464 }
2015 } 2465 }
2016 } 2466 }
… …
2018 2468
2019 glEnd (); 2469 glEnd ();
2020 glDisable (GL_TEXTURE_2D); 2470 glDisable (GL_TEXTURE_2D);
2021 key.texname = -1; 2471 key.texname = -1;
2022 } 2472 }
2023
2024 hv_clear (smooth);
2025 } 2473 }
2474
2475 if (pl_tex.name)
2476 {
2477 maptex tex = pl_tex;
2478 int px = pl_x + sdx;
2479 int py = pl_y + sdy;
2480
2481 key.texname = tex.name;
2482 arr = rc_array (rc, &key);
2483
2484 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2485 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2486 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2487 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2488
2489 rc_draw (rc);
2490 }
2491
2492 rc_draw (rc_ov);
2493 rc_clear (rc_ov);
2026 2494
2027 glDisable (GL_BLEND); 2495 glDisable (GL_BLEND);
2028 rc_free (rc); 2496 rc_free (rc);
2497 rc_free (rc_ov);
2029 2498
2030 // top layer: overlays such as the health bar 2499 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2500 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2501 if (0 <= y + my && y + my < self->rows)
2033 { 2502 {
… …
2036 for (x = 0; x < sw; x++) 2505 for (x = 0; x < sw; x++)
2037 if (row->c0 <= x + mx && x + mx < row->c1) 2506 if (row->c0 <= x + mx && x + mx < row->c1)
2038 { 2507 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2508 mapcell *cell = row->col + (x + mx - row->c0);
2040 2509
2041 int px = x * T; 2510 int px = x * Tw;
2042 int py = y * T; 2511 int py = y * Th;
2512
2513 if (expect_false (cell->player == player))
2514 {
2515 px += sdx;
2516 py += sdy;
2517 }
2043 2518
2044 if (cell->stat_hp) 2519 if (cell->stat_hp)
2045 { 2520 {
2046 int width = cell->stat_width * T; 2521 int width = cell->stat_width * Tw;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2522 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2048 2523
2049 glColor3ub (0, 0, 0); 2524 glColor3ub (0, 0, 0);
2050 glRectf (px + 1, py - thick - 2, 2525 glRectf (px + 1, py - thick - 2,
2051 px + width - 1, py); 2526 px + width - 1, py);
2052 2527
… …
2058 } 2533 }
2059 } 2534 }
2060} 2535}
2061 2536
2062void 2537void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2538draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2064 CODE: 2539 CODE:
2065{ 2540{
2066 static float color[16][3] = { 2541 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2542 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2543 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2544 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2545 { 1.00f, 0.00f, 0.00f },
2071 2546
2072 { 1.00F, 0.54F, 0.00F }, 2547 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2548 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2549 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2550 { 0.18f, 0.54f, 0.34f },
2076 2551
2077 { 0.56F, 0.73F, 0.56F }, 2552 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2553 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2554 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2555 { 0.99f, 0.77f, 0.26f },
2081 2556
2082 { 0.74F, 0.65F, 0.41F }, 2557 { 0.74f, 0.65f, 0.41f },
2083 2558
2084 { 0.00F, 1.00F, 1.00F }, 2559 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2560 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2561 { 1.00f, 1.00f, 0.00f },
2087 }; 2562 };
2088 2563
2089 int x, y; 2564 int x, y;
2090 2565
2091 glEnable (GL_TEXTURE_2D); 2566 glEnable (GL_TEXTURE_2D);
2567 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2568 * but the nvidia driver (185.18.14) mishandles alpha textures
2569 * and takes the colour from god knows where instead of using
2570 * Cp. MODULATE results in the same colour, but slightly different
2571 * alpha, but atcually gives us the correct colour with nvidia.
2572 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2573 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2574 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2575 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2576 glBegin (GL_QUADS);
2096 2577
2097 for (y = 0; y < h; y++) 2578 for (y = 0; y < h; y++)
… …
2101 2582
2102 if (m) 2583 if (m)
2103 { 2584 {
2104 float *c = color [m & 15]; 2585 float *c = color [m & 15];
2105 2586
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2587 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2588 float tx2 = tx1 + 0.5f;
2108 2589
2109 glColor4f (c[0], c[1], c[2], 0.75); 2590 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2591 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2592 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2593 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2594 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2595 }
… …
2118 glDisable (GL_BLEND); 2599 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2600 glDisable (GL_TEXTURE_2D);
2120} 2601}
2121 2602
2122void 2603void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2604fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2605 PPCODE:
2125{ 2606{
2126 int x, y; 2607 int x, y;
2127 int sw1 = sw + 2; 2608 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2609 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2610 int sh3 = sh * 3;
2130 int sw34 = (sw * 3 + 3) & ~3; 2611 int sw3 = sw * 3;
2612 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2613 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2614 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2615 memset (darkness1, 0, sw1*sh1);
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2616
2135 SvPOK_only (darkness3_sv); 2617 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2618 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2619
2138 mx += self->x - 1; 2620 mx += self->x - 1;
2139 my += self->y - 1; 2621 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2622
2143 for (y = 0; y < sh1; y++) 2623 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2624 if (0 <= y + my && y + my < self->rows)
2145 { 2625 {
2146 maprow *row = self->row + (y + my); 2626 maprow *row = self->row + (y + my);
… …
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2629 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2630 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2631 mapcell *cell = row->col + (x + mx - row->c0);
2152 2632
2153 darkness1 [y * sw1 + x] = cell->darkness 2633 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2634 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2635 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2636 }
2157 } 2637 }
2158 2638
2159 for (y = 0; y < sh; ++y) 2639 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2640 for (x = 0; x < sw; ++x)
… …
2179 2659
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2660 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2661 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2662 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2663
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2664 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2665 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2667 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2668 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2670 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2671 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2673 }
2194 2674
2195 free (darkness1); 2675 free (darkness1);
2196 2676
2197 EXTEND (SP, 3); 2677 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2678 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2679 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2680 PUSHs (darkness3_sv);
2201} 2681}
2202 2682
2203SV * 2683SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2684get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2685 CODE:
2206{ 2686{
2207 int x, y, x1, y1; 2687 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2688 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2689 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2266 else 2746 else
2267 *data++ = 0; 2747 *data++ = 0;
2268 } 2748 }
2269 } 2749 }
2270 2750
2751 /* if size is w*h + 5 then no data has been found */
2752 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2753 {
2271 SvPOK_only (data_sv); 2754 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2755 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2756 }
2757
2273 RETVAL = data_sv; 2758 RETVAL = data_sv;
2274} 2759}
2275 OUTPUT: 2760 OUTPUT:
2276 RETVAL 2761 RETVAL
2277 2762
2278void 2763void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2764set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2765 PPCODE:
2281{ 2766{
2282 int x, y, z; 2767 int x, y, z;
2283 int w, h; 2768 int w, h;
2284 int x1, y1; 2769 int x1, y1;
2770 STRLEN len;
2771 uint8_t *data, *end;
2772
2773 len = SvLEN (data_sv);
2774 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2775 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2776 end = data + len + 8;
2777
2778 if (len < 5)
2779 XSRETURN_EMPTY;
2285 2780
2286 if (*data++ != 0) 2781 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2782 XSRETURN_EMPTY; /* version mismatch */
2288 2783
2289 w = *data++ << 8; w |= *data++; 2784 w = *data++ << 8; w |= *data++;
… …
2304 { 2799 {
2305 maprow *row = map_get_row (self, y); 2800 maprow *row = map_get_row (self, y);
2306 2801
2307 for (x = x0; x < x1; x++) 2802 for (x = x0; x < x1; x++)
2308 { 2803 {
2804 uint8_t flags;
2805
2806 if (data + 7 >= end)
2807 XSRETURN_EMPTY;
2808
2309 uint8_t flags = *data++; 2809 flags = *data++;
2310 2810
2311 if (flags) 2811 if (flags)
2312 { 2812 {
2313 mapcell *cell = row_get_cell (row, x); 2813 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2814 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2817 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2818 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2819
2320 if (cell->darkness == 0) 2820 if (cell->darkness == 0)
2321 { 2821 {
2322 cell->darkness = 0; 2822 /*cell->darkness = 0;*/
2823 EXTEND (SP, 3);
2323 2824
2324 for (z = 0; z <= 2; z++) 2825 for (z = 0; z <= 2; z++)
2325 { 2826 {
2326 tileid t = tile [z]; 2827 tileid t = tile [z];
2327 2828
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2829 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2830 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2831 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2832 need_texid (self, t);
2332 } 2833 }
2333 2834
2334 cell->tile [z] = t; 2835 cell->tile [z] = t;
2335 } 2836 }
… …
2337 } 2838 }
2338 } 2839 }
2339 } 2840 }
2340} 2841}
2341 2842
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2843MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2844
2344CFPlus::RW 2845DC::RW
2345new (SV *class, SV *data_sv) 2846new (SV *klass, SV *data_sv)
2346 CODE: 2847 CODE:
2347{ 2848{
2348 STRLEN datalen; 2849 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2850 char *data = SvPVbyte (data_sv, datalen);
2350 2851
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2852 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2853}
2353 OUTPUT: 2854 OUTPUT:
2354 RETVAL 2855 RETVAL
2355 2856
2356CFPlus::RW 2857DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2858new_from_file (SV *klass, const char *path, const char *mode = "rb")
2358 CODE: 2859 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2860 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2861 OUTPUT:
2361 RETVAL 2862 RETVAL
2362 2863
2363# fails on win32: 2864# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2865# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2866#void
2366#close (CFPlus::RW self) 2867#close (DC::RW self)
2367# CODE: 2868# CODE:
2368# (self->(close)) (self); 2869# (self->(close)) (self);
2369 2870
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2871MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2872
2372PROTOTYPES: DISABLE 2873PROTOTYPES: DISABLE
2373 2874
2374CFPlus::Channel 2875DC::Channel
2375find () 2876find ()
2376 CODE: 2877 CODE:
2377{ 2878{
2378 RETVAL = Mix_GroupAvailable (-1); 2879 RETVAL = Mix_GroupAvailable (-1);
2379 2880
2380 if (RETVAL < 0) 2881 if (RETVAL < 0)
2381 { 2882 {
2382 RETVAL = Mix_GroupOldest (-1); 2883 RETVAL = Mix_GroupOldest (-1);
2383 2884
2384 if (RETVAL < 0) 2885 if (RETVAL < 0)
2886 {
2887 // happens sometimes, maybe it just stopped playing(?)
2888 RETVAL = Mix_GroupAvailable (-1);
2889
2890 if (RETVAL < 0)
2385 XSRETURN_UNDEF; 2891 XSRETURN_UNDEF;
2386 2892 }
2893 else
2387 Mix_HaltChannel (RETVAL); 2894 Mix_HaltChannel (RETVAL);
2388 } 2895 }
2389 2896
2390 Mix_UnregisterAllEffects (RETVAL); 2897 Mix_UnregisterAllEffects (RETVAL);
2391 Mix_Volume (RETVAL, 128); 2898 Mix_Volume (RETVAL, 128);
2392} 2899}
2393 OUTPUT: 2900 OUTPUT:
2394 RETVAL 2901 RETVAL
2395 2902
2396void 2903void
2397halt (CFPlus::Channel self) 2904halt (DC::Channel self)
2398 CODE: 2905 CODE:
2399 Mix_HaltChannel (self); 2906 Mix_HaltChannel (self);
2400 2907
2401void 2908void
2402expire (CFPlus::Channel self, int ticks = -1) 2909expire (DC::Channel self, int ticks = -1)
2403 CODE: 2910 CODE:
2404 Mix_ExpireChannel (self, ticks); 2911 Mix_ExpireChannel (self, ticks);
2405 2912
2406void 2913void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2914fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2915 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2916 Mix_FadeOutChannel (self, ticks);
2410 2917
2411int 2918int
2412volume (CFPlus::Channel self, int volume) 2919volume (DC::Channel self, int volume)
2413 CODE: 2920 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2921 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2922 OUTPUT:
2416 RETVAL 2923 RETVAL
2417 2924
2418void 2925void
2419unregister_all_effects (CFPlus::Channel self) 2926unregister_all_effects (DC::Channel self)
2420 CODE: 2927 CODE:
2421 Mix_UnregisterAllEffects (self); 2928 Mix_UnregisterAllEffects (self);
2422 2929
2423void 2930void
2424set_panning (CFPlus::Channel self, int left, int right) 2931set_panning (DC::Channel self, int left, int right)
2425 CODE: 2932 CODE:
2426 left = CLAMP (left , 0, 255); 2933 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2934 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2935 Mix_SetPanning (self, left, right);
2429 2936
2430void 2937void
2431set_distance (CFPlus::Channel self, int distance) 2938set_distance (DC::Channel self, int distance)
2432 CODE: 2939 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2940 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2941
2435void 2942void
2436set_position (CFPlus::Channel self, int angle, int distance) 2943set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2944 CODE:
2438 2945
2439void 2946void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2947set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2948 CODE:
2442{ 2949{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2950 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2951 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2952 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2953}
2447 2954
2448void 2955void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2956set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2957 CODE:
2451 Mix_SetReverseStereo (self, flip); 2958 Mix_SetReverseStereo (self, flip);
2452 2959
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2960MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2961
2455PROTOTYPES: DISABLE 2962PROTOTYPES: DISABLE
2456 2963
2964void
2965decoders ()
2966 PPCODE:
2967#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2968 int i, num = Mix_GetNumChunkDecoders ();
2969 EXTEND (SP, num);
2970 for (i = 0; i < num; ++i)
2971 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2972#else
2973 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2974#endif
2975
2457CFPlus::MixChunk 2976DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2977new (SV *klass, DC::RW rwops)
2459 CODE: 2978 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2979 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2980 OUTPUT:
2462 RETVAL 2981 RETVAL
2463 2982
2464void 2983void
2465DESTROY (CFPlus::MixChunk self) 2984DESTROY (DC::MixChunk self)
2466 CODE: 2985 CODE:
2467 Mix_FreeChunk (self); 2986 Mix_FreeChunk (self);
2468 2987
2469int 2988int
2470volume (CFPlus::MixChunk self, int volume = -1) 2989volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2990 CODE:
2472 if (items > 1) 2991 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2992 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2993 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2994 OUTPUT:
2476 RETVAL 2995 RETVAL
2477 2996
2478CFPlus::Channel 2997DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2998play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2999 CODE:
2481{ 3000{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 3001 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 3002
2484 if (RETVAL < 0) 3003 if (RETVAL < 0)
… …
2491 } 3010 }
2492} 3011}
2493 OUTPUT: 3012 OUTPUT:
2494 RETVAL 3013 RETVAL
2495 3014
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 3015MODULE = Deliantra::Client PACKAGE = DC::MixMusic
3016
3017void
3018decoders ()
3019 PPCODE:
3020#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3021 int i, num = Mix_GetNumMusicDecoders ();
3022 EXTEND (SP, num);
3023 for (i = 0; i < num; ++i)
3024 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3025#else
3026 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3027#endif
2497 3028
2498int 3029int
2499volume (int volume = -1) 3030volume (int volume = -1)
2500 PROTOTYPE: ;$ 3031 PROTOTYPE: ;$
2501 CODE: 3032 CODE:
… …
2513void 3044void
2514halt () 3045halt ()
2515 CODE: 3046 CODE:
2516 Mix_HaltMusic (); 3047 Mix_HaltMusic ();
2517 3048
3049int
3050playing ()
3051 CODE:
3052 RETVAL = Mix_PlayingMusic ();
3053 OUTPUT:
3054 RETVAL
3055
2518CFPlus::MixMusic 3056DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 3057new (SV *klass, DC::RW rwops)
2520 CODE: 3058 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 3059 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 3060 OUTPUT:
2523 RETVAL 3061 RETVAL
2524 3062
2525void 3063void
2526DESTROY (CFPlus::MixMusic self) 3064DESTROY (DC::MixMusic self)
2527 CODE: 3065 CODE:
2528 Mix_FreeMusic (self); 3066 Mix_FreeMusic (self);
2529 3067
2530int 3068int
2531play (CFPlus::MixMusic self, int loops = -1) 3069play (DC::MixMusic self, int loops = -1)
2532 CODE: 3070 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 3071 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 3072 OUTPUT:
2535 RETVAL 3073 RETVAL
2536 3074
2537void 3075void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3076fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 3077 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 3078 Mix_FadeInMusicPos (self, loops, ms, position);
2541 3079
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3080MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 3081
2544PROTOTYPES: ENABLE 3082PROTOTYPES: ENABLE
2545 3083
2546BOOT: 3084BOOT:
2547{ 3085{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3086 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 3087 static const struct {
2550 const char *name; 3088 const char *name;
2551 IV iv; 3089 IV iv;
2552 } *civ, const_iv[] = { 3090 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 3091# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 3092 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 3093 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 3094 const_iv (GL_EXTENSIONS),
3095 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 3096 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 3097 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 3098 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 3099 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 3100 const_iv (GL_BLEND),
… …
2573 const_iv (GL_ZERO), 3112 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 3113 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 3114 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3115 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 3116 const_iv (GL_ONE_MINUS_DST_ALPHA),
3117 const_iv (GL_SRC_COLOR),
3118 const_iv (GL_DST_COLOR),
3119 const_iv (GL_ONE_MINUS_SRC_COLOR),
3120 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 3121 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 3122 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 3123 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 3124 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3125 const_iv (GL_RGBA8),
… …
2650 const_iv (GL_NICEST), 3193 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3194 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3195 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3196 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 3197 const_iv (GL_T2F_N3F_V3F),
3198 const_iv (GL_FUNC_ADD),
3199 const_iv (GL_FUNC_SUBTRACT),
3200 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 3201# undef const_iv
2656 }; 3202 };
2657 3203
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3204 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3205 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2660 3206
2661 texture_av = newAV (); 3207 texture_av = newAV ();
2662 AvREAL_off (texture_av); 3208 AvREAL_off (texture_av);
2663} 3209}
2664 3210
… …
2666disable_GL_EXT_blend_func_separate () 3212disable_GL_EXT_blend_func_separate ()
2667 CODE: 3213 CODE:
2668 gl.BlendFuncSeparate = 0; 3214 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3215 gl.BlendFuncSeparateEXT = 0;
2670 3216
2671char * 3217void
3218apple_nvidia_bug (int enable)
3219
3220const char *
2672gl_vendor () 3221gl_vendor ()
2673 CODE: 3222 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3223 RETVAL = (const char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3224 OUTPUT:
2676 RETVAL 3225 RETVAL
2677 3226
2678char * 3227const char *
2679gl_version () 3228gl_version ()
2680 CODE: 3229 CODE:
2681 RETVAL = (char *)glGetString (GL_VERSION); 3230 RETVAL = (const char *)glGetString (GL_VERSION);
2682 OUTPUT: 3231 OUTPUT:
2683 RETVAL 3232 RETVAL
2684 3233
2685char * 3234const char *
2686gl_extensions () 3235gl_extensions ()
2687 CODE: 3236 CODE:
2688 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3237 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2689 OUTPUT: 3238 OUTPUT:
2690 RETVAL 3239 RETVAL
2691 3240
2692const char *glGetString (GLenum pname) 3241const char *glGetString (GLenum pname)
3242 CODE:
3243 RETVAL = (const char *)glGetString (pname);
3244 OUTPUT:
3245 RETVAL
2693 3246
2694GLint glGetInteger (GLenum pname) 3247GLint glGetInteger (GLenum pname)
2695 CODE: 3248 CODE:
2696 glGetIntegerv (pname, &RETVAL); 3249 glGetIntegerv (pname, &RETVAL);
2697 OUTPUT: 3250 OUTPUT:
… …
2705 3258
2706int glGetError () 3259int glGetError ()
2707 3260
2708void glFinish () 3261void glFinish ()
2709 3262
3263void glFlush ()
3264
2710void glClear (int mask) 3265void glClear (int mask)
2711 3266
2712void glClearColor (float r, float g, float b, float a = 1.0) 3267void glClearColor (float r, float g, float b, float a = 1.0)
2713 PROTOTYPE: @ 3268 PROTOTYPE: @
2714 3269
… …
2723void glBlendFunc (int sfactor, int dfactor) 3278void glBlendFunc (int sfactor, int dfactor)
2724 3279
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3280void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3281 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3282 gl_BlendFuncSeparate (sa, da, saa, daa);
3283
3284# void glBlendEquation (int se)
2728 3285
2729void glDepthMask (int flag) 3286void glDepthMask (int flag)
2730 3287
2731void glLogicOp (int opcode) 3288void glLogicOp (int opcode)
2732 3289
… …
2767void glRotate (float angle, float x, float y, float z) 3324void glRotate (float angle, float x, float y, float z)
2768 CODE: 3325 CODE:
2769 glRotatef (angle, x, y, z); 3326 glRotatef (angle, x, y, z);
2770 3327
2771void glColor (float r, float g, float b, float a = 1.0) 3328void glColor (float r, float g, float b, float a = 1.0)
3329 PROTOTYPE: @
2772 ALIAS: 3330 ALIAS:
2773 glColor_premultiply = 1 3331 glColor_premultiply = 1
2774 CODE: 3332 CODE:
2775 if (ix) 3333 if (ix)
2776 { 3334 {
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3404void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3405 CODE:
2848 if (gl.SeparableFilter2D) 3406 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3407 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3408
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3409void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3410
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3411void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3412
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3413void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3414
… …
2882 3440
2883void glEndList () 3441void glEndList ()
2884 3442
2885void glCallList (int list) 3443void glCallList (int list)
2886 3444
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3445void c_init ()
3446 CODE:
3447 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3448 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3449
3450MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3451
2889PROTOTYPES: DISABLE 3452PROTOTYPES: DISABLE
2890 3453
2891void 3454void
2892find_widget (SV *self, NV x, NV y) 3455find_widget (SV *self, NV x, NV y)
2893 PPCODE: 3456 PPCODE:
2894{ 3457{
2895 if (within_widget (self, x, y)) 3458 if (within_widget (self, x, y))
2896 XPUSHs (self); 3459 XPUSHs (self);
2897} 3460}
2898 3461
2899BOOT: 3462BOOT:
2900{ 3463{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3464 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3465
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3466 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3467 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3468 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3469 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3470}
2908 3471
2909void 3472void
2910draw (SV *self) 3473draw (SV *self)
2911 CODE: 3474 CODE:
2912{ 3475{
2913 HV *hv; 3476 HV *hv;
2914 SV **svp; 3477 SV **svp;
2915 NV x, y, w, h; 3478 NV x, y, w, h;
2916 SV *draw_x_sv = GvSV (draw_x_gv); 3479 SV *draw_x_sv = GvSV (draw_x_gv);
2917 SV *draw_y_sv = GvSV (draw_y_gv); 3480 SV *draw_y_sv = GvSV (draw_y_gv);
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3481 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3482 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3483 double draw_x, draw_y;
2921 3484
2922 if (!SvROK (self)) 3485 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3486 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3487
2925 hv = (HV *)SvRV (self); 3488 hv = (HV *)SvRV (self);
2926 3489
2927 if (SvTYPE (hv) != SVt_PVHV) 3490 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3491 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3492
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3493 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3494 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3495
2933 if (!h || !w) 3496 if (!h || !w)

Diff Legend

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