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.332 by root, Mon Nov 19 00:56:08 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines