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

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

Diff Legend

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