ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 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),
619 const_iv (KMOD_LMETA), 804 const_iv (KMOD_LMETA),
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),
809
810 const_iv (KMOD_LRAM),
811
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)
624# undef const_iv 842# undef const_iv
625 }; 843 };
626 844
627 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--)
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
629 847
630 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
631 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
632} 850}
633 851
649NV ceil (NV x) 867NV ceil (NV x)
650 868
651IV minpot (UV n) 869IV minpot (UV n)
652 870
653IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
876
877NV distance (NV dx, NV dy)
878 CODE:
879 RETVAL = pow (dx * dx + dy * dy, 0.5);
880 OUTPUT:
881 RETVAL
654 882
655void 883void
656pango_init () 884pango_init ()
657 CODE: 885 CODE:
658{ 886{
659 opengl_fontmap = pango_opengl_font_map_new (); 887 opengl_fontmap = pango_opengl_font_map_new ();
660 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 888 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
661 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 889 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
890 /*pango_context_set_font_description (opengl_context, default_font);*/
891#if PANGO_VERSION_CHECK (1, 15, 2)
892 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
893 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
894#endif
662} 895}
663 896
664char *
665SDL_GetError () 897char *SDL_GetError ()
666 898
667int 899void SDL_main_hack (SV *real_main)
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 900 PROTOTYPE: &
669 901
670void 902int SDL_Init (U32 flags)
903
904int SDL_InitSubSystem (U32 flags)
905
906void SDL_QuitSubSystem (U32 flags)
907
671SDL_Quit () 908void SDL_Quit ()
909
910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
912
913int SDL_GL_GetAttribute (int attr)
914 CODE:
915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
916 XSRETURN_UNDEF;
917 OUTPUT:
918 RETVAL
672 919
673void 920void
674SDL_ListModes (int rgb, int alpha) 921SDL_ListModes (int rgb, int alpha)
675 PPCODE: 922 PPCODE:
676{ 923{
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 935 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 936 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 937 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 938
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 939 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693#if SDL_VERSION_ATLEAST(1,2,10)
694 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 940 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 941
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 942 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 943
700 if (m && m != (SDL_Rect **)-1) 944 if (m && m != (SDL_Rect **)-1)
701 while (*m) 945 while (*m)
702 { 946 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 947 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 948 {
705 AV *av = newAV (); 949 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 950 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 951 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 952 av_push (av, newSViv (rgb));
731 ); 975 );
732 976
733 if (RETVAL) 977 if (RETVAL)
734 { 978 {
735 av_clear (texture_av); 979 av_clear (texture_av);
736
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 981#include "glfunc.h"
740#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
741 } 985 }
742} 986}
743 OUTPUT: 987 OUTPUT:
744 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
745 992
746void 993void
747SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
748 995
749char * 996char *
750SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
751 999
752int 1000int
753SDL_GetAppState () 1001SDL_GetAppState ()
754 1002
1003int
1004SDL_GetModState ()
1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
755void 1010void
1011SDL_PumpEvents ()
1012
1013void
756poll_events () 1014peep_events ()
757 PPCODE: 1015 PPCODE:
758{ 1016{
759 SDL_Event ev; 1017 SDL_Event ev;
760 1018
761 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
768 { 1026 {
769 case SDL_KEYDOWN: 1027 case SDL_KEYDOWN:
770 case SDL_KEYUP: 1028 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1029 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1030 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1031 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
774 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1032 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1033 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 1034 break;
777 1035
778 case SDL_ACTIVEEVENT: 1036 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1037 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 1055 x = ev.motion.x;
798 y = ev.motion.y; 1056 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1057 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 1058 }
801 1059
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1060 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 1061 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 1062 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 1063 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1064 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1065 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 1066 }
809 break; 1067 break;
810 1068
811 case SDL_MOUSEBUTTONDOWN: 1069 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 1070 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1071 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 1072
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1073 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1074 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1075 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1076 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1081 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1082 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 1083 break;
826 } 1084 }
827 1085
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1086 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 1087 }
830} 1088}
831 1089
1090char *
1091SDL_AudioDriverName ()
1092 CODE:
1093{
1094 char buf [256];
1095 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1096 XSRETURN_UNDEF;
1097
1098 RETVAL = buf;
1099}
1100 OUTPUT:
1101 RETVAL
1102
832int 1103int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 1105 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
1108
1109void
1110Mix_QuerySpec ()
1111 PPCODE:
1112{
1113 int freq, channels;
1114 Uint16 format;
1115
1116 if (Mix_QuerySpec (&freq, &format, &channels))
1117 {
1118 EXTEND (SP, 3);
1119 PUSHs (sv_2mortal (newSViv (freq)));
1120 PUSHs (sv_2mortal (newSViv (format)));
1121 PUSHs (sv_2mortal (newSViv (channels)));
1122 }
1123}
837 1124
838void 1125void
839Mix_CloseAudio () 1126Mix_CloseAudio ()
840 1127
841int 1128int
876 } 1163 }
877 } 1164 }
878#endif 1165#endif
879} 1166}
880 1167
881void 1168int
882add_font (char *file) 1169add_font (char *file)
883 CODE: 1170 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1172 OUTPUT:
1173 RETVAL
1174
1175void
1176IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1177
1178# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1179void
1180Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
885 1181
886void 1182void
887load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
888 ALIAS: 1184 ALIAS:
889 load_image_file = 1 1185 load_image_file = 1
935 1231
936 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
937 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
938 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
939 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
940 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
941 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
942 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
944 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
945 1241
975void 1271void
976error (char *message) 1272error (char *message)
977 CODE: 1273 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1274 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1275#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1276 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1277#endif
982 1278
983void 1279void
984fatal (char *message) 1280fatal (char *message)
985 CODE: 1281 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1282 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1283#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1284 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1285#endif
990 _exit (1); 1286 _exit (1);
991 1287
992void 1288void
993_exit (int retval = 0) 1289_exit (int retval = 0)
1005#if DEBUG 1301#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1302 VALGRIND_DO_LEAK_CHECK;
1007#endif 1303#endif
1008} 1304}
1009 1305
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1306int
1307SvREFCNT (SV *sv)
1308 CODE:
1309 RETVAL = SvREFCNT (sv);
1310 OUTPUT:
1311 RETVAL
1312
1313MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1314
1012PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1013 1316
1014CFPlus::Font 1317DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1016 CODE: 1319 CODE:
1017{ 1320{
1018 int count; 1321 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1020 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1022} 1325}
1023 OUTPUT: 1326 OUTPUT:
1024 RETVAL 1327 RETVAL
1025 1328
1026void 1329void
1027DESTROY (CFPlus::Font self) 1330DESTROY (DC::Font self)
1028 CODE: 1331 CODE:
1029 pango_font_description_free (self); 1332 pango_font_description_free (self);
1030 1333
1031void 1334void
1032make_default (CFPlus::Font self) 1335make_default (DC::Font self)
1033 PROTOTYPE: $ 1336 PROTOTYPE: $
1034 CODE: 1337 CODE:
1035 default_font = self; 1338 default_font = self;
1036 1339
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1340MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1341
1039PROTOTYPES: DISABLE 1342PROTOTYPES: DISABLE
1040 1343
1041void 1344void
1042reset_glyph_cache () 1345glyph_cache_backup ()
1043 PROTOTYPE: 1346 PROTOTYPE:
1044 CODE: 1347 CODE:
1348 tc_backup ();
1349
1350void
1351glyph_cache_restore ()
1352 PROTOTYPE:
1353 CODE:
1045 tc_clear (); 1354 tc_restore ();
1046 1355
1047CFPlus::Layout 1356DC::Layout
1048new (SV *class) 1357new (SV *klass)
1049 CODE: 1358 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1051 1360
1052 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1053 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1054 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1055 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1056 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1057 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1058 RETVAL->font = 0; 1367 RETVAL->font = 0;
1059 RETVAL->rc = rc_alloc ();
1060 1368
1061 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1062 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1063 OUTPUT: 1371 OUTPUT:
1064 RETVAL 1372 RETVAL
1065 1373
1066void 1374void
1067DESTROY (CFPlus::Layout self) 1375DESTROY (DC::Layout self)
1068 CODE: 1376 CODE:
1069 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1070 rc_free (self->rc);
1071 Safefree (self); 1378 delete self;
1072 1379
1073void 1380void
1074set_text (CFPlus::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1075 CODE: 1382 CODE:
1076{ 1383{
1077 STRLEN textlen; 1384 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1385 char *text = SvPVutf8 (text_, textlen);
1079 1386
1080 pango_layout_set_text (self->pl, text, textlen); 1387 pango_layout_set_text (self->pl, text, textlen);
1081} 1388}
1082 1389
1083void 1390void
1084set_markup (CFPlus::Layout self, SV *text_) 1391set_markup (DC::Layout self, SV *text_)
1085 CODE: 1392 CODE:
1086{ 1393{
1087 STRLEN textlen; 1394 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1395 char *text = SvPVutf8 (text_, textlen);
1089 1396
1090 pango_layout_set_markup (self->pl, text, textlen); 1397 pango_layout_set_markup (self->pl, text, textlen);
1091} 1398}
1092 1399
1093void 1400void
1094set_shapes (CFPlus::Layout self, ...) 1401set_shapes (DC::Layout self, ...)
1095 CODE: 1402 CODE:
1096{ 1403{
1097 PangoAttrList *attrs = 0; 1404 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1405 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1406 const char *pos = text;
1134 if (attrs) 1441 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1442 pango_layout_set_attributes (self->pl, attrs);
1136} 1443}
1137 1444
1138void 1445void
1139get_shapes (CFPlus::Layout self) 1446get_shapes (DC::Layout self)
1140 PPCODE: 1447 PPCODE:
1141{ 1448{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1449 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1450
1144 do 1451 do
1145 { 1452 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1453 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1454
1148 if (run && shape_attr_p (run)) 1455 if (run && shape_attr_p (run))
1149 { 1456 {
1150 PangoRectangle extents; 1457 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1458 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1466
1160 pango_layout_iter_free (iter); 1467 pango_layout_iter_free (iter);
1161} 1468}
1162 1469
1163int 1470int
1164has_wrapped (CFPlus::Layout self) 1471has_wrapped (DC::Layout self)
1165 CODE: 1472 CODE:
1166{ 1473{
1167 int lines = 1; 1474 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1475 const char *text = pango_layout_get_text (self->pl);
1169 1476
1174} 1481}
1175 OUTPUT: 1482 OUTPUT:
1176 RETVAL 1483 RETVAL
1177 1484
1178SV * 1485SV *
1179get_text (CFPlus::Layout self) 1486get_text (DC::Layout self)
1180 CODE: 1487 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1488 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1489 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1490 OUTPUT:
1184 RETVAL 1491 RETVAL
1185 1492
1186void 1493void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1494set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1495 CODE:
1189 self->r = r; 1496 self->r = r;
1190 self->g = g; 1497 self->g = g;
1191 self->b = b; 1498 self->b = b;
1192 self->a = a; 1499 self->a = a;
1193 1500
1194void 1501void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1502set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1503 CODE:
1197 if (self->font != font) 1504 if (self->font != font)
1198 { 1505 {
1199 self->font = font; 1506 self->font = font;
1200 layout_update_font (self); 1507 layout_update_font (self);
1201 } 1508 }
1202 1509
1203void 1510void
1204set_height (CFPlus::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1205 CODE: 1512 CODE:
1206 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1207 { 1514 {
1208 self->base_height = base_height; 1515 self->base_height = base_height;
1209 layout_update_font (self); 1516 layout_update_font (self);
1210 } 1517 }
1211 1518
1212void 1519void
1213set_width (CFPlus::Layout self, int max_width = -1) 1520set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1521 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1522 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1523
1217void 1524void
1218set_indent (CFPlus::Layout self, int indent) 1525set_indent (DC::Layout self, int indent)
1219 CODE: 1526 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1527 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1528
1222void 1529void
1223set_spacing (CFPlus::Layout self, int spacing) 1530set_spacing (DC::Layout self, int spacing)
1224 CODE: 1531 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1532 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1533
1227void 1534void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1535set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1536 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1537 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1538 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1539 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1540 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1541 : PANGO_ELLIPSIZE_NONE
1235 ); 1542 );
1236 1543
1237void 1544void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1545set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1546 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1547 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1548
1242void 1549void
1243size (CFPlus::Layout self) 1550size (DC::Layout self)
1244 PPCODE: 1551 PPCODE:
1245{ 1552{
1246 int w, h; 1553 int w, h;
1247 1554
1248 layout_get_pixel_size (self, &w, &h); 1555 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1558 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1559 PUSHs (sv_2mortal (newSViv (h)));
1253} 1560}
1254 1561
1255int 1562int
1256descent (CFPlus::Layout self) 1563descent (DC::Layout self)
1257 CODE: 1564 CODE:
1258{ 1565{
1259 PangoRectangle rect; 1566 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1567 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1568 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1569 RETVAL = PANGO_DESCENT (rect);
1263} 1570}
1264 OUTPUT: 1571 OUTPUT:
1265 RETVAL 1572 RETVAL
1266 1573
1267int 1574int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1575xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1576 CODE:
1270{ 1577{
1271 int index, trailing; 1578 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1579 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1580 RETVAL = index + trailing;
1274} 1581}
1275 OUTPUT: 1582 OUTPUT:
1276 RETVAL 1583 RETVAL
1277 1584
1278void 1585void
1279cursor_pos (CFPlus::Layout self, int index) 1586cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1587 PPCODE:
1281{ 1588{
1282 PangoRectangle strong_pos; 1589 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1590 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1591
1285 EXTEND (SP, 3); 1592 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1593 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1595 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1596}
1290 1597
1291void 1598void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1599index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1600 PPCODE:
1294{ 1601{
1295 int line, x; 1602 int line, x;
1296 1603
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1604 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1605#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1606 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1607 --line;
1608#endif
1300 EXTEND (SP, 2); 1609 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1610 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1612}
1304 1613
1305void 1614void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1615line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1616 PPCODE:
1308{ 1617{
1309 PangoLayoutLine *lp; 1618 PangoLayoutLine *lp;
1310 int index, trailing; 1619 int index, trailing;
1311 1620
1312 if (line < 0) 1621 if (line < 0)
1313 XSRETURN_EMPTY; 1622 XSRETURN_EMPTY;
1314 1623
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1624 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1625 XSRETURN_EMPTY; /* do better */
1317 1626
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1627 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1628
1320 EXTEND (SP, 2); 1629 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1635 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1636 }
1328} 1637}
1329 1638
1330void 1639void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1641 CODE:
1333 rc_clear (self->rc); 1642 self->rc.clear ();
1334 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1335 self->pl, 1644 self->pl,
1336 self->rc, 1645 &self->rc,
1337 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1338 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1339 flags 1648 flags
1340 ); 1649 );
1341 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1651 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1652 pango_layout_context_changed (self->pl);
1344 1653
1345void 1654void
1346draw (CFPlus::Layout self) 1655draw (DC::Layout self)
1347 CODE: 1656 CODE:
1348{ 1657{
1349 glEnable (GL_TEXTURE_2D); 1658 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1659 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1660 glEnable (GL_BLEND);
1352 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1353 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1354 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1355 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1356 1665
1357 rc_draw (self->rc); 1666 self->rc.draw ();
1358 1667
1359 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1362} 1671}
1363 1672
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1673MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1674
1366PROTOTYPES: ENABLE 1675PROTOTYPES: ENABLE
1367 1676
1368void 1677void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1678pad (SV *data_, int ow, int oh, int nw, int nh)
1437 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1438 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1439 } 1748 }
1440} 1749}
1441 1750
1751void
1752draw_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)
1753 PROTOTYPE: @
1754 CODE:
1755{
1756 glEnable (GL_BLEND);
1757 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1758 glEnable (GL_TEXTURE_2D);
1759 glBindTexture (GL_TEXTURE_2D, name1);
1760
1761 glColor3f (intensity, intensity, intensity);
1762 glPushMatrix ();
1763 glScalef (1./3, 1./3, 1.);
1764
1765 if (blend > 0.f)
1766 {
1767 float dx3 = dx * -3.f / w;
1768 float dy3 = dy * -3.f / h;
1769 GLfloat env_color[4] = { 0., 0., 0., blend };
1770
1771 /* interpolate the two shadow textures */
1772 /* stage 0 == rgb(glcolor) + alpha(t0) */
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774
1775 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1776 gl.ActiveTexture (GL_TEXTURE1);
1777 glEnable (GL_TEXTURE_2D);
1778 glBindTexture (GL_TEXTURE_2D, name2);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1780
1781 /* rgb == rgb(glcolor) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1783 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1784 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1785
1786 /* alpha = interpolate t0, t1 by env_alpha */
1787 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1788
1789 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1798
1799 glBegin (GL_QUADS);
1800 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1801 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1802 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1803 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1804 glEnd ();
1805
1806 glDisable (GL_TEXTURE_2D);
1807 gl.ActiveTexture (GL_TEXTURE0);
1808 }
1809 else
1810 {
1811 /* simple blending of one texture, also opengl <1.3 path */
1812 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1813
1814 glBegin (GL_QUADS);
1815 glTexCoord2f (0, 0); glVertex2f (0, 0);
1816 glTexCoord2f (0, t); glVertex2f (0, h);
1817 glTexCoord2f (s, t); glVertex2f (w, h);
1818 glTexCoord2f (s, 0); glVertex2f (w, 0);
1819 glEnd ();
1820 }
1821
1822 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1823 {
1824 int x, y;
1825 int dx3 = dx * 3;
1826 int dy3 = dy * 3;
1827
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1829 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1830 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1831 glTranslatef (-1., -1., 0);
1832 glBegin (GL_QUADS);
1833
1834 for (y = 1; y < h; y += 3)
1835 {
1836 int y1 = y - dy3;
1837 int y1valid = y1 >= 0 && y1 < h;
1838
1839 for (x = 1; x < w; x += 3)
1840 {
1841 int x1 = x - dx3;
1842 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1843 uint8_t h2;
1844
1845 if (y1valid && x1 >= 0 && x1 < w)
1846 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1847 else
1848 h2 = 1; /* out of range == invisible */
1849
1850 if (h1 || h2)
1851 {
1852 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1853 glColor4f (1., 1., 1., alpha);
1854
1855 glTexCoord2f (0, 0.); glVertex2i (x , y );
1856 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1857 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1858 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1859 }
1860 }
1861 }
1862 }
1863
1864 glEnd ();
1865
1866 glPopMatrix ();
1867
1868 glDisable (GL_TEXTURE_2D);
1869 glDisable (GL_BLEND);
1870}
1871
1442IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1872IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1443 CODE: 1873 CODE:
1444{ 1874{
1445 GLint width; 1875 GLint width;
1446 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1876 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1448 RETVAL = width > 0; 1878 RETVAL = width > 0;
1449} 1879}
1450 OUTPUT: 1880 OUTPUT:
1451 RETVAL 1881 RETVAL
1452 1882
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1884
1455PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1456 1886
1457CFPlus::Map 1887DC::Map
1458new (SV *class) 1888new (SV *klass)
1459 CODE: 1889 CODE:
1460 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1461 RETVAL->x = 0; 1891 RETVAL->x = 0;
1462 RETVAL->y = 0; 1892 RETVAL->y = 0;
1463 RETVAL->w = 0; 1893 RETVAL->w = 0;
1464 RETVAL->h = 0; 1894 RETVAL->h = 0;
1465 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1470 RETVAL->row = 0; 1900 RETVAL->row = 0;
1471 OUTPUT: 1901 OUTPUT:
1472 RETVAL 1902 RETVAL
1473 1903
1474void 1904void
1475DESTROY (CFPlus::Map self) 1905DESTROY (DC::Map self)
1476 CODE: 1906 CODE:
1477{ 1907{
1478 map_clear (self); 1908 map_clear (self);
1479 Safefree (self->face2tile); 1909 Safefree (self->face2tile);
1480 Safefree (self->tex); 1910 Safefree (self->tex);
1481 Safefree (self); 1911 Safefree (self);
1482} 1912}
1483 1913
1484void 1914void
1485resize (CFPlus::Map self, int map_width, int map_height) 1915resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1916 CODE:
1487 self->w = map_width; 1917 self->w = map_width;
1488 self->h = map_height; 1918 self->h = map_height;
1489 1919
1490void 1920void
1491clear (CFPlus::Map self) 1921clear (DC::Map self)
1492 CODE: 1922 CODE:
1493 map_clear (self); 1923 map_clear (self);
1494 1924
1495void 1925void
1496set_tileid (CFPlus::Map self, int face, int tile) 1926set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1927 CODE:
1498{ 1928{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1929 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1930 need_texid (self, tile);
1501} 1931}
1502 1932
1503void 1933void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1935 CODE:
1506{ 1936{
1507 tileid texid; 1937 tileid texid;
1508 maptex *tex; 1938 maptex *tex;
1509 1939
1510 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1511 return; 1941 return;
1512 1942
1513 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1514 return; 1944 return;
1515 1945
1516 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1517 1947
1518 if (!texid) 1948 if (!texid)
1519 return; 1949 return;
1520 1950
1521 tex = self->tex + texid; 1951 tex = self->tex + texid;
1522 tex->smoothtile = self->face2tile [smooth]; 1952 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1953 tex->smoothlevel = level;
1524} 1954}
1525 1955
1526void 1956void
1527set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1957set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528 CODE: 1958 CODE:
1529{ 1959{
1530 need_texid (self, texid); 1960 need_texid (self, texid);
1531 1961
1532 { 1962 {
1551 // use uglier nearest interpolation because linear suffers 1981 // use uglier nearest interpolation because linear suffers
1552 // from transparent color bleeding and ugly wrapping effects. 1982 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1983 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1984}
1555 1985
1986void
1987expire_textures (DC::Map self, int texid, int count)
1988 PPCODE:
1989 for (; texid < self->texs && count; ++texid, --count)
1990 {
1991 maptex *tex = self->tex + texid;
1992
1993 if (tex->name)
1994 {
1995 if (tex->unused)
1996 {
1997 tex->name = 0;
1998 tex->unused = 0;
1999 XPUSHs (sv_2mortal (newSViv (texid)));
2000 }
2001 else
2002 tex->unused = 1;
2003 }
2004 }
2005
1556int 2006int
1557ox (CFPlus::Map self) 2007ox (DC::Map self)
1558 ALIAS: 2008 ALIAS:
1559 oy = 1 2009 oy = 1
1560 x = 2 2010 x = 2
1561 y = 3 2011 y = 3
1562 w = 4 2012 w = 4
1573 } 2023 }
1574 OUTPUT: 2024 OUTPUT:
1575 RETVAL 2025 RETVAL
1576 2026
1577void 2027void
1578scroll (CFPlus::Map self, int dx, int dy) 2028scroll (DC::Map self, int dx, int dy)
1579 CODE: 2029 CODE:
1580{ 2030{
1581 if (dx > 0) 2031 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 2032 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 2033 else if (dx < 0)
1591 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1592 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1593 2043
1594 while (self->y < 0) 2044 while (self->y < 0)
1595 { 2045 {
1596 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1597 2047
1598 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1599 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1600 } 2050 }
1601} 2051}
1602 2052
1603SV * 2053SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1605 CODE: 2055 CODE:
1606{ 2056{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 2059 mapcell *cell;
1630 2080
1631 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1632 2082
1633 if (flags & 8) 2083 if (flags & 8)
1634 { 2084 {
2085 uint8_t ext, cmd;
2086
1635 if (extmap) 2087 do
1636 { 2088 {
1637 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1638 2091
1639 do 2092 if (cmd < 4)
2093 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2094 else if (cmd == 5) // health
1640 { 2095 {
1641 ext = *data++;
1642 cmd = ext & 0x3f;
1643
1644 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1;
1646 else if (cmd == 5) // health
1647 {
1648 cell->stat_width = 1; 2096 cell->stat_width = 1;
1649 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1650 }
1651 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47)
1654 {
1655 if (*data == 4)
1656 ; // decode player count
1657
1658 data += *data + 1;
1659 }
1660 else if (cmd == 8) // cell flags
1661 cell->flags = *data++;
1662 else if (ext & 0x40) // unknown, multibyte => skip
1663 data += *data + 1;
1664 else
1665 data++;
1666 } 2098 }
1667 while (ext & 0x80); 2099 else if (cmd == 6) // monster width
2100 cell->stat_width = *data++ + 1;
2101 else if (cmd == 0x47)
2102 {
2103 if (*data == 1) cell->player = data [1];
2104 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2105 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2106 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2107
2108 data += *data + 1;
2109 }
2110 else if (cmd == 8) // cell flags
2111 cell->flags = *data++;
2112 else if (ext & 0x40) // unknown, multibyte => skip
2113 data += *data + 1;
2114 else
2115 data++;
1668 } 2116 }
1669 else 2117 while (ext & 0x80);
1670 cell->darkness = *data++ + 1;
1671 } 2118 }
1672 2119
1673 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1674 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1675 { 2122 {
1678 cell->tile [z] = self->face2tile [face]; 2125 cell->tile [z] = self->face2tile [face];
1679 2126
1680 if (cell->tile [z]) 2127 if (cell->tile [z])
1681 { 2128 {
1682 maptex *tex = self->tex + cell->tile [z]; 2129 maptex *tex = self->tex + cell->tile [z];
2130 tex->unused = 0;
1683 if (!tex->name) 2131 if (!tex->name)
1684 av_push (missing, newSViv (cell->tile [z])); 2132 av_push (missing, newSViv (cell->tile [z]));
1685 2133
1686 if (tex->smoothtile) 2134 if (tex->smoothtile)
1687 { 2135 {
1688 maptex *smooth = self->tex + tex->smoothtile; 2136 maptex *smooth = self->tex + tex->smoothtile;
2137 smooth->unused = 0;
1689 if (!smooth->name) 2138 if (!smooth->name)
1690 av_push (missing, newSViv (tex->smoothtile)); 2139 av_push (missing, newSViv (tex->smoothtile));
1691 } 2140 }
1692 } 2141 }
1693 } 2142 }
1694 } 2143 }
1695 else 2144 else
1696 cell->darkness = 0; 2145 CELL_CLEAR (cell);
1697 } 2146 }
1698} 2147}
1699 OUTPUT: 2148 OUTPUT:
1700 RETVAL 2149 RETVAL
1701 2150
1702SV * 2151SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2152mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 2153 CODE:
1705{ 2154{
1706 int x1, x; 2155 int x1, x;
1707 int y1, y; 2156 int y1, y;
1708 int z; 2157 int z;
1721 ? self->row + y 2170 ? self->row + y
1722 : 0; 2171 : 0;
1723 2172
1724 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1725 { 2174 {
1726 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1727 2176
1728 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1729 { 2178 {
1730 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1731 2180
1733 { 2182 {
1734 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1735 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1736 int a1 = tex.a; 2185 int a1 = tex.a;
1737 2186
1738 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1739 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1740 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1741 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1742 } 2191 }
1743 } 2192 }
1744 2193
1745 *map++ = (r ) 2194 *map++ = (r )
1746 | (g << 8) 2195 | (g << 8)
1747 | (b << 16) 2196 | (b << 16)
1748 | (a << 24); 2197 | (a << 24);
1749 } 2198 }
1750 } 2199 }
1751 2200
1752 RETVAL = map_sv; 2201 RETVAL = map_sv;
1753} 2202}
1754 OUTPUT: 2203 OUTPUT:
1755 RETVAL 2204 RETVAL
1756 2205
1757void 2206void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2207draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1759 CODE: 2208 CODE:
1760{ 2209{
1761 int x, y, z; 2210 int x, y, z;
1762 2211
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1765 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1766 smooth_key skey; 2213 int pl_x, pl_y;
1767 2214 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2216 rc_t rc_ov;
1769 rc_key_t key; 2217 rc_key_t key;
1770 rc_array_t *arr; 2218 rc_t::array_t *arr;
1771 2219
2220 pl_tex.name = 0;
2221
1772 // thats current max. sorry. 2222 // that's current max. sorry.
1773 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
1775
1776 // clear key, in case of extra padding
1777 memset (&skey, 0, sizeof (skey));
1778 2225
1779 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
1780 key.r = 255; 2227 key.r = 255;
1781 key.g = 255; 2228 key.g = 255;
1782 key.b = 255; 2229 key.b = 255;
1783 key.a = 255; 2230 key.a = 255;
1784 key.mode = GL_QUADS; 2231 key.mode = GL_QUADS;
1785 key.format = GL_T2F_V3F; 2232 key.format = GL_T2F_V3F;
1786 key.texname = -1;
1787 2233
1788 mx += self->x; 2234 mx += self->x;
1789 my += self->y; 2235 my += self->y;
1790 2236
1791 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
1792 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
1793 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
1794 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1795 2241
1796 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1797 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1798 { 2244 {
1799 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
1814 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1815 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1816 2262
1817 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
1818 { 2264 {
1819 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2268 key.texname = -1;
1820 2269
1821 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
1822 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
1823 { 2272 {
1824 maprow *row = self->row + (y + my); 2273 maprow *row = self->row + (y + my);
1834 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
1835 int px, py; 2284 int px, py;
1836 2285
1837 if (key.texname != tex.name) 2286 if (key.texname != tex.name)
1838 { 2287 {
2288 self->tex [tile].unused = 0;
2289
1839 if (!tex.name) 2290 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1841 2292
1842 key.texname = tex.name; 2293 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
1844 } 2295 }
1845 2296
1846 px = (x + 1) * T - tex.w; 2297 px = (x + 1) * Th - tex.w;
1847 py = (y + 1) * T - tex.h; 2298 py = (y + 1) * Tw - tex.h;
1848 2299
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1851 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1852 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853
1854 if (cell->flags && z == 2)
1855 { 2301 {
1856 // overlays such as the speech bubble, probably more to come 2302 pl_x = px;
1857 if (cell->flags & 1) 2303 pl_y = py;
2304 pl_tex = tex;
1858 { 2305 continue;
1859 maptex tex = self->tex [1];
1860 int px = x * T + T * 2 / 32;
1861 int py = y * T - T * 6 / 32;
1862
1863 if (tex.name)
1864 {
1865 if (key.texname != tex.name)
1866 {
1867 key.texname = tex.name;
1868 arr = rc_array (rc, &key);
1869 }
1870
1871 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1872 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1873 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1874 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1875 }
1876 }
1877 } 2306 }
2307
2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2310 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1878 2312
1879 // update smooth hash 2313 // update smooth hash
1880 if (tex.smoothtile) 2314 if (tex.smoothtile)
1881 { 2315 {
1882 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
1883 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
1884 2318
1885 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
1886 2320
1887 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
1888 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
1889 2323
1890 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
1898 2332
1899 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1900 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
1901 2335
1902 // full tile 2336 // full tile
1903 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1904 2338
1905 // borders 2339 // borders
1906 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1907 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2341 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1908 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2342 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1909 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1910 2344
1911 // corners 2345 // corners
1912 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1913 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2347 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1914 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2348 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1915 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2350 }
2351 }
2352
2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2354 {
2355 // overlays such as the speech bubble, probably more to come
2356 if (cell->flags & 1)
2357 {
2358 rc_key_t key_ov = key;
2359 maptex tex = self->tex[TEXID_SPEECH];
2360 int px = x * Tw + Tw * 2 / 32;
2361 int py = y * Th - Th * 6 / 32;
2362
2363 key_ov.texname = tex.name;
2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2365
2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1916 } 2370 }
1917 } 2371 }
1918 } 2372 }
1919 } 2373 }
1920 2374
1921 rc_draw (rc); 2375 rc.draw ();
1922 rc_clear (rc); 2376 rc.clear ();
1923 2377
1924 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
1925 // this is basically counting sort 2379 // this is basically counting sort
1926 { 2380 {
1927 int w, b; 2381 int w, b;
1928 2382
1929 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
1930 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
1931 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1932 { 2388 {
1933 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
1934 if (smask) 2390 IV bits = it->second;
1935 for (b = 0; b < 32; ++b) 2391
1936 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
1937 { 2395 {
1938 int level = (w << 5) | b; 2396 maptex tex = self->tex [skey.tile];
2397 int px = (((int)skey.x) - 1) * Tw;
2398 int py = (((int)skey.y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
1939 HE *he; 2404 if (tex.name)
1940
1941 hv_iterinit (smooth);
1942 while ((he = hv_iternext (smooth)))
1943 { 2405 {
1944 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
1945 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
1946 2408 if (key.texname != tex.name)
1947 if (!(bits & 0x1000)
1948 && skey->level == level
1949 && level > smooth_max [skey->x][skey->y])
1950 { 2409 {
1951 maptex tex = self->tex [skey->tile]; 2410 self->tex [skey.tile].unused = 0;
1952 int px = (((int)skey->x) - 1) * T;
1953 int py = (((int)skey->y) - 1) * T;
1954 int border = bits & 15;
1955 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1956 float dx = tex.s * .0625f; // 16 images/row
1957 float dy = tex.t * .5f ; // 2 images/column
1958 2411
1959 if (tex.name)
1960 {
1961 // this time avoiding texture state changes
1962 // save gobs of state changes.
1963 if (key.texname != tex.name)
1964 {
1965 glEnd (); 2412 glEnd ();
1966 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1967 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
1968 } 2415 }
1969 2416
1970 if (border) 2417 if (border)
1971 { 2418 {
1972 float ox = border * dx; 2419 float ox = border * dx;
1973 2420
1974 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1975 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1976 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1977 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1978 } 2425 }
1979 2426
1980 if (corner) 2427 if (corner)
1981 { 2428 {
1982 float ox = corner * dx; 2429 float ox = corner * dx;
1983 2430
1984 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1985 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1986 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1987 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1988 }
1989 }
1990 } 2435 }
1991 } 2436 }
1992 } 2437 }
1993 } 2438 }
1994 2439
1995 glEnd (); 2440 glEnd ();
1996 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
1997 key.texname = -1; 2442 key.texname = -1;
1998 } 2443 }
1999
2000 hv_clear (smooth);
2001 } 2444 }
2002 2445
2446 if (pl_tex.name)
2447 {
2448 maptex tex = pl_tex;
2449 int px = pl_x + sdx;
2450 int py = pl_y + sdy;
2451
2452 key.texname = tex.name;
2453 rc_t::array_t &arr = rc.array (key);
2454
2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2457 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2459
2460 rc.draw ();
2461 }
2462
2463 rc_ov.draw ();
2464 rc_ov.clear ();
2465
2003 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2004 rc_free (rc);
2005 2467
2006 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2008 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2009 { 2471 {
2012 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2013 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2014 { 2476 {
2015 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2016 2478
2017 int px = x * T; 2479 int px = x * Tw;
2018 int py = y * T; 2480 int py = y * Th;
2481
2482 if (ecb_expect_false (cell->player == player))
2483 {
2484 px += sdx;
2485 py += sdy;
2486 }
2019 2487
2020 if (cell->stat_hp) 2488 if (cell->stat_hp)
2021 { 2489 {
2022 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2023 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2024 2492
2025 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2026 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2027 px + width - 1, py); 2495 px + width - 1, py);
2028 2496
2034 } 2502 }
2035 } 2503 }
2036} 2504}
2037 2505
2038void 2506void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2040 CODE: 2508 CODE:
2041{ 2509{
2042 static float color[16][3] = { 2510 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2044 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2045 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2046 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2047 2515
2048 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2049 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2050 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2051 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2052 2520
2053 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2054 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2055 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2056 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2057 2525
2058 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2059 2527
2060 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2061 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2062 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2063 }; 2531 };
2064 2532
2065 int x, y; 2533 int x, y;
2066 2534
2067 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2068 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2069 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2070 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2071 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2072 2546
2073 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2077 2551
2078 if (m) 2552 if (m)
2079 { 2553 {
2080 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2081 2555
2082 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2083 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2084 2558
2085 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2086 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2087 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2088 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2089 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2090 } 2564 }
2094 glDisable (GL_BLEND); 2568 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2569 glDisable (GL_TEXTURE_2D);
2096} 2570}
2097 2571
2098void 2572void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2574 PPCODE:
2101{ 2575{
2102 int x, y; 2576 int x, y;
2103 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2105 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2106 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2107 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2108 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2109 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2110 2585
2111 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2113 2588
2114 mx += self->x - 1; 2589 mx += self->x - 1;
2115 my += self->y - 1; 2590 my += self->y - 1;
2116
2117 memset (darkness1, 255, sw1 * sh1);
2118 2591
2119 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2121 { 2594 {
2122 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2599 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2128 2601
2129 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2130 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2131 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2132 } 2605 }
2133 } 2606 }
2134 2607
2135 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2136 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2155 2628
2156 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2157 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2158 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2159 2632
2160 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2161 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2162 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2163 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2164 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2165 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2166 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2167 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2168 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2169 } 2642 }
2170 2643
2171 free (darkness1); 2644 free (darkness1);
2172 2645
2173 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2174 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2177} 2650}
2178 2651
2179SV * 2652SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2653get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2654 CODE:
2182{ 2655{
2183 int x, y, x1, y1; 2656 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2657 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2658 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2242 else 2715 else
2243 *data++ = 0; 2716 *data++ = 0;
2244 } 2717 }
2245 } 2718 }
2246 2719
2720 /* if size is w*h + 5 then no data has been found */
2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2722 {
2247 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2725 }
2726
2249 RETVAL = data_sv; 2727 RETVAL = data_sv;
2250} 2728}
2251 OUTPUT: 2729 OUTPUT:
2252 RETVAL 2730 RETVAL
2253 2731
2254void 2732void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2733set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2734 PPCODE:
2257{ 2735{
2258 int x, y, z; 2736 int x, y, z;
2259 int w, h; 2737 int w, h;
2260 int x1, y1; 2738 int x1, y1;
2739 STRLEN len;
2740 uint8_t *data, *end;
2741
2742 len = SvLEN (data_sv);
2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2745 end = data + len + 8;
2746
2747 if (len < 5)
2748 XSRETURN_EMPTY;
2261 2749
2262 if (*data++ != 0) 2750 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2751 XSRETURN_EMPTY; /* version mismatch */
2264 2752
2265 w = *data++ << 8; w |= *data++; 2753 w = *data++ << 8; w |= *data++;
2280 { 2768 {
2281 maprow *row = map_get_row (self, y); 2769 maprow *row = map_get_row (self, y);
2282 2770
2283 for (x = x0; x < x1; x++) 2771 for (x = x0; x < x1; x++)
2284 { 2772 {
2773 uint8_t flags;
2774
2775 if (data + 7 >= end)
2776 XSRETURN_EMPTY;
2777
2285 uint8_t flags = *data++; 2778 flags = *data++;
2286 2779
2287 if (flags) 2780 if (flags)
2288 { 2781 {
2289 mapcell *cell = row_get_cell (row, x); 2782 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2783 tileid tile[3] = { 0, 0, 0 };
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2786 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2787 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2788
2296 if (cell->darkness == 0) 2789 if (cell->darkness == 0)
2297 { 2790 {
2298 cell->darkness = 0; 2791 /*cell->darkness = 0;*/
2792 EXTEND (SP, 3);
2299 2793
2300 for (z = 0; z <= 2; z++) 2794 for (z = 0; z <= 2; z++)
2301 { 2795 {
2302 tileid t = tile [z]; 2796 tileid t = tile [z];
2303 2797
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2798 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2799 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2800 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2801 need_texid (self, t);
2308 } 2802 }
2309 2803
2310 cell->tile [z] = t; 2804 cell->tile [z] = t;
2311 } 2805 }
2313 } 2807 }
2314 } 2808 }
2315 } 2809 }
2316} 2810}
2317 2811
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2813
2320CFPlus::RW 2814DC::RW
2321new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2322 CODE: 2816 CODE:
2323{ 2817{
2324 STRLEN datalen; 2818 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2326 2820
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2821 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2822}
2329 OUTPUT: 2823 OUTPUT:
2330 RETVAL 2824 RETVAL
2331 2825
2332CFPlus::RW 2826DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2334 CODE: 2828 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2830 OUTPUT:
2337 RETVAL 2831 RETVAL
2338 2832
2339# fails on win32: 2833# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2834# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2835#void
2342#close (CFPlus::RW self) 2836#close (DC::RW self)
2343# CODE: 2837# CODE:
2344# (self->(close)) (self); 2838# (self->(close)) (self);
2345 2839
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2840MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2841
2348PROTOTYPES: DISABLE 2842PROTOTYPES: DISABLE
2349 2843
2350CFPlus::Channel 2844DC::Channel
2351find () 2845find ()
2352 CODE: 2846 CODE:
2353{ 2847{
2354 RETVAL = Mix_GroupAvailable (-1); 2848 RETVAL = Mix_GroupAvailable (-1);
2355 2849
2356 if (RETVAL < 0) 2850 if (RETVAL < 0)
2357 { 2851 {
2358 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2359 2853
2360 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2361 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2362 2861 }
2862 else
2363 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2364 } 2864 }
2365 2865
2366 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2367 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2368} 2868}
2369 OUTPUT: 2869 OUTPUT:
2370 RETVAL 2870 RETVAL
2371 2871
2372void 2872void
2373halt (CFPlus::Channel self) 2873halt (DC::Channel self)
2374 CODE: 2874 CODE:
2375 Mix_HaltChannel (self); 2875 Mix_HaltChannel (self);
2376 2876
2377void 2877void
2378expire (CFPlus::Channel self, int ticks = -1) 2878expire (DC::Channel self, int ticks = -1)
2379 CODE: 2879 CODE:
2380 Mix_ExpireChannel (self, ticks); 2880 Mix_ExpireChannel (self, ticks);
2381 2881
2382void 2882void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2883fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2884 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2885 Mix_FadeOutChannel (self, ticks);
2386 2886
2387int 2887int
2388volume (CFPlus::Channel self, int volume) 2888volume (DC::Channel self, int volume)
2389 CODE: 2889 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2890 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2891 OUTPUT:
2392 RETVAL 2892 RETVAL
2393 2893
2394void 2894void
2395unregister_all_effects (CFPlus::Channel self) 2895unregister_all_effects (DC::Channel self)
2396 CODE: 2896 CODE:
2397 Mix_UnregisterAllEffects (self); 2897 Mix_UnregisterAllEffects (self);
2398 2898
2399void 2899void
2400set_panning (CFPlus::Channel self, int left, int right) 2900set_panning (DC::Channel self, int left, int right)
2401 CODE: 2901 CODE:
2402 left = CLAMP (left , 0, 255); 2902 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2903 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2904 Mix_SetPanning (self, left, right);
2405 2905
2406void 2906void
2407set_distance (CFPlus::Channel self, int distance) 2907set_distance (DC::Channel self, int distance)
2408 CODE: 2908 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2909 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2910
2411void 2911void
2412set_position (CFPlus::Channel self, int angle, int distance) 2912set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2913 CODE:
2414 2914
2415void 2915void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2917 CODE:
2418{ 2918{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2922}
2423 2923
2424void 2924void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2926 CODE:
2427 Mix_SetReverseStereo (self, flip); 2927 Mix_SetReverseStereo (self, flip);
2428 2928
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2930
2431PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2432 2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2944
2433CFPlus::MixChunk 2945DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2946new (SV *klass, DC::RW rwops)
2435 CODE: 2947 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2949 OUTPUT:
2438 RETVAL 2950 RETVAL
2439 2951
2440void 2952void
2441DESTROY (CFPlus::MixChunk self) 2953DESTROY (DC::MixChunk self)
2442 CODE: 2954 CODE:
2443 Mix_FreeChunk (self); 2955 Mix_FreeChunk (self);
2444 2956
2445int 2957int
2446volume (CFPlus::MixChunk self, int volume = -1) 2958volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2959 CODE:
2448 if (items > 1) 2960 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2961 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2962 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2963 OUTPUT:
2452 RETVAL 2964 RETVAL
2453 2965
2454CFPlus::Channel 2966DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2967play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2968 CODE:
2457{ 2969{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2970 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2971
2460 if (RETVAL < 0) 2972 if (RETVAL < 0)
2467 } 2979 }
2468} 2980}
2469 OUTPUT: 2981 OUTPUT:
2470 RETVAL 2982 RETVAL
2471 2983
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2473 2997
2474int 2998int
2475volume (int volume = -1) 2999volume (int volume = -1)
2476 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2477 CODE: 3001 CODE:
2489void 3013void
2490halt () 3014halt ()
2491 CODE: 3015 CODE:
2492 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2493 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2494CFPlus::MixMusic 3025DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 3026new (SV *klass, DC::RW rwops)
2496 CODE: 3027 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 3029 OUTPUT:
2499 RETVAL 3030 RETVAL
2500 3031
2501void 3032void
2502DESTROY (CFPlus::MixMusic self) 3033DESTROY (DC::MixMusic self)
2503 CODE: 3034 CODE:
2504 Mix_FreeMusic (self); 3035 Mix_FreeMusic (self);
2505 3036
2506int 3037int
2507play (CFPlus::MixMusic self, int loops = -1) 3038play (DC::MixMusic self, int loops = -1)
2508 CODE: 3039 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 3040 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 3041 OUTPUT:
2511 RETVAL 3042 RETVAL
2512 3043
2513void 3044void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3045fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 3046 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 3047 Mix_FadeInMusicPos (self, loops, ms, position);
2517 3048
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3049MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 3050
2520PROTOTYPES: ENABLE 3051PROTOTYPES: ENABLE
2521 3052
2522BOOT: 3053BOOT:
2523{ 3054{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3055 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 3056 static const struct {
2526 const char *name; 3057 const char *name;
2527 IV iv; 3058 IV iv;
2528 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2530 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2531 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2532 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2533 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2534 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2535 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2536 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2537 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2549 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2550 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2551 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2552 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2553 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2554 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2555 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2556 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2557 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2558 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2626 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2627 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2628 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2629 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2630 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2631# undef const_iv 3170# undef const_iv
2632 }; 3171 };
2633 3172
2634 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2635 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2636 3175
2637 texture_av = newAV (); 3176 texture_av = newAV ();
2638 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2639} 3178}
2640 3179
2642disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2643 CODE: 3182 CODE:
2644 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2645 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2646 3185
2647char * 3186void
3187apple_nvidia_bug (int enable)
3188
3189const char *
2648gl_vendor () 3190gl_vendor ()
2649 CODE: 3191 CODE:
2650 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2651 OUTPUT: 3193 OUTPUT:
2652 RETVAL 3194 RETVAL
2653 3195
2654char * 3196const char *
2655gl_version () 3197gl_version ()
2656 CODE: 3198 CODE:
2657 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2658 OUTPUT: 3200 OUTPUT:
2659 RETVAL 3201 RETVAL
2660 3202
2661char * 3203const char *
2662gl_extensions () 3204gl_extensions ()
2663 CODE: 3205 CODE:
2664 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2665 OUTPUT: 3207 OUTPUT:
2666 RETVAL 3208 RETVAL
2667 3209
2668const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2669 3215
2670GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2671 CODE: 3217 CODE:
2672 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2673 OUTPUT: 3219 OUTPUT:
2681 3227
2682int glGetError () 3228int glGetError ()
2683 3229
2684void glFinish () 3230void glFinish ()
2685 3231
3232void glFlush ()
3233
2686void glClear (int mask) 3234void glClear (int mask)
2687 3235
2688void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2689 PROTOTYPE: @ 3237 PROTOTYPE: @
2690 3238
2699void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
2700 3248
2701void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2702 CODE: 3250 CODE:
2703 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
2704 3254
2705void glDepthMask (int flag) 3255void glDepthMask (int flag)
2706 3256
2707void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
2708 3258
2743void glRotate (float angle, float x, float y, float z) 3293void glRotate (float angle, float x, float y, float z)
2744 CODE: 3294 CODE:
2745 glRotatef (angle, x, y, z); 3295 glRotatef (angle, x, y, z);
2746 3296
2747void glColor (float r, float g, float b, float a = 1.0) 3297void glColor (float r, float g, float b, float a = 1.0)
3298 PROTOTYPE: @
2748 ALIAS: 3299 ALIAS:
2749 glColor_premultiply = 1 3300 glColor_premultiply = 1
2750 CODE: 3301 CODE:
2751 if (ix) 3302 if (ix)
2752 { 3303 {
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3373void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 3374 CODE:
2824 if (gl.SeparableFilter2D) 3375 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3376 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 3377
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3378void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 3379
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3380void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 3381
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 3382void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 3383
2858 3409
2859void glEndList () 3410void glEndList ()
2860 3411
2861void glCallList (int list) 3412void glCallList (int list)
2862 3413
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3420
2865PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
2866 3422
2867void 3423void
2868find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
2869 PPCODE: 3425 PPCODE:
2870{ 3426{
2871 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
2872 XPUSHs (self); 3428 XPUSHs (self);
2873} 3429}
2874 3430
2875BOOT: 3431BOOT:
2876{ 3432{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3433 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3434
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3435 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3436 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3437 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3438 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3439}
2884 3440
2885void 3441void
2886draw (SV *self) 3442draw (SV *self)
2887 CODE: 3443 CODE:
2888{ 3444{
2889 HV *hv; 3445 HV *hv;
2890 SV **svp; 3446 SV **svp;
2891 NV x, y, w, h; 3447 NV x, y, w, h;
2892 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
2893 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3452 double draw_x, draw_y;
2897 3453
2898 if (!SvROK (self)) 3454 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3455 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3456
2901 hv = (HV *)SvRV (self); 3457 hv = (HV *)SvRV (self);
2902 3458
2903 if (SvTYPE (hv) != SVt_PVHV) 3459 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3460 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3461
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3462 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3463 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3464
2909 if (!h || !w) 3465 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines