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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines