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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines