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.236 by root, Mon Oct 8 16:10:14 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{
… …
498 return 0; 580 return 0;
499 581
500 return 1; 582 return 1;
501} 583}
502 584
503MODULE = 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
504 644
505PROTOTYPES: ENABLE 645PROTOTYPES: ENABLE
506 646
507BOOT: 647BOOT:
508{ 648{
509 HV *stash = gv_stashpv ("CFPlus", 1); 649 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 650 static const struct {
511 const char *name; 651 const char *name;
512 IV iv; 652 IV iv;
513 } *civ, const_iv[] = { 653 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 654# define const_iv(name) { # name, (IV)name }
… …
535 const_iv (SDL_USEREVENT), 675 const_iv (SDL_USEREVENT),
536 676
537 const_iv (SDL_APPINPUTFOCUS), 677 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 678 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 679 const_iv (SDL_APPACTIVE),
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),
540 730
541 const_iv (SDLK_FIRST), 731 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 732 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 733 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 734 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 810 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 811 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 812 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 813 const_iv (KMOD_MODE),
624 814
815 const_iv (KMOD_LRAM),
816
625 const_iv (MIX_DEFAULT_FORMAT), 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)
626# undef const_iv 847# undef const_iv
627 }; 848 };
628 849
629 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--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 851 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 852
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 853 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 854 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 855}
635 856
… …
651NV ceil (NV x) 872NV ceil (NV x)
652 873
653IV minpot (UV n) 874IV minpot (UV n)
654 875
655IV popcount (UV n) 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
656 883
657void 884void
658pango_init () 885pango_init ()
659 CODE: 886 CODE:
660{ 887{
661 opengl_fontmap = pango_opengl_font_map_new (); 888 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 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
664} 896}
665 897
666char *
667SDL_GetError () 898char *SDL_GetError ()
668 899
669int 900void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 901 PROTOTYPE: &
671 902
672void 903int SDL_Init (U32 flags)
904
905int SDL_InitSubSystem (U32 flags)
906
907void SDL_QuitSubSystem (U32 flags)
908
673SDL_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
674 920
675void 921void
676SDL_ListModes (int rgb, int alpha) 922SDL_ListModes (int rgb, int alpha)
677 PPCODE: 923 PPCODE:
678{ 924{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 936 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 937 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 938 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 939
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 940 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 941 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 942
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 943 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 944
702 if (m && m != (SDL_Rect **)-1) 945 if (m && m != (SDL_Rect **)-1)
703 while (*m) 946 while (*m)
704 { 947 {
705 if ((*m)->w >= 640 && (*m)->h >= 480) 948 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 949 {
707 AV *av = newAV (); 950 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 951 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 952 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 953 av_push (av, newSViv (rgb));
… …
733 ); 976 );
734 977
735 if (RETVAL) 978 if (RETVAL)
736 { 979 {
737 av_clear (texture_av); 980 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");
740#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);
741#include "glfunc.h" 982#include "glfunc.h"
742#undef GL_FUNC 983#undef GL_FUNC
984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 986 }
744} 987}
745 OUTPUT: 988 OUTPUT:
746 RETVAL 989 RETVAL
990
991void
992SDL_WM_SetCaption (const char *title, const char *icon)
747 993
748void 994void
749SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
750 996
751char * 997char *
752SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
753 1000
754int 1001int
755SDL_GetAppState () 1002SDL_GetAppState ()
756 1003
1004int
1005SDL_GetModState ()
1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
757void 1011void
1012SDL_PumpEvents ()
1013
1014void
758poll_events () 1015peep_events ()
759 PPCODE: 1016 PPCODE:
760{ 1017{
761 SDL_Event ev; 1018 SDL_Event ev;
762 1019
763 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
… …
770 { 1027 {
771 case SDL_KEYDOWN: 1028 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1029 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1030 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1031 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1034 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1035 break;
779 1036
780 case SDL_ACTIVEEVENT: 1037 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1038 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 1056 x = ev.motion.x;
800 y = ev.motion.y; 1057 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1058 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1059 }
803 1060
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1061 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1062 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1063 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1064 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1065 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1066 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1067 }
811 break; 1068 break;
812 1069
813 case SDL_MOUSEBUTTONDOWN: 1070 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1071 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1072 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1073
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1074 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1075 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1076 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1077 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1082 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1083 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1084 break;
828 } 1085 }
829 1086
830 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))));
831 } 1088 }
832} 1089}
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
833 1103
834int 1104int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1105Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1106 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
838 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
839 1109
840void 1110void
841Mix_QuerySpec () 1111Mix_QuerySpec ()
… …
894 } 1164 }
895 } 1165 }
896#endif 1166#endif
897} 1167}
898 1168
899void 1169int
900add_font (char *file) 1170add_font (char *file)
901 CODE: 1171 CODE:
902 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)
903 1182
904void 1183void
905load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
906 ALIAS: 1185 ALIAS:
907 load_image_file = 1 1186 load_image_file = 1
… …
953 1232
954 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
955 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
956 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
957 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
958 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
959 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1238 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
960 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
961 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
962 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
963 1242
… …
993void 1272void
994error (char *message) 1273error (char *message)
995 CODE: 1274 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1275 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1276#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1277 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1278#endif
1000 1279
1001void 1280void
1002fatal (char *message) 1281fatal (char *message)
1003 CODE: 1282 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1283 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1284#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1285 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1286#endif
1008 _exit (1); 1287 _exit (1);
1009 1288
1010void 1289void
1011_exit (int retval = 0) 1290_exit (int retval = 0)
… …
1023#if DEBUG 1302#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1303 VALGRIND_DO_LEAK_CHECK;
1025#endif 1304#endif
1026} 1305}
1027 1306
1028MODULE = 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
1029 1315
1030PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1031 1317
1032CFPlus::Font 1318DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1034 CODE: 1320 CODE:
1035{ 1321{
1036 int count; 1322 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1038 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1040} 1326}
1041 OUTPUT: 1327 OUTPUT:
1042 RETVAL 1328 RETVAL
1043 1329
1044void 1330void
1045DESTROY (CFPlus::Font self) 1331DESTROY (DC::Font self)
1046 CODE: 1332 CODE:
1047 pango_font_description_free (self); 1333 pango_font_description_free (self);
1048 1334
1049void 1335void
1050make_default (CFPlus::Font self) 1336make_default (DC::Font self)
1051 PROTOTYPE: $ 1337 PROTOTYPE: $
1052 CODE: 1338 CODE:
1053 default_font = self; 1339 default_font = self;
1054 1340
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1341MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1342
1057PROTOTYPES: DISABLE 1343PROTOTYPES: DISABLE
1058 1344
1059void 1345void
1060reset_glyph_cache () 1346glyph_cache_backup ()
1061 PROTOTYPE: 1347 PROTOTYPE:
1062 CODE: 1348 CODE:
1349 tc_backup ();
1350
1351void
1352glyph_cache_restore ()
1353 PROTOTYPE:
1354 CODE:
1063 tc_clear (); 1355 tc_restore ();
1064 1356
1065CFPlus::Layout 1357DC::Layout
1066new (SV *class) 1358new (SV *klass)
1067 CODE: 1359 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1069 1361
1070 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1071 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1072 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1073 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1074 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1075 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1076 RETVAL->font = 0; 1368 RETVAL->font = 0;
1077 RETVAL->rc = rc_alloc ();
1078 1369
1079 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1080 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1081 OUTPUT: 1372 OUTPUT:
1082 RETVAL 1373 RETVAL
1083 1374
1084void 1375void
1085DESTROY (CFPlus::Layout self) 1376DESTROY (DC::Layout self)
1086 CODE: 1377 CODE:
1087 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1088 rc_free (self->rc);
1089 Safefree (self); 1379 delete self;
1090 1380
1091void 1381void
1092set_text (CFPlus::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1093 CODE: 1383 CODE:
1094{ 1384{
1095 STRLEN textlen; 1385 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1386 char *text = SvPVutf8 (text_, textlen);
1097 1387
1098 pango_layout_set_text (self->pl, text, textlen); 1388 pango_layout_set_text (self->pl, text, textlen);
1099} 1389}
1100 1390
1101void 1391void
1102set_markup (CFPlus::Layout self, SV *text_) 1392set_markup (DC::Layout self, SV *text_)
1103 CODE: 1393 CODE:
1104{ 1394{
1105 STRLEN textlen; 1395 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1396 char *text = SvPVutf8 (text_, textlen);
1107 1397
1108 pango_layout_set_markup (self->pl, text, textlen); 1398 pango_layout_set_markup (self->pl, text, textlen);
1109} 1399}
1110 1400
1111void 1401void
1112set_shapes (CFPlus::Layout self, ...) 1402set_shapes (DC::Layout self, ...)
1113 CODE: 1403 CODE:
1114{ 1404{
1115 PangoAttrList *attrs = 0; 1405 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1406 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1407 const char *pos = text;
… …
1152 if (attrs) 1442 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1443 pango_layout_set_attributes (self->pl, attrs);
1154} 1444}
1155 1445
1156void 1446void
1157get_shapes (CFPlus::Layout self) 1447get_shapes (DC::Layout self)
1158 PPCODE: 1448 PPCODE:
1159{ 1449{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1450 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1451
1162 do 1452 do
1163 { 1453 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1454 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1455
1166 if (run && shape_attr_p (run)) 1456 if (run && shape_attr_p (run))
1167 { 1457 {
1168 PangoRectangle extents; 1458 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1459 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1177 1467
1178 pango_layout_iter_free (iter); 1468 pango_layout_iter_free (iter);
1179} 1469}
1180 1470
1181int 1471int
1182has_wrapped (CFPlus::Layout self) 1472has_wrapped (DC::Layout self)
1183 CODE: 1473 CODE:
1184{ 1474{
1185 int lines = 1; 1475 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1476 const char *text = pango_layout_get_text (self->pl);
1187 1477
… …
1192} 1482}
1193 OUTPUT: 1483 OUTPUT:
1194 RETVAL 1484 RETVAL
1195 1485
1196SV * 1486SV *
1197get_text (CFPlus::Layout self) 1487get_text (DC::Layout self)
1198 CODE: 1488 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1489 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1490 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1491 OUTPUT:
1202 RETVAL 1492 RETVAL
1203 1493
1204void 1494void
1205set_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.)
1206 CODE: 1496 CODE:
1207 self->r = r; 1497 self->r = r;
1208 self->g = g; 1498 self->g = g;
1209 self->b = b; 1499 self->b = b;
1210 self->a = a; 1500 self->a = a;
1211 1501
1212void 1502void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1503set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1504 CODE:
1215 if (self->font != font) 1505 if (self->font != font)
1216 { 1506 {
1217 self->font = font; 1507 self->font = font;
1218 layout_update_font (self); 1508 layout_update_font (self);
1219 } 1509 }
1220 1510
1221void 1511void
1222set_height (CFPlus::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1223 CODE: 1513 CODE:
1224 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1225 { 1515 {
1226 self->base_height = base_height; 1516 self->base_height = base_height;
1227 layout_update_font (self); 1517 layout_update_font (self);
1228 } 1518 }
1229 1519
1230void 1520void
1231set_width (CFPlus::Layout self, int max_width = -1) 1521set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1522 CODE:
1233 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);
1234 1524
1235void 1525void
1236set_indent (CFPlus::Layout self, int indent) 1526set_indent (DC::Layout self, int indent)
1237 CODE: 1527 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1528 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1529
1240void 1530void
1241set_spacing (CFPlus::Layout self, int spacing) 1531set_spacing (DC::Layout self, int spacing)
1242 CODE: 1532 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1533 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1534
1245void 1535void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1536set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1537 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1538 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1539 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1540 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1541 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1542 : PANGO_ELLIPSIZE_NONE
1253 ); 1543 );
1254 1544
1255void 1545void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1546set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1547 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1548 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1549
1260void 1550void
1261size (CFPlus::Layout self) 1551size (DC::Layout self)
1262 PPCODE: 1552 PPCODE:
1263{ 1553{
1264 int w, h; 1554 int w, h;
1265 1555
1266 layout_get_pixel_size (self, &w, &h); 1556 layout_get_pixel_size (self, &w, &h);
… …
1269 PUSHs (sv_2mortal (newSViv (w))); 1559 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1560 PUSHs (sv_2mortal (newSViv (h)));
1271} 1561}
1272 1562
1273int 1563int
1274descent (CFPlus::Layout self) 1564descent (DC::Layout self)
1275 CODE: 1565 CODE:
1276{ 1566{
1277 PangoRectangle rect; 1567 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1568 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1569 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1570 RETVAL = PANGO_DESCENT (rect);
1281} 1571}
1282 OUTPUT: 1572 OUTPUT:
1283 RETVAL 1573 RETVAL
1284 1574
1285int 1575int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1576xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1577 CODE:
1288{ 1578{
1289 int index, trailing; 1579 int index, trailing;
1290 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);
1291 RETVAL = index + trailing; 1581 RETVAL = index + trailing;
1292} 1582}
1293 OUTPUT: 1583 OUTPUT:
1294 RETVAL 1584 RETVAL
1295 1585
1296void 1586void
1297cursor_pos (CFPlus::Layout self, int index) 1587cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1588 PPCODE:
1299{ 1589{
1300 PangoRectangle strong_pos; 1590 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1591 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1592
1303 EXTEND (SP, 3); 1593 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1595 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1596 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1597}
1308 1598
1309void 1599void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1600index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1601 PPCODE:
1312{ 1602{
1313 int line, x; 1603 int line, x;
1314 1604
1315 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)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1607 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1608 --line;
1609#endif
1318 EXTEND (SP, 2); 1610 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1611 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1612 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1613}
1322 1614
1323void 1615void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1616line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1617 PPCODE:
1326{ 1618{
1327 PangoLayoutLine *lp; 1619 PangoLayoutLine *lp;
1328 int index, trailing; 1620 int index, trailing;
1329 1621
1330 if (line < 0) 1622 if (line < 0)
1331 XSRETURN_EMPTY; 1623 XSRETURN_EMPTY;
1332 1624
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1625 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1626 XSRETURN_EMPTY; /* do better */
1335 1627
1336 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);
1337 1629
1338 EXTEND (SP, 2); 1630 EXTEND (SP, 2);
… …
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1636 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1637 }
1346} 1638}
1347 1639
1348void 1640void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1642 CODE:
1351 rc_clear (self->rc); 1643 self->rc.clear ();
1352 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1353 self->pl, 1645 self->pl,
1354 self->rc, 1646 &self->rc,
1355 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1356 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1357 flags 1649 flags
1358 ); 1650 );
1359 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1652 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1653 pango_layout_context_changed (self->pl);
1362 1654
1363void 1655void
1364draw (CFPlus::Layout self) 1656draw (DC::Layout self)
1365 CODE: 1657 CODE:
1366{ 1658{
1367 glEnable (GL_TEXTURE_2D); 1659 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1660 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1661 glEnable (GL_BLEND);
1370 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1371 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1372 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1373 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1374 1666
1375 rc_draw (self->rc); 1667 self->rc.draw ();
1376 1668
1377 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1380} 1672}
1381 1673
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1674MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1675
1384PROTOTYPES: ENABLE 1676PROTOTYPES: ENABLE
1385 1677
1386void 1678void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1679pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1455 glDisable (GL_ALPHA_TEST); 1747 glDisable (GL_ALPHA_TEST);
1456 glDisable (GL_BLEND); 1748 glDisable (GL_BLEND);
1457 } 1749 }
1458} 1750}
1459 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
1460IV 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)
1461 CODE: 1874 CODE:
1462{ 1875{
1463 GLint width; 1876 GLint width;
1464 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);
… …
1466 RETVAL = width > 0; 1879 RETVAL = width > 0;
1467} 1880}
1468 OUTPUT: 1881 OUTPUT:
1469 RETVAL 1882 RETVAL
1470 1883
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1885
1473PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1474 1887
1475CFPlus::Map 1888DC::Map
1476new (SV *class) 1889new (SV *klass)
1477 CODE: 1890 CODE:
1478 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1479 RETVAL->x = 0; 1892 RETVAL->x = 0;
1480 RETVAL->y = 0; 1893 RETVAL->y = 0;
1481 RETVAL->w = 0; 1894 RETVAL->w = 0;
1482 RETVAL->h = 0; 1895 RETVAL->h = 0;
1483 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1484 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1485 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1486 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1487 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1488 RETVAL->row = 0; 1899 RETVAL->row = 0;
1489 OUTPUT: 1900 OUTPUT:
1490 RETVAL 1901 RETVAL
1491 1902
1492void 1903void
1493DESTROY (CFPlus::Map self) 1904DESTROY (DC::Map self)
1494 CODE: 1905 CODE:
1495{ 1906{
1496 map_clear (self);
1497 Safefree (self->face2tile);
1498 Safefree (self->tex);
1499 Safefree (self); 1907 delete self;
1500} 1908}
1501 1909
1502void 1910void
1503resize (CFPlus::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1912 CODE:
1505 self->w = map_width; 1913 self->w = map_width;
1506 self->h = map_height; 1914 self->h = map_height;
1507 1915
1508void 1916void
1509clear (CFPlus::Map self) 1917clear (DC::Map self)
1510 CODE: 1918 CODE:
1511 map_clear (self); 1919 self->clear_cells ();
1512 1920
1513void 1921void
1514set_tileid (CFPlus::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1923 CODE:
1516{ 1924{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1518 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1519} 1928}
1520 1929
1521void 1930void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1932 CODE:
1524{ 1933{
1525 tileid texid;
1526 maptex *tex;
1527
1528 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1529 return; 1935 return;
1530 1936
1531 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1532 return; 1938 return;
1533 1939
1534 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1535 1941
1536 if (!texid) 1942 if (!texid)
1537 return; 1943 return;
1538 1944
1539 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1540 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1541 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1542} 1948}
1543 1949
1544void 1950void
1545set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1546 CODE: 1952 CODE:
1547{ 1953{
1548 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1549 1955
1550 { 1956 {
1551 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1552 1958
1553 tex->name = name; 1959 tex.name = name;
1554 tex->w = w; 1960 tex.w = w;
1555 tex->h = h; 1961 tex.h = h;
1556 tex->s = s; 1962 tex.s = s;
1557 tex->t = t; 1963 tex.t = t;
1558 tex->r = r; 1964 tex.r = r;
1559 tex->g = g; 1965 tex.g = g;
1560 tex->b = b; 1966 tex.b = b;
1561 tex->a = a; 1967 tex.a = a;
1562 } 1968 }
1563 1969
1564 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1565 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1566 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
… …
1569 // use uglier nearest interpolation because linear suffers 1975 // use uglier nearest interpolation because linear suffers
1570 // from transparent color bleeding and ugly wrapping effects. 1976 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1977 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1978}
1573 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
1574int 2000int
1575ox (CFPlus::Map self) 2001ox (DC::Map self)
1576 ALIAS: 2002 ALIAS:
1577 oy = 1 2003 oy = 1
1578 x = 2 2004 x = 2
1579 y = 3 2005 y = 3
1580 w = 4 2006 w = 4
… …
1591 } 2017 }
1592 OUTPUT: 2018 OUTPUT:
1593 RETVAL 2019 RETVAL
1594 2020
1595void 2021void
1596scroll (CFPlus::Map self, int dx, int dy) 2022scroll (DC::Map self, int dx, int dy)
1597 CODE: 2023 CODE:
1598{ 2024{
1599 if (dx > 0) 2025 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 2026 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 2027 else if (dx < 0)
… …
1617 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1618 } 2044 }
1619} 2045}
1620 2046
1621SV * 2047SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1623 CODE: 2049 CODE:
1624{ 2050{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 2053 mapcell *cell;
… …
1648 2074
1649 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
1650 2076
1651 if (flags & 8) 2077 if (flags & 8)
1652 { 2078 {
2079 uint8_t ext, cmd;
2080
1653 if (extmap) 2081 do
1654 { 2082 {
1655 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
1656 2085
1657 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
1658 { 2089 {
1659 ext = *data++;
1660 cmd = ext & 0x3f;
1661
1662 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health
1665 {
1666 cell->stat_width = 1; 2090 cell->stat_width = 1;
1667 cell->stat_hp = *data++; 2091 cell->stat_hp = *data++;
1668 }
1669 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47)
1672 {
1673 if (*data == 4)
1674 ; // decode player count
1675
1676 data += *data + 1;
1677 }
1678 else if (cmd == 8) // cell flags
1679 cell->flags = *data++;
1680 else if (ext & 0x40) // unknown, multibyte => skip
1681 data += *data + 1;
1682 else
1683 data++;
1684 } 2092 }
1685 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++;
1686 } 2110 }
1687 else 2111 while (ext & 0x80);
1688 cell->darkness = *data++ + 1;
1689 } 2112 }
1690 2113
1691 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
1692 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
1693 { 2116 {
1694 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
1695 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
1696 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
1697 2120
1698 if (cell->tile [z]) 2121 if (cell->tile[z])
1699 { 2122 {
1700 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
2124 tex.unused = 0;
1701 if (!tex->name) 2125 if (!tex.name)
1702 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
1703 2127
1704 if (tex->smoothtile) 2128 if (tex.smoothtile)
1705 { 2129 {
1706 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
2131 smooth.unused = 0;
1707 if (!smooth->name) 2132 if (!smooth.name)
1708 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
1709 } 2134 }
1710 } 2135 }
1711 } 2136 }
1712 } 2137 }
1713 else 2138 else
1714 cell->darkness = 0; 2139 CELL_CLEAR (cell);
1715 } 2140 }
1716} 2141}
1717 OUTPUT: 2142 OUTPUT:
1718 RETVAL 2143 RETVAL
1719 2144
1720SV * 2145SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2146mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 2147 CODE:
1723{ 2148{
1724 int x1, x; 2149 int x1, x;
1725 int y1, y; 2150 int y1, y;
1726 int z; 2151 int z;
… …
1739 ? self->row + y 2164 ? self->row + y
1740 : 0; 2165 : 0;
1741 2166
1742 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
1743 { 2168 {
1744 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
1745 2170
1746 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
1747 { 2172 {
1748 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
1749 2174
… …
1751 { 2176 {
1752 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
1753 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
1754 int a1 = tex.a; 2179 int a1 = tex.a;
1755 2180
1756 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
1757 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
1758 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
1759 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
1760 } 2185 }
1761 } 2186 }
1762 2187
1763 *map++ = (r ) 2188 *map++ = (r )
1764 | (g << 8) 2189 | (g << 8)
1765 | (b << 16) 2190 | (b << 16)
1766 | (a << 24); 2191 | (a << 24);
1767 } 2192 }
1768 } 2193 }
1769 2194
1770 RETVAL = map_sv; 2195 RETVAL = map_sv;
1771} 2196}
1772 OUTPUT: 2197 OUTPUT:
1773 RETVAL 2198 RETVAL
1774 2199
1775void 2200void
1776draw (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)
1777 CODE: 2202 CODE:
1778{ 2203{
1779 int x, y, z; 2204 int x, y, z;
1780 2205
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2206 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1784 smooth_key skey; 2207 int pl_x, pl_y;
1785 2208 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2210 rc_t rc_ov;
1787 rc_key_t key; 2211 rc_key_t key;
1788 rc_array_t *arr; 2212 rc_t::array_t *arr;
1789 2213
2214 pl_tex.name = 0;
2215
1790 // thats current max. sorry. 2216 // that's current max. sorry.
1791 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
1793
1794 // clear key, in case of extra padding
1795 memset (&skey, 0, sizeof (skey));
1796 2219
1797 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
1798 key.r = 255; 2221 key.r = 255;
1799 key.g = 255; 2222 key.g = 255;
1800 key.b = 255; 2223 key.b = 255;
1801 key.a = 255; 2224 key.a = 255;
1802 key.mode = GL_QUADS; 2225 key.mode = GL_QUADS;
1803 key.format = GL_T2F_V3F; 2226 key.format = GL_T2F_V3F;
1804 key.texname = -1;
1805 2227
1806 mx += self->x; 2228 mx += self->x;
1807 my += self->y; 2229 my += self->y;
1808 2230
1809 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1810 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
1811 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
1812 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1813 2235
1814 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
1815 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
1816 { 2238 {
1817 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
… …
1832 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1833 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1834 2256
1835 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
1836 { 2258 {
1837 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;
1838 2263
1839 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
1840 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
1841 { 2266 {
1842 maprow *row = self->row + (y + my); 2267 maprow *row = self->row + (y + my);
… …
1852 maptex tex = self->tex [tile]; 2277 maptex tex = self->tex [tile];
1853 int px, py; 2278 int px, py;
1854 2279
1855 if (key.texname != tex.name) 2280 if (key.texname != tex.name)
1856 { 2281 {
2282 self->tex [tile].unused = 0;
2283
1857 if (!tex.name) 2284 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1859 2286
1860 key.texname = tex.name; 2287 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
1862 } 2289 }
1863 2290
1864 px = (x + 1) * T - tex.w; 2291 px = (x + 1) * Th - tex.w;
1865 py = (y + 1) * T - tex.h; 2292 py = (y + 1) * Tw - tex.h;
1866 2293
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871
1872 if (cell->flags && z == 2)
1873 { 2295 {
1874 // overlays such as the speech bubble, probably more to come 2296 pl_x = px;
1875 if (cell->flags & 1) 2297 pl_y = py;
2298 pl_tex = tex;
1876 { 2299 continue;
1877 maptex tex = self->tex [1];
1878 int px = x * T + T * 2 / 32;
1879 int py = y * T - T * 6 / 32;
1880
1881 if (tex.name)
1882 {
1883 if (key.texname != tex.name)
1884 {
1885 key.texname = tex.name;
1886 arr = rc_array (rc, &key);
1887 }
1888
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1893 }
1894 }
1895 } 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);
1896 2306
1897 // update smooth hash 2307 // update smooth hash
1898 if (tex.smoothtile) 2308 if (tex.smoothtile)
1899 { 2309 {
1900 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
1901 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
1902 2312
1903 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
1904 2314
1905 // 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
1906 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
1907 2317
1908 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
… …
1916 2326
1917 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1918 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
1919 2329
1920 // full tile 2330 // full tile
1921 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);
1922 2332
1923 // borders 2333 // borders
1924 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);
1925 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);
1926 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);
1927 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);
1928 2338
1929 // corners 2339 // corners
1930 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);
1931 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);
1932 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);
1933 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);
1934 } 2364 }
1935 } 2365 }
1936 } 2366 }
1937 } 2367 }
1938 2368
1939 rc_draw (rc); 2369 rc.draw ();
1940 rc_clear (rc); 2370 rc.clear ();
1941 2371
1942 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
1943 // this is basically counting sort 2373 // this is basically counting sort
1944 { 2374 {
1945 int w, b; 2375 int w, b;
1946 2376
1947 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
1948 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
1949 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)
1950 { 2382 {
1951 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
1952 if (smask) 2384 IV bits = it->second;
1953 for (b = 0; b < 32; ++b) 2385
1954 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
1955 { 2389 {
1956 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
1957 HE *he; 2398 if (tex.name)
1958
1959 hv_iterinit (smooth);
1960 while ((he = hv_iternext (smooth)))
1961 { 2399 {
1962 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
1963 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
1964 2402 if (key.texname != tex.name)
1965 if (!(bits & 0x1000)
1966 && skey->level == level
1967 && level > smooth_max [skey->x][skey->y])
1968 { 2403 {
1969 maptex tex = self->tex [skey->tile]; 2404 self->tex [skey.tile].unused = 0;
1970 int px = (((int)skey->x) - 1) * T;
1971 int py = (((int)skey->y) - 1) * T;
1972 int border = bits & 15;
1973 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1974 float dx = tex.s * .0625f; // 16 images/row
1975 float dy = tex.t * .5f ; // 2 images/column
1976 2405
1977 if (tex.name)
1978 {
1979 // this time avoiding texture state changes
1980 // save gobs of state changes.
1981 if (key.texname != tex.name)
1982 {
1983 glEnd (); 2406 glEnd ();
1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1985 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
1986 } 2409 }
1987 2410
1988 if (border) 2411 if (border)
1989 { 2412 {
1990 float ox = border * dx; 2413 float ox = border * dx;
1991 2414
1992 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1993 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1994 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1995 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1996 } 2419 }
1997 2420
1998 if (corner) 2421 if (corner)
1999 { 2422 {
2000 float ox = corner * dx; 2423 float ox = corner * dx;
2001 2424
2002 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2003 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2004 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2005 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2006 }
2007 }
2008 } 2429 }
2009 } 2430 }
2010 } 2431 }
2011 } 2432 }
2012 2433
2013 glEnd (); 2434 glEnd ();
2014 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2015 key.texname = -1; 2436 key.texname = -1;
2016 } 2437 }
2017
2018 hv_clear (smooth);
2019 } 2438 }
2020 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
2021 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2022 rc_free (rc);
2023 2461
2024 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2026 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2027 { 2465 {
… …
2030 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
2031 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
2032 { 2470 {
2033 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
2034 2472
2035 int px = x * T; 2473 int px = x * Tw;
2036 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 }
2037 2481
2038 if (cell->stat_hp) 2482 if (cell->stat_hp)
2039 { 2483 {
2040 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
2041 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2042 2486
2043 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
2044 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
2045 px + width - 1, py); 2489 px + width - 1, py);
2046 2490
… …
2052 } 2496 }
2053 } 2497 }
2054} 2498}
2055 2499
2056void 2500void
2057draw_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)
2058 CODE: 2502 CODE:
2059{ 2503{
2060 static float color[16][3] = { 2504 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2505 { 0.00f, 0.00f, 0.00f },
2062 { 1.00F, 1.00F, 1.00F }, 2506 { 1.00f, 1.00f, 1.00f },
2063 { 0.00F, 0.00F, 0.55F }, 2507 { 0.00f, 0.00f, 0.55f },
2064 { 1.00F, 0.00F, 0.00F }, 2508 { 1.00f, 0.00f, 0.00f },
2065 2509
2066 { 1.00F, 0.54F, 0.00F }, 2510 { 1.00f, 0.54f, 0.00f },
2067 { 0.11F, 0.56F, 1.00F }, 2511 { 0.11f, 0.56f, 1.00f },
2068 { 0.93F, 0.46F, 0.00F }, 2512 { 0.93f, 0.46f, 0.00f },
2069 { 0.18F, 0.54F, 0.34F }, 2513 { 0.18f, 0.54f, 0.34f },
2070 2514
2071 { 0.56F, 0.73F, 0.56F }, 2515 { 0.56f, 0.73f, 0.56f },
2072 { 0.80F, 0.80F, 0.80F }, 2516 { 0.80f, 0.80f, 0.80f },
2073 { 0.55F, 0.41F, 0.13F }, 2517 { 0.55f, 0.41f, 0.13f },
2074 { 0.99F, 0.77F, 0.26F }, 2518 { 0.99f, 0.77f, 0.26f },
2075 2519
2076 { 0.74F, 0.65F, 0.41F }, 2520 { 0.74f, 0.65f, 0.41f },
2077 2521
2078 { 0.00F, 1.00F, 1.00F }, 2522 { 0.00f, 1.00f, 1.00f },
2079 { 1.00F, 0.00F, 1.00F }, 2523 { 1.00f, 0.00f, 1.00f },
2080 { 1.00F, 1.00F, 0.00F }, 2524 { 1.00f, 1.00f, 0.00f },
2081 }; 2525 };
2082 2526
2083 int x, y; 2527 int x, y;
2084 2528
2085 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 */
2086 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2536 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2087 glEnable (GL_BLEND); 2537 glEnable (GL_BLEND);
2088 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2538 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2089 glBegin (GL_QUADS); 2539 glBegin (GL_QUADS);
2090 2540
2091 for (y = 0; y < h; y++) 2541 for (y = 0; y < h; y++)
… …
2095 2545
2096 if (m) 2546 if (m)
2097 { 2547 {
2098 float *c = color [m & 15]; 2548 float *c = color [m & 15];
2099 2549
2100 float tx1 = m & 0x40 ? 0.5 : 0.; 2550 float tx1 = m & 0x40 ? 0.5f : 0.f;
2101 float tx2 = tx1 + 0.5; 2551 float tx2 = tx1 + 0.5f;
2102 2552
2103 glColor4f (c[0], c[1], c[2], 0.75); 2553 glColor4f (c[0], c[1], c[2], 1);
2104 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2554 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2105 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2555 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2106 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2556 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2107 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2557 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2108 } 2558 }
… …
2112 glDisable (GL_BLEND); 2562 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2563 glDisable (GL_TEXTURE_2D);
2114} 2564}
2115 2565
2116void 2566void
2117fow_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)
2118 PPCODE: 2568 PPCODE:
2119{ 2569{
2120 int x, y; 2570 int x, y;
2121 int sw1 = sw + 2; 2571 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2572 int sh1 = sh + 2;
2123 int sh3 = sh * 3; 2573 int sh3 = sh * 3;
2124 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);
2125 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2126 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2578 memset (darkness1, 0, sw1*sh1);
2127 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2128 2579
2129 SvPOK_only (darkness3_sv); 2580 SvPOK_only (darkness3_sv);
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
2131 2582
2132 mx += self->x - 1; 2583 mx += self->x - 1;
2133 my += self->y - 1; 2584 my += self->y - 1;
2134
2135 memset (darkness1, 255, sw1 * sh1);
2136 2585
2137 for (y = 0; y < sh1; y++) 2586 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2587 if (0 <= y + my && y + my < self->rows)
2139 { 2588 {
2140 maprow *row = self->row + (y + my); 2589 maprow *row = self->row + (y + my);
… …
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2592 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2593 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2594 mapcell *cell = row->col + (x + mx - row->c0);
2146 2595
2147 darkness1 [y * sw1 + x] = cell->darkness 2596 darkness1 [y * sw1 + x] = cell->darkness
2148 ? 255 - (cell->darkness - 1) 2597 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2149 : 255 - FOW_DARKNESS; 2598 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2150 } 2599 }
2151 } 2600 }
2152 2601
2153 for (y = 0; y < sh; ++y) 2602 for (y = 0; y < sh; ++y)
2154 for (x = 0; x < sw; ++x) 2603 for (x = 0; x < sw; ++x)
… …
2173 2622
2174 uint8_t r13 = (d13 + d23 + d12) / 3; 2623 uint8_t r13 = (d13 + d23 + d12) / 3;
2175 uint8_t r23 = d23; 2624 uint8_t r23 = d23;
2176 uint8_t r33 = (d23 + d33 + d32) / 3; 2625 uint8_t r33 = (d23 + d33 + d32) / 3;
2177 2626
2178 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2179 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2180 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2629 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2181 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2182 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 */
2183 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2632 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2184 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2185 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2186 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2635 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2187 } 2636 }
2188 2637
2189 free (darkness1); 2638 free (darkness1);
2190 2639
2191 EXTEND (SP, 3); 2640 EXTEND (SP, 3);
2192 PUSHs (sv_2mortal (newSViv (sw34))); 2641 PUSHs (sv_2mortal (newSViv (sw3)));
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2642 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2643 PUSHs (darkness3_sv);
2195} 2644}
2196 2645
2197SV * 2646SV *
2198get_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)
2199 CODE: 2648 CODE:
2200{ 2649{
2201 int x, y, x1, y1; 2650 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2651 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2652 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2260 else 2709 else
2261 *data++ = 0; 2710 *data++ = 0;
2262 } 2711 }
2263 } 2712 }
2264 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 {
2265 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2719 }
2720
2267 RETVAL = data_sv; 2721 RETVAL = data_sv;
2268} 2722}
2269 OUTPUT: 2723 OUTPUT:
2270 RETVAL 2724 RETVAL
2271 2725
2272void 2726void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2727set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2728 PPCODE:
2275{ 2729{
2276 int x, y, z; 2730 int x, y, z;
2277 int w, h; 2731 int w, h;
2278 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;
2279 2743
2280 if (*data++ != 0) 2744 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2745 XSRETURN_EMPTY; /* version mismatch */
2282 2746
2283 w = *data++ << 8; w |= *data++; 2747 w = *data++ << 8; w |= *data++;
… …
2298 { 2762 {
2299 maprow *row = map_get_row (self, y); 2763 maprow *row = map_get_row (self, y);
2300 2764
2301 for (x = x0; x < x1; x++) 2765 for (x = x0; x < x1; x++)
2302 { 2766 {
2767 uint8_t flags;
2768
2769 if (data + 7 >= end)
2770 XSRETURN_EMPTY;
2771
2303 uint8_t flags = *data++; 2772 flags = *data++;
2304 2773
2305 if (flags) 2774 if (flags)
2306 { 2775 {
2307 mapcell *cell = row_get_cell (row, x); 2776 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2777 tileid tile[3] = { 0, 0, 0 };
… …
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2780 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2781 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2782
2314 if (cell->darkness == 0) 2783 if (cell->darkness == 0)
2315 { 2784 {
2316 cell->darkness = 0; 2785 /*cell->darkness = 0;*/
2786 EXTEND (SP, 3);
2317 2787
2318 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2319 { 2789 {
2320 tileid t = tile [z]; 2790 tileid t = tile [z];
2321 2791
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2323 { 2793 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2326 } 2796 }
2327 2797
2328 cell->tile [z] = t; 2798 cell->tile[z] = t;
2329 } 2799 }
2330 } 2800 }
2331 } 2801 }
2332 } 2802 }
2333 } 2803 }
2334} 2804}
2335 2805
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2807
2338CFPlus::RW 2808DC::RW
2339new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2340 CODE: 2810 CODE:
2341{ 2811{
2342 STRLEN datalen; 2812 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2344 2814
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2815 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2816}
2347 OUTPUT: 2817 OUTPUT:
2348 RETVAL 2818 RETVAL
2349 2819
2350CFPlus::RW 2820DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2352 CODE: 2822 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2824 OUTPUT:
2355 RETVAL 2825 RETVAL
2356 2826
2357# fails on win32: 2827# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2828# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2829#void
2360#close (CFPlus::RW self) 2830#close (DC::RW self)
2361# CODE: 2831# CODE:
2362# (self->(close)) (self); 2832# (self->(close)) (self);
2363 2833
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2834MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2835
2366PROTOTYPES: DISABLE 2836PROTOTYPES: DISABLE
2367 2837
2368CFPlus::Channel 2838DC::Channel
2369find () 2839find ()
2370 CODE: 2840 CODE:
2371{ 2841{
2372 RETVAL = Mix_GroupAvailable (-1); 2842 RETVAL = Mix_GroupAvailable (-1);
2373 2843
2374 if (RETVAL < 0) 2844 if (RETVAL < 0)
2375 { 2845 {
2376 RETVAL = Mix_GroupOldest (-1); 2846 RETVAL = Mix_GroupOldest (-1);
2377 2847
2378 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)
2379 XSRETURN_UNDEF; 2854 XSRETURN_UNDEF;
2380 2855 }
2856 else
2381 Mix_HaltChannel (RETVAL); 2857 Mix_HaltChannel (RETVAL);
2382 } 2858 }
2383 2859
2384 Mix_UnregisterAllEffects (RETVAL); 2860 Mix_UnregisterAllEffects (RETVAL);
2385 Mix_Volume (RETVAL, 128); 2861 Mix_Volume (RETVAL, 128);
2386} 2862}
2387 OUTPUT: 2863 OUTPUT:
2388 RETVAL 2864 RETVAL
2389 2865
2390void 2866void
2391halt (CFPlus::Channel self) 2867halt (DC::Channel self)
2392 CODE: 2868 CODE:
2393 Mix_HaltChannel (self); 2869 Mix_HaltChannel (self);
2394 2870
2395void 2871void
2396expire (CFPlus::Channel self, int ticks = -1) 2872expire (DC::Channel self, int ticks = -1)
2397 CODE: 2873 CODE:
2398 Mix_ExpireChannel (self, ticks); 2874 Mix_ExpireChannel (self, ticks);
2399 2875
2400void 2876void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2877fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2878 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2879 Mix_FadeOutChannel (self, ticks);
2404 2880
2405int 2881int
2406volume (CFPlus::Channel self, int volume) 2882volume (DC::Channel self, int volume)
2407 CODE: 2883 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2884 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2885 OUTPUT:
2410 RETVAL 2886 RETVAL
2411 2887
2412void 2888void
2413unregister_all_effects (CFPlus::Channel self) 2889unregister_all_effects (DC::Channel self)
2414 CODE: 2890 CODE:
2415 Mix_UnregisterAllEffects (self); 2891 Mix_UnregisterAllEffects (self);
2416 2892
2417void 2893void
2418set_panning (CFPlus::Channel self, int left, int right) 2894set_panning (DC::Channel self, int left, int right)
2419 CODE: 2895 CODE:
2420 left = CLAMP (left , 0, 255); 2896 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2897 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2898 Mix_SetPanning (self, left, right);
2423 2899
2424void 2900void
2425set_distance (CFPlus::Channel self, int distance) 2901set_distance (DC::Channel self, int distance)
2426 CODE: 2902 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2903 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2904
2429void 2905void
2430set_position (CFPlus::Channel self, int angle, int distance) 2906set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2907 CODE:
2432 2908
2433void 2909void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2910set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2911 CODE:
2436{ 2912{
2437 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));
2438 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;
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2915 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2916}
2441 2917
2442void 2918void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2919set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2920 CODE:
2445 Mix_SetReverseStereo (self, flip); 2921 Mix_SetReverseStereo (self, flip);
2446 2922
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2923MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2924
2449PROTOTYPES: DISABLE 2925PROTOTYPES: DISABLE
2450 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
2451CFPlus::MixChunk 2939DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2940new (SV *klass, DC::RW rwops)
2453 CODE: 2941 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2943 OUTPUT:
2456 RETVAL 2944 RETVAL
2457 2945
2458void 2946void
2459DESTROY (CFPlus::MixChunk self) 2947DESTROY (DC::MixChunk self)
2460 CODE: 2948 CODE:
2461 Mix_FreeChunk (self); 2949 Mix_FreeChunk (self);
2462 2950
2463int 2951int
2464volume (CFPlus::MixChunk self, int volume = -1) 2952volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2953 CODE:
2466 if (items > 1) 2954 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2955 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2956 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2957 OUTPUT:
2470 RETVAL 2958 RETVAL
2471 2959
2472CFPlus::Channel 2960DC::Channel
2473play (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)
2474 CODE: 2962 CODE:
2475{ 2963{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2964 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2965
2478 if (RETVAL < 0) 2966 if (RETVAL < 0)
… …
2485 } 2973 }
2486} 2974}
2487 OUTPUT: 2975 OUTPUT:
2488 RETVAL 2976 RETVAL
2489 2977
2490MODULE = 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
2491 2991
2492int 2992int
2493volume (int volume = -1) 2993volume (int volume = -1)
2494 PROTOTYPE: ;$ 2994 PROTOTYPE: ;$
2495 CODE: 2995 CODE:
… …
2507void 3007void
2508halt () 3008halt ()
2509 CODE: 3009 CODE:
2510 Mix_HaltMusic (); 3010 Mix_HaltMusic ();
2511 3011
3012int
3013playing ()
3014 CODE:
3015 RETVAL = Mix_PlayingMusic ();
3016 OUTPUT:
3017 RETVAL
3018
2512CFPlus::MixMusic 3019DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 3020new (SV *klass, DC::RW rwops)
2514 CODE: 3021 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 3023 OUTPUT:
2517 RETVAL 3024 RETVAL
2518 3025
2519void 3026void
2520DESTROY (CFPlus::MixMusic self) 3027DESTROY (DC::MixMusic self)
2521 CODE: 3028 CODE:
2522 Mix_FreeMusic (self); 3029 Mix_FreeMusic (self);
2523 3030
2524int 3031int
2525play (CFPlus::MixMusic self, int loops = -1) 3032play (DC::MixMusic self, int loops = -1)
2526 CODE: 3033 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 3034 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 3035 OUTPUT:
2529 RETVAL 3036 RETVAL
2530 3037
2531void 3038void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3039fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 3040 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 3041 Mix_FadeInMusicPos (self, loops, ms, position);
2535 3042
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3043MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 3044
2538PROTOTYPES: ENABLE 3045PROTOTYPES: ENABLE
2539 3046
2540BOOT: 3047BOOT:
2541{ 3048{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3049 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 3050 static const struct {
2544 const char *name; 3051 const char *name;
2545 IV iv; 3052 IV iv;
2546 } *civ, const_iv[] = { 3053 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 3054# define const_iv(name) { # name, (IV)name }
2548 const_iv (GL_VENDOR), 3055 const_iv (GL_VENDOR),
2549 const_iv (GL_VERSION), 3056 const_iv (GL_VERSION),
2550 const_iv (GL_EXTENSIONS), 3057 const_iv (GL_EXTENSIONS),
3058 const_iv (GL_MAX_TEXTURE_UNITS),
2551 const_iv (GL_COLOR_MATERIAL), 3059 const_iv (GL_COLOR_MATERIAL),
2552 const_iv (GL_SMOOTH), 3060 const_iv (GL_SMOOTH),
2553 const_iv (GL_FLAT), 3061 const_iv (GL_FLAT),
2554 const_iv (GL_DITHER), 3062 const_iv (GL_DITHER),
2555 const_iv (GL_BLEND), 3063 const_iv (GL_BLEND),
… …
2567 const_iv (GL_ZERO), 3075 const_iv (GL_ZERO),
2568 const_iv (GL_SRC_ALPHA), 3076 const_iv (GL_SRC_ALPHA),
2569 const_iv (GL_DST_ALPHA), 3077 const_iv (GL_DST_ALPHA),
2570 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3078 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2571 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),
2572 const_iv (GL_SRC_ALPHA_SATURATE), 3084 const_iv (GL_SRC_ALPHA_SATURATE),
2573 const_iv (GL_RGB), 3085 const_iv (GL_RGB),
2574 const_iv (GL_RGBA), 3086 const_iv (GL_RGBA),
2575 const_iv (GL_RGBA4), 3087 const_iv (GL_RGBA4),
2576 const_iv (GL_RGBA8), 3088 const_iv (GL_RGBA8),
… …
2644 const_iv (GL_NICEST), 3156 const_iv (GL_NICEST),
2645 const_iv (GL_V2F), 3157 const_iv (GL_V2F),
2646 const_iv (GL_V3F), 3158 const_iv (GL_V3F),
2647 const_iv (GL_T2F_V3F), 3159 const_iv (GL_T2F_V3F),
2648 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),
2649# undef const_iv 3164# undef const_iv
2650 }; 3165 };
2651 3166
2652 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--)
2653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2654 3169
2655 texture_av = newAV (); 3170 texture_av = newAV ();
2656 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
2657} 3172}
2658 3173
… …
2660disable_GL_EXT_blend_func_separate () 3175disable_GL_EXT_blend_func_separate ()
2661 CODE: 3176 CODE:
2662 gl.BlendFuncSeparate = 0; 3177 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
2664 3179
2665char * 3180void
3181apple_nvidia_bug (int enable)
3182
3183const char *
2666gl_vendor () 3184gl_vendor ()
2667 CODE: 3185 CODE:
2668 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
2669 OUTPUT: 3187 OUTPUT:
2670 RETVAL 3188 RETVAL
2671 3189
2672char * 3190const char *
2673gl_version () 3191gl_version ()
2674 CODE: 3192 CODE:
2675 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
2676 OUTPUT: 3194 OUTPUT:
2677 RETVAL 3195 RETVAL
2678 3196
2679char * 3197const char *
2680gl_extensions () 3198gl_extensions ()
2681 CODE: 3199 CODE:
2682 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2683 OUTPUT: 3201 OUTPUT:
2684 RETVAL 3202 RETVAL
2685 3203
2686const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
2687 3209
2688GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
2689 CODE: 3211 CODE:
2690 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
2691 OUTPUT: 3213 OUTPUT:
… …
2699 3221
2700int glGetError () 3222int glGetError ()
2701 3223
2702void glFinish () 3224void glFinish ()
2703 3225
3226void glFlush ()
3227
2704void glClear (int mask) 3228void glClear (int mask)
2705 3229
2706void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
2707 PROTOTYPE: @ 3231 PROTOTYPE: @
2708 3232
… …
2717void glBlendFunc (int sfactor, int dfactor) 3241void glBlendFunc (int sfactor, int dfactor)
2718 3242
2719void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3243void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2720 CODE: 3244 CODE:
2721 gl_BlendFuncSeparate (sa, da, saa, daa); 3245 gl_BlendFuncSeparate (sa, da, saa, daa);
3246
3247# void glBlendEquation (int se)
2722 3248
2723void glDepthMask (int flag) 3249void glDepthMask (int flag)
2724 3250
2725void glLogicOp (int opcode) 3251void glLogicOp (int opcode)
2726 3252
… …
2761void glRotate (float angle, float x, float y, float z) 3287void glRotate (float angle, float x, float y, float z)
2762 CODE: 3288 CODE:
2763 glRotatef (angle, x, y, z); 3289 glRotatef (angle, x, y, z);
2764 3290
2765void 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: @
2766 ALIAS: 3293 ALIAS:
2767 glColor_premultiply = 1 3294 glColor_premultiply = 1
2768 CODE: 3295 CODE:
2769 if (ix) 3296 if (ix)
2770 { 3297 {
… …
2840void 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)
2841 CODE: 3368 CODE:
2842 if (gl.SeparableFilter2D) 3369 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3370 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3371
2845void 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)
2846 3373
2847void 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)
2848 3375
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3376void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3377
… …
2876 3403
2877void glEndList () 3404void glEndList ()
2878 3405
2879void glCallList (int list) 3406void glCallList (int list)
2880 3407
2881MODULE = 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
2882 3414
2883PROTOTYPES: DISABLE 3415PROTOTYPES: DISABLE
2884 3416
2885void 3417void
2886find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
2887 PPCODE: 3419 PPCODE:
2888{ 3420{
2889 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
2890 XPUSHs (self); 3422 XPUSHs (self);
2891} 3423}
2892 3424
2893BOOT: 3425BOOT:
2894{ 3426{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3427 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3428
2897 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);
2898 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);
2899 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);
2900 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);
2901} 3433}
2902 3434
2903void 3435void
2904draw (SV *self) 3436draw (SV *self)
2905 CODE: 3437 CODE:
2906{ 3438{
2907 HV *hv; 3439 HV *hv;
2908 SV **svp; 3440 SV **svp;
2909 NV x, y, w, h; 3441 NV x, y, w, h;
2910 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
2911 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3445 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3446 double draw_x, draw_y;
2915 3447
2916 if (!SvROK (self)) 3448 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3449 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3450
2919 hv = (HV *)SvRV (self); 3451 hv = (HV *)SvRV (self);
2920 3452
2921 if (SvTYPE (hv) != SVt_PVHV) 3453 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3454 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3455
2924 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.;
2925 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.;
2926 3458
2927 if (!h || !w) 3459 if (!h || !w)

Diff Legend

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