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.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 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};
237 298
238static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
239prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
240{ 304{
241 char *p; 305 T *p;
242 306
243 New (0, p, sze + inc, char); 307 New (0, p, sze + inc, T);
244 Zero (p, inc, char); 308 Zero (p, inc, T);
245 Move (ptr, p + inc, sze, char); 309 Move (ptr, p + inc, sze, T);
246 Safefree (ptr); 310 Safefree (ptr);
247 311
248 return p; 312 ptr = p;
249} 313}
250 314
251static char * 315template<typename T>
252append (char *ptr, int sze, int inc)
253{
254 Renew (ptr, sze + inc, char);
255 Zero (ptr + sze, inc, char);
256
257 return ptr;
258}
259
260#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))
262
263static void 316static void
317append (T *&ptr, int sze, int inc)
318{
319 Renew (ptr, sze + inc, T);
320 Zero (ptr + sze, inc, T);
321}
322
323static void
264need_facenum (struct map *self, faceid face) 324need_facenum (struct mapgrid *self, faceid face)
265{ 325{
266 while (self->faces <= face) 326 while (self->faces <= face)
267 { 327 {
268 Append (tileid, self->face2tile, self->faces, self->faces); 328 append (self->face2tile, self->faces, self->faces);
269 self->faces *= 2; 329 self->faces *= 2;
270 } 330 }
271} 331}
272 332
273static void 333static void
274need_texid (struct map *self, int texid) 334need_texid (struct mapgrid *self, int texid)
275{ 335{
276 while (self->texs <= texid) 336 while (self->texs <= texid)
277 { 337 {
278 Append (maptex, self->tex, self->texs, self->texs); 338 append (self->tex, self->texs, self->texs);
279 self->texs *= 2; 339 self->texs *= 2;
280 } 340 }
281} 341}
282 342
283static maprow * 343static maprow *
284map_get_row (CFPlus__Map self, int y) 344map_get_row (mapgrid *self, int y)
285{ 345{
286 if (0 > y) 346 if (0 > y)
287 { 347 {
288 int extend = - y + MAP_EXTEND_Y; 348 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 349 prepend (self->row, self->rows, extend);
290 350
291 self->rows += extend; 351 self->rows += extend;
292 self->y += extend; 352 self->y += extend;
293 y += extend; 353 y += extend;
294 } 354 }
295 else if (y >= self->rows) 355 else if (y >= self->rows)
296 { 356 {
297 int extend = y - self->rows + MAP_EXTEND_Y; 357 int extend = y - self->rows + MAP_EXTEND_Y;
298 Append (maprow, self->row, self->rows, extend); 358 append (self->row, self->rows, extend);
299 self->rows += extend; 359 self->rows += extend;
300 } 360 }
301 361
302 return self->row + y; 362 return self->row + y;
303} 363}
313 } 373 }
314 374
315 if (row->c0 > x) 375 if (row->c0 > x)
316 { 376 {
317 int extend = row->c0 - x + MAP_EXTEND_X; 377 int extend = row->c0 - x + MAP_EXTEND_X;
318 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 378 prepend (row->col, row->c1 - row->c0, extend);
319 row->c0 -= extend; 379 row->c0 -= extend;
320 } 380 }
321 else if (x >= row->c1) 381 else if (x >= row->c1)
322 { 382 {
323 int extend = x - row->c1 + MAP_EXTEND_X; 383 int extend = x - row->c1 + MAP_EXTEND_X;
324 Append (mapcell, row->col, row->c1 - row->c0, extend); 384 append (row->col, row->c1 - row->c0, extend);
325 row->c1 += extend; 385 row->c1 += extend;
326 } 386 }
327 387
328 return row->col + (x - row->c0); 388 return row->col + (x - row->c0);
329} 389}
330 390
331static mapcell * 391static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 392map_get_cell (mapgrid *self, int x, int y)
333{ 393{
334 return row_get_cell (map_get_row (self, y), x); 394 return row_get_cell (map_get_row (self, y), x);
335} 395}
336 396
337static void 397static void
338map_clear (CFPlus__Map self) 398map_clear (mapgrid *self)
339{ 399{
340 int r; 400 int r;
341 401
342 for (r = 0; r < self->rows; r++) 402 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 403 Safefree (self->row[r].col);
350 self->oy = 0; 410 self->oy = 0;
351 self->row = 0; 411 self->row = 0;
352 self->rows = 0; 412 self->rows = 0;
353} 413}
354 414
415#define CELL_CLEAR(cell) \
416 do { \
417 if ((cell)->player) \
418 (cell)->tile [2] = 0; \
419 (cell)->darkness = 0; \
420 (cell)->stat_hp = 0; \
421 (cell)->flags = 0; \
422 (cell)->player = 0; \
423 } while (0)
424
355static void 425static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 426map_blank (mapgrid *self, int x0, int y0, int w, int h)
357{ 427{
358 int x, y; 428 int x, y;
359 maprow *row; 429 maprow *row;
360 mapcell *cell; 430 mapcell *cell;
361 431
373 if (x >= row->c1) 443 if (x >= row->c1)
374 break; 444 break;
375 445
376 cell = row->col + x - row->c0; 446 cell = row->col + x - row->c0;
377 447
378 cell->darkness = 0; 448 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 449 }
383 } 450 }
384} 451}
385 452
386typedef struct { 453struct smooth_key
454{
387 tileid tile; 455 tileid tile;
388 uint8_t x, y, level; 456 uint8_t x, y, level;
389} smooth_key; 457
458 bool operator == (const smooth_key &o) const
459 {
460 return tile == o.tile && x == o.x && y == o.y && level == o.level;
461 }
462};
463
464typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
465
466namespace std {
467 template <>
468 struct hash<smooth_key>
469 {
470 size_t operator () (const smooth_key &v) const
471 {
472 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
473 }
474 };
475}
390 476
391static void 477static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits) 478smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
393{ 479{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 480 auto &&it = h.find (key);
395 481
396 if (SvIOK (*sv)) 482 if (it == h.end ())
397 SvIV_set (*sv, SvIVX (*sv) | bits); 483 h.insert (std::make_pair (key, bits));
398 else 484 else
399 sv_setiv (*sv, bits); 485 it->second |= bits;
400} 486}
401 487
402static void 488static void
403music_finished (void) 489music_finished (void)
404{ 490{
421 ev.code = 1; 507 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 508 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 509 ev.data2 = 0;
424 510
425 SDL_PushEvent ((SDL_Event *)&ev); 511 SDL_PushEvent ((SDL_Event *)&ev);
512}
513
514// approximately divide by 255
515static unsigned int
516div255 (unsigned int n)
517{
518 return (n + (n >> 8)) >> 8;
426} 519}
427 520
428static unsigned int 521static unsigned int
429minpot (unsigned int n) 522minpot (unsigned int n)
430{ 523{
498 return 0; 591 return 0;
499 592
500 return 1; 593 return 1;
501} 594}
502 595
503MODULE = CFPlus PACKAGE = CFPlus 596/******************************************************************************/
597
598/* process keyboard modifiers */
599static int
600mod_munge (int mod)
601{
602 mod &= MOD_MASK;
603
604 if (mod & (KMOD_META | KMOD_ALT))
605 mod |= KMOD_LRAM;
606
607 return mod;
608}
609
610static void
611deliantra_main (SV *real_main)
612{
613 dSP;
614
615 PUSHMARK (SP);
616 call_sv (real_main, G_DISCARD | G_VOID);
617}
618
619#ifdef __MACOSX__
620 static SV *real_main;
621
622 /* to due surprising braindamage on the side of SDL design, we
623 * do some mind-boggling hack here: SDL requires a custom main()
624 * on OS X, so... we provide one and call the original main(), which,
625 * due to shared library magic, calls -lSDLmain's main, not perl's main,
626 * and which calls our main (== SDL_main) back.
627 */
628 extern C_LINKAGE int
629 main (int argc, char *argv[])
630 {
631 deliantra_main (real_main);
632 }
633
634 #undef main
635
636 extern C_LINKAGE int main (int argc, char *argv[]);
637
638 static void
639 SDL_main_hack (SV *real_main_)
640 {
641 real_main = real_main_;
642
643 char *argv[] = { "deliantra client", 0 };
644 (main) (1, argv);
645 }
646#else
647 static void
648 SDL_main_hack (SV *real_main)
649 {
650 deliantra_main (real_main);
651 }
652#endif
653
654MODULE = Deliantra::Client PACKAGE = DC
504 655
505PROTOTYPES: ENABLE 656PROTOTYPES: ENABLE
506 657
507BOOT: 658BOOT:
508{ 659{
509 HV *stash = gv_stashpv ("CFPlus", 1); 660 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 661 static const struct {
511 const char *name; 662 const char *name;
512 IV iv; 663 IV iv;
513 } *civ, const_iv[] = { 664 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 665# define const_iv(name) { # name, (IV)name }
535 const_iv (SDL_USEREVENT), 686 const_iv (SDL_USEREVENT),
536 687
537 const_iv (SDL_APPINPUTFOCUS), 688 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 689 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 690 const_iv (SDL_APPACTIVE),
691
692
693 const_iv (SDLK_UNKNOWN),
694 const_iv (SDLK_FIRST),
695 const_iv (SDLK_BACKSPACE),
696 const_iv (SDLK_TAB),
697 const_iv (SDLK_CLEAR),
698 const_iv (SDLK_RETURN),
699 const_iv (SDLK_PAUSE),
700 const_iv (SDLK_ESCAPE),
701 const_iv (SDLK_SPACE),
702 const_iv (SDLK_EXCLAIM),
703 const_iv (SDLK_QUOTEDBL),
704 const_iv (SDLK_HASH),
705 const_iv (SDLK_DOLLAR),
706 const_iv (SDLK_AMPERSAND),
707 const_iv (SDLK_QUOTE),
708 const_iv (SDLK_LEFTPAREN),
709 const_iv (SDLK_RIGHTPAREN),
710 const_iv (SDLK_ASTERISK),
711 const_iv (SDLK_PLUS),
712 const_iv (SDLK_COMMA),
713 const_iv (SDLK_MINUS),
714 const_iv (SDLK_PERIOD),
715 const_iv (SDLK_SLASH),
716 const_iv (SDLK_0),
717 const_iv (SDLK_1),
718 const_iv (SDLK_2),
719 const_iv (SDLK_3),
720 const_iv (SDLK_4),
721 const_iv (SDLK_5),
722 const_iv (SDLK_6),
723 const_iv (SDLK_7),
724 const_iv (SDLK_8),
725 const_iv (SDLK_9),
726 const_iv (SDLK_COLON),
727 const_iv (SDLK_SEMICOLON),
728 const_iv (SDLK_LESS),
729 const_iv (SDLK_EQUALS),
730 const_iv (SDLK_GREATER),
731 const_iv (SDLK_QUESTION),
732 const_iv (SDLK_AT),
733
734 const_iv (SDLK_LEFTBRACKET),
735 const_iv (SDLK_BACKSLASH),
736 const_iv (SDLK_RIGHTBRACKET),
737 const_iv (SDLK_CARET),
738 const_iv (SDLK_UNDERSCORE),
739 const_iv (SDLK_BACKQUOTE),
740 const_iv (SDLK_DELETE),
540 741
541 const_iv (SDLK_FIRST), 742 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 743 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 744 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 745 const_iv (SDLK_KP1),
619 const_iv (KMOD_LMETA), 820 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 821 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 822 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 823 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 824 const_iv (KMOD_MODE),
825
826 const_iv (KMOD_LRAM),
827
828 const_iv (MIX_DEFAULT_FORMAT),
829
830 const_iv (SDL_INIT_TIMER),
831 const_iv (SDL_INIT_AUDIO),
832 const_iv (SDL_INIT_VIDEO),
833 const_iv (SDL_INIT_CDROM),
834 const_iv (SDL_INIT_JOYSTICK),
835 const_iv (SDL_INIT_EVERYTHING),
836 const_iv (SDL_INIT_NOPARACHUTE),
837 const_iv (SDL_INIT_EVENTTHREAD),
838
839 const_iv (SDL_GL_RED_SIZE),
840 const_iv (SDL_GL_GREEN_SIZE),
841 const_iv (SDL_GL_BLUE_SIZE),
842 const_iv (SDL_GL_ALPHA_SIZE),
843 const_iv (SDL_GL_DOUBLEBUFFER),
844 const_iv (SDL_GL_BUFFER_SIZE),
845 const_iv (SDL_GL_DEPTH_SIZE),
846 const_iv (SDL_GL_STENCIL_SIZE),
847 const_iv (SDL_GL_ACCUM_RED_SIZE),
848 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
849 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
850 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
851 const_iv (SDL_GL_STEREO),
852 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
853 const_iv (SDL_GL_MULTISAMPLESAMPLES),
854 const_iv (SDL_GL_ACCELERATED_VISUAL),
855 const_iv (SDL_GL_SWAP_CONTROL),
856
857 const_iv (FOW_DARKNESS)
624# undef const_iv 858# undef const_iv
625 }; 859 };
626 860
627 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 861 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 862 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
629 863
630 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 864 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
631 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 865 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
632} 866}
633 867
649NV ceil (NV x) 883NV ceil (NV x)
650 884
651IV minpot (UV n) 885IV minpot (UV n)
652 886
653IV popcount (UV n) 887IV popcount (UV n)
888
889NV distance (NV dx, NV dy)
890 CODE:
891 RETVAL = pow (dx * dx + dy * dy, 0.5);
892 OUTPUT:
893 RETVAL
654 894
655void 895void
656pango_init () 896pango_init ()
657 CODE: 897 CODE:
658{ 898{
659 opengl_fontmap = pango_opengl_font_map_new (); 899 opengl_fontmap = pango_opengl_font_map_new ();
660 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 900 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
661 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 901 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
902 /*pango_context_set_font_description (opengl_context, default_font);*/
903#if PANGO_VERSION_CHECK (1, 15, 2)
904 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
905 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
906#endif
662} 907}
663 908
664char *
665SDL_GetError () 909char *SDL_GetError ()
666 910
667int 911void SDL_main_hack (SV *real_main)
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 912 PROTOTYPE: &
669 913
670void 914int SDL_Init (U32 flags)
915
916int SDL_InitSubSystem (U32 flags)
917
918void SDL_QuitSubSystem (U32 flags)
919
671SDL_Quit () 920void SDL_Quit ()
921
922int SDL_GL_SetAttribute (int attr, int value)
923 C_ARGS: (SDL_GLattr)attr, value
924
925int SDL_GL_GetAttribute (int attr)
926 CODE:
927 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
928 XSRETURN_UNDEF;
929 OUTPUT:
930 RETVAL
672 931
673void 932void
674SDL_ListModes (int rgb, int alpha) 933SDL_ListModes (int rgb, int alpha)
675 PPCODE: 934 PPCODE:
676{ 935{
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 947 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 948 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 949 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 950
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 951 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693#if SDL_VERSION_ATLEAST(1,2,10)
694 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 952 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 953
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 954 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 955
700 if (m && m != (SDL_Rect **)-1) 956 if (m && m != (SDL_Rect **)-1)
701 while (*m) 957 while (*m)
702 { 958 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 959 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 960 {
705 AV *av = newAV (); 961 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 962 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 963 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 964 av_push (av, newSViv (rgb));
731 ); 987 );
732 988
733 if (RETVAL) 989 if (RETVAL)
734 { 990 {
735 av_clear (texture_av); 991 av_clear (texture_av);
736
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 992#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 993#include "glfunc.h"
740#undef GL_FUNC 994#undef GL_FUNC
995 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
996 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
741 } 997 }
742} 998}
743 OUTPUT: 999 OUTPUT:
744 RETVAL 1000 RETVAL
1001
1002void
1003SDL_WM_SetCaption (const char *title, const char *icon)
745 1004
746void 1005void
747SDL_GL_SwapBuffers () 1006SDL_GL_SwapBuffers ()
748 1007
749char * 1008char *
750SDL_GetKeyName (int sym) 1009SDL_GetKeyName (int sym)
1010 C_ARGS: (SDLKey)sym
751 1011
752int 1012int
753SDL_GetAppState () 1013SDL_GetAppState ()
754 1014
1015int
1016SDL_GetModState ()
1017
1018int
1019SDL_WaitEvent ()
1020 C_ARGS: 0
1021
755void 1022void
1023SDL_PumpEvents ()
1024
1025void
756poll_events () 1026peep_events ()
757 PPCODE: 1027 PPCODE:
758{ 1028{
759 SDL_Event ev; 1029 SDL_Event ev;
760 1030
761 SDL_PumpEvents (); 1031 SDL_PumpEvents ();
768 { 1038 {
769 case SDL_KEYDOWN: 1039 case SDL_KEYDOWN:
770 case SDL_KEYUP: 1040 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1042 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
774 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1044 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1045 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 1046 break;
777 1047
778 case SDL_ACTIVEEVENT: 1048 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1049 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 1067 x = ev.motion.x;
798 y = ev.motion.y; 1068 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1069 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 1070 }
801 1071
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1072 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 1073 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 1074 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 1075 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1076 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1077 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 1078 }
809 break; 1079 break;
810 1080
811 case SDL_MOUSEBUTTONDOWN: 1081 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 1082 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1083 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 1084
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1085 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1086 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1087 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1088 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1093 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1094 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 1095 break;
826 } 1096 }
827 1097
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1098 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 1099 }
830} 1100}
831 1101
1102char *
1103SDL_AudioDriverName ()
1104 CODE:
1105{
1106 char buf [256];
1107 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1108 XSRETURN_UNDEF;
1109
1110 RETVAL = buf;
1111}
1112 OUTPUT:
1113 RETVAL
1114
832int 1115int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1116Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 1117 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 1118 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 1119 Mix_ChannelFinished (channel_finished);
1120
1121void
1122Mix_QuerySpec ()
1123 PPCODE:
1124{
1125 int freq, channels;
1126 Uint16 format;
1127
1128 if (Mix_QuerySpec (&freq, &format, &channels))
1129 {
1130 EXTEND (SP, 3);
1131 PUSHs (sv_2mortal (newSViv (freq)));
1132 PUSHs (sv_2mortal (newSViv (format)));
1133 PUSHs (sv_2mortal (newSViv (channels)));
1134 }
1135}
837 1136
838void 1137void
839Mix_CloseAudio () 1138Mix_CloseAudio ()
840 1139
841int 1140int
876 } 1175 }
877 } 1176 }
878#endif 1177#endif
879} 1178}
880 1179
881void 1180int
882add_font (char *file) 1181add_font (char *file)
883 CODE: 1182 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1183 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1184 OUTPUT:
1185 RETVAL
1186
1187void
1188IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1189
1190# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1191void
1192Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
885 1193
886void 1194void
887load_image_inline (SV *image_) 1195load_image_inline (SV *image_)
888 ALIAS: 1196 ALIAS:
889 load_image_file = 1 1197 load_image_file = 1
935 1243
936 SDL_LockSurface (surface2); 1244 SDL_LockSurface (surface2);
937 EXTEND (SP, 6); 1245 EXTEND (SP, 6);
938 PUSHs (sv_2mortal (newSViv (surface2->w))); 1246 PUSHs (sv_2mortal (newSViv (surface2->w)));
939 PUSHs (sv_2mortal (newSViv (surface2->h))); 1247 PUSHs (sv_2mortal (newSViv (surface2->h)));
940 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1248 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
941 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1249 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
942 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1250 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1251 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
944 SDL_UnlockSurface (surface2); 1252 SDL_UnlockSurface (surface2);
945 1253
975void 1283void
976error (char *message) 1284error (char *message)
977 CODE: 1285 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1286 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1287#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1288 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1289#endif
982 1290
983void 1291void
984fatal (char *message) 1292fatal (char *message)
985 CODE: 1293 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1294 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1295#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1296 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1297#endif
990 _exit (1); 1298 _exit (1);
991 1299
992void 1300void
993_exit (int retval = 0) 1301_exit (int retval = 0)
1005#if DEBUG 1313#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1314 VALGRIND_DO_LEAK_CHECK;
1007#endif 1315#endif
1008} 1316}
1009 1317
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1318int
1319SvREFCNT (SV *sv)
1320 CODE:
1321 RETVAL = SvREFCNT (sv);
1322 OUTPUT:
1323 RETVAL
1324
1325MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1326
1012PROTOTYPES: DISABLE 1327PROTOTYPES: DISABLE
1013 1328
1014CFPlus::Font 1329DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1330new_from_file (SV *klass, char *path, int id = 0)
1016 CODE: 1331 CODE:
1017{ 1332{
1018 int count; 1333 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1334 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1020 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1335 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1022} 1337}
1023 OUTPUT: 1338 OUTPUT:
1024 RETVAL 1339 RETVAL
1025 1340
1026void 1341void
1027DESTROY (CFPlus::Font self) 1342DESTROY (DC::Font self)
1028 CODE: 1343 CODE:
1029 pango_font_description_free (self); 1344 pango_font_description_free (self);
1030 1345
1031void 1346void
1032make_default (CFPlus::Font self) 1347make_default (DC::Font self)
1033 PROTOTYPE: $ 1348 PROTOTYPE: $
1034 CODE: 1349 CODE:
1035 default_font = self; 1350 default_font = self;
1036 1351
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1352MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1353
1039PROTOTYPES: DISABLE 1354PROTOTYPES: DISABLE
1040 1355
1041void 1356void
1042reset_glyph_cache () 1357glyph_cache_backup ()
1043 PROTOTYPE: 1358 PROTOTYPE:
1044 CODE: 1359 CODE:
1360 tc_backup ();
1361
1362void
1363glyph_cache_restore ()
1364 PROTOTYPE:
1365 CODE:
1045 tc_clear (); 1366 tc_restore ();
1046 1367
1047CFPlus::Layout 1368DC::Layout
1048new (SV *class) 1369new (SV *klass)
1049 CODE: 1370 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1371 RETVAL = new cf_layout;
1051 1372
1052 RETVAL->pl = pango_layout_new (opengl_context); 1373 RETVAL->pl = pango_layout_new (opengl_context);
1053 RETVAL->r = 1.; 1374 RETVAL->r = 1.;
1054 RETVAL->g = 1.; 1375 RETVAL->g = 1.;
1055 RETVAL->b = 1.; 1376 RETVAL->b = 1.;
1056 RETVAL->a = 1.; 1377 RETVAL->a = 1.;
1057 RETVAL->base_height = MIN_FONT_HEIGHT; 1378 RETVAL->base_height = MIN_FONT_HEIGHT;
1058 RETVAL->font = 0; 1379 RETVAL->font = 0;
1059 RETVAL->rc = rc_alloc ();
1060 1380
1061 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1381 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1062 layout_update_font (RETVAL); 1382 layout_update_font (RETVAL);
1063 OUTPUT: 1383 OUTPUT:
1064 RETVAL 1384 RETVAL
1065 1385
1066void 1386void
1067DESTROY (CFPlus::Layout self) 1387DESTROY (DC::Layout self)
1068 CODE: 1388 CODE:
1069 g_object_unref (self->pl); 1389 g_object_unref (self->pl);
1070 rc_free (self->rc);
1071 Safefree (self); 1390 delete self;
1072 1391
1073void 1392void
1074set_text (CFPlus::Layout self, SV *text_) 1393set_text (DC::Layout self, SV *text_)
1075 CODE: 1394 CODE:
1076{ 1395{
1077 STRLEN textlen; 1396 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1397 char *text = SvPVutf8 (text_, textlen);
1079 1398
1080 pango_layout_set_text (self->pl, text, textlen); 1399 pango_layout_set_text (self->pl, text, textlen);
1081} 1400}
1082 1401
1083void 1402void
1084set_markup (CFPlus::Layout self, SV *text_) 1403set_markup (DC::Layout self, SV *text_)
1085 CODE: 1404 CODE:
1086{ 1405{
1087 STRLEN textlen; 1406 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1407 char *text = SvPVutf8 (text_, textlen);
1089 1408
1090 pango_layout_set_markup (self->pl, text, textlen); 1409 pango_layout_set_markup (self->pl, text, textlen);
1091} 1410}
1092 1411
1093void 1412void
1094set_shapes (CFPlus::Layout self, ...) 1413set_shapes (DC::Layout self, ...)
1095 CODE: 1414 CODE:
1096{ 1415{
1097 PangoAttrList *attrs = 0; 1416 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1417 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1418 const char *pos = text;
1134 if (attrs) 1453 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1454 pango_layout_set_attributes (self->pl, attrs);
1136} 1455}
1137 1456
1138void 1457void
1139get_shapes (CFPlus::Layout self) 1458get_shapes (DC::Layout self)
1140 PPCODE: 1459 PPCODE:
1141{ 1460{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1461 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1462
1144 do 1463 do
1145 { 1464 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1465 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1466
1148 if (run && shape_attr_p (run)) 1467 if (run && shape_attr_p (run))
1149 { 1468 {
1150 PangoRectangle extents; 1469 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1470 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1478
1160 pango_layout_iter_free (iter); 1479 pango_layout_iter_free (iter);
1161} 1480}
1162 1481
1163int 1482int
1164has_wrapped (CFPlus::Layout self) 1483has_wrapped (DC::Layout self)
1165 CODE: 1484 CODE:
1166{ 1485{
1167 int lines = 1; 1486 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1487 const char *text = pango_layout_get_text (self->pl);
1169 1488
1174} 1493}
1175 OUTPUT: 1494 OUTPUT:
1176 RETVAL 1495 RETVAL
1177 1496
1178SV * 1497SV *
1179get_text (CFPlus::Layout self) 1498get_text (DC::Layout self)
1180 CODE: 1499 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1500 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1501 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1502 OUTPUT:
1184 RETVAL 1503 RETVAL
1185 1504
1186void 1505void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1506set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1507 CODE:
1189 self->r = r; 1508 self->r = r;
1190 self->g = g; 1509 self->g = g;
1191 self->b = b; 1510 self->b = b;
1192 self->a = a; 1511 self->a = a;
1193 1512
1194void 1513void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1514set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1515 CODE:
1197 if (self->font != font) 1516 if (self->font != font)
1198 { 1517 {
1199 self->font = font; 1518 self->font = font;
1200 layout_update_font (self); 1519 layout_update_font (self);
1201 } 1520 }
1202 1521
1203void 1522void
1204set_height (CFPlus::Layout self, int base_height) 1523set_height (DC::Layout self, int base_height)
1205 CODE: 1524 CODE:
1206 if (self->base_height != base_height) 1525 if (self->base_height != base_height)
1207 { 1526 {
1208 self->base_height = base_height; 1527 self->base_height = base_height;
1209 layout_update_font (self); 1528 layout_update_font (self);
1210 } 1529 }
1211 1530
1212void 1531void
1213set_width (CFPlus::Layout self, int max_width = -1) 1532set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1533 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1534 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1535
1217void 1536void
1218set_indent (CFPlus::Layout self, int indent) 1537set_indent (DC::Layout self, int indent)
1219 CODE: 1538 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1539 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1540
1222void 1541void
1223set_spacing (CFPlus::Layout self, int spacing) 1542set_spacing (DC::Layout self, int spacing)
1224 CODE: 1543 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1544 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1545
1227void 1546void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1547set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1548 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1549 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1550 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1551 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1552 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1553 : PANGO_ELLIPSIZE_NONE
1235 ); 1554 );
1236 1555
1237void 1556void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1557set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1558 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1559 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1560
1242void 1561void
1243size (CFPlus::Layout self) 1562size (DC::Layout self)
1244 PPCODE: 1563 PPCODE:
1245{ 1564{
1246 int w, h; 1565 int w, h;
1247 1566
1248 layout_get_pixel_size (self, &w, &h); 1567 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1570 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1571 PUSHs (sv_2mortal (newSViv (h)));
1253} 1572}
1254 1573
1255int 1574int
1256descent (CFPlus::Layout self) 1575descent (DC::Layout self)
1257 CODE: 1576 CODE:
1258{ 1577{
1259 PangoRectangle rect; 1578 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1579 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1580 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1581 RETVAL = PANGO_DESCENT (rect);
1263} 1582}
1264 OUTPUT: 1583 OUTPUT:
1265 RETVAL 1584 RETVAL
1266 1585
1267int 1586int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1587xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1588 CODE:
1270{ 1589{
1271 int index, trailing; 1590 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1591 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1592 RETVAL = index + trailing;
1274} 1593}
1275 OUTPUT: 1594 OUTPUT:
1276 RETVAL 1595 RETVAL
1277 1596
1278void 1597void
1279cursor_pos (CFPlus::Layout self, int index) 1598cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1599 PPCODE:
1281{ 1600{
1282 PangoRectangle strong_pos; 1601 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1602 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1603
1285 EXTEND (SP, 3); 1604 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1605 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1606 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1607 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1608}
1290 1609
1291void 1610void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1611index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1612 PPCODE:
1294{ 1613{
1295 int line, x; 1614 int line, x;
1296 1615
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1616 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1617#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1618 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1619 --line;
1620#endif
1300 EXTEND (SP, 2); 1621 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1622 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1623 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1624}
1304 1625
1305void 1626void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1627line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1628 PPCODE:
1308{ 1629{
1309 PangoLayoutLine *lp; 1630 PangoLayoutLine *lp;
1310 int index, trailing; 1631 int index, trailing;
1311 1632
1312 if (line < 0) 1633 if (line < 0)
1313 XSRETURN_EMPTY; 1634 XSRETURN_EMPTY;
1314 1635
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1636 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1637 XSRETURN_EMPTY; /* do better */
1317 1638
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1639 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1640
1320 EXTEND (SP, 2); 1641 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1647 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1648 }
1328} 1649}
1329 1650
1330void 1651void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1652render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1653 CODE:
1333 rc_clear (self->rc); 1654 self->rc.clear ();
1334 pango_opengl_render_layout_subpixel ( 1655 pango_opengl_render_layout_subpixel (
1335 self->pl, 1656 self->pl,
1336 self->rc, 1657 &self->rc,
1337 x * PANGO_SCALE, y * PANGO_SCALE, 1658 x * PANGO_SCALE, y * PANGO_SCALE,
1338 self->r, self->g, self->b, self->a, 1659 self->r, self->g, self->b, self->a,
1339 flags 1660 flags
1340 ); 1661 );
1341 // we assume that context_change actually clears/frees stuff 1662 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1663 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1664 pango_layout_context_changed (self->pl);
1344 1665
1345void 1666void
1346draw (CFPlus::Layout self) 1667draw (DC::Layout self)
1347 CODE: 1668 CODE:
1348{ 1669{
1349 glEnable (GL_TEXTURE_2D); 1670 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1671 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1672 glEnable (GL_BLEND);
1352 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1673 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1353 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1674 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1354 glEnable (GL_ALPHA_TEST); 1675 glEnable (GL_ALPHA_TEST);
1355 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1676 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1356 1677
1357 rc_draw (self->rc); 1678 self->rc.draw ();
1358 1679
1359 glDisable (GL_ALPHA_TEST); 1680 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1681 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1682 glDisable (GL_TEXTURE_2D);
1362} 1683}
1363 1684
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1685MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1686
1366PROTOTYPES: ENABLE 1687PROTOTYPES: ENABLE
1367 1688
1368void 1689void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1690pad (SV *data_, int ow, int oh, int nw, int nh)
1437 glDisable (GL_ALPHA_TEST); 1758 glDisable (GL_ALPHA_TEST);
1438 glDisable (GL_BLEND); 1759 glDisable (GL_BLEND);
1439 } 1760 }
1440} 1761}
1441 1762
1763void
1764draw_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)
1765 PROTOTYPE: @
1766 CODE:
1767{
1768 glEnable (GL_BLEND);
1769 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1770 glEnable (GL_TEXTURE_2D);
1771 glBindTexture (GL_TEXTURE_2D, name1);
1772
1773 glColor3f (intensity, intensity, intensity);
1774 glPushMatrix ();
1775 glScalef (1./3, 1./3, 1.);
1776
1777 if (blend > 0.f)
1778 {
1779 float dx3 = dx * -3.f / w;
1780 float dy3 = dy * -3.f / h;
1781 GLfloat env_color[4] = { 0., 0., 0., blend };
1782
1783 /* interpolate the two shadow textures */
1784 /* stage 0 == rgb(glcolor) + alpha(t0) */
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1786
1787 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1788 gl.ActiveTexture (GL_TEXTURE1);
1789 glEnable (GL_TEXTURE_2D);
1790 glBindTexture (GL_TEXTURE_2D, name2);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1792
1793 /* rgb == rgb(glcolor) */
1794 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1797
1798 /* alpha = interpolate t0, t1 by env_alpha */
1799 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1800
1801 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1810
1811 glBegin (GL_QUADS);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1813 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1816 glEnd ();
1817
1818 glDisable (GL_TEXTURE_2D);
1819 gl.ActiveTexture (GL_TEXTURE0);
1820 }
1821 else
1822 {
1823 /* simple blending of one texture, also opengl <1.3 path */
1824 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1825
1826 glBegin (GL_QUADS);
1827 glTexCoord2f (0, 0); glVertex2f (0, 0);
1828 glTexCoord2f (0, t); glVertex2f (0, h);
1829 glTexCoord2f (s, t); glVertex2f (w, h);
1830 glTexCoord2f (s, 0); glVertex2f (w, 0);
1831 glEnd ();
1832 }
1833
1834 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1835 {
1836 int x, y;
1837 int dx3 = dx * 3;
1838 int dy3 = dy * 3;
1839
1840 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1841 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1842 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1843 glTranslatef (-1., -1., 0);
1844 glBegin (GL_QUADS);
1845
1846 for (y = 1; y < h; y += 3)
1847 {
1848 int y1 = y - dy3;
1849 int y1valid = y1 >= 0 && y1 < h;
1850
1851 for (x = 1; x < w; x += 3)
1852 {
1853 int x1 = x - dx3;
1854 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1855 uint8_t h2;
1856
1857 if (y1valid && x1 >= 0 && x1 < w)
1858 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 else
1860 h2 = 1; /* out of range == invisible */
1861
1862 if (h1 || h2)
1863 {
1864 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1865 glColor4f (1., 1., 1., alpha);
1866
1867 glTexCoord2f (0, 0.); glVertex2i (x , y );
1868 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1869 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1870 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1871 }
1872 }
1873 }
1874 }
1875
1876 glEnd ();
1877
1878 glPopMatrix ();
1879
1880 glDisable (GL_TEXTURE_2D);
1881 glDisable (GL_BLEND);
1882}
1883
1442IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1884IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1443 CODE: 1885 CODE:
1444{ 1886{
1445 GLint width; 1887 GLint width;
1446 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1888 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1448 RETVAL = width > 0; 1890 RETVAL = width > 0;
1449} 1891}
1450 OUTPUT: 1892 OUTPUT:
1451 RETVAL 1893 RETVAL
1452 1894
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1895MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1896
1455PROTOTYPES: DISABLE 1897PROTOTYPES: DISABLE
1456 1898
1457CFPlus::Map 1899DC::Map
1458new (SV *class) 1900new (SV *klass)
1459 CODE: 1901 CODE:
1460 New (0, RETVAL, 1, struct map); 1902 New (0, RETVAL, 1, mapgrid);
1461 RETVAL->x = 0; 1903 RETVAL->x = 0;
1462 RETVAL->y = 0; 1904 RETVAL->y = 0;
1463 RETVAL->w = 0; 1905 RETVAL->w = 0;
1464 RETVAL->h = 0; 1906 RETVAL->h = 0;
1465 RETVAL->ox = 0; 1907 RETVAL->ox = 0;
1470 RETVAL->row = 0; 1912 RETVAL->row = 0;
1471 OUTPUT: 1913 OUTPUT:
1472 RETVAL 1914 RETVAL
1473 1915
1474void 1916void
1475DESTROY (CFPlus::Map self) 1917DESTROY (DC::Map self)
1476 CODE: 1918 CODE:
1477{ 1919{
1478 map_clear (self); 1920 map_clear (self);
1479 Safefree (self->face2tile); 1921 Safefree (self->face2tile);
1480 Safefree (self->tex); 1922 Safefree (self->tex);
1481 Safefree (self); 1923 Safefree (self);
1482} 1924}
1483 1925
1484void 1926void
1485resize (CFPlus::Map self, int map_width, int map_height) 1927resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1928 CODE:
1487 self->w = map_width; 1929 self->w = map_width;
1488 self->h = map_height; 1930 self->h = map_height;
1489 1931
1490void 1932void
1491clear (CFPlus::Map self) 1933clear (DC::Map self)
1492 CODE: 1934 CODE:
1493 map_clear (self); 1935 map_clear (self);
1494 1936
1495void 1937void
1496set_tileid (CFPlus::Map self, int face, int tile) 1938set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1939 CODE:
1498{ 1940{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1941 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1942 need_texid (self, tile);
1501} 1943}
1502 1944
1503void 1945void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1946set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1947 CODE:
1506{ 1948{
1507 tileid texid; 1949 tileid texid;
1508 maptex *tex; 1950 maptex *tex;
1509 1951
1510 if (face < 0 || face >= self->faces) 1952 if (face < 0 || face >= self->faces)
1511 return; 1953 return;
1512 1954
1513 if (smooth < 0 || smooth >= self->faces) 1955 if (smooth < 0 || smooth >= self->faces)
1514 return; 1956 return;
1515 1957
1516 texid = self->face2tile [face]; 1958 texid = self->face2tile [face];
1517 1959
1518 if (!texid) 1960 if (!texid)
1519 return; 1961 return;
1520 1962
1521 tex = self->tex + texid; 1963 tex = self->tex + texid;
1522 tex->smoothtile = self->face2tile [smooth]; 1964 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1965 tex->smoothlevel = level;
1524} 1966}
1525 1967
1526void 1968void
1527set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1969set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528 CODE: 1970 CODE:
1529{ 1971{
1530 need_texid (self, texid); 1972 need_texid (self, texid);
1531 1973
1532 { 1974 {
1551 // use uglier nearest interpolation because linear suffers 1993 // use uglier nearest interpolation because linear suffers
1552 // from transparent color bleeding and ugly wrapping effects. 1994 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1995 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1996}
1555 1997
1998void
1999expire_textures (DC::Map self, int texid, int count)
2000 PPCODE:
2001 for (; texid < self->texs && count; ++texid, --count)
2002 {
2003 maptex *tex = self->tex + texid;
2004
2005 if (tex->name)
2006 {
2007 if (tex->unused)
2008 {
2009 tex->name = 0;
2010 tex->unused = 0;
2011 XPUSHs (sv_2mortal (newSViv (texid)));
2012 }
2013 else
2014 tex->unused = 1;
2015 }
2016 }
2017
1556int 2018int
1557ox (CFPlus::Map self) 2019ox (DC::Map self)
1558 ALIAS: 2020 ALIAS:
1559 oy = 1 2021 oy = 1
1560 x = 2 2022 x = 2
1561 y = 3 2023 y = 3
1562 w = 4 2024 w = 4
1573 } 2035 }
1574 OUTPUT: 2036 OUTPUT:
1575 RETVAL 2037 RETVAL
1576 2038
1577void 2039void
1578scroll (CFPlus::Map self, int dx, int dy) 2040scroll (DC::Map self, int dx, int dy)
1579 CODE: 2041 CODE:
1580{ 2042{
1581 if (dx > 0) 2043 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 2044 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 2045 else if (dx < 0)
1591 self->ox += dx; self->x += dx; 2053 self->ox += dx; self->x += dx;
1592 self->oy += dy; self->y += dy; 2054 self->oy += dy; self->y += dy;
1593 2055
1594 while (self->y < 0) 2056 while (self->y < 0)
1595 { 2057 {
1596 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2058 prepend (self->row, self->rows, MAP_EXTEND_Y);
1597 2059
1598 self->rows += MAP_EXTEND_Y; 2060 self->rows += MAP_EXTEND_Y;
1599 self->y += MAP_EXTEND_Y; 2061 self->y += MAP_EXTEND_Y;
1600 } 2062 }
1601} 2063}
1602 2064
1603SV * 2065SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 2066map1a_update (DC::Map self, SV *data_)
1605 CODE: 2067 CODE:
1606{ 2068{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2069 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 2070 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 2071 mapcell *cell;
1630 2092
1631 //TODO: don't trust server data to be in-range(!) 2093 //TODO: don't trust server data to be in-range(!)
1632 2094
1633 if (flags & 8) 2095 if (flags & 8)
1634 { 2096 {
2097 uint8_t ext, cmd;
2098
1635 if (extmap) 2099 do
1636 { 2100 {
1637 uint8_t ext, cmd; 2101 ext = *data++;
2102 cmd = ext & 0x7f;
1638 2103
1639 do 2104 if (cmd < 4)
2105 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2106 else if (cmd == 5) // health
1640 { 2107 {
1641 ext = *data++;
1642 cmd = ext & 0x3f;
1643
1644 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1;
1646 else if (cmd == 5) // health
1647 {
1648 cell->stat_width = 1; 2108 cell->stat_width = 1;
1649 cell->stat_hp = *data++; 2109 cell->stat_hp = *data++;
1650 }
1651 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47)
1654 {
1655 if (*data == 4)
1656 ; // decode player count
1657
1658 data += *data + 1;
1659 }
1660 else if (cmd == 8) // cell flags
1661 cell->flags = *data++;
1662 else if (ext & 0x40) // unknown, multibyte => skip
1663 data += *data + 1;
1664 else
1665 data++;
1666 } 2110 }
1667 while (ext & 0x80); 2111 else if (cmd == 6) // monster width
2112 cell->stat_width = *data++ + 1;
2113 else if (cmd == 0x47)
2114 {
2115 if (*data == 1) cell->player = data [1];
2116 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2117 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2118 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2119
2120 data += *data + 1;
2121 }
2122 else if (cmd == 8) // cell flags
2123 cell->flags = *data++;
2124 else if (ext & 0x40) // unknown, multibyte => skip
2125 data += *data + 1;
2126 else
2127 data++;
1668 } 2128 }
1669 else 2129 while (ext & 0x80);
1670 cell->darkness = *data++ + 1;
1671 } 2130 }
1672 2131
1673 for (z = 0; z <= 2; ++z) 2132 for (z = 0; z <= 2; ++z)
1674 if (flags & (4 >> z)) 2133 if (flags & (4 >> z))
1675 { 2134 {
1678 cell->tile [z] = self->face2tile [face]; 2137 cell->tile [z] = self->face2tile [face];
1679 2138
1680 if (cell->tile [z]) 2139 if (cell->tile [z])
1681 { 2140 {
1682 maptex *tex = self->tex + cell->tile [z]; 2141 maptex *tex = self->tex + cell->tile [z];
2142 tex->unused = 0;
1683 if (!tex->name) 2143 if (!tex->name)
1684 av_push (missing, newSViv (cell->tile [z])); 2144 av_push (missing, newSViv (cell->tile [z]));
1685 2145
1686 if (tex->smoothtile) 2146 if (tex->smoothtile)
1687 { 2147 {
1688 maptex *smooth = self->tex + tex->smoothtile; 2148 maptex *smooth = self->tex + tex->smoothtile;
2149 smooth->unused = 0;
1689 if (!smooth->name) 2150 if (!smooth->name)
1690 av_push (missing, newSViv (tex->smoothtile)); 2151 av_push (missing, newSViv (tex->smoothtile));
1691 } 2152 }
1692 } 2153 }
1693 } 2154 }
1694 } 2155 }
1695 else 2156 else
1696 cell->darkness = 0; 2157 CELL_CLEAR (cell);
1697 } 2158 }
1698} 2159}
1699 OUTPUT: 2160 OUTPUT:
1700 RETVAL 2161 RETVAL
1701 2162
1702SV * 2163SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2164mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 2165 CODE:
1705{ 2166{
1706 int x1, x; 2167 int x1, x;
1707 int y1, y; 2168 int y1, y;
1708 int z; 2169 int z;
1721 ? self->row + y 2182 ? self->row + y
1722 : 0; 2183 : 0;
1723 2184
1724 for (x = x0; x < x1; x++) 2185 for (x = x0; x < x1; x++)
1725 { 2186 {
1726 int r = 32, g = 32, b = 32, a = 192; 2187 unsigned int r = 32, g = 32, b = 32, a = 192;
1727 2188
1728 if (row && row->c0 <= x && x < row->c1) 2189 if (row && row->c0 <= x && x < row->c1)
1729 { 2190 {
1730 mapcell *cell = row->col + (x - row->c0); 2191 mapcell *cell = row->col + (x - row->c0);
1731 2192
1733 { 2194 {
1734 maptex tex = self->tex [cell->tile [z]]; 2195 maptex tex = self->tex [cell->tile [z]];
1735 int a0 = 255 - tex.a; 2196 int a0 = 255 - tex.a;
1736 int a1 = tex.a; 2197 int a1 = tex.a;
1737 2198
1738 r = (r * a0 + tex.r * a1) / 255; 2199 r = div255 (r * a0 + tex.r * a1);
1739 g = (g * a0 + tex.g * a1) / 255; 2200 g = div255 (g * a0 + tex.g * a1);
1740 b = (b * a0 + tex.b * a1) / 255; 2201 b = div255 (b * a0 + tex.b * a1);
1741 a = (a * a0 + tex.a * a1) / 255; 2202 a = div255 (a * a0 + tex.a * a1);
1742 } 2203 }
1743 } 2204 }
1744 2205
1745 *map++ = (r ) 2206 *map++ = (r )
1746 | (g << 8) 2207 | (g << 8)
1747 | (b << 16) 2208 | (b << 16)
1748 | (a << 24); 2209 | (a << 24);
1749 } 2210 }
1750 } 2211 }
1751 2212
1752 RETVAL = map_sv; 2213 RETVAL = map_sv;
1753} 2214}
1754 OUTPUT: 2215 OUTPUT:
1755 RETVAL 2216 RETVAL
1756 2217
1757void 2218void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2219draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1759 CODE: 2220 CODE:
1760{ 2221{
1761 int x, y, z; 2222 int x, y, z;
1762 2223
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1765 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2224 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1766 smooth_key skey; 2225 int pl_x, pl_y;
1767 2226 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 2227 rc_t rc;
2228 rc_t rc_ov;
1769 rc_key_t key; 2229 rc_key_t key;
1770 rc_array_t *arr; 2230 rc_t::array_t *arr;
1771 2231
2232 pl_tex.name = 0;
2233
1772 // thats current max. sorry. 2234 // that's current max. sorry.
1773 if (sw > 255) sw = 255; 2235 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 2236 if (sh > 255) sh = 255;
1775
1776 // clear key, in case of extra padding
1777 memset (&skey, 0, sizeof (skey));
1778 2237
1779 memset (&key, 0, sizeof (key)); 2238 memset (&key, 0, sizeof (key));
1780 key.r = 255; 2239 key.r = 255;
1781 key.g = 255; 2240 key.g = 255;
1782 key.b = 255; 2241 key.b = 255;
1783 key.a = 255; 2242 key.a = 255;
1784 key.mode = GL_QUADS; 2243 key.mode = GL_QUADS;
1785 key.format = GL_T2F_V3F; 2244 key.format = GL_T2F_V3F;
1786 key.texname = -1;
1787 2245
1788 mx += self->x; 2246 mx += self->x;
1789 my += self->y; 2247 my += self->y;
1790 2248
1791 // first pass: determine smooth_max 2249 // first pass: determine smooth_max
1792 // rather ugly, if you ask me 2250 // rather ugly, if you ask me
1793 // could also be stored inside mapcell and updated on change 2251 // could also be stored inside mapcell and updated on change
1794 memset (smooth_max, 0, sizeof (smooth_max)); 2252 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1795 2253
1796 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
1797 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
1798 { 2256 {
1799 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
1814 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2272 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1815 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2273 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1816 2274
1817 for (z = 0; z <= 2; z++) 2275 for (z = 0; z <= 2; z++)
1818 { 2276 {
1819 memset (smooth_level, 0, sizeof (smooth_level)); 2277 std::bitset<256> smooth_level; // one bit for every possible smooth level
2278 smooth_key skey;
2279 smooth_hash smooth;
2280 key.texname = -1;
1820 2281
1821 for (y = 0; y < sh; y++) 2282 for (y = 0; y < sh; y++)
1822 if (0 <= y + my && y + my < self->rows) 2283 if (0 <= y + my && y + my < self->rows)
1823 { 2284 {
1824 maprow *row = self->row + (y + my); 2285 maprow *row = self->row + (y + my);
1834 maptex tex = self->tex [tile]; 2295 maptex tex = self->tex [tile];
1835 int px, py; 2296 int px, py;
1836 2297
1837 if (key.texname != tex.name) 2298 if (key.texname != tex.name)
1838 { 2299 {
2300 self->tex [tile].unused = 0;
2301
1839 if (!tex.name) 2302 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 2303 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1841 2304
1842 key.texname = tex.name; 2305 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 2306 arr = &rc.array (key);
1844 } 2307 }
1845 2308
1846 px = (x + 1) * T - tex.w; 2309 px = (x + 1) * Th - tex.w;
1847 py = (y + 1) * T - tex.h; 2310 py = (y + 1) * Tw - tex.h;
1848 2311
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2312 if (expect_false (cell->player == player) && expect_false (z == 2))
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1851 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1852 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853
1854 if (cell->flags && z == 2)
1855 { 2313 {
1856 // overlays such as the speech bubble, probably more to come 2314 pl_x = px;
1857 if (cell->flags & 1) 2315 pl_y = py;
2316 pl_tex = tex;
1858 { 2317 continue;
1859 maptex tex = self->tex [1];
1860 int px = x * T + T * 2 / 32;
1861 int py = y * T - T * 6 / 32;
1862
1863 if (tex.name)
1864 {
1865 if (key.texname != tex.name)
1866 {
1867 key.texname = tex.name;
1868 arr = rc_array (rc, &key);
1869 }
1870
1871 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1872 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1873 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1874 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1875 }
1876 }
1877 } 2318 }
2319
2320 arr->t2f_v3f (0 , 0 , px , py , 0);
2321 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2322 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2323 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1878 2324
1879 // update smooth hash 2325 // update smooth hash
1880 if (tex.smoothtile) 2326 if (tex.smoothtile)
1881 { 2327 {
1882 skey.tile = tex.smoothtile; 2328 skey.tile = tex.smoothtile;
1883 skey.level = tex.smoothlevel; 2329 skey.level = tex.smoothlevel;
1884 2330
1885 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2331 smooth_level[tex.smoothlevel] = 1;
1886 2332
1887 // add bits to current tile and all neighbours. skey.x|y is 2333 // add bits to current tile and all neighbours. skey.x|y is
1888 // shifted +1|+1 so we always stay positive. 2334 // shifted +1|+1 so we always stay positive.
1889 2335
1890 // bits is ___n cccc CCCC bbbb 2336 // bits is ___n cccc CCCC bbbb
1898 2344
1899 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2345 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1900 // ·· ·· ·┏ ┓· 2346 // ·· ·· ·┏ ┓·
1901 2347
1902 // full tile 2348 // full tile
1903 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2349 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1904 2350
1905 // borders 2351 // borders
1906 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2352 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1907 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2353 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1908 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2354 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1909 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2355 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1910 2356
1911 // corners 2357 // corners
1912 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2358 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1913 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2359 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1914 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2360 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1915 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2361 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2362 }
2363 }
2364
2365 if (expect_false (z == 2) && expect_false (cell->flags))
2366 {
2367 // overlays such as the speech bubble, probably more to come
2368 if (cell->flags & 1)
2369 {
2370 rc_key_t key_ov = key;
2371 maptex tex = self->tex[TEXID_SPEECH];
2372 int px = x * Tw + Tw * 2 / 32;
2373 int py = y * Th - Th * 6 / 32;
2374
2375 key_ov.texname = tex.name;
2376 rc_t::array_t &arr = rc_ov.array (key_ov);
2377
2378 arr.t2f_v3f (0 , 0 , px , py , 0);
2379 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2380 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2381 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1916 } 2382 }
1917 } 2383 }
1918 } 2384 }
1919 } 2385 }
1920 2386
1921 rc_draw (rc); 2387 rc.draw ();
1922 rc_clear (rc); 2388 rc.clear ();
1923 2389
1924 // go through all smoothlevels, lowest to highest, then draw. 2390 // go through all smoothlevels, lowest to highest, then draw.
1925 // this is basically counting sort 2391 // this is basically counting sort
1926 { 2392 {
1927 int w, b; 2393 int w, b;
1928 2394
1929 glEnable (GL_TEXTURE_2D); 2395 glEnable (GL_TEXTURE_2D);
1930 glBegin (GL_QUADS); 2396 glBegin (GL_QUADS);
1931 for (w = 0; w < 256 / 32; ++w) 2397 for (int level = 0; level < smooth_level.size (); ++level)
2398 if (smooth_level[level])
2399 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1932 { 2400 {
1933 uint32_t smask = smooth_level [w]; 2401 smooth_key &skey = it->first;
1934 if (smask) 2402 IV bits = it->second;
1935 for (b = 0; b < 32; ++b) 2403
1936 if (smask & (((uint32_t)1) << b)) 2404 if (!(bits & 0x1000)
2405 && skey.level == level
2406 && level > smooth_max [skey.x][skey.y])
1937 { 2407 {
1938 int level = (w << 5) | b; 2408 maptex tex = self->tex [skey.tile];
2409 int px = (((int)skey.x) - 1) * Tw;
2410 int py = (((int)skey.y) - 1) * Th;
2411 int border = bits & 15;
2412 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2413 float dx = tex.s * .0625f; // 16 images/row
2414 float dy = tex.t * .5f ; // 2 images/column
2415
1939 HE *he; 2416 if (tex.name)
1940
1941 hv_iterinit (smooth);
1942 while ((he = hv_iternext (smooth)))
1943 { 2417 {
1944 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 // this time avoiding texture state changes
1945 IV bits = SvIVX (HeVAL (he)); 2419 // save gobs of state changes.
1946 2420 if (key.texname != tex.name)
1947 if (!(bits & 0x1000)
1948 && skey->level == level
1949 && level > smooth_max [skey->x][skey->y])
1950 { 2421 {
1951 maptex tex = self->tex [skey->tile]; 2422 self->tex [skey.tile].unused = 0;
1952 int px = (((int)skey->x) - 1) * T;
1953 int py = (((int)skey->y) - 1) * T;
1954 int border = bits & 15;
1955 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1956 float dx = tex.s * .0625f; // 16 images/row
1957 float dy = tex.t * .5f ; // 2 images/column
1958 2423
1959 if (tex.name)
1960 {
1961 // this time avoiding texture state changes
1962 // save gobs of state changes.
1963 if (key.texname != tex.name)
1964 {
1965 glEnd (); 2424 glEnd ();
1966 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2425 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1967 glBegin (GL_QUADS); 2426 glBegin (GL_QUADS);
1968 } 2427 }
1969 2428
1970 if (border) 2429 if (border)
1971 { 2430 {
1972 float ox = border * dx; 2431 float ox = border * dx;
1973 2432
1974 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1975 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1976 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1977 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1978 } 2437 }
1979 2438
1980 if (corner) 2439 if (corner)
1981 { 2440 {
1982 float ox = corner * dx; 2441 float ox = corner * dx;
1983 2442
1984 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1985 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1986 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1987 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1988 }
1989 }
1990 } 2447 }
1991 } 2448 }
1992 } 2449 }
1993 } 2450 }
1994 2451
1995 glEnd (); 2452 glEnd ();
1996 glDisable (GL_TEXTURE_2D); 2453 glDisable (GL_TEXTURE_2D);
1997 key.texname = -1; 2454 key.texname = -1;
1998 } 2455 }
1999
2000 hv_clear (smooth);
2001 } 2456 }
2002 2457
2458 if (pl_tex.name)
2459 {
2460 maptex tex = pl_tex;
2461 int px = pl_x + sdx;
2462 int py = pl_y + sdy;
2463
2464 key.texname = tex.name;
2465 rc_t::array_t &arr = rc.array (key);
2466
2467 arr.t2f_v3f (0 , 0 , px , py , 0);
2468 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2469 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2470 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2471
2472 rc.draw ();
2473 }
2474
2475 rc_ov.draw ();
2476 rc_ov.clear ();
2477
2003 glDisable (GL_BLEND); 2478 glDisable (GL_BLEND);
2004 rc_free (rc);
2005 2479
2006 // top layer: overlays such as the health bar 2480 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2481 for (y = 0; y < sh; y++)
2008 if (0 <= y + my && y + my < self->rows) 2482 if (0 <= y + my && y + my < self->rows)
2009 { 2483 {
2012 for (x = 0; x < sw; x++) 2486 for (x = 0; x < sw; x++)
2013 if (row->c0 <= x + mx && x + mx < row->c1) 2487 if (row->c0 <= x + mx && x + mx < row->c1)
2014 { 2488 {
2015 mapcell *cell = row->col + (x + mx - row->c0); 2489 mapcell *cell = row->col + (x + mx - row->c0);
2016 2490
2017 int px = x * T; 2491 int px = x * Tw;
2018 int py = y * T; 2492 int py = y * Th;
2493
2494 if (expect_false (cell->player == player))
2495 {
2496 px += sdx;
2497 py += sdy;
2498 }
2019 2499
2020 if (cell->stat_hp) 2500 if (cell->stat_hp)
2021 { 2501 {
2022 int width = cell->stat_width * T; 2502 int width = cell->stat_width * Tw;
2023 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2503 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2024 2504
2025 glColor3ub (0, 0, 0); 2505 glColor3ub (0, 0, 0);
2026 glRectf (px + 1, py - thick - 2, 2506 glRectf (px + 1, py - thick - 2,
2027 px + width - 1, py); 2507 px + width - 1, py);
2028 2508
2034 } 2514 }
2035 } 2515 }
2036} 2516}
2037 2517
2038void 2518void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2519draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2040 CODE: 2520 CODE:
2041{ 2521{
2042 static float color[16][3] = { 2522 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2523 { 0.00f, 0.00f, 0.00f },
2044 { 1.00F, 1.00F, 1.00F }, 2524 { 1.00f, 1.00f, 1.00f },
2045 { 0.00F, 0.00F, 0.55F }, 2525 { 0.00f, 0.00f, 0.55f },
2046 { 1.00F, 0.00F, 0.00F }, 2526 { 1.00f, 0.00f, 0.00f },
2047 2527
2048 { 1.00F, 0.54F, 0.00F }, 2528 { 1.00f, 0.54f, 0.00f },
2049 { 0.11F, 0.56F, 1.00F }, 2529 { 0.11f, 0.56f, 1.00f },
2050 { 0.93F, 0.46F, 0.00F }, 2530 { 0.93f, 0.46f, 0.00f },
2051 { 0.18F, 0.54F, 0.34F }, 2531 { 0.18f, 0.54f, 0.34f },
2052 2532
2053 { 0.56F, 0.73F, 0.56F }, 2533 { 0.56f, 0.73f, 0.56f },
2054 { 0.80F, 0.80F, 0.80F }, 2534 { 0.80f, 0.80f, 0.80f },
2055 { 0.55F, 0.41F, 0.13F }, 2535 { 0.55f, 0.41f, 0.13f },
2056 { 0.99F, 0.77F, 0.26F }, 2536 { 0.99f, 0.77f, 0.26f },
2057 2537
2058 { 0.74F, 0.65F, 0.41F }, 2538 { 0.74f, 0.65f, 0.41f },
2059 2539
2060 { 0.00F, 1.00F, 1.00F }, 2540 { 0.00f, 1.00f, 1.00f },
2061 { 1.00F, 0.00F, 1.00F }, 2541 { 1.00f, 0.00f, 1.00f },
2062 { 1.00F, 1.00F, 0.00F }, 2542 { 1.00f, 1.00f, 0.00f },
2063 }; 2543 };
2064 2544
2065 int x, y; 2545 int x, y;
2066 2546
2067 glEnable (GL_TEXTURE_2D); 2547 glEnable (GL_TEXTURE_2D);
2548 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2549 * but the nvidia driver (185.18.14) mishandles alpha textures
2550 * and takes the colour from god knows where instead of using
2551 * Cp. MODULATE results in the same colour, but slightly different
2552 * alpha, but atcually gives us the correct colour with nvidia.
2553 */
2068 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2554 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2069 glEnable (GL_BLEND); 2555 glEnable (GL_BLEND);
2070 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2556 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2071 glBegin (GL_QUADS); 2557 glBegin (GL_QUADS);
2072 2558
2073 for (y = 0; y < h; y++) 2559 for (y = 0; y < h; y++)
2077 2563
2078 if (m) 2564 if (m)
2079 { 2565 {
2080 float *c = color [m & 15]; 2566 float *c = color [m & 15];
2081 2567
2082 float tx1 = m & 0x40 ? 0.5 : 0.; 2568 float tx1 = m & 0x40 ? 0.5f : 0.f;
2083 float tx2 = tx1 + 0.5; 2569 float tx2 = tx1 + 0.5f;
2084 2570
2085 glColor4f (c[0], c[1], c[2], 0.75); 2571 glColor4f (c[0], c[1], c[2], 1);
2086 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2572 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2087 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2573 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2088 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2574 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2089 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2575 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2090 } 2576 }
2094 glDisable (GL_BLEND); 2580 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2581 glDisable (GL_TEXTURE_2D);
2096} 2582}
2097 2583
2098void 2584void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2585fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2586 PPCODE:
2101{ 2587{
2102 int x, y; 2588 int x, y;
2103 int sw1 = sw + 2; 2589 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2590 int sh1 = sh + 2;
2105 int sh3 = sh * 3; 2591 int sh3 = sh * 3;
2106 int sw34 = (sw * 3 + 3) & ~3; 2592 int sw3 = sw * 3;
2593 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2594 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2107 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2595 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2108 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2596 memset (darkness1, 0, sw1*sh1);
2109 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2110 2597
2111 SvPOK_only (darkness3_sv); 2598 SvPOK_only (darkness3_sv);
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2599 SvCUR_set (darkness3_sv, sw3 * sh3);
2113 2600
2114 mx += self->x - 1; 2601 mx += self->x - 1;
2115 my += self->y - 1; 2602 my += self->y - 1;
2116
2117 memset (darkness1, 255, sw1 * sh1);
2118 2603
2119 for (y = 0; y < sh1; y++) 2604 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2605 if (0 <= y + my && y + my < self->rows)
2121 { 2606 {
2122 maprow *row = self->row + (y + my); 2607 maprow *row = self->row + (y + my);
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2610 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2611 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2612 mapcell *cell = row->col + (x + mx - row->c0);
2128 2613
2129 darkness1 [y * sw1 + x] = cell->darkness 2614 darkness1 [y * sw1 + x] = cell->darkness
2130 ? 255 - (cell->darkness - 1) 2615 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2131 : 255 - FOW_DARKNESS; 2616 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2132 } 2617 }
2133 } 2618 }
2134 2619
2135 for (y = 0; y < sh; ++y) 2620 for (y = 0; y < sh; ++y)
2136 for (x = 0; x < sw; ++x) 2621 for (x = 0; x < sw; ++x)
2155 2640
2156 uint8_t r13 = (d13 + d23 + d12) / 3; 2641 uint8_t r13 = (d13 + d23 + d12) / 3;
2157 uint8_t r23 = d23; 2642 uint8_t r23 = d23;
2158 uint8_t r33 = (d23 + d33 + d32) / 3; 2643 uint8_t r33 = (d23 + d33 + d32) / 3;
2159 2644
2160 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2161 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2162 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2647 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2163 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2164 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2165 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2650 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2166 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2167 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2168 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2653 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2169 } 2654 }
2170 2655
2171 free (darkness1); 2656 free (darkness1);
2172 2657
2173 EXTEND (SP, 3); 2658 EXTEND (SP, 3);
2174 PUSHs (sv_2mortal (newSViv (sw34))); 2659 PUSHs (sv_2mortal (newSViv (sw3)));
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2660 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2661 PUSHs (darkness3_sv);
2177} 2662}
2178 2663
2179SV * 2664SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2665get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2666 CODE:
2182{ 2667{
2183 int x, y, x1, y1; 2668 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2669 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2670 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2242 else 2727 else
2243 *data++ = 0; 2728 *data++ = 0;
2244 } 2729 }
2245 } 2730 }
2246 2731
2732 /* if size is w*h + 5 then no data has been found */
2733 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2734 {
2247 SvPOK_only (data_sv); 2735 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2736 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2737 }
2738
2249 RETVAL = data_sv; 2739 RETVAL = data_sv;
2250} 2740}
2251 OUTPUT: 2741 OUTPUT:
2252 RETVAL 2742 RETVAL
2253 2743
2254void 2744void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2745set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2746 PPCODE:
2257{ 2747{
2258 int x, y, z; 2748 int x, y, z;
2259 int w, h; 2749 int w, h;
2260 int x1, y1; 2750 int x1, y1;
2751 STRLEN len;
2752 uint8_t *data, *end;
2753
2754 len = SvLEN (data_sv);
2755 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2756 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2757 end = data + len + 8;
2758
2759 if (len < 5)
2760 XSRETURN_EMPTY;
2261 2761
2262 if (*data++ != 0) 2762 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2763 XSRETURN_EMPTY; /* version mismatch */
2264 2764
2265 w = *data++ << 8; w |= *data++; 2765 w = *data++ << 8; w |= *data++;
2280 { 2780 {
2281 maprow *row = map_get_row (self, y); 2781 maprow *row = map_get_row (self, y);
2282 2782
2283 for (x = x0; x < x1; x++) 2783 for (x = x0; x < x1; x++)
2284 { 2784 {
2785 uint8_t flags;
2786
2787 if (data + 7 >= end)
2788 XSRETURN_EMPTY;
2789
2285 uint8_t flags = *data++; 2790 flags = *data++;
2286 2791
2287 if (flags) 2792 if (flags)
2288 { 2793 {
2289 mapcell *cell = row_get_cell (row, x); 2794 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2795 tileid tile[3] = { 0, 0, 0 };
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2798 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2799 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2800
2296 if (cell->darkness == 0) 2801 if (cell->darkness == 0)
2297 { 2802 {
2298 cell->darkness = 0; 2803 /*cell->darkness = 0;*/
2804 EXTEND (SP, 3);
2299 2805
2300 for (z = 0; z <= 2; z++) 2806 for (z = 0; z <= 2; z++)
2301 { 2807 {
2302 tileid t = tile [z]; 2808 tileid t = tile [z];
2303 2809
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2810 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2811 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2812 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2813 need_texid (self, t);
2308 } 2814 }
2309 2815
2310 cell->tile [z] = t; 2816 cell->tile [z] = t;
2311 } 2817 }
2313 } 2819 }
2314 } 2820 }
2315 } 2821 }
2316} 2822}
2317 2823
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2824MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2825
2320CFPlus::RW 2826DC::RW
2321new (SV *class, SV *data_sv) 2827new (SV *klass, SV *data_sv)
2322 CODE: 2828 CODE:
2323{ 2829{
2324 STRLEN datalen; 2830 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2831 char *data = SvPVbyte (data_sv, datalen);
2326 2832
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2833 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2834}
2329 OUTPUT: 2835 OUTPUT:
2330 RETVAL 2836 RETVAL
2331 2837
2332CFPlus::RW 2838DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2839new_from_file (SV *klass, const char *path, const char *mode = "rb")
2334 CODE: 2840 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2841 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2842 OUTPUT:
2337 RETVAL 2843 RETVAL
2338 2844
2339# fails on win32: 2845# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2846# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2847#void
2342#close (CFPlus::RW self) 2848#close (DC::RW self)
2343# CODE: 2849# CODE:
2344# (self->(close)) (self); 2850# (self->(close)) (self);
2345 2851
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2852MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2853
2348PROTOTYPES: DISABLE 2854PROTOTYPES: DISABLE
2349 2855
2350CFPlus::Channel 2856DC::Channel
2351find () 2857find ()
2352 CODE: 2858 CODE:
2353{ 2859{
2354 RETVAL = Mix_GroupAvailable (-1); 2860 RETVAL = Mix_GroupAvailable (-1);
2355 2861
2356 if (RETVAL < 0) 2862 if (RETVAL < 0)
2357 { 2863 {
2358 RETVAL = Mix_GroupOldest (-1); 2864 RETVAL = Mix_GroupOldest (-1);
2359 2865
2360 if (RETVAL < 0) 2866 if (RETVAL < 0)
2867 {
2868 // happens sometimes, maybe it just stopped playing(?)
2869 RETVAL = Mix_GroupAvailable (-1);
2870
2871 if (RETVAL < 0)
2361 XSRETURN_UNDEF; 2872 XSRETURN_UNDEF;
2362 2873 }
2874 else
2363 Mix_HaltChannel (RETVAL); 2875 Mix_HaltChannel (RETVAL);
2364 } 2876 }
2365 2877
2366 Mix_UnregisterAllEffects (RETVAL); 2878 Mix_UnregisterAllEffects (RETVAL);
2367 Mix_Volume (RETVAL, 128); 2879 Mix_Volume (RETVAL, 128);
2368} 2880}
2369 OUTPUT: 2881 OUTPUT:
2370 RETVAL 2882 RETVAL
2371 2883
2372void 2884void
2373halt (CFPlus::Channel self) 2885halt (DC::Channel self)
2374 CODE: 2886 CODE:
2375 Mix_HaltChannel (self); 2887 Mix_HaltChannel (self);
2376 2888
2377void 2889void
2378expire (CFPlus::Channel self, int ticks = -1) 2890expire (DC::Channel self, int ticks = -1)
2379 CODE: 2891 CODE:
2380 Mix_ExpireChannel (self, ticks); 2892 Mix_ExpireChannel (self, ticks);
2381 2893
2382void 2894void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2895fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2896 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2897 Mix_FadeOutChannel (self, ticks);
2386 2898
2387int 2899int
2388volume (CFPlus::Channel self, int volume) 2900volume (DC::Channel self, int volume)
2389 CODE: 2901 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2902 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2903 OUTPUT:
2392 RETVAL 2904 RETVAL
2393 2905
2394void 2906void
2395unregister_all_effects (CFPlus::Channel self) 2907unregister_all_effects (DC::Channel self)
2396 CODE: 2908 CODE:
2397 Mix_UnregisterAllEffects (self); 2909 Mix_UnregisterAllEffects (self);
2398 2910
2399void 2911void
2400set_panning (CFPlus::Channel self, int left, int right) 2912set_panning (DC::Channel self, int left, int right)
2401 CODE: 2913 CODE:
2402 left = CLAMP (left , 0, 255); 2914 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2915 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2916 Mix_SetPanning (self, left, right);
2405 2917
2406void 2918void
2407set_distance (CFPlus::Channel self, int distance) 2919set_distance (DC::Channel self, int distance)
2408 CODE: 2920 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2921 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2922
2411void 2923void
2412set_position (CFPlus::Channel self, int angle, int distance) 2924set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2925 CODE:
2414 2926
2415void 2927void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2928set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2929 CODE:
2418{ 2930{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2931 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2932 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2933 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2934}
2423 2935
2424void 2936void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2937set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2938 CODE:
2427 Mix_SetReverseStereo (self, flip); 2939 Mix_SetReverseStereo (self, flip);
2428 2940
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2941MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2942
2431PROTOTYPES: DISABLE 2943PROTOTYPES: DISABLE
2432 2944
2945void
2946decoders ()
2947 PPCODE:
2948#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2949 int i, num = Mix_GetNumChunkDecoders ();
2950 EXTEND (SP, num);
2951 for (i = 0; i < num; ++i)
2952 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2953#else
2954 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2955#endif
2956
2433CFPlus::MixChunk 2957DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2958new (SV *klass, DC::RW rwops)
2435 CODE: 2959 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2960 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2961 OUTPUT:
2438 RETVAL 2962 RETVAL
2439 2963
2440void 2964void
2441DESTROY (CFPlus::MixChunk self) 2965DESTROY (DC::MixChunk self)
2442 CODE: 2966 CODE:
2443 Mix_FreeChunk (self); 2967 Mix_FreeChunk (self);
2444 2968
2445int 2969int
2446volume (CFPlus::MixChunk self, int volume = -1) 2970volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2971 CODE:
2448 if (items > 1) 2972 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2973 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2974 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2975 OUTPUT:
2452 RETVAL 2976 RETVAL
2453 2977
2454CFPlus::Channel 2978DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2979play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2980 CODE:
2457{ 2981{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2982 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2983
2460 if (RETVAL < 0) 2984 if (RETVAL < 0)
2467 } 2991 }
2468} 2992}
2469 OUTPUT: 2993 OUTPUT:
2470 RETVAL 2994 RETVAL
2471 2995
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2996MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2997
2998void
2999decoders ()
3000 PPCODE:
3001#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3002 int i, num = Mix_GetNumMusicDecoders ();
3003 EXTEND (SP, num);
3004 for (i = 0; i < num; ++i)
3005 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3006#else
3007 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3008#endif
2473 3009
2474int 3010int
2475volume (int volume = -1) 3011volume (int volume = -1)
2476 PROTOTYPE: ;$ 3012 PROTOTYPE: ;$
2477 CODE: 3013 CODE:
2489void 3025void
2490halt () 3026halt ()
2491 CODE: 3027 CODE:
2492 Mix_HaltMusic (); 3028 Mix_HaltMusic ();
2493 3029
3030int
3031playing ()
3032 CODE:
3033 RETVAL = Mix_PlayingMusic ();
3034 OUTPUT:
3035 RETVAL
3036
2494CFPlus::MixMusic 3037DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 3038new (SV *klass, DC::RW rwops)
2496 CODE: 3039 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 3040 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 3041 OUTPUT:
2499 RETVAL 3042 RETVAL
2500 3043
2501void 3044void
2502DESTROY (CFPlus::MixMusic self) 3045DESTROY (DC::MixMusic self)
2503 CODE: 3046 CODE:
2504 Mix_FreeMusic (self); 3047 Mix_FreeMusic (self);
2505 3048
2506int 3049int
2507play (CFPlus::MixMusic self, int loops = -1) 3050play (DC::MixMusic self, int loops = -1)
2508 CODE: 3051 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 3052 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 3053 OUTPUT:
2511 RETVAL 3054 RETVAL
2512 3055
2513void 3056void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3057fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 3058 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 3059 Mix_FadeInMusicPos (self, loops, ms, position);
2517 3060
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3061MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 3062
2520PROTOTYPES: ENABLE 3063PROTOTYPES: ENABLE
2521 3064
2522BOOT: 3065BOOT:
2523{ 3066{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3067 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 3068 static const struct {
2526 const char *name; 3069 const char *name;
2527 IV iv; 3070 IV iv;
2528 } *civ, const_iv[] = { 3071 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 3072# define const_iv(name) { # name, (IV)name }
2530 const_iv (GL_VENDOR), 3073 const_iv (GL_VENDOR),
2531 const_iv (GL_VERSION), 3074 const_iv (GL_VERSION),
2532 const_iv (GL_EXTENSIONS), 3075 const_iv (GL_EXTENSIONS),
3076 const_iv (GL_MAX_TEXTURE_UNITS),
2533 const_iv (GL_COLOR_MATERIAL), 3077 const_iv (GL_COLOR_MATERIAL),
2534 const_iv (GL_SMOOTH), 3078 const_iv (GL_SMOOTH),
2535 const_iv (GL_FLAT), 3079 const_iv (GL_FLAT),
2536 const_iv (GL_DITHER), 3080 const_iv (GL_DITHER),
2537 const_iv (GL_BLEND), 3081 const_iv (GL_BLEND),
2549 const_iv (GL_ZERO), 3093 const_iv (GL_ZERO),
2550 const_iv (GL_SRC_ALPHA), 3094 const_iv (GL_SRC_ALPHA),
2551 const_iv (GL_DST_ALPHA), 3095 const_iv (GL_DST_ALPHA),
2552 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3096 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2553 const_iv (GL_ONE_MINUS_DST_ALPHA), 3097 const_iv (GL_ONE_MINUS_DST_ALPHA),
3098 const_iv (GL_SRC_COLOR),
3099 const_iv (GL_DST_COLOR),
3100 const_iv (GL_ONE_MINUS_SRC_COLOR),
3101 const_iv (GL_ONE_MINUS_DST_COLOR),
2554 const_iv (GL_SRC_ALPHA_SATURATE), 3102 const_iv (GL_SRC_ALPHA_SATURATE),
2555 const_iv (GL_RGB), 3103 const_iv (GL_RGB),
2556 const_iv (GL_RGBA), 3104 const_iv (GL_RGBA),
2557 const_iv (GL_RGBA4), 3105 const_iv (GL_RGBA4),
2558 const_iv (GL_RGBA8), 3106 const_iv (GL_RGBA8),
2626 const_iv (GL_NICEST), 3174 const_iv (GL_NICEST),
2627 const_iv (GL_V2F), 3175 const_iv (GL_V2F),
2628 const_iv (GL_V3F), 3176 const_iv (GL_V3F),
2629 const_iv (GL_T2F_V3F), 3177 const_iv (GL_T2F_V3F),
2630 const_iv (GL_T2F_N3F_V3F), 3178 const_iv (GL_T2F_N3F_V3F),
3179 const_iv (GL_FUNC_ADD),
3180 const_iv (GL_FUNC_SUBTRACT),
3181 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2631# undef const_iv 3182# undef const_iv
2632 }; 3183 };
2633 3184
2634 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3185 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2635 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3186 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2636 3187
2637 texture_av = newAV (); 3188 texture_av = newAV ();
2638 AvREAL_off (texture_av); 3189 AvREAL_off (texture_av);
2639} 3190}
2640 3191
2642disable_GL_EXT_blend_func_separate () 3193disable_GL_EXT_blend_func_separate ()
2643 CODE: 3194 CODE:
2644 gl.BlendFuncSeparate = 0; 3195 gl.BlendFuncSeparate = 0;
2645 gl.BlendFuncSeparateEXT = 0; 3196 gl.BlendFuncSeparateEXT = 0;
2646 3197
2647char * 3198void
3199apple_nvidia_bug (int enable)
3200
3201const char *
2648gl_vendor () 3202gl_vendor ()
2649 CODE: 3203 CODE:
2650 RETVAL = (char *)glGetString (GL_VENDOR); 3204 RETVAL = (const char *)glGetString (GL_VENDOR);
2651 OUTPUT: 3205 OUTPUT:
2652 RETVAL 3206 RETVAL
2653 3207
2654char * 3208const char *
2655gl_version () 3209gl_version ()
2656 CODE: 3210 CODE:
2657 RETVAL = (char *)glGetString (GL_VERSION); 3211 RETVAL = (const char *)glGetString (GL_VERSION);
2658 OUTPUT: 3212 OUTPUT:
2659 RETVAL 3213 RETVAL
2660 3214
2661char * 3215const char *
2662gl_extensions () 3216gl_extensions ()
2663 CODE: 3217 CODE:
2664 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3218 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2665 OUTPUT: 3219 OUTPUT:
2666 RETVAL 3220 RETVAL
2667 3221
2668const char *glGetString (GLenum pname) 3222const char *glGetString (GLenum pname)
3223 CODE:
3224 RETVAL = (const char *)glGetString (pname);
3225 OUTPUT:
3226 RETVAL
2669 3227
2670GLint glGetInteger (GLenum pname) 3228GLint glGetInteger (GLenum pname)
2671 CODE: 3229 CODE:
2672 glGetIntegerv (pname, &RETVAL); 3230 glGetIntegerv (pname, &RETVAL);
2673 OUTPUT: 3231 OUTPUT:
2681 3239
2682int glGetError () 3240int glGetError ()
2683 3241
2684void glFinish () 3242void glFinish ()
2685 3243
3244void glFlush ()
3245
2686void glClear (int mask) 3246void glClear (int mask)
2687 3247
2688void glClearColor (float r, float g, float b, float a = 1.0) 3248void glClearColor (float r, float g, float b, float a = 1.0)
2689 PROTOTYPE: @ 3249 PROTOTYPE: @
2690 3250
2699void glBlendFunc (int sfactor, int dfactor) 3259void glBlendFunc (int sfactor, int dfactor)
2700 3260
2701void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3261void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2702 CODE: 3262 CODE:
2703 gl_BlendFuncSeparate (sa, da, saa, daa); 3263 gl_BlendFuncSeparate (sa, da, saa, daa);
3264
3265# void glBlendEquation (int se)
2704 3266
2705void glDepthMask (int flag) 3267void glDepthMask (int flag)
2706 3268
2707void glLogicOp (int opcode) 3269void glLogicOp (int opcode)
2708 3270
2743void glRotate (float angle, float x, float y, float z) 3305void glRotate (float angle, float x, float y, float z)
2744 CODE: 3306 CODE:
2745 glRotatef (angle, x, y, z); 3307 glRotatef (angle, x, y, z);
2746 3308
2747void glColor (float r, float g, float b, float a = 1.0) 3309void glColor (float r, float g, float b, float a = 1.0)
3310 PROTOTYPE: @
2748 ALIAS: 3311 ALIAS:
2749 glColor_premultiply = 1 3312 glColor_premultiply = 1
2750 CODE: 3313 CODE:
2751 if (ix) 3314 if (ix)
2752 { 3315 {
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3385void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 3386 CODE:
2824 if (gl.SeparableFilter2D) 3387 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3388 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 3389
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3390void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 3391
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3392void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 3393
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 3394void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 3395
2858 3421
2859void glEndList () 3422void glEndList ()
2860 3423
2861void glCallList (int list) 3424void glCallList (int list)
2862 3425
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3426void c_init ()
3427 CODE:
3428 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3429 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3430
3431MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3432
2865PROTOTYPES: DISABLE 3433PROTOTYPES: DISABLE
2866 3434
2867void 3435void
2868find_widget (SV *self, NV x, NV y) 3436find_widget (SV *self, NV x, NV y)
2869 PPCODE: 3437 PPCODE:
2870{ 3438{
2871 if (within_widget (self, x, y)) 3439 if (within_widget (self, x, y))
2872 XPUSHs (self); 3440 XPUSHs (self);
2873} 3441}
2874 3442
2875BOOT: 3443BOOT:
2876{ 3444{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3445 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3446
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3447 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3448 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3449 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3450 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3451}
2884 3452
2885void 3453void
2886draw (SV *self) 3454draw (SV *self)
2887 CODE: 3455 CODE:
2888{ 3456{
2889 HV *hv; 3457 HV *hv;
2890 SV **svp; 3458 SV **svp;
2891 NV x, y, w, h; 3459 NV x, y, w, h;
2892 SV *draw_x_sv = GvSV (draw_x_gv); 3460 SV *draw_x_sv = GvSV (draw_x_gv);
2893 SV *draw_y_sv = GvSV (draw_y_gv); 3461 SV *draw_y_sv = GvSV (draw_y_gv);
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3462 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3463 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3464 double draw_x, draw_y;
2897 3465
2898 if (!SvROK (self)) 3466 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3467 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3468
2901 hv = (HV *)SvRV (self); 3469 hv = (HV *)SvRV (self);
2902 3470
2903 if (SvTYPE (hv) != SVt_PVHV) 3471 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3472 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3473
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3474 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3475 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3476
2909 if (!h || !w) 3477 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines