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

Diff Legend

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