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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 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{
1350 HV *hv = (HV *)SvRV (self); 1724 HV *hv = (HV *)SvRV (self);
1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1725 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1726 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1727 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354 1728
1729 if (name <= 0)
1730 XSRETURN_EMPTY;
1731
1355 if (items < 5) 1732 if (items < 5)
1356 { 1733 {
1357 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1734 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1735 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359 } 1736 }
1386 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1387 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1388 } 1765 }
1389} 1766}
1390 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
1391IV 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)
1392 CODE: 1890 CODE:
1393{ 1891{
1394 GLint width; 1892 GLint width;
1395 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);
1397 RETVAL = width > 0; 1895 RETVAL = width > 0;
1398} 1896}
1399 OUTPUT: 1897 OUTPUT:
1400 RETVAL 1898 RETVAL
1401 1899
1402MODULE = CFPlus PACKAGE = CFPlus::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1403 1901
1404PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1405 1903
1406CFPlus::Map 1904DC::Map
1407new (SV *class) 1905new (SV *klass)
1408 CODE: 1906 CODE:
1409 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1410 RETVAL->x = 0; 1908 RETVAL->x = 0;
1411 RETVAL->y = 0; 1909 RETVAL->y = 0;
1412 RETVAL->w = 0; 1910 RETVAL->w = 0;
1413 RETVAL->h = 0; 1911 RETVAL->h = 0;
1414 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1419 RETVAL->row = 0; 1917 RETVAL->row = 0;
1420 OUTPUT: 1918 OUTPUT:
1421 RETVAL 1919 RETVAL
1422 1920
1423void 1921void
1424DESTROY (CFPlus::Map self) 1922DESTROY (DC::Map self)
1425 CODE: 1923 CODE:
1426{ 1924{
1427 map_clear (self); 1925 map_clear (self);
1428 Safefree (self->face2tile); 1926 Safefree (self->face2tile);
1429 Safefree (self->tex); 1927 Safefree (self->tex);
1430 Safefree (self); 1928 Safefree (self);
1431} 1929}
1432 1930
1433void 1931void
1434resize (CFPlus::Map self, int map_width, int map_height) 1932resize (DC::Map self, int map_width, int map_height)
1435 CODE: 1933 CODE:
1436 self->w = map_width; 1934 self->w = map_width;
1437 self->h = map_height; 1935 self->h = map_height;
1438 1936
1439void 1937void
1440clear (CFPlus::Map self) 1938clear (DC::Map self)
1441 CODE: 1939 CODE:
1442 map_clear (self); 1940 map_clear (self);
1443 1941
1444void 1942void
1445set_tileid (CFPlus::Map self, int face, int tile) 1943set_tileid (DC::Map self, int face, int tile)
1446 CODE: 1944 CODE:
1447{ 1945{
1448 need_facenum (self, face); self->face2tile [face] = tile; 1946 need_facenum (self, face); self->face2tile [face] = tile;
1449 need_texid (self, tile); 1947 need_texid (self, tile);
1450} 1948}
1451 1949
1452void 1950void
1453set_smooth (CFPlus::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1454 CODE: 1952 CODE:
1455{ 1953{
1456 tileid texid; 1954 tileid texid;
1457 maptex *tex; 1955 maptex *tex;
1458 1956
1459 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1460 return; 1958 return;
1461 1959
1462 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1463 return; 1961 return;
1464 1962
1465 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1466 1964
1467 if (!texid) 1965 if (!texid)
1468 return; 1966 return;
1469 1967
1470 tex = self->tex + texid; 1968 tex = self->tex + texid;
1471 tex->smoothtile = self->face2tile [smooth]; 1969 tex->smoothtile = self->face2tile [smooth];
1472 tex->smoothlevel = level; 1970 tex->smoothlevel = level;
1473} 1971}
1474 1972
1475void 1973void
1476set_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)
1477 CODE: 1975 CODE:
1478{ 1976{
1479 need_texid (self, texid); 1977 need_texid (self, texid);
1480 1978
1481 { 1979 {
1500 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1501 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1502 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503} 2001}
1504 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
1505int 2023int
1506ox (CFPlus::Map self) 2024ox (DC::Map self)
1507 ALIAS: 2025 ALIAS:
1508 oy = 1 2026 oy = 1
1509 x = 2 2027 x = 2
1510 y = 3 2028 y = 3
1511 w = 4 2029 w = 4
1522 } 2040 }
1523 OUTPUT: 2041 OUTPUT:
1524 RETVAL 2042 RETVAL
1525 2043
1526void 2044void
1527scroll (CFPlus::Map self, int dx, int dy) 2045scroll (DC::Map self, int dx, int dy)
1528 CODE: 2046 CODE:
1529{ 2047{
1530 if (dx > 0) 2048 if (dx > 0)
1531 map_blank (self, self->x, self->y, dx, self->h); 2049 map_blank (self, self->x, self->y, dx, self->h);
1532 else if (dx < 0) 2050 else if (dx < 0)
1547 self->rows += MAP_EXTEND_Y; 2065 self->rows += MAP_EXTEND_Y;
1548 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1549 } 2067 }
1550} 2068}
1551 2069
1552void 2070SV *
1553map1a_update (CFPlus::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1554 CODE: 2072 CODE:
1555{ 2073{
1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1558 mapcell *cell; 2076 mapcell *cell;
1559 int x, y, flags; 2077 int x, y, z, flags;
2078 AV *missing = newAV ();
2079 RETVAL = newRV_noinc ((SV *)missing);
1560 2080
1561 while (data < data_end - 1) 2081 while (data < data_end - 1)
1562 { 2082 {
1563 flags = (data [0] << 8) + data [1]; data += 2; 2083 flags = (data [0] << 8) + data [1]; data += 2;
1564 2084
1577 2097
1578 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1579 2099
1580 if (flags & 8) 2100 if (flags & 8)
1581 { 2101 {
2102 uint8_t ext, cmd;
2103
1582 if (extmap) 2104 do
1583 { 2105 {
1584 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1585 2108
1586 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
1587 { 2112 {
1588 ext = *data++;
1589 cmd = ext & 0x3f;
1590
1591 if (cmd < 4)
1592 cell->darkness = 255 - ext * 64 + 1;
1593 else if (cmd == 5) // health
1594 {
1595 cell->stat_width = 1; 2113 cell->stat_width = 1;
1596 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1597 }
1598 else if (cmd == 6) // monster width
1599 cell->stat_width = *data++ + 1;
1600 else if (cmd == 0x47)
1601 {
1602 if (*data == 4)
1603 ; // decode player count
1604
1605 data += *data + 1;
1606 }
1607 else if (cmd == 8) // cell flags
1608 cell->flags = *data++;
1609 else if (ext & 0x40) // unknown, multibyte => skip
1610 data += *data + 1;
1611 else
1612 data++;
1613 } 2115 }
1614 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++;
1615 } 2133 }
1616 else 2134 while (ext & 0x80);
1617 cell->darkness = *data++ + 1;
1618 } 2135 }
1619 2136
2137 for (z = 0; z <= 2; ++z)
1620 if (flags & 4) 2138 if (flags & (4 >> z))
1621 { 2139 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2; 2140 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face); 2141 need_facenum (self, face);
1624 cell->tile [0] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
2143
2144 if (cell->tile [z])
2145 {
2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
2148 if (!tex->name)
2149 av_push (missing, newSViv (cell->tile [z]));
2150
2151 if (tex->smoothtile)
2152 {
2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
2155 if (!smooth->name)
2156 av_push (missing, newSViv (tex->smoothtile));
2157 }
2158 }
1625 } 2159 }
1626
1627 if (flags & 2)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1632 }
1633
1634 if (flags & 1)
1635 {
1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1639 }
1640 } 2160 }
1641 else 2161 else
1642 cell->darkness = 0; 2162 CELL_CLEAR (cell);
1643 } 2163 }
1644} 2164}
2165 OUTPUT:
2166 RETVAL
1645 2167
1646SV * 2168SV *
1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2169mapmap (DC::Map self, int x0, int y0, int w, int h)
1648 CODE: 2170 CODE:
1649{ 2171{
1650 int x1, x; 2172 int x1, x;
1651 int y1, y; 2173 int y1, y;
1652 int z; 2174 int z;
1665 ? self->row + y 2187 ? self->row + y
1666 : 0; 2188 : 0;
1667 2189
1668 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1669 { 2191 {
1670 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1671 2193
1672 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1673 { 2195 {
1674 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1675 2197
1677 { 2199 {
1678 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1679 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1680 int a1 = tex.a; 2202 int a1 = tex.a;
1681 2203
1682 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1683 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1684 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1685 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1686 } 2208 }
1687 } 2209 }
1688 2210
1689 *map++ = (r ) 2211 *map++ = (r )
1690 | (g << 8) 2212 | (g << 8)
1691 | (b << 16) 2213 | (b << 16)
1692 | (a << 24); 2214 | (a << 24);
1693 } 2215 }
1694 } 2216 }
1695 2217
1696 RETVAL = map_sv; 2218 RETVAL = map_sv;
1697} 2219}
1698 OUTPUT: 2220 OUTPUT:
1699 RETVAL 2221 RETVAL
1700 2222
1701void 2223void
1702draw (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)
1703 CODE: 2225 CODE:
1704{ 2226{
1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1708 smooth_key skey;
1709 int x, y, z; 2227 int x, y, z;
1710 int last_name;
1711 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
1712 // thats current max. sorry. 2239 // that's current max. sorry.
1713 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1715 2242
1716 // clear key, in case of extra padding
1717 memset (&skey, 0, sizeof (skey)); 2243 memset (&key, 0, sizeof (key));
1718 2244 key.r = 255;
1719 glColor4ub (255, 255, 255, 255); 2245 key.g = 255;
1720 2246 key.b = 255;
1721 glEnable (GL_BLEND); 2247 key.a = 255;
1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2248 key.mode = GL_QUADS;
1723 glEnable (GL_TEXTURE_2D); 2249 key.format = GL_T2F_V3F;
1724 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1725
1726 glBegin (GL_QUADS);
1727
1728 last_name = 0;
1729 2250
1730 mx += self->x; 2251 mx += self->x;
1731 my += self->y; 2252 my += self->y;
1732 2253
1733 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1734 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1735 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1736 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1737 2258
1738 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1739 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1740 { 2261 {
1741 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1750 MAX (self->tex [cell->tile [1]].smoothlevel, 2271 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel)); 2272 self->tex [cell->tile [2]].smoothlevel));
1752 } 2273 }
1753 } 2274 }
1754 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
1755 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1756 { 2281 {
1757 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2285 key.texname = -1;
1758 2286
1759 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
1760 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
1761 { 2289 {
1762 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
1768 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
1769 2297
1770 if (tile) 2298 if (tile)
1771 { 2299 {
1772 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w; 2301 int px, py;
1774 int py = (y + 1) * T - tex.h;
1775 2302
1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name) 2303 if (key.texname != tex.name)
1779 { 2304 {
2305 self->tex [tile].unused = 0;
2306
1780 if (!tex.name) 2307 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1782 2309
1783 glEnd (); 2310 key.texname = tex.name;
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2311 arr = rc_array (rc, &key);
1785 glBegin (GL_QUADS);
1786 } 2312 }
1787 2313
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2314 px = (x + 1) * Th - tex.w;
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2315 py = (y + 1) * Tw - tex.h;
1790 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792 2316
1793 if (cell->flags && z == 2) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
1794 { 2318 {
1795 if (cell->flags & 1) 2319 pl_x = px;
2320 pl_y = py;
2321 pl_tex = tex;
1796 { 2322 continue;
1797 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32;
1800
1801 glEnd ();
1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1803 glBegin (GL_QUADS);
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 }
1810 } 2323 }
2324
2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2326 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2327 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2328 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1811 2329
1812 // update smooth hash 2330 // update smooth hash
1813 if (tex.smoothtile) 2331 if (tex.smoothtile)
1814 { 2332 {
1815 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
1816 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
1817 2335
1818 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
1819 2337
1820 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
1821 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
1822 2340
1823 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
1831 2349
1832 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1833 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
1834 2352
1835 // full tile 2353 // full tile
1836 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1837 2355
1838 // borders 2356 // borders
1839 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1840 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2358 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1841 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2359 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1842 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1843 2361
1844 // corners 2362 // corners
1845 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1846 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2364 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1847 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2365 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1848 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2367 }
2368 }
2369
2370 if (expect_false (z == 2) && expect_false (cell->flags))
2371 {
2372 // overlays such as the speech bubble, probably more to come
2373 if (cell->flags & 1)
2374 {
2375 rc_key_t key_ov = key;
2376 maptex tex = self->tex [TEXID_SPEECH];
2377 rc_array_t *arr;
2378 int px = x * Tw + Tw * 2 / 32;
2379 int py = y * Th - Th * 6 / 32;
2380
2381 key_ov.texname = tex.name;
2382 arr = rc_array (rc_ov, &key_ov);
2383
2384 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2385 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2386 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1849 } 2388 }
1850 } 2389 }
1851 } 2390 }
1852 } 2391 }
1853 2392
2393 rc_draw (rc);
2394 rc_clear (rc);
2395
1854 // go through all smoothlevels, lowest to highest, then draw. 2396 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort 2397 // this is basically counting sort
1856 { 2398 {
1857 int w, b; 2399 int w, b;
1858 2400
1859 for (w = 0; w < 256 / 32; ++w) 2401 glEnable (GL_TEXTURE_2D);
2402 glBegin (GL_QUADS);
2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1860 { 2406 {
1861 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
1862 if (smask) 2408 IV bits = it->second;
1863 for (b = 0; b < 32; ++b) 2409
1864 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
1865 { 2413 {
1866 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
1867 HE *he; 2422 if (tex.name)
1868
1869 hv_iterinit (smooth);
1870 while ((he = hv_iternext (smooth)))
1871 { 2423 {
1872 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
1873 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
1874 2426 if (key.texname != tex.name)
1875 if (!(bits & 0x1000)
1876 && skey->level == level
1877 && level > smooth_max [skey->x][skey->y])
1878 { 2427 {
1879 maptex tex = self->tex [skey->tile]; 2428 self->tex [skey.tile].unused = 0;
1880 int px = (((int)skey->x) - 1) * T;
1881 int py = (((int)skey->y) - 1) * T;
1882 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column
1886 2429
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name)
1890 {
1891 if (!tex.name)
1892 continue; // smoothing not yet available
1893
1894 glEnd (); 2430 glEnd ();
1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
1897 } 2433 }
1898 2434
1899 if (border) 2435 if (border)
1900 { 2436 {
1901 float ox = border * dx; 2437 float ox = border * dx;
1902 2438
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1907 } 2443 }
1908 2444
1909 if (corner) 2445 if (corner)
1910 { 2446 {
1911 float ox = corner * dx; 2447 float ox = corner * dx;
1912 2448
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1917 }
1918 } 2453 }
1919 } 2454 }
1920 } 2455 }
1921 } 2456 }
2457
2458 glEnd ();
2459 glDisable (GL_TEXTURE_2D);
2460 key.texname = -1;
1922 } 2461 }
1923
1924 hv_clear (smooth);
1925 } 2462 }
1926 2463
1927 glEnd (); 2464 if (pl_tex.name)
2465 {
2466 maptex tex = pl_tex;
2467 int px = pl_x + sdx;
2468 int py = pl_y + sdy;
1928 2469
1929 glDisable (GL_TEXTURE_2D); 2470 key.texname = tex.name;
2471 arr = rc_array (rc, &key);
2472
2473 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2474 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2475 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2476 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2477
2478 rc_draw (rc);
2479 }
2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
1930 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2485 rc_free (rc);
2486 rc_free (rc_ov);
1931 2487
1932 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
1935 { 2491 {
1938 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
1939 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
1940 { 2496 {
1941 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
1942 2498
1943 int px = x * T; 2499 int px = x * Tw;
1944 int py = y * T; 2500 int py = y * Th;
2501
2502 if (expect_false (cell->player == player))
2503 {
2504 px += sdx;
2505 py += sdy;
2506 }
1945 2507
1946 if (cell->stat_hp) 2508 if (cell->stat_hp)
1947 { 2509 {
1948 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
1949 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1950 2512
1951 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
1952 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
1953 px + width - 1, py); 2515 px + width - 1, py);
1954 2516
1960 } 2522 }
1961 } 2523 }
1962} 2524}
1963 2525
1964void 2526void
1965draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2527draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1966 CODE: 2528 CODE:
1967{ 2529{
1968 static float color[16][3] = { 2530 static float color[16][3] = {
1969 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
1970 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
1971 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
1972 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
1973 2535
1974 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
1975 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
1976 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
1977 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
1978 2540
1979 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
1980 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
1981 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
1982 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
1983 2545
1984 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
1985 2547
1986 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
1987 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
1988 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
1989 }; 2551 };
1990 2552
1991 int x, y; 2553 int x, y;
1992 2554
1993 glEnable (GL_TEXTURE_2D); 2555 glEnable (GL_TEXTURE_2D);
2556 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2557 * but the nvidia driver (185.18.14) mishandles alpha textures
2558 * and takes the colour from god knows where instead of using
2559 * Cp. MODULATE results in the same colour, but slightly different
2560 * alpha, but atcually gives us the correct colour with nvidia.
2561 */
1994 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1995 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
1996 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1997 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
1998 2566
1999 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
2003 2571
2004 if (m) 2572 if (m)
2005 { 2573 {
2006 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2007 2575
2008 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2009 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2010 2578
2011 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2012 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2013 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2014 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2015 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2016 } 2584 }
2020 glDisable (GL_BLEND); 2588 glDisable (GL_BLEND);
2021 glDisable (GL_TEXTURE_2D); 2589 glDisable (GL_TEXTURE_2D);
2022} 2590}
2023 2591
2024void 2592void
2025fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2593fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2026 PPCODE: 2594 PPCODE:
2027{ 2595{
2028 int x, y; 2596 int x, y;
2029 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2030 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2031 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2032 int sw34 = (sw * 3 + 3) & ~3; 2600 int sw3 = sw * 3;
2601 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2602 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2033 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2034 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2035 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2036 2605
2037 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2038 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2039 2608
2040 mx += self->x - 1; 2609 mx += self->x - 1;
2041 my += self->y - 1; 2610 my += self->y - 1;
2042
2043 memset (darkness1, 255, sw1 * sh1);
2044 2611
2045 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2046 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2047 { 2614 {
2048 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2051 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2052 { 2619 {
2053 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2054 2621
2055 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2056 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2057 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2058 } 2625 }
2059 } 2626 }
2060 2627
2061 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2062 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2081 2648
2082 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2083 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2084 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2085 2652
2086 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2087 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2088 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2089 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2090 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2657 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2091 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2092 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2093 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2094 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2095 } 2662 }
2096 2663
2097 free (darkness1); 2664 free (darkness1);
2098 2665
2099 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2100 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2101 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2102 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2103} 2670}
2104 2671
2105SV * 2672SV *
2106get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2673get_rect (DC::Map self, int x0, int y0, int w, int h)
2107 CODE: 2674 CODE:
2108{ 2675{
2109 int x, y, x1, y1; 2676 int x, y, x1, y1;
2110 SV *data_sv = newSV (w * h * 7 + 5); 2677 SV *data_sv = newSV (w * h * 7 + 5);
2111 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2168 else 2735 else
2169 *data++ = 0; 2736 *data++ = 0;
2170 } 2737 }
2171 } 2738 }
2172 2739
2740 /* if size is w*h + 5 then no data has been found */
2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2742 {
2173 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2174 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2745 }
2746
2175 RETVAL = data_sv; 2747 RETVAL = data_sv;
2176} 2748}
2177 OUTPUT: 2749 OUTPUT:
2178 RETVAL 2750 RETVAL
2179 2751
2180void 2752void
2181set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2753set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2182 PPCODE: 2754 PPCODE:
2183{ 2755{
2184 int x, y, z; 2756 int x, y, z;
2185 int w, h; 2757 int w, h;
2186 int x1, y1; 2758 int x1, y1;
2759 STRLEN len;
2760 uint8_t *data, *end;
2761
2762 len = SvLEN (data_sv);
2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2765 end = data + len + 8;
2766
2767 if (len < 5)
2768 XSRETURN_EMPTY;
2187 2769
2188 if (*data++ != 0) 2770 if (*data++ != 0)
2189 return; /* version mismatch */ 2771 XSRETURN_EMPTY; /* version mismatch */
2190 2772
2191 w = *data++ << 8; w |= *data++; 2773 w = *data++ << 8; w |= *data++;
2192 h = *data++ << 8; h |= *data++; 2774 h = *data++ << 8; h |= *data++;
2193 2775
2194 // we need to do this 'cause we don't keep an absolute coord system for rows 2776 // we need to do this 'cause we don't keep an absolute coord system for rows
2206 { 2788 {
2207 maprow *row = map_get_row (self, y); 2789 maprow *row = map_get_row (self, y);
2208 2790
2209 for (x = x0; x < x1; x++) 2791 for (x = x0; x < x1; x++)
2210 { 2792 {
2793 uint8_t flags;
2794
2795 if (data + 7 >= end)
2796 XSRETURN_EMPTY;
2797
2211 uint8_t flags = *data++; 2798 flags = *data++;
2212 2799
2213 if (flags) 2800 if (flags)
2214 { 2801 {
2215 mapcell *cell = row_get_cell (row, x); 2802 mapcell *cell = row_get_cell (row, x);
2216 tileid tile[3] = { 0, 0, 0 }; 2803 tileid tile[3] = { 0, 0, 0 };
2219 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2806 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2220 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2807 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2221 2808
2222 if (cell->darkness == 0) 2809 if (cell->darkness == 0)
2223 { 2810 {
2224 cell->darkness = 0; 2811 /*cell->darkness = 0;*/
2812 EXTEND (SP, 3);
2225 2813
2226 for (z = 0; z <= 2; z++) 2814 for (z = 0; z <= 2; z++)
2227 { 2815 {
2228 tileid t = tile [z]; 2816 tileid t = tile [z];
2229 2817
2230 if (t >= self->texs || (t && !self->tex [t].name)) 2818 if (t >= self->texs || (t && !self->tex [t].name))
2231 { 2819 {
2232 XPUSHs (sv_2mortal (newSViv (t))); 2820 PUSHs (sv_2mortal (newSViv (t)));
2233 need_texid (self, t); 2821 need_texid (self, t);
2234 } 2822 }
2235 2823
2236 cell->tile [z] = t; 2824 cell->tile [z] = t;
2237 } 2825 }
2239 } 2827 }
2240 } 2828 }
2241 } 2829 }
2242} 2830}
2243 2831
2244MODULE = CFPlus PACKAGE = CFPlus::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2245 2833
2246CFPlus::RW 2834DC::RW
2247new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2248 CODE: 2836 CODE:
2249{ 2837{
2250 STRLEN datalen; 2838 STRLEN datalen;
2251 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2252 2840
2253 RETVAL = SDL_RWFromConstMem (data, datalen); 2841 RETVAL = SDL_RWFromConstMem (data, datalen);
2254} 2842}
2255 OUTPUT: 2843 OUTPUT:
2256 RETVAL 2844 RETVAL
2257 2845
2258CFPlus::RW 2846DC::RW
2259new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2260 CODE: 2848 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT: 2850 OUTPUT:
2263 RETVAL 2851 RETVAL
2264 2852
2265# fails on win32: 2853# fails on win32:
2266# CFPlus.xs(2268) : error C2059: syntax error : '(' 2854# dc.xs(2268) : error C2059: syntax error : '('
2267#void 2855#void
2268#close (CFPlus::RW self) 2856#close (DC::RW self)
2269# CODE: 2857# CODE:
2270# (self->(close)) (self); 2858# (self->(close)) (self);
2271 2859
2272MODULE = CFPlus PACKAGE = CFPlus::Channel 2860MODULE = Deliantra::Client PACKAGE = DC::Channel
2273 2861
2274PROTOTYPES: DISABLE 2862PROTOTYPES: DISABLE
2275 2863
2276CFPlus::Channel 2864DC::Channel
2277find () 2865find ()
2278 CODE: 2866 CODE:
2279{ 2867{
2280 RETVAL = Mix_GroupAvailable (-1); 2868 RETVAL = Mix_GroupAvailable (-1);
2281 2869
2282 if (RETVAL < 0) 2870 if (RETVAL < 0)
2283 { 2871 {
2284 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2285 2873
2286 if (RETVAL < 0) 2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2287 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2288 2881 }
2882 else
2289 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2290 } 2884 }
2291 2885
2292 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2293 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2294} 2888}
2295 OUTPUT: 2889 OUTPUT:
2296 RETVAL 2890 RETVAL
2297 2891
2298void 2892void
2299halt (CFPlus::Channel self) 2893halt (DC::Channel self)
2300 CODE: 2894 CODE:
2301 Mix_HaltChannel (self); 2895 Mix_HaltChannel (self);
2302 2896
2303void 2897void
2304expire (CFPlus::Channel self, int ticks = -1) 2898expire (DC::Channel self, int ticks = -1)
2305 CODE: 2899 CODE:
2306 Mix_ExpireChannel (self, ticks); 2900 Mix_ExpireChannel (self, ticks);
2307 2901
2308void 2902void
2309fade_out (CFPlus::Channel self, int ticks = -1) 2903fade_out (DC::Channel self, int ticks = -1)
2310 CODE: 2904 CODE:
2311 Mix_FadeOutChannel (self, ticks); 2905 Mix_FadeOutChannel (self, ticks);
2312 2906
2313int 2907int
2314volume (CFPlus::Channel self, int volume) 2908volume (DC::Channel self, int volume)
2315 CODE: 2909 CODE:
2316 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2910 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2317 OUTPUT: 2911 OUTPUT:
2318 RETVAL 2912 RETVAL
2319 2913
2320void 2914void
2321unregister_all_effects (CFPlus::Channel self) 2915unregister_all_effects (DC::Channel self)
2322 CODE: 2916 CODE:
2323 Mix_UnregisterAllEffects (self); 2917 Mix_UnregisterAllEffects (self);
2324 2918
2325void 2919void
2326set_panning (CFPlus::Channel self, int left, int right) 2920set_panning (DC::Channel self, int left, int right)
2327 CODE: 2921 CODE:
2328 left = CLAMP (left , 0, 255); 2922 left = CLAMP (left , 0, 255);
2329 right = CLAMP (right, 0, 255); 2923 right = CLAMP (right, 0, 255);
2330 Mix_SetPanning (self, left, right); 2924 Mix_SetPanning (self, left, right);
2331 2925
2332void 2926void
2333set_distance (CFPlus::Channel self, int distance) 2927set_distance (DC::Channel self, int distance)
2334 CODE: 2928 CODE:
2335 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2929 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336 2930
2337void 2931void
2338set_position (CFPlus::Channel self, int angle, int distance) 2932set_position (DC::Channel self, int angle, int distance)
2339 CODE: 2933 CODE:
2934
2935void
2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2937 CODE:
2938{
2939 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2940 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2340 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2942}
2341 2943
2342void 2944void
2343set_reverse_stereo (CFPlus::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2344 CODE: 2946 CODE:
2345 Mix_SetReverseStereo (self, flip); 2947 Mix_SetReverseStereo (self, flip);
2346 2948
2347MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2348 2950
2349PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2350 2952
2953void
2954decoders ()
2955 PPCODE:
2956#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2957 int i, num = Mix_GetNumChunkDecoders ();
2958 EXTEND (SP, num);
2959 for (i = 0; i < num; ++i)
2960 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2961#else
2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2963#endif
2964
2351CFPlus::MixChunk 2965DC::MixChunk
2352new (SV *class, CFPlus::RW rwops) 2966new (SV *klass, DC::RW rwops)
2353 CODE: 2967 CODE:
2354 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2355 OUTPUT: 2969 OUTPUT:
2356 RETVAL 2970 RETVAL
2357 2971
2358void 2972void
2359DESTROY (CFPlus::MixChunk self) 2973DESTROY (DC::MixChunk self)
2360 CODE: 2974 CODE:
2361 Mix_FreeChunk (self); 2975 Mix_FreeChunk (self);
2362 2976
2363int 2977int
2364volume (CFPlus::MixChunk self, int volume = -1) 2978volume (DC::MixChunk self, int volume = -1)
2365 CODE: 2979 CODE:
2366 if (items > 1) 2980 if (items > 1)
2367 volume = CLAMP (volume, 0, 128); 2981 volume = CLAMP (volume, 0, 128);
2368 RETVAL = Mix_VolumeChunk (self, volume); 2982 RETVAL = Mix_VolumeChunk (self, volume);
2369 OUTPUT: 2983 OUTPUT:
2370 RETVAL 2984 RETVAL
2371 2985
2372CFPlus::Channel 2986DC::Channel
2373play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2987play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2374 CODE: 2988 CODE:
2375{ 2989{
2376 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2990 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2377 2991
2378 if (RETVAL < 0) 2992 if (RETVAL < 0)
2385 } 2999 }
2386} 3000}
2387 OUTPUT: 3001 OUTPUT:
2388 RETVAL 3002 RETVAL
2389 3003
2390MODULE = CFPlus PACKAGE = CFPlus::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
3005
3006void
3007decoders ()
3008 PPCODE:
3009#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3010 int i, num = Mix_GetNumMusicDecoders ();
3011 EXTEND (SP, num);
3012 for (i = 0; i < num; ++i)
3013 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3014#else
3015 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3016#endif
2391 3017
2392int 3018int
2393volume (int volume = -1) 3019volume (int volume = -1)
2394 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2395 CODE: 3021 CODE:
2407void 3033void
2408halt () 3034halt ()
2409 CODE: 3035 CODE:
2410 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2411 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2412CFPlus::MixMusic 3045DC::MixMusic
2413new (SV *class, CFPlus::RW rwops) 3046new (SV *klass, DC::RW rwops)
2414 CODE: 3047 CODE:
2415 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2416 OUTPUT: 3049 OUTPUT:
2417 RETVAL 3050 RETVAL
2418 3051
2419void 3052void
2420DESTROY (CFPlus::MixMusic self) 3053DESTROY (DC::MixMusic self)
2421 CODE: 3054 CODE:
2422 Mix_FreeMusic (self); 3055 Mix_FreeMusic (self);
2423 3056
2424int 3057int
2425play (CFPlus::MixMusic self, int loops = -1) 3058play (DC::MixMusic self, int loops = -1)
2426 CODE: 3059 CODE:
2427 RETVAL = Mix_PlayMusic (self, loops); 3060 RETVAL = Mix_PlayMusic (self, loops);
2428 OUTPUT: 3061 OUTPUT:
2429 RETVAL 3062 RETVAL
2430 3063
2431void 3064void
2432fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3065fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2433 CODE: 3066 CODE:
2434 Mix_FadeInMusicPos (self, loops, ms, position); 3067 Mix_FadeInMusicPos (self, loops, ms, position);
2435 3068
2436MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3069MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2437 3070
2438PROTOTYPES: ENABLE 3071PROTOTYPES: ENABLE
2439 3072
2440BOOT: 3073BOOT:
2441{ 3074{
2442 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3075 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2443 static const struct { 3076 static const struct {
2444 const char *name; 3077 const char *name;
2445 IV iv; 3078 IV iv;
2446 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2447# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2448 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2449 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2450 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2451 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2452 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2453 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2454 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2455 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2467 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2468 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2469 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2470 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2471 const_iv (GL_ONE_MINUS_DST_ALPHA), 3105 const_iv (GL_ONE_MINUS_DST_ALPHA),
3106 const_iv (GL_SRC_COLOR),
3107 const_iv (GL_DST_COLOR),
3108 const_iv (GL_ONE_MINUS_SRC_COLOR),
3109 const_iv (GL_ONE_MINUS_DST_COLOR),
2472 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2473 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2474 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2475 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2476 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2482 const_iv (GL_INTENSITY), 3120 const_iv (GL_INTENSITY),
2483 const_iv (GL_LUMINANCE), 3121 const_iv (GL_LUMINANCE),
2484 const_iv (GL_LUMINANCE_ALPHA), 3122 const_iv (GL_LUMINANCE_ALPHA),
2485 const_iv (GL_FLOAT), 3123 const_iv (GL_FLOAT),
2486 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3124 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3125 const_iv (GL_COMPRESSED_ALPHA_ARB),
3126 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3127 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3128 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3129 const_iv (GL_COMPRESSED_RGB_ARB),
3130 const_iv (GL_COMPRESSED_RGBA_ARB),
2487 const_iv (GL_COMPILE), 3131 const_iv (GL_COMPILE),
2488 const_iv (GL_PROXY_TEXTURE_1D), 3132 const_iv (GL_PROXY_TEXTURE_1D),
2489 const_iv (GL_PROXY_TEXTURE_2D), 3133 const_iv (GL_PROXY_TEXTURE_2D),
2490 const_iv (GL_TEXTURE_1D), 3134 const_iv (GL_TEXTURE_1D),
2491 const_iv (GL_TEXTURE_2D), 3135 const_iv (GL_TEXTURE_2D),
2530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3174 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2531 const_iv (GL_POINT_SMOOTH_HINT), 3175 const_iv (GL_POINT_SMOOTH_HINT),
2532 const_iv (GL_LINE_SMOOTH_HINT), 3176 const_iv (GL_LINE_SMOOTH_HINT),
2533 const_iv (GL_POLYGON_SMOOTH_HINT), 3177 const_iv (GL_POLYGON_SMOOTH_HINT),
2534 const_iv (GL_GENERATE_MIPMAP_HINT), 3178 const_iv (GL_GENERATE_MIPMAP_HINT),
3179 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2535 const_iv (GL_FASTEST), 3180 const_iv (GL_FASTEST),
2536 const_iv (GL_DONT_CARE), 3181 const_iv (GL_DONT_CARE),
2537 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2538 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2539 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2540 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2541 const_iv (GL_T2F_N3F_V3F), 3186 const_iv (GL_T2F_N3F_V3F),
3187 const_iv (GL_FUNC_ADD),
3188 const_iv (GL_FUNC_SUBTRACT),
3189 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2542# undef const_iv 3190# undef const_iv
2543 }; 3191 };
2544 3192
2545 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3193 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2546 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2547 3195
2548 texture_av = newAV (); 3196 texture_av = newAV ();
2549 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2550} 3198}
2551 3199
2552char * 3200void
3201disable_GL_EXT_blend_func_separate ()
3202 CODE:
3203 gl.BlendFuncSeparate = 0;
3204 gl.BlendFuncSeparateEXT = 0;
3205
3206void
3207apple_nvidia_bug (int enable)
3208
3209const char *
2553gl_vendor () 3210gl_vendor ()
2554 CODE: 3211 CODE:
2555 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2556 OUTPUT: 3213 OUTPUT:
2557 RETVAL 3214 RETVAL
2558 3215
2559char * 3216const char *
2560gl_version () 3217gl_version ()
2561 CODE: 3218 CODE:
2562 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2563 OUTPUT: 3220 OUTPUT:
2564 RETVAL 3221 RETVAL
2565 3222
2566char * 3223const char *
2567gl_extensions () 3224gl_extensions ()
2568 CODE: 3225 CODE:
2569 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2570 OUTPUT: 3227 OUTPUT:
2571 RETVAL 3228 RETVAL
2572 3229
2573const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2574 3235
2575GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2576 CODE: 3237 CODE:
2577 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2578 OUTPUT: 3239 OUTPUT:
2586 3247
2587int glGetError () 3248int glGetError ()
2588 3249
2589void glFinish () 3250void glFinish ()
2590 3251
3252void glFlush ()
3253
2591void glClear (int mask) 3254void glClear (int mask)
2592 3255
2593void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2594 PROTOTYPE: @ 3257 PROTOTYPE: @
2595 3258
2604void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2605 3268
2606void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2607 CODE: 3270 CODE:
2608 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
2609 3274
2610void glDepthMask (int flag) 3275void glDepthMask (int flag)
2611 3276
2612void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2613 3278
2648void glRotate (float angle, float x, float y, float z) 3313void glRotate (float angle, float x, float y, float z)
2649 CODE: 3314 CODE:
2650 glRotatef (angle, x, y, z); 3315 glRotatef (angle, x, y, z);
2651 3316
2652void glColor (float r, float g, float b, float a = 1.0) 3317void glColor (float r, float g, float b, float a = 1.0)
3318 PROTOTYPE: @
2653 ALIAS: 3319 ALIAS:
2654 glColor_premultiply = 1 3320 glColor_premultiply = 1
2655 CODE: 3321 CODE:
2656 if (ix) 3322 if (ix)
2657 { 3323 {
2677 3343
2678void glRect (float x1, float y1, float x2, float y2) 3344void glRect (float x1, float y1, float x2, float y2)
2679 CODE: 3345 CODE:
2680 glRectf (x1, y1, x2, y2); 3346 glRectf (x1, y1, x2, y2);
2681 3347
3348void glRect_lineloop (float x1, float y1, float x2, float y2)
3349 CODE:
3350 glBegin (GL_LINE_LOOP);
3351 glVertex2f (x1, y1);
3352 glVertex2f (x2, y1);
3353 glVertex2f (x2, y2);
3354 glVertex2f (x1, y2);
3355 glEnd ();
3356
2682PROTOTYPES: ENABLE 3357PROTOTYPES: ENABLE
2683 3358
2684void glBegin (int mode) 3359void glBegin (int mode)
2685 3360
2686void glEnd () 3361void glEnd ()
2718void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3393void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2719 CODE: 3394 CODE:
2720 if (gl.SeparableFilter2D) 3395 if (gl.SeparableFilter2D)
2721 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3396 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2722 3397
2723void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3398void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2724 3399
2725void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3400void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2726 3401
2727void glDrawPixels (int width, int height, int format, int type, char *pixels) 3402void glDrawPixels (int width, int height, int format, int type, char *pixels)
2728 3403
2754 3429
2755void glEndList () 3430void glEndList ()
2756 3431
2757void glCallList (int list) 3432void glCallList (int list)
2758 3433
2759MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2760 3440
2761PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
2762 3442
2763void 3443void
2764find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
2765 PPCODE: 3445 PPCODE:
2766{ 3446{
2767 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
2768 XPUSHs (self); 3448 XPUSHs (self);
2769} 3449}
2770 3450
2771BOOT: 3451BOOT:
2772{ 3452{
2773 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3453 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2774 3454
2775 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3455 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2776 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3456 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2777 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3457 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2778 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3458 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2779} 3459}
2780 3460
2781void 3461void
2782draw (SV *self) 3462draw (SV *self)
2783 CODE: 3463 CODE:
2784{ 3464{
2785 HV *hv; 3465 HV *hv;
2786 SV **svp; 3466 SV **svp;
2787 NV x, y, w, h; 3467 NV x, y, w, h;
2788 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
2789 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
2790 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
2791 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);
2792 SV *hover;
2793 double draw_x, draw_y, draw_w, draw_h; 3472 double draw_x, draw_y;
2794 3473
2795 if (!SvROK (self)) 3474 if (!SvROK (self))
2796 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3475 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2797 3476
2798 hv = (HV *)SvRV (self); 3477 hv = (HV *)SvRV (self);
2799 3478
2800 if (SvTYPE (hv) != SVt_PVHV) 3479 if (SvTYPE (hv) != SVt_PVHV)
2801 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3480 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2802 3481
2803 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3482 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2804 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3483 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2805 3484
2806 if (!h || !w) 3485 if (!h || !w)
2826 { 3505 {
2827 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3506 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2828 3507
2829 if (svp && SvTRUE (*svp)) 3508 if (svp && SvTRUE (*svp))
2830 { 3509 {
2831 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3510 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2832 glEnable (GL_BLEND); 3511 glEnable (GL_BLEND);
2833 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3512 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2834 glBegin (GL_QUADS); 3513 glBegin (GL_QUADS);
2835 glVertex2f (0, 0); 3514 glVertex2f (0, 0);
2836 glVertex2f (w, 0); 3515 glVertex2f (w, 0);
2839 glEnd (); 3518 glEnd ();
2840 glDisable (GL_BLEND); 3519 glDisable (GL_BLEND);
2841 } 3520 }
2842 } 3521 }
2843#if 0 3522#if 0
2844 if ($ENV{CFPLUS_DEBUG} & 1) { 3523 // draw borders, for debugging
2845 glPushMatrix; 3524 glPushMatrix ();
2846 glColor 1, 1, 0, 1; 3525 glColor4f (1., 1., 0., 1.);
2847 glTranslate 0.375, 0.375; 3526 glTranslatef (.5, .5, 0.);
2848 glBegin GL_LINE_LOOP; 3527 glBegin (GL_LINE_LOOP);
2849 glVertex 0 , 0; 3528 glVertex2f (0 , 0);
2850 glVertex $self->{w} - 1, 0; 3529 glVertex2f (w - 1, 0);
2851 glVertex $self->{w} - 1, $self->{h} - 1; 3530 glVertex2f (w - 1, h - 1);
2852 glVertex 0 , $self->{h} - 1; 3531 glVertex2f (0 , h - 1);
2853 glEnd; 3532 glEnd ();
2854 glPopMatrix; 3533 glPopMatrix ();
2855 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2856 }
2857#endif 3534#endif
2858 PUSHMARK (SP); 3535 PUSHMARK (SP);
2859 XPUSHs (self); 3536 XPUSHs (self);
2860 PUTBACK; 3537 PUTBACK;
2861 call_method ("_draw", G_VOID | G_DISCARD); 3538 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines