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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines