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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines