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.237 by root, Sun Oct 14 15:33:30 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 >= 640 && (*m)->h >= 480) 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
1060reset_glyph_cache () 1351glyph_cache_backup ()
1061 PROTOTYPE: 1352 PROTOTYPE:
1062 CODE: 1353 CODE:
1354 tc_backup ();
1355
1356void
1357glyph_cache_restore ()
1358 PROTOTYPE:
1359 CODE:
1063 tc_clear (); 1360 tc_restore ();
1064 1361
1065CFPlus::Layout 1362DC::Layout
1066new (SV *class) 1363new (SV *klass)
1067 CODE: 1364 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1069 1366
1070 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1071 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1072 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1073 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1074 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1075 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1076 RETVAL->font = 0; 1373 RETVAL->font = 0;
1077 RETVAL->rc = rc_alloc ();
1078 1374
1079 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1080 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1081 OUTPUT: 1377 OUTPUT:
1082 RETVAL 1378 RETVAL
1083 1379
1084void 1380void
1085DESTROY (CFPlus::Layout self) 1381DESTROY (DC::Layout self)
1086 CODE: 1382 CODE:
1087 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1088 rc_free (self->rc);
1089 Safefree (self); 1384 delete self;
1090 1385
1091void 1386void
1092set_text (CFPlus::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1093 CODE: 1388 CODE:
1094{ 1389{
1095 STRLEN textlen; 1390 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1391 char *text = SvPVutf8 (text_, textlen);
1097 1392
1098 pango_layout_set_text (self->pl, text, textlen); 1393 pango_layout_set_text (self->pl, text, textlen);
1099} 1394}
1100 1395
1101void 1396void
1102set_markup (CFPlus::Layout self, SV *text_) 1397set_markup (DC::Layout self, SV *text_)
1103 CODE: 1398 CODE:
1104{ 1399{
1105 STRLEN textlen; 1400 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1401 char *text = SvPVutf8 (text_, textlen);
1107 1402
1108 pango_layout_set_markup (self->pl, text, textlen); 1403 pango_layout_set_markup (self->pl, text, textlen);
1109} 1404}
1110 1405
1111void 1406void
1112set_shapes (CFPlus::Layout self, ...) 1407set_shapes (DC::Layout self, ...)
1113 CODE: 1408 CODE:
1114{ 1409{
1115 PangoAttrList *attrs = 0; 1410 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1411 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1412 const char *pos = text;
1152 if (attrs) 1447 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1448 pango_layout_set_attributes (self->pl, attrs);
1154} 1449}
1155 1450
1156void 1451void
1157get_shapes (CFPlus::Layout self) 1452get_shapes (DC::Layout self)
1158 PPCODE: 1453 PPCODE:
1159{ 1454{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1455 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1456
1162 do 1457 do
1163 { 1458 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1459 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1460
1166 if (run && shape_attr_p (run)) 1461 if (run && shape_attr_p (run))
1167 { 1462 {
1168 PangoRectangle extents; 1463 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1464 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1472
1178 pango_layout_iter_free (iter); 1473 pango_layout_iter_free (iter);
1179} 1474}
1180 1475
1181int 1476int
1182has_wrapped (CFPlus::Layout self) 1477has_wrapped (DC::Layout self)
1183 CODE: 1478 CODE:
1184{ 1479{
1185 int lines = 1; 1480 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1481 const char *text = pango_layout_get_text (self->pl);
1187 1482
1192} 1487}
1193 OUTPUT: 1488 OUTPUT:
1194 RETVAL 1489 RETVAL
1195 1490
1196SV * 1491SV *
1197get_text (CFPlus::Layout self) 1492get_text (DC::Layout self)
1198 CODE: 1493 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1494 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1495 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1496 OUTPUT:
1202 RETVAL 1497 RETVAL
1203 1498
1204void 1499void
1205set_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.)
1206 CODE: 1501 CODE:
1207 self->r = r; 1502 self->r = r;
1208 self->g = g; 1503 self->g = g;
1209 self->b = b; 1504 self->b = b;
1210 self->a = a; 1505 self->a = a;
1211 1506
1212void 1507void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1508set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1509 CODE:
1215 if (self->font != font) 1510 if (self->font != font)
1216 { 1511 {
1217 self->font = font; 1512 self->font = font;
1218 layout_update_font (self); 1513 layout_update_font (self);
1219 } 1514 }
1220 1515
1221void 1516void
1222set_height (CFPlus::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1223 CODE: 1518 CODE:
1224 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1225 { 1520 {
1226 self->base_height = base_height; 1521 self->base_height = base_height;
1227 layout_update_font (self); 1522 layout_update_font (self);
1228 } 1523 }
1229 1524
1230void 1525void
1231set_width (CFPlus::Layout self, int max_width = -1) 1526set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1527 CODE:
1233 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);
1234 1529
1235void 1530void
1236set_indent (CFPlus::Layout self, int indent) 1531set_indent (DC::Layout self, int indent)
1237 CODE: 1532 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1533 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1534
1240void 1535void
1241set_spacing (CFPlus::Layout self, int spacing) 1536set_spacing (DC::Layout self, int spacing)
1242 CODE: 1537 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1538 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1539
1245void 1540void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1541set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1542 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1543 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1544 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1545 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1546 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1547 : PANGO_ELLIPSIZE_NONE
1253 ); 1548 );
1254 1549
1255void 1550void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1551set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1552 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1553 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1554
1260void 1555void
1261size (CFPlus::Layout self) 1556size (DC::Layout self)
1262 PPCODE: 1557 PPCODE:
1263{ 1558{
1264 int w, h; 1559 int w, h;
1265 1560
1266 layout_get_pixel_size (self, &w, &h); 1561 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1564 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1565 PUSHs (sv_2mortal (newSViv (h)));
1271} 1566}
1272 1567
1273int 1568int
1274descent (CFPlus::Layout self) 1569descent (DC::Layout self)
1275 CODE: 1570 CODE:
1276{ 1571{
1277 PangoRectangle rect; 1572 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1573 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1574 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1575 RETVAL = PANGO_DESCENT (rect);
1281} 1576}
1282 OUTPUT: 1577 OUTPUT:
1283 RETVAL 1578 RETVAL
1284 1579
1285int 1580int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1581xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1582 CODE:
1288{ 1583{
1289 int index, trailing; 1584 int index, trailing;
1290 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);
1291 RETVAL = index + trailing; 1586 RETVAL = index + trailing;
1292} 1587}
1293 OUTPUT: 1588 OUTPUT:
1294 RETVAL 1589 RETVAL
1295 1590
1296void 1591void
1297cursor_pos (CFPlus::Layout self, int index) 1592cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1593 PPCODE:
1299{ 1594{
1300 PangoRectangle strong_pos; 1595 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1596 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1597
1303 EXTEND (SP, 3); 1598 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1599 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1600 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1601 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1602}
1308 1603
1309void 1604void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1605index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1606 PPCODE:
1312{ 1607{
1313 int line, x; 1608 int line, x;
1314 1609
1315 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)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1612 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1613 --line;
1614#endif
1318 EXTEND (SP, 2); 1615 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1616 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1617 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1618}
1322 1619
1323void 1620void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1621line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1622 PPCODE:
1326{ 1623{
1327 PangoLayoutLine *lp; 1624 PangoLayoutLine *lp;
1328 int index, trailing; 1625 int index, trailing;
1329 1626
1330 if (line < 0) 1627 if (line < 0)
1331 XSRETURN_EMPTY; 1628 XSRETURN_EMPTY;
1332 1629
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1630 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1631 XSRETURN_EMPTY; /* do better */
1335 1632
1336 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);
1337 1634
1338 EXTEND (SP, 2); 1635 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1641 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1642 }
1346} 1643}
1347 1644
1348void 1645void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1647 CODE:
1351 rc_clear (self->rc); 1648 self->rc.clear ();
1352 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1353 self->pl, 1650 self->pl,
1354 self->rc, 1651 &self->rc,
1355 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1356 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1357 flags 1654 flags
1358 ); 1655 );
1359 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1657 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1658 pango_layout_context_changed (self->pl);
1362 1659
1363void 1660void
1364draw (CFPlus::Layout self) 1661draw (DC::Layout self)
1365 CODE: 1662 CODE:
1366{ 1663{
1367 glEnable (GL_TEXTURE_2D); 1664 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1665 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1666 glEnable (GL_BLEND);
1370 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1371 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1372 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1373 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1374 1671
1375 rc_draw (self->rc); 1672 self->rc.draw ();
1376 1673
1377 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1380} 1677}
1381 1678
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1679MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1680
1384PROTOTYPES: ENABLE 1681PROTOTYPES: ENABLE
1385 1682
1386void 1683void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1684pad (SV *data_, int ow, int oh, int nw, int nh)
1455 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1456 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1457 } 1754 }
1458} 1755}
1459 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
1460IV 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)
1461 CODE: 1879 CODE:
1462{ 1880{
1463 GLint width; 1881 GLint width;
1464 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);
1466 RETVAL = width > 0; 1884 RETVAL = width > 0;
1467} 1885}
1468 OUTPUT: 1886 OUTPUT:
1469 RETVAL 1887 RETVAL
1470 1888
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1890
1473PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1474 1892
1475CFPlus::Map 1893DC::Map
1476new (SV *class) 1894new (SV *klass)
1477 CODE: 1895 CODE:
1478 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1479 RETVAL->x = 0; 1897 RETVAL->x = 0;
1480 RETVAL->y = 0; 1898 RETVAL->y = 0;
1481 RETVAL->w = 0; 1899 RETVAL->w = 0;
1482 RETVAL->h = 0; 1900 RETVAL->h = 0;
1483 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1488 RETVAL->row = 0; 1906 RETVAL->row = 0;
1489 OUTPUT: 1907 OUTPUT:
1490 RETVAL 1908 RETVAL
1491 1909
1492void 1910void
1493DESTROY (CFPlus::Map self) 1911DESTROY (DC::Map self)
1494 CODE: 1912 CODE:
1495{ 1913{
1496 map_clear (self); 1914 map_clear (self);
1497 Safefree (self->face2tile); 1915 Safefree (self->face2tile);
1498 Safefree (self->tex); 1916 Safefree (self->tex);
1499 Safefree (self); 1917 Safefree (self);
1500} 1918}
1501 1919
1502void 1920void
1503resize (CFPlus::Map self, int map_width, int map_height) 1921resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1922 CODE:
1505 self->w = map_width; 1923 self->w = map_width;
1506 self->h = map_height; 1924 self->h = map_height;
1507 1925
1508void 1926void
1509clear (CFPlus::Map self) 1927clear (DC::Map self)
1510 CODE: 1928 CODE:
1511 map_clear (self); 1929 map_clear (self);
1512 1930
1513void 1931void
1514set_tileid (CFPlus::Map self, int face, int tile) 1932set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1933 CODE:
1516{ 1934{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1935 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1936 need_texid (self, tile);
1519} 1937}
1520 1938
1521void 1939void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1941 CODE:
1524{ 1942{
1525 tileid texid; 1943 tileid texid;
1526 maptex *tex; 1944 maptex *tex;
1527 1945
1528 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1529 return; 1947 return;
1530 1948
1531 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1532 return; 1950 return;
1533 1951
1534 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1535 1953
1536 if (!texid) 1954 if (!texid)
1537 return; 1955 return;
1538 1956
1539 tex = self->tex + texid; 1957 tex = self->tex + texid;
1540 tex->smoothtile = self->face2tile [smooth]; 1958 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1959 tex->smoothlevel = level;
1542} 1960}
1543 1961
1544void 1962void
1545set_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)
1546 CODE: 1964 CODE:
1547{ 1965{
1548 need_texid (self, texid); 1966 need_texid (self, texid);
1549 1967
1550 { 1968 {
1569 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1570 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1990}
1573 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
1574int 2012int
1575ox (CFPlus::Map self) 2013ox (DC::Map self)
1576 ALIAS: 2014 ALIAS:
1577 oy = 1 2015 oy = 1
1578 x = 2 2016 x = 2
1579 y = 3 2017 y = 3
1580 w = 4 2018 w = 4
1591 } 2029 }
1592 OUTPUT: 2030 OUTPUT:
1593 RETVAL 2031 RETVAL
1594 2032
1595void 2033void
1596scroll (CFPlus::Map self, int dx, int dy) 2034scroll (DC::Map self, int dx, int dy)
1597 CODE: 2035 CODE:
1598{ 2036{
1599 if (dx > 0) 2037 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 2038 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 2039 else if (dx < 0)
1609 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1610 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1611 2049
1612 while (self->y < 0) 2050 while (self->y < 0)
1613 { 2051 {
1614 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1615 2053
1616 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1617 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1618 } 2056 }
1619} 2057}
1620 2058
1621SV * 2059SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1623 CODE: 2061 CODE:
1624{ 2062{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 2065 mapcell *cell;
1648 2086
1649 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1650 2088
1651 if (flags & 8) 2089 if (flags & 8)
1652 { 2090 {
2091 uint8_t ext, cmd;
2092
1653 if (extmap) 2093 do
1654 { 2094 {
1655 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1656 2097
1657 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
1658 { 2101 {
1659 ext = *data++;
1660 cmd = ext & 0x3f;
1661
1662 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health
1665 {
1666 cell->stat_width = 1; 2102 cell->stat_width = 1;
1667 cell->stat_hp = *data++; 2103 cell->stat_hp = *data++;
1668 }
1669 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47)
1672 {
1673 if (*data == 4)
1674 ; // decode player count
1675
1676 data += *data + 1;
1677 }
1678 else if (cmd == 8) // cell flags
1679 cell->flags = *data++;
1680 else if (ext & 0x40) // unknown, multibyte => skip
1681 data += *data + 1;
1682 else
1683 data++;
1684 } 2104 }
1685 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++;
1686 } 2122 }
1687 else 2123 while (ext & 0x80);
1688 cell->darkness = *data++ + 1;
1689 } 2124 }
1690 2125
1691 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1692 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1693 { 2128 {
1696 cell->tile [z] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
1697 2132
1698 if (cell->tile [z]) 2133 if (cell->tile [z])
1699 { 2134 {
1700 maptex *tex = self->tex + cell->tile [z]; 2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
1701 if (!tex->name) 2137 if (!tex->name)
1702 av_push (missing, newSViv (cell->tile [z])); 2138 av_push (missing, newSViv (cell->tile [z]));
1703 2139
1704 if (tex->smoothtile) 2140 if (tex->smoothtile)
1705 { 2141 {
1706 maptex *smooth = self->tex + tex->smoothtile; 2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
1707 if (!smooth->name) 2144 if (!smooth->name)
1708 av_push (missing, newSViv (tex->smoothtile)); 2145 av_push (missing, newSViv (tex->smoothtile));
1709 } 2146 }
1710 } 2147 }
1711 } 2148 }
1712 } 2149 }
1713 else 2150 else
1714 cell->darkness = 0; 2151 CELL_CLEAR (cell);
1715 } 2152 }
1716} 2153}
1717 OUTPUT: 2154 OUTPUT:
1718 RETVAL 2155 RETVAL
1719 2156
1720SV * 2157SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2158mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 2159 CODE:
1723{ 2160{
1724 int x1, x; 2161 int x1, x;
1725 int y1, y; 2162 int y1, y;
1726 int z; 2163 int z;
1739 ? self->row + y 2176 ? self->row + y
1740 : 0; 2177 : 0;
1741 2178
1742 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1743 { 2180 {
1744 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1745 2182
1746 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1747 { 2184 {
1748 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1749 2186
1751 { 2188 {
1752 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1753 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1754 int a1 = tex.a; 2191 int a1 = tex.a;
1755 2192
1756 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1757 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1758 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1759 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1760 } 2197 }
1761 } 2198 }
1762 2199
1763 *map++ = (r ) 2200 *map++ = (r )
1764 | (g << 8) 2201 | (g << 8)
1765 | (b << 16) 2202 | (b << 16)
1766 | (a << 24); 2203 | (a << 24);
1767 } 2204 }
1768 } 2205 }
1769 2206
1770 RETVAL = map_sv; 2207 RETVAL = map_sv;
1771} 2208}
1772 OUTPUT: 2209 OUTPUT:
1773 RETVAL 2210 RETVAL
1774 2211
1775void 2212void
1776draw (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)
1777 CODE: 2214 CODE:
1778{ 2215{
1779 int x, y, z; 2216 int x, y, z;
1780 2217
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783 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!
1784 smooth_key skey; 2219 int pl_x, pl_y;
1785 2220 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
1787 rc_key_t key; 2223 rc_key_t key;
1788 rc_array_t *arr; 2224 rc_t::array_t *arr;
1789 2225
2226 pl_tex.name = 0;
2227
1790 // thats current max. sorry. 2228 // that's current max. sorry.
1791 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1793
1794 // clear key, in case of extra padding
1795 memset (&skey, 0, sizeof (skey));
1796 2231
1797 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
1798 key.r = 255; 2233 key.r = 255;
1799 key.g = 255; 2234 key.g = 255;
1800 key.b = 255; 2235 key.b = 255;
1801 key.a = 255; 2236 key.a = 255;
1802 key.mode = GL_QUADS; 2237 key.mode = GL_QUADS;
1803 key.format = GL_T2F_V3F; 2238 key.format = GL_T2F_V3F;
1804 key.texname = -1;
1805 2239
1806 mx += self->x; 2240 mx += self->x;
1807 my += self->y; 2241 my += self->y;
1808 2242
1809 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1810 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1811 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1812 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1813 2247
1814 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1815 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1816 { 2250 {
1817 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
1832 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1833 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1834 2268
1835 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
1836 { 2270 {
1837 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;
1838 2275
1839 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
1840 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
1841 { 2278 {
1842 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
1852 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
1853 int px, py; 2290 int px, py;
1854 2291
1855 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
1856 { 2293 {
2294 self->tex [tile].unused = 0;
2295
1857 if (!tex.name) 2296 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1859 2298
1860 key.texname = tex.name; 2299 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
1862 } 2301 }
1863 2302
1864 px = (x + 1) * T - tex.w; 2303 px = (x + 1) * Th - tex.w;
1865 py = (y + 1) * T - tex.h; 2304 py = (y + 1) * Tw - tex.h;
1866 2305
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871
1872 if (cell->flags && z == 2)
1873 { 2307 {
1874 // overlays such as the speech bubble, probably more to come 2308 pl_x = px;
1875 if (cell->flags & 1) 2309 pl_y = py;
2310 pl_tex = tex;
1876 { 2311 continue;
1877 maptex tex = self->tex [1];
1878 int px = x * T + T * 2 / 32;
1879 int py = y * T - T * 6 / 32;
1880
1881 if (tex.name)
1882 {
1883 if (key.texname != tex.name)
1884 {
1885 key.texname = tex.name;
1886 arr = rc_array (rc, &key);
1887 }
1888
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1893 }
1894 }
1895 } 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);
1896 2318
1897 // update smooth hash 2319 // update smooth hash
1898 if (tex.smoothtile) 2320 if (tex.smoothtile)
1899 { 2321 {
1900 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
1901 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
1902 2324
1903 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
1904 2326
1905 // 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
1906 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
1907 2329
1908 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
1916 2338
1917 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1918 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
1919 2341
1920 // full tile 2342 // full tile
1921 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);
1922 2344
1923 // borders 2345 // borders
1924 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);
1925 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);
1926 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);
1927 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);
1928 2350
1929 // corners 2351 // corners
1930 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);
1931 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);
1932 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);
1933 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);
1934 } 2376 }
1935 } 2377 }
1936 } 2378 }
1937 } 2379 }
1938 2380
1939 rc_draw (rc); 2381 rc.draw ();
1940 rc_clear (rc); 2382 rc.clear ();
1941 2383
1942 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
1943 // this is basically counting sort 2385 // this is basically counting sort
1944 { 2386 {
1945 int w, b; 2387 int w, b;
1946 2388
1947 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
1948 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
1949 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)
1950 { 2394 {
1951 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
1952 if (smask) 2396 IV bits = it->second;
1953 for (b = 0; b < 32; ++b) 2397
1954 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
1955 { 2401 {
1956 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
1957 HE *he; 2410 if (tex.name)
1958
1959 hv_iterinit (smooth);
1960 while ((he = hv_iternext (smooth)))
1961 { 2411 {
1962 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
1963 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
1964 2414 if (key.texname != tex.name)
1965 if (!(bits & 0x1000)
1966 && skey->level == level
1967 && level > smooth_max [skey->x][skey->y])
1968 { 2415 {
1969 maptex tex = self->tex [skey->tile]; 2416 self->tex [skey.tile].unused = 0;
1970 int px = (((int)skey->x) - 1) * T;
1971 int py = (((int)skey->y) - 1) * T;
1972 int border = bits & 15;
1973 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1974 float dx = tex.s * .0625f; // 16 images/row
1975 float dy = tex.t * .5f ; // 2 images/column
1976 2417
1977 if (tex.name)
1978 {
1979 // this time avoiding texture state changes
1980 // save gobs of state changes.
1981 if (key.texname != tex.name)
1982 {
1983 glEnd (); 2418 glEnd ();
1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1985 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
1986 } 2421 }
1987 2422
1988 if (border) 2423 if (border)
1989 { 2424 {
1990 float ox = border * dx; 2425 float ox = border * dx;
1991 2426
1992 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1993 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1994 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1995 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1996 } 2431 }
1997 2432
1998 if (corner) 2433 if (corner)
1999 { 2434 {
2000 float ox = corner * dx; 2435 float ox = corner * dx;
2001 2436
2002 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2003 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2004 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2005 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2006 }
2007 }
2008 } 2441 }
2009 } 2442 }
2010 } 2443 }
2011 } 2444 }
2012 2445
2013 glEnd (); 2446 glEnd ();
2014 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2015 key.texname = -1; 2448 key.texname = -1;
2016 } 2449 }
2017
2018 hv_clear (smooth);
2019 } 2450 }
2020 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
2021 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2022 rc_free (rc);
2023 2473
2024 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2026 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2027 { 2477 {
2030 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2031 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2032 { 2482 {
2033 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2034 2484
2035 int px = x * T; 2485 int px = x * Tw;
2036 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 }
2037 2493
2038 if (cell->stat_hp) 2494 if (cell->stat_hp)
2039 { 2495 {
2040 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2041 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2042 2498
2043 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2044 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2045 px + width - 1, py); 2501 px + width - 1, py);
2046 2502
2052 } 2508 }
2053 } 2509 }
2054} 2510}
2055 2511
2056void 2512void
2057draw_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)
2058 CODE: 2514 CODE:
2059{ 2515{
2060 static float color[16][3] = { 2516 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2062 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2063 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2064 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2065 2521
2066 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2067 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2068 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2069 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2070 2526
2071 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2072 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2073 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2074 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2075 2531
2076 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2077 2533
2078 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2079 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2080 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2081 }; 2537 };
2082 2538
2083 int x, y; 2539 int x, y;
2084 2540
2085 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 */
2086 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2087 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2088 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2089 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2090 2552
2091 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2095 2557
2096 if (m) 2558 if (m)
2097 { 2559 {
2098 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2099 2561
2100 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2101 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2102 2564
2103 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2104 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2105 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2106 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2107 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2108 } 2570 }
2112 glDisable (GL_BLEND); 2574 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2575 glDisable (GL_TEXTURE_2D);
2114} 2576}
2115 2577
2116void 2578void
2117fow_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)
2118 PPCODE: 2580 PPCODE:
2119{ 2581{
2120 int x, y; 2582 int x, y;
2121 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2123 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2124 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);
2125 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2126 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2127 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2128 2591
2129 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2131 2594
2132 mx += self->x - 1; 2595 mx += self->x - 1;
2133 my += self->y - 1; 2596 my += self->y - 1;
2134
2135 memset (darkness1, 255, sw1 * sh1);
2136 2597
2137 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2139 { 2600 {
2140 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2605 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2146 2607
2147 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2148 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2149 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2150 } 2611 }
2151 } 2612 }
2152 2613
2153 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2154 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2173 2634
2174 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2175 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2176 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2177 2638
2178 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2179 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2180 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2181 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2182 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 */
2183 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2184 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2185 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2186 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2187 } 2648 }
2188 2649
2189 free (darkness1); 2650 free (darkness1);
2190 2651
2191 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2192 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2195} 2656}
2196 2657
2197SV * 2658SV *
2198get_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)
2199 CODE: 2660 CODE:
2200{ 2661{
2201 int x, y, x1, y1; 2662 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2663 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2664 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2721 else
2261 *data++ = 0; 2722 *data++ = 0;
2262 } 2723 }
2263 } 2724 }
2264 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 {
2265 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2731 }
2732
2267 RETVAL = data_sv; 2733 RETVAL = data_sv;
2268} 2734}
2269 OUTPUT: 2735 OUTPUT:
2270 RETVAL 2736 RETVAL
2271 2737
2272void 2738void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2739set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2740 PPCODE:
2275{ 2741{
2276 int x, y, z; 2742 int x, y, z;
2277 int w, h; 2743 int w, h;
2278 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;
2279 2755
2280 if (*data++ != 0) 2756 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2757 XSRETURN_EMPTY; /* version mismatch */
2282 2758
2283 w = *data++ << 8; w |= *data++; 2759 w = *data++ << 8; w |= *data++;
2298 { 2774 {
2299 maprow *row = map_get_row (self, y); 2775 maprow *row = map_get_row (self, y);
2300 2776
2301 for (x = x0; x < x1; x++) 2777 for (x = x0; x < x1; x++)
2302 { 2778 {
2779 uint8_t flags;
2780
2781 if (data + 7 >= end)
2782 XSRETURN_EMPTY;
2783
2303 uint8_t flags = *data++; 2784 flags = *data++;
2304 2785
2305 if (flags) 2786 if (flags)
2306 { 2787 {
2307 mapcell *cell = row_get_cell (row, x); 2788 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2789 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2792 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2793 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2794
2314 if (cell->darkness == 0) 2795 if (cell->darkness == 0)
2315 { 2796 {
2316 cell->darkness = 0; 2797 /*cell->darkness = 0;*/
2798 EXTEND (SP, 3);
2317 2799
2318 for (z = 0; z <= 2; z++) 2800 for (z = 0; z <= 2; z++)
2319 { 2801 {
2320 tileid t = tile [z]; 2802 tileid t = tile [z];
2321 2803
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2804 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2805 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2806 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2807 need_texid (self, t);
2326 } 2808 }
2327 2809
2328 cell->tile [z] = t; 2810 cell->tile [z] = t;
2329 } 2811 }
2331 } 2813 }
2332 } 2814 }
2333 } 2815 }
2334} 2816}
2335 2817
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2819
2338CFPlus::RW 2820DC::RW
2339new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2340 CODE: 2822 CODE:
2341{ 2823{
2342 STRLEN datalen; 2824 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2344 2826
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2827 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2828}
2347 OUTPUT: 2829 OUTPUT:
2348 RETVAL 2830 RETVAL
2349 2831
2350CFPlus::RW 2832DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2352 CODE: 2834 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2836 OUTPUT:
2355 RETVAL 2837 RETVAL
2356 2838
2357# fails on win32: 2839# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2840# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2841#void
2360#close (CFPlus::RW self) 2842#close (DC::RW self)
2361# CODE: 2843# CODE:
2362# (self->(close)) (self); 2844# (self->(close)) (self);
2363 2845
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2846MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2847
2366PROTOTYPES: DISABLE 2848PROTOTYPES: DISABLE
2367 2849
2368CFPlus::Channel 2850DC::Channel
2369find () 2851find ()
2370 CODE: 2852 CODE:
2371{ 2853{
2372 RETVAL = Mix_GroupAvailable (-1); 2854 RETVAL = Mix_GroupAvailable (-1);
2373 2855
2374 if (RETVAL < 0) 2856 if (RETVAL < 0)
2375 { 2857 {
2376 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2377 2859
2378 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)
2379 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2380 2867 }
2868 else
2381 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2382 } 2870 }
2383 2871
2384 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2385 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2386} 2874}
2387 OUTPUT: 2875 OUTPUT:
2388 RETVAL 2876 RETVAL
2389 2877
2390void 2878void
2391halt (CFPlus::Channel self) 2879halt (DC::Channel self)
2392 CODE: 2880 CODE:
2393 Mix_HaltChannel (self); 2881 Mix_HaltChannel (self);
2394 2882
2395void 2883void
2396expire (CFPlus::Channel self, int ticks = -1) 2884expire (DC::Channel self, int ticks = -1)
2397 CODE: 2885 CODE:
2398 Mix_ExpireChannel (self, ticks); 2886 Mix_ExpireChannel (self, ticks);
2399 2887
2400void 2888void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2889fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2890 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2891 Mix_FadeOutChannel (self, ticks);
2404 2892
2405int 2893int
2406volume (CFPlus::Channel self, int volume) 2894volume (DC::Channel self, int volume)
2407 CODE: 2895 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2896 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2897 OUTPUT:
2410 RETVAL 2898 RETVAL
2411 2899
2412void 2900void
2413unregister_all_effects (CFPlus::Channel self) 2901unregister_all_effects (DC::Channel self)
2414 CODE: 2902 CODE:
2415 Mix_UnregisterAllEffects (self); 2903 Mix_UnregisterAllEffects (self);
2416 2904
2417void 2905void
2418set_panning (CFPlus::Channel self, int left, int right) 2906set_panning (DC::Channel self, int left, int right)
2419 CODE: 2907 CODE:
2420 left = CLAMP (left , 0, 255); 2908 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2909 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2910 Mix_SetPanning (self, left, right);
2423 2911
2424void 2912void
2425set_distance (CFPlus::Channel self, int distance) 2913set_distance (DC::Channel self, int distance)
2426 CODE: 2914 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2915 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2916
2429void 2917void
2430set_position (CFPlus::Channel self, int angle, int distance) 2918set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2919 CODE:
2432 2920
2433void 2921void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2923 CODE:
2436{ 2924{
2437 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));
2438 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;
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2928}
2441 2929
2442void 2930void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2932 CODE:
2445 Mix_SetReverseStereo (self, flip); 2933 Mix_SetReverseStereo (self, flip);
2446 2934
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2936
2449PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2450 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
2451CFPlus::MixChunk 2951DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2952new (SV *klass, DC::RW rwops)
2453 CODE: 2953 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2955 OUTPUT:
2456 RETVAL 2956 RETVAL
2457 2957
2458void 2958void
2459DESTROY (CFPlus::MixChunk self) 2959DESTROY (DC::MixChunk self)
2460 CODE: 2960 CODE:
2461 Mix_FreeChunk (self); 2961 Mix_FreeChunk (self);
2462 2962
2463int 2963int
2464volume (CFPlus::MixChunk self, int volume = -1) 2964volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2965 CODE:
2466 if (items > 1) 2966 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2967 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2968 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2969 OUTPUT:
2470 RETVAL 2970 RETVAL
2471 2971
2472CFPlus::Channel 2972DC::Channel
2473play (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)
2474 CODE: 2974 CODE:
2475{ 2975{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2976 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2977
2478 if (RETVAL < 0) 2978 if (RETVAL < 0)
2485 } 2985 }
2486} 2986}
2487 OUTPUT: 2987 OUTPUT:
2488 RETVAL 2988 RETVAL
2489 2989
2490MODULE = 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
2491 3003
2492int 3004int
2493volume (int volume = -1) 3005volume (int volume = -1)
2494 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2495 CODE: 3007 CODE:
2507void 3019void
2508halt () 3020halt ()
2509 CODE: 3021 CODE:
2510 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2511 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2512CFPlus::MixMusic 3031DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 3032new (SV *klass, DC::RW rwops)
2514 CODE: 3033 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 3035 OUTPUT:
2517 RETVAL 3036 RETVAL
2518 3037
2519void 3038void
2520DESTROY (CFPlus::MixMusic self) 3039DESTROY (DC::MixMusic self)
2521 CODE: 3040 CODE:
2522 Mix_FreeMusic (self); 3041 Mix_FreeMusic (self);
2523 3042
2524int 3043int
2525play (CFPlus::MixMusic self, int loops = -1) 3044play (DC::MixMusic self, int loops = -1)
2526 CODE: 3045 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 3046 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 3047 OUTPUT:
2529 RETVAL 3048 RETVAL
2530 3049
2531void 3050void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3051fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 3052 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 3053 Mix_FadeInMusicPos (self, loops, ms, position);
2535 3054
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3055MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 3056
2538PROTOTYPES: ENABLE 3057PROTOTYPES: ENABLE
2539 3058
2540BOOT: 3059BOOT:
2541{ 3060{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3061 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 3062 static const struct {
2544 const char *name; 3063 const char *name;
2545 IV iv; 3064 IV iv;
2546 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2548 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2549 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2550 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2551 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2552 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2553 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2554 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2555 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2567 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2568 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2569 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2570 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2571 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),
2572 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2573 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2574 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2575 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2576 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2644 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2645 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2646 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2647 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2648 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),
2649# undef const_iv 3176# undef const_iv
2650 }; 3177 };
2651 3178
2652 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--)
2653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2654 3181
2655 texture_av = newAV (); 3182 texture_av = newAV ();
2656 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2657} 3184}
2658 3185
2660disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2661 CODE: 3188 CODE:
2662 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2664 3191
2665char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2666gl_vendor () 3196gl_vendor ()
2667 CODE: 3197 CODE:
2668 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2669 OUTPUT: 3199 OUTPUT:
2670 RETVAL 3200 RETVAL
2671 3201
2672char * 3202const char *
2673gl_version () 3203gl_version ()
2674 CODE: 3204 CODE:
2675 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2676 OUTPUT: 3206 OUTPUT:
2677 RETVAL 3207 RETVAL
2678 3208
2679char * 3209const char *
2680gl_extensions () 3210gl_extensions ()
2681 CODE: 3211 CODE:
2682 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2683 OUTPUT: 3213 OUTPUT:
2684 RETVAL 3214 RETVAL
2685 3215
2686const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2687 3221
2688GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2689 CODE: 3223 CODE:
2690 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2691 OUTPUT: 3225 OUTPUT:
2699 3233
2700int glGetError () 3234int glGetError ()
2701 3235
2702void glFinish () 3236void glFinish ()
2703 3237
3238void glFlush ()
3239
2704void glClear (int mask) 3240void glClear (int mask)
2705 3241
2706void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2707 PROTOTYPE: @ 3243 PROTOTYPE: @
2708 3244
2717void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2718 3254
2719void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2720 CODE: 3256 CODE:
2721 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2722 3260
2723void glDepthMask (int flag) 3261void glDepthMask (int flag)
2724 3262
2725void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2726 3264
2761void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2762 CODE: 3300 CODE:
2763 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2764 3302
2765void 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: @
2766 ALIAS: 3305 ALIAS:
2767 glColor_premultiply = 1 3306 glColor_premultiply = 1
2768 CODE: 3307 CODE:
2769 if (ix) 3308 if (ix)
2770 { 3309 {
2840void 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)
2841 CODE: 3380 CODE:
2842 if (gl.SeparableFilter2D) 3381 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3382 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3383
2845void 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)
2846 3385
2847void 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)
2848 3387
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3388void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3389
2876 3415
2877void glEndList () 3416void glEndList ()
2878 3417
2879void glCallList (int list) 3418void glCallList (int list)
2880 3419
2881MODULE = 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
2882 3426
2883PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
2884 3428
2885void 3429void
2886find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
2887 PPCODE: 3431 PPCODE:
2888{ 3432{
2889 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
2890 XPUSHs (self); 3434 XPUSHs (self);
2891} 3435}
2892 3436
2893BOOT: 3437BOOT:
2894{ 3438{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3439 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3440
2897 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);
2898 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);
2899 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);
2900 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);
2901} 3445}
2902 3446
2903void 3447void
2904draw (SV *self) 3448draw (SV *self)
2905 CODE: 3449 CODE:
2906{ 3450{
2907 HV *hv; 3451 HV *hv;
2908 SV **svp; 3452 SV **svp;
2909 NV x, y, w, h; 3453 NV x, y, w, h;
2910 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
2911 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3458 double draw_x, draw_y;
2915 3459
2916 if (!SvROK (self)) 3460 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3461 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3462
2919 hv = (HV *)SvRV (self); 3463 hv = (HV *)SvRV (self);
2920 3464
2921 if (SvTYPE (hv) != SVt_PVHV) 3465 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3466 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3467
2924 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.;
2925 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.;
2926 3470
2927 if (!h || !w) 3471 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines