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.234 by root, Mon Aug 27 02:52:54 2007 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines