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.212 by root, Sun Jul 29 03:58:26 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}
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
807 1117
808int 1118int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 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);
813 1123
814void 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}
1139
1140void
815Mix_CloseAudio () 1141Mix_CloseAudio ()
816 1142
817int 1143int
818Mix_AllocateChannels (int numchans = -1) 1144Mix_AllocateChannels (int numchans = -1)
1145
1146const char *
1147Mix_GetError ()
819 1148
820void 1149void
821lowdelay (int fd, int val = 1) 1150lowdelay (int fd, int val = 1)
822 CODE: 1151 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1152 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1178 }
850 } 1179 }
851#endif 1180#endif
852} 1181}
853 1182
854void 1183int
855add_font (char *file) 1184add_font (char *file)
856 CODE: 1185 CODE:
857 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)
858 1196
859void 1197void
860load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
861 ALIAS: 1199 ALIAS:
862 load_image_file = 1 1200 load_image_file = 1
908 1246
909 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
910 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
911 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
912 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
913 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
914 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)));
915 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
916 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
917 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
918 1256
948void 1286void
949error (char *message) 1287error (char *message)
950 CODE: 1288 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1289 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1290#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1291 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1292#endif
955 1293
956void 1294void
957fatal (char *message) 1295fatal (char *message)
958 CODE: 1296 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1297 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1298#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1299 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1300#endif
963 _exit (1); 1301 _exit (1);
964 1302
965void 1303void
966_exit (int retval = 0) 1304_exit (int retval = 0)
978#if DEBUG 1316#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
980#endif 1318#endif
981} 1319}
982 1320
983MODULE = 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
984 1329
985PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
986 1331
987CFPlus::Font 1332DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
989 CODE: 1334 CODE:
990{ 1335{
991 int count; 1336 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
993 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
995} 1340}
996 OUTPUT: 1341 OUTPUT:
997 RETVAL 1342 RETVAL
998 1343
999void 1344void
1000DESTROY (CFPlus::Font self) 1345DESTROY (DC::Font self)
1001 CODE: 1346 CODE:
1002 pango_font_description_free (self); 1347 pango_font_description_free (self);
1003 1348
1004void 1349void
1005make_default (CFPlus::Font self) 1350make_default (DC::Font self)
1006 PROTOTYPE: $ 1351 PROTOTYPE: $
1007 CODE: 1352 CODE:
1008 default_font = self; 1353 default_font = self;
1009 1354
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1355MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1356
1012PROTOTYPES: DISABLE 1357PROTOTYPES: DISABLE
1013 1358
1014void 1359void
1015reset_glyph_cache () 1360glyph_cache_backup ()
1016 PROTOTYPE: 1361 PROTOTYPE:
1017 CODE: 1362 CODE:
1363 tc_backup ();
1364
1365void
1366glyph_cache_restore ()
1367 PROTOTYPE:
1368 CODE:
1018 tc_clear (); 1369 tc_restore ();
1019 1370
1020CFPlus::Layout 1371DC::Layout
1021new (SV *class) 1372new (SV *klass)
1022 CODE: 1373 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1024 1375
1025 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1026 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1027 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1382 RETVAL->font = 0;
1383 RETVAL->rc = rc_alloc ();
1032 1384
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1385 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1386 layout_update_font (RETVAL);
1035 OUTPUT: 1387 OUTPUT:
1036 RETVAL 1388 RETVAL
1037 1389
1038void 1390void
1039DESTROY (CFPlus::Layout self) 1391DESTROY (DC::Layout self)
1040 CODE: 1392 CODE:
1041 g_object_unref (self->pl); 1393 g_object_unref (self->pl);
1394 rc_free (self->rc);
1042 Safefree (self); 1395 Safefree (self);
1043 1396
1044void 1397void
1045set_text (CFPlus::Layout self, SV *text_) 1398set_text (DC::Layout self, SV *text_)
1046 CODE: 1399 CODE:
1047{ 1400{
1048 STRLEN textlen; 1401 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1402 char *text = SvPVutf8 (text_, textlen);
1050 1403
1051 pango_layout_set_text (self->pl, text, textlen); 1404 pango_layout_set_text (self->pl, text, textlen);
1052} 1405}
1053 1406
1054void 1407void
1055set_markup (CFPlus::Layout self, SV *text_) 1408set_markup (DC::Layout self, SV *text_)
1056 CODE: 1409 CODE:
1057{ 1410{
1058 STRLEN textlen; 1411 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1412 char *text = SvPVutf8 (text_, textlen);
1060 1413
1061 pango_layout_set_markup (self->pl, text, textlen); 1414 pango_layout_set_markup (self->pl, text, textlen);
1062} 1415}
1063 1416
1064void 1417void
1065set_shapes (CFPlus::Layout self, ...) 1418set_shapes (DC::Layout self, ...)
1066 CODE: 1419 CODE:
1067{ 1420{
1068 PangoAttrList *attrs = 0; 1421 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1422 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1423 const char *pos = text;
1105 if (attrs) 1458 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1459 pango_layout_set_attributes (self->pl, attrs);
1107} 1460}
1108 1461
1109void 1462void
1110get_shapes (CFPlus::Layout self) 1463get_shapes (DC::Layout self)
1111 PPCODE: 1464 PPCODE:
1112{ 1465{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1466 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1467
1115 do 1468 do
1116 { 1469 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1470 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1471
1119 if (run && shape_attr_p (run)) 1472 if (run && shape_attr_p (run))
1120 { 1473 {
1121 PangoRectangle extents; 1474 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1475 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1483
1131 pango_layout_iter_free (iter); 1484 pango_layout_iter_free (iter);
1132} 1485}
1133 1486
1134int 1487int
1135has_wrapped (CFPlus::Layout self) 1488has_wrapped (DC::Layout self)
1136 CODE: 1489 CODE:
1137{ 1490{
1138 int lines = 1; 1491 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1492 const char *text = pango_layout_get_text (self->pl);
1140 1493
1145} 1498}
1146 OUTPUT: 1499 OUTPUT:
1147 RETVAL 1500 RETVAL
1148 1501
1149SV * 1502SV *
1150get_text (CFPlus::Layout self) 1503get_text (DC::Layout self)
1151 CODE: 1504 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1505 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1506 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1507 OUTPUT:
1155 RETVAL 1508 RETVAL
1156 1509
1157void 1510void
1158set_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.)
1159 CODE: 1512 CODE:
1160 self->r = r; 1513 self->r = r;
1161 self->g = g; 1514 self->g = g;
1162 self->b = b; 1515 self->b = b;
1163 self->a = a; 1516 self->a = a;
1164 1517
1165void 1518void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1519set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1520 CODE:
1168 if (self->font != font) 1521 if (self->font != font)
1169 { 1522 {
1170 self->font = font; 1523 self->font = font;
1171 layout_update_font (self); 1524 layout_update_font (self);
1172 } 1525 }
1173 1526
1174void 1527void
1175set_height (CFPlus::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1176 CODE: 1529 CODE:
1177 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1178 { 1531 {
1179 self->base_height = base_height; 1532 self->base_height = base_height;
1180 layout_update_font (self); 1533 layout_update_font (self);
1181 } 1534 }
1182 1535
1183void 1536void
1184set_width (CFPlus::Layout self, int max_width = -1) 1537set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1538 CODE:
1186 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);
1187 1540
1188void 1541void
1189set_indent (CFPlus::Layout self, int indent) 1542set_indent (DC::Layout self, int indent)
1190 CODE: 1543 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1544 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1545
1193void 1546void
1194set_spacing (CFPlus::Layout self, int spacing) 1547set_spacing (DC::Layout self, int spacing)
1195 CODE: 1548 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1549 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1550
1198void 1551void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1552set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1553 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1554 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1555 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1556 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1557 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1558 : PANGO_ELLIPSIZE_NONE
1206 ); 1559 );
1207 1560
1208void 1561void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1562set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1563 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1564 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1565
1213void 1566void
1214size (CFPlus::Layout self) 1567size (DC::Layout self)
1215 PPCODE: 1568 PPCODE:
1216{ 1569{
1217 int w, h; 1570 int w, h;
1218 1571
1219 layout_get_pixel_size (self, &w, &h); 1572 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1575 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1576 PUSHs (sv_2mortal (newSViv (h)));
1224} 1577}
1225 1578
1226int 1579int
1227descent (CFPlus::Layout self) 1580descent (DC::Layout self)
1228 CODE: 1581 CODE:
1229{ 1582{
1230 PangoRectangle rect; 1583 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1584 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1585 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1586 RETVAL = PANGO_DESCENT (rect);
1234} 1587}
1235 OUTPUT: 1588 OUTPUT:
1236 RETVAL 1589 RETVAL
1237 1590
1238int 1591int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1592xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1593 CODE:
1241{ 1594{
1242 int index, trailing; 1595 int index, trailing;
1243 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);
1244 RETVAL = index + trailing; 1597 RETVAL = index + trailing;
1245} 1598}
1246 OUTPUT: 1599 OUTPUT:
1247 RETVAL 1600 RETVAL
1248 1601
1249void 1602void
1250cursor_pos (CFPlus::Layout self, int index) 1603cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1604 PPCODE:
1252{ 1605{
1253 PangoRectangle strong_pos; 1606 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1607 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1608
1256 EXTEND (SP, 3); 1609 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1612 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1613}
1261 1614
1262void 1615void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1616index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1617 PPCODE:
1265{ 1618{
1266 int line, x; 1619 int line, x;
1267 1620
1268 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)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1623 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1624 --line;
1625#endif
1271 EXTEND (SP, 2); 1626 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1627 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1628 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1629}
1275 1630
1276void 1631void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1632line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1633 PPCODE:
1279{ 1634{
1280 PangoLayoutLine *lp; 1635 PangoLayoutLine *lp;
1281 int index, trailing; 1636 int index, trailing;
1282 1637
1283 if (line < 0) 1638 if (line < 0)
1284 XSRETURN_EMPTY; 1639 XSRETURN_EMPTY;
1285 1640
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1641 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1642 XSRETURN_EMPTY; /* do better */
1288 1643
1289 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);
1290 1645
1291 EXTEND (SP, 2); 1646 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1652 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1653 }
1299} 1654}
1300 1655
1301void 1656void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1657render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1658 CODE:
1659 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1660 pango_opengl_render_layout_subpixel (
1305 self->pl, 1661 self->pl,
1662 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1663 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1664 self->r, self->g, self->b, self->a,
1308 flags 1665 flags
1309 ); 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);
1310 1670
1311MODULE = 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
1312 1691
1313PROTOTYPES: ENABLE 1692PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1693
1317void 1694void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1695pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1696 CODE:
1320{ 1697{
1347 HV *hv = (HV *)SvRV (self); 1724 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1725 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1726 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1727 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1728
1729 if (name <= 0)
1730 XSRETURN_EMPTY;
1731
1352 if (items < 5) 1732 if (items < 5)
1353 { 1733 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1734 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1735 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1736 }
1383 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1385 } 1765 }
1386} 1766}
1387 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
1388IV 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)
1389 CODE: 1890 CODE:
1390{ 1891{
1391 GLint width; 1892 GLint width;
1392 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);
1394 RETVAL = width > 0; 1895 RETVAL = width > 0;
1395} 1896}
1396 OUTPUT: 1897 OUTPUT:
1397 RETVAL 1898 RETVAL
1398 1899
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1901
1401PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1402 1903
1403CFPlus::Map 1904DC::Map
1404new (SV *class) 1905new (SV *klass)
1405 CODE: 1906 CODE:
1406 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1407 RETVAL->x = 0; 1908 RETVAL->x = 0;
1408 RETVAL->y = 0; 1909 RETVAL->y = 0;
1409 RETVAL->w = 0; 1910 RETVAL->w = 0;
1410 RETVAL->h = 0; 1911 RETVAL->h = 0;
1411 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1416 RETVAL->row = 0; 1917 RETVAL->row = 0;
1417 OUTPUT: 1918 OUTPUT:
1418 RETVAL 1919 RETVAL
1419 1920
1420void 1921void
1421DESTROY (CFPlus::Map self) 1922DESTROY (DC::Map self)
1422 CODE: 1923 CODE:
1423{ 1924{
1424 map_clear (self); 1925 map_clear (self);
1425 Safefree (self->face2tile); 1926 Safefree (self->face2tile);
1426 Safefree (self->tex); 1927 Safefree (self->tex);
1427 Safefree (self); 1928 Safefree (self);
1428} 1929}
1429 1930
1430void 1931void
1431resize (CFPlus::Map self, int map_width, int map_height) 1932resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1933 CODE:
1433 self->w = map_width; 1934 self->w = map_width;
1434 self->h = map_height; 1935 self->h = map_height;
1435 1936
1436void 1937void
1437clear (CFPlus::Map self) 1938clear (DC::Map self)
1438 CODE: 1939 CODE:
1439 map_clear (self); 1940 map_clear (self);
1440 1941
1441void 1942void
1442set_tileid (CFPlus::Map self, int face, int tile) 1943set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1944 CODE:
1444{ 1945{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1946 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1947 need_texid (self, tile);
1447} 1948}
1448 1949
1449void 1950void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1952 CODE:
1452{ 1953{
1453 tileid texid; 1954 tileid texid;
1454 maptex *tex; 1955 maptex *tex;
1455 1956
1456 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1457 return; 1958 return;
1458 1959
1459 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1460 return; 1961 return;
1461 1962
1462 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1463 1964
1464 if (!texid) 1965 if (!texid)
1465 return; 1966 return;
1466 1967
1467 tex = self->tex + texid; 1968 tex = self->tex + texid;
1468 tex->smoothtile = self->face2tile [smooth]; 1969 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1970 tex->smoothlevel = level;
1470} 1971}
1471 1972
1472void 1973void
1473set_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)
1474 CODE: 1975 CODE:
1475{ 1976{
1476 need_texid (self, texid); 1977 need_texid (self, texid);
1477 1978
1478 { 1979 {
1497 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1498 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 2001}
1501 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
1502int 2023int
1503ox (CFPlus::Map self) 2024ox (DC::Map self)
1504 ALIAS: 2025 ALIAS:
1505 oy = 1 2026 oy = 1
1506 x = 2 2027 x = 2
1507 y = 3 2028 y = 3
1508 w = 4 2029 w = 4
1519 } 2040 }
1520 OUTPUT: 2041 OUTPUT:
1521 RETVAL 2042 RETVAL
1522 2043
1523void 2044void
1524scroll (CFPlus::Map self, int dx, int dy) 2045scroll (DC::Map self, int dx, int dy)
1525 CODE: 2046 CODE:
1526{ 2047{
1527 if (dx > 0) 2048 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 2049 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 2050 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 2065 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1546 } 2067 }
1547} 2068}
1548 2069
1549void 2070SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1551 CODE: 2072 CODE:
1552{ 2073{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 2076 mapcell *cell;
1556 int x, y, flags; 2077 int x, y, z, flags;
2078 AV *missing = newAV ();
2079 RETVAL = newRV_noinc ((SV *)missing);
1557 2080
1558 while (data < data_end - 1) 2081 while (data < data_end - 1)
1559 { 2082 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 2083 flags = (data [0] << 8) + data [1]; data += 2;
1561 2084
1574 2097
1575 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1576 2099
1577 if (flags & 8) 2100 if (flags & 8)
1578 { 2101 {
2102 uint8_t ext, cmd;
2103
1579 if (extmap) 2104 do
1580 { 2105 {
1581 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1582 2108
1583 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
1584 { 2112 {
1585 ext = *data++;
1586 cmd = ext & 0x3f;
1587
1588 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health
1591 {
1592 cell->stat_width = 1; 2113 cell->stat_width = 1;
1593 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1594 }
1595 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47)
1598 {
1599 if (*data == 4)
1600 ; // decode player count
1601
1602 data += *data + 1;
1603 }
1604 else if (cmd == 8) // cell flags
1605 cell->flags = *data++;
1606 else if (ext & 0x40) // unknown, multibyte => skip
1607 data += *data + 1;
1608 else
1609 data++;
1610 } 2115 }
1611 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++;
1612 } 2133 }
1613 else 2134 while (ext & 0x80);
1614 cell->darkness = *data++ + 1;
1615 } 2135 }
1616 2136
2137 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 2138 if (flags & (4 >> z))
1618 { 2139 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 2140 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 2141 need_facenum (self, face);
1621 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 }
1622 } 2159 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 2160 }
1638 else 2161 else
1639 cell->darkness = 0; 2162 CELL_CLEAR (cell);
1640 } 2163 }
1641} 2164}
2165 OUTPUT:
2166 RETVAL
1642 2167
1643SV * 2168SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2169mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 2170 CODE:
1646{ 2171{
1647 int x1, x; 2172 int x1, x;
1648 int y1, y; 2173 int y1, y;
1649 int z; 2174 int z;
1662 ? self->row + y 2187 ? self->row + y
1663 : 0; 2188 : 0;
1664 2189
1665 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1666 { 2191 {
1667 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1668 2193
1669 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1670 { 2195 {
1671 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1672 2197
1674 { 2199 {
1675 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1676 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1677 int a1 = tex.a; 2202 int a1 = tex.a;
1678 2203
1679 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1680 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1681 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1682 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1683 } 2208 }
1684 } 2209 }
1685 2210
1686 *map++ = (r ) 2211 *map++ = (r )
1687 | (g << 8) 2212 | (g << 8)
1688 | (b << 16) 2213 | (b << 16)
1689 | (a << 24); 2214 | (a << 24);
1690 } 2215 }
1691 } 2216 }
1692 2217
1693 RETVAL = map_sv; 2218 RETVAL = map_sv;
1694} 2219}
1695 OUTPUT: 2220 OUTPUT:
1696 RETVAL 2221 RETVAL
1697 2222
1698void 2223void
1699draw (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)
1700 CODE: 2225 CODE:
1701{ 2226{
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1705 smooth_key skey;
1706 int x, y, z; 2227 int x, y, z;
1707 int last_name;
1708 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
1709 // thats current max. sorry. 2239 // that's current max. sorry.
1710 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1712 2242
1713 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 2243 memset (&key, 0, sizeof (key));
1715 2244 key.r = 255;
1716 glColor4ub (255, 255, 255, 255); 2245 key.g = 255;
1717 2246 key.b = 255;
1718 glEnable (GL_BLEND); 2247 key.a = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2248 key.mode = GL_QUADS;
1720 glEnable (GL_TEXTURE_2D); 2249 key.format = GL_T2F_V3F;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1722
1723 glBegin (GL_QUADS);
1724
1725 last_name = 0;
1726 2250
1727 mx += self->x; 2251 mx += self->x;
1728 my += self->y; 2252 my += self->y;
1729 2253
1730 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1731 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1732 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1733 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1734 2258
1735 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1736 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1737 { 2261 {
1738 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2271 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2272 self->tex [cell->tile [2]].smoothlevel));
1749 } 2273 }
1750 } 2274 }
1751 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
1752 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1753 { 2281 {
1754 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;
1755 2286
1756 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
1757 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
1758 { 2289 {
1759 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
1765 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
1766 2297
1767 if (tile) 2298 if (tile)
1768 { 2299 {
1769 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2301 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 2302
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2303 if (key.texname != tex.name)
1776 { 2304 {
2305 self->tex [tile].unused = 0;
2306
1777 if (!tex.name) 2307 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1779 2309
1780 glEnd (); 2310 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2311 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2312 }
1784 2313
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2314 px = (x + 1) * Th - tex.w;
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2315 py = (y + 1) * Tw - tex.h;
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789 2316
1790 if (cell->flags && z == 2) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
1791 { 2318 {
1792 if (cell->flags & 1) 2319 pl_x = px;
2320 pl_y = py;
2321 pl_tex = tex;
1793 { 2322 continue;
1794 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32;
1797
1798 glEnd ();
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1800 glBegin (GL_QUADS);
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 }
1807 } 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);
1808 2329
1809 // update smooth hash 2330 // update smooth hash
1810 if (tex.smoothtile) 2331 if (tex.smoothtile)
1811 { 2332 {
1812 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
1813 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
1814 2335
1815 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
1816 2337
1817 // 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
1818 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
1819 2340
1820 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
1828 2349
1829 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1830 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
1831 2352
1832 // full tile 2353 // full tile
1833 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);
1834 2355
1835 // borders 2356 // borders
1836 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);
1837 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);
1838 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);
1839 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);
1840 2361
1841 // corners 2362 // corners
1842 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);
1843 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);
1844 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);
1845 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);
1846 } 2388 }
1847 } 2389 }
1848 } 2390 }
1849 } 2391 }
1850 2392
2393 rc_draw (rc);
2394 rc_clear (rc);
2395
1851 // go through all smoothlevels, lowest to highest, then draw. 2396 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2397 // this is basically counting sort
1853 { 2398 {
1854 int w, b; 2399 int w, b;
1855 2400
1856 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)
1857 { 2406 {
1858 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
1859 if (smask) 2408 IV bits = it->second;
1860 for (b = 0; b < 32; ++b) 2409
1861 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
1862 { 2413 {
1863 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
1864 HE *he; 2422 if (tex.name)
1865
1866 hv_iterinit (smooth);
1867 while ((he = hv_iternext (smooth)))
1868 { 2423 {
1869 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
1870 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
1871 2426 if (key.texname != tex.name)
1872 if (!(bits & 0x1000)
1873 && skey->level == level
1874 && level > smooth_max [skey->x][skey->y])
1875 { 2427 {
1876 maptex tex = self->tex [skey->tile]; 2428 self->tex [skey.tile].unused = 0;
1877 int px = (((int)skey->x) - 1) * T;
1878 int py = (((int)skey->y) - 1) * T;
1879 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column
1883 2429
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name)
1887 {
1888 if (!tex.name)
1889 continue; // smoothing not yet available
1890
1891 glEnd (); 2430 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
1894 } 2433 }
1895 2434
1896 if (border) 2435 if (border)
1897 { 2436 {
1898 float ox = border * dx; 2437 float ox = border * dx;
1899 2438
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1904 } 2443 }
1905 2444
1906 if (corner) 2445 if (corner)
1907 { 2446 {
1908 float ox = corner * dx; 2447 float ox = corner * dx;
1909 2448
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1914 }
1915 } 2453 }
1916 } 2454 }
1917 } 2455 }
1918 } 2456 }
2457
2458 glEnd ();
2459 glDisable (GL_TEXTURE_2D);
2460 key.texname = -1;
1919 } 2461 }
1920
1921 hv_clear (smooth);
1922 } 2462 }
1923 2463
1924 glEnd (); 2464 if (pl_tex.name)
2465 {
2466 maptex tex = pl_tex;
2467 int px = pl_x + sdx;
2468 int py = pl_y + sdy;
1925 2469
1926 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
1927 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2485 rc_free (rc);
2486 rc_free (rc_ov);
1928 2487
1929 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
1932 { 2491 {
1935 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
1936 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
1937 { 2496 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
1939 2498
1940 int px = x * T; 2499 int px = x * Tw;
1941 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 }
1942 2507
1943 if (cell->stat_hp) 2508 if (cell->stat_hp)
1944 { 2509 {
1945 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1947 2512
1948 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
1949 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
1950 px + width - 1, py); 2515 px + width - 1, py);
1951 2516
1957 } 2522 }
1958 } 2523 }
1959} 2524}
1960 2525
1961void 2526void
1962draw_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)
1963 CODE: 2528 CODE:
1964{ 2529{
1965 static float color[16][3] = { 2530 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
1967 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
1968 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
1969 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
1970 2535
1971 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
1972 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
1973 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
1974 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
1975 2540
1976 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
1977 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
1978 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
1979 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
1980 2545
1981 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
1982 2547
1983 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
1984 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
1985 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
1986 }; 2551 };
1987 2552
1988 int x, y; 2553 int x, y;
1989 2554
1990 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 */
1991 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1992 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
1993 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1994 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
1995 2566
1996 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
2000 2571
2001 if (m) 2572 if (m)
2002 { 2573 {
2003 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2004 2575
2005 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2006 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2007 2578
2008 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2009 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2010 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2011 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2012 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2013 } 2584 }
2017 glDisable (GL_BLEND); 2588 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2589 glDisable (GL_TEXTURE_2D);
2019} 2590}
2020 2591
2021void 2592void
2022fow_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)
2023 PPCODE: 2594 PPCODE:
2024{ 2595{
2025 int x, y; 2596 int x, y;
2026 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2028 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2029 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);
2030 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2031 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2032 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2033 2605
2034 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2036 2608
2037 mx += self->x - 1; 2609 mx += self->x - 1;
2038 my += self->y - 1; 2610 my += self->y - 1;
2039
2040 memset (darkness1, 255, sw1 * sh1);
2041 2611
2042 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2044 { 2614 {
2045 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2048 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2049 { 2619 {
2050 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2051 2621
2052 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2053 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2054 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2055 } 2625 }
2056 } 2626 }
2057 2627
2058 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2059 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2078 2648
2079 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2080 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2081 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2082 2652
2083 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2084 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2085 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2086 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2087 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 */
2088 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2089 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2090 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2091 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2092 } 2662 }
2093 2663
2094 free (darkness1); 2664 free (darkness1);
2095 2665
2096 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2097 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2100} 2670}
2101 2671
2102SV * 2672SV *
2103get_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)
2104 CODE: 2674 CODE:
2105{ 2675{
2106 int x, y, x1, y1; 2676 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2677 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2735 else
2166 *data++ = 0; 2736 *data++ = 0;
2167 } 2737 }
2168 } 2738 }
2169 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 {
2170 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2745 }
2746
2172 RETVAL = data_sv; 2747 RETVAL = data_sv;
2173} 2748}
2174 OUTPUT: 2749 OUTPUT:
2175 RETVAL 2750 RETVAL
2176 2751
2177void 2752void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2753set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2754 PPCODE:
2180{ 2755{
2181 int x, y, z; 2756 int x, y, z;
2182 int w, h; 2757 int w, h;
2183 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;
2184 2769
2185 if (*data++ != 0) 2770 if (*data++ != 0)
2186 return; /* version mismatch */ 2771 XSRETURN_EMPTY; /* version mismatch */
2187 2772
2188 w = *data++ << 8; w |= *data++; 2773 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2774 h = *data++ << 8; h |= *data++;
2190 2775
2191 // 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
2203 { 2788 {
2204 maprow *row = map_get_row (self, y); 2789 maprow *row = map_get_row (self, y);
2205 2790
2206 for (x = x0; x < x1; x++) 2791 for (x = x0; x < x1; x++)
2207 { 2792 {
2793 uint8_t flags;
2794
2795 if (data + 7 >= end)
2796 XSRETURN_EMPTY;
2797
2208 uint8_t flags = *data++; 2798 flags = *data++;
2209 2799
2210 if (flags) 2800 if (flags)
2211 { 2801 {
2212 mapcell *cell = row_get_cell (row, x); 2802 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2803 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2806 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2807 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2808
2219 if (cell->darkness == 0) 2809 if (cell->darkness == 0)
2220 { 2810 {
2221 cell->darkness = 0; 2811 /*cell->darkness = 0;*/
2812 EXTEND (SP, 3);
2222 2813
2223 for (z = 0; z <= 2; z++) 2814 for (z = 0; z <= 2; z++)
2224 { 2815 {
2225 tileid t = tile [z]; 2816 tileid t = tile [z];
2226 2817
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2818 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2819 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2820 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2821 need_texid (self, t);
2231 } 2822 }
2232 2823
2233 cell->tile [z] = t; 2824 cell->tile [z] = t;
2234 } 2825 }
2236 } 2827 }
2237 } 2828 }
2238 } 2829 }
2239} 2830}
2240 2831
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2833
2243CFPlus::RW 2834DC::RW
2244new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2245 CODE: 2836 CODE:
2246{ 2837{
2247 STRLEN datalen; 2838 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2249 2840
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2841 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2842}
2252 OUTPUT: 2843 OUTPUT:
2253 RETVAL 2844 RETVAL
2254 2845
2255CFPlus::RW 2846DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2257 CODE: 2848 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2850 OUTPUT:
2260 RETVAL 2851 RETVAL
2261 2852
2853# fails on win32:
2854# dc.xs(2268) : error C2059: syntax error : '('
2262void 2855#void
2263close (CFPlus::RW self) 2856#close (DC::RW self)
2264 CODE: 2857# CODE:
2265 SDL_RWclose (self); 2858# (self->(close)) (self);
2266 2859
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2860MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2861
2269PROTOTYPES: DISABLE 2862PROTOTYPES: DISABLE
2270 2863
2864DC::Channel
2865find ()
2866 CODE:
2867{
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2871 {
2872 RETVAL = Mix_GroupOldest (-1);
2873
2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2880 XSRETURN_UNDEF;
2881 }
2882 else
2883 Mix_HaltChannel (RETVAL);
2884 }
2885
2886 Mix_UnregisterAllEffects (RETVAL);
2887 Mix_Volume (RETVAL, 128);
2888}
2889 OUTPUT:
2890 RETVAL
2891
2892void
2893halt (DC::Channel self)
2894 CODE:
2895 Mix_HaltChannel (self);
2896
2897void
2898expire (DC::Channel self, int ticks = -1)
2899 CODE:
2900 Mix_ExpireChannel (self, ticks);
2901
2902void
2903fade_out (DC::Channel self, int ticks = -1)
2904 CODE:
2905 Mix_FadeOutChannel (self, ticks);
2906
2271int 2907int
2272volume (CFPlus::Channel self, int volume) 2908volume (DC::Channel self, int volume)
2273 CODE: 2909 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2910 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2275 OUTPUT: 2911 OUTPUT:
2276 RETVAL 2912 RETVAL
2277 2913
2278int 2914void
2279unregister_all_effects (CFPlus::Channel self) 2915unregister_all_effects (DC::Channel self)
2280 CODE: 2916 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2917 Mix_UnregisterAllEffects (self);
2282 OUTPUT:
2283 RETVAL
2284 2918
2285int 2919void
2286set_panning (CFPlus::Channel self, int left, int right) 2920set_panning (DC::Channel self, int left, int right)
2287 CODE: 2921 CODE:
2922 left = CLAMP (left , 0, 255);
2923 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2924 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2925
2292int 2926void
2293set_distance (CFPlus::Channel self, int distance) 2927set_distance (DC::Channel self, int distance)
2294 CODE: 2928 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2929 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2930
2299int 2931void
2300set_position (CFPlus::Channel self, int angle, int distance) 2932set_position (DC::Channel self, int angle, int distance)
2301 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;
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2942}
2304 RETVAL
2305 2943
2306int 2944void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2946 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2947 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2948
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2950
2315PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2316 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
2317CFPlus::MixChunk 2965DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2966new (SV *klass, DC::RW rwops)
2319 CODE: 2967 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2969 OUTPUT:
2322 RETVAL 2970 RETVAL
2323 2971
2324void 2972void
2325DESTROY (CFPlus::MixChunk self) 2973DESTROY (DC::MixChunk self)
2326 CODE: 2974 CODE:
2327 Mix_FreeChunk (self); 2975 Mix_FreeChunk (self);
2328 2976
2329int 2977int
2330volume (CFPlus::MixChunk self, int volume = -1) 2978volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2979 CODE:
2980 if (items > 1)
2981 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2982 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2983 OUTPUT:
2334 RETVAL 2984 RETVAL
2335 2985
2336CFPlus::Channel 2986DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2987play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2988 CODE:
2989{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2990 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2991
2992 if (RETVAL < 0)
2993 XSRETURN_UNDEF;
2994
2995 if (channel < 0)
2996 {
2340 Mix_UnregisterAllEffects (RETVAL); 2997 Mix_UnregisterAllEffects (RETVAL);
2998 Mix_Volume (RETVAL, 128);
2999 }
3000}
2341 OUTPUT: 3001 OUTPUT:
2342 RETVAL 3002 RETVAL
2343 3003
2344MODULE = 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
2345 3017
2346int 3018int
2347volume (int volume = -1) 3019volume (int volume = -1)
2348 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2349 CODE: 3021 CODE:
3022 if (items > 0)
3023 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 3024 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 3025 OUTPUT:
2352 RETVAL 3026 RETVAL
2353 3027
3028void
3029fade_out (int ms)
3030 CODE:
3031 Mix_FadeOutMusic (ms);
3032
3033void
3034halt ()
3035 CODE:
3036 Mix_HaltMusic ();
3037
2354int 3038int
2355fade_out (int ms) 3039playing ()
2356 CODE: 3040 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 3041 RETVAL = Mix_PlayingMusic ();
2358 OUTPUT: 3042 OUTPUT:
2359 RETVAL 3043 RETVAL
2360 3044
2361void
2362halt ()
2363 CODE:
2364 Mix_HaltMusic ();
2365
2366CFPlus::MixMusic 3045DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 3046new (SV *klass, DC::RW rwops)
2368 CODE: 3047 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 3049 OUTPUT:
2371 RETVAL 3050 RETVAL
2372 3051
2373void 3052void
2374DESTROY (CFPlus::MixMusic self) 3053DESTROY (DC::MixMusic self)
2375 CODE: 3054 CODE:
2376 Mix_FreeMusic (self); 3055 Mix_FreeMusic (self);
2377 3056
2378int 3057int
2379play (CFPlus::MixMusic self, int loops = -1) 3058play (DC::MixMusic self, int loops = -1)
2380 CODE: 3059 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 3060 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 3061 OUTPUT:
2383 RETVAL 3062 RETVAL
2384 3063
2385int 3064void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3065fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 3066 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3067 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 3068
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3069MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 3070
2394PROTOTYPES: ENABLE 3071PROTOTYPES: ENABLE
2395 3072
2396BOOT: 3073BOOT:
2397{ 3074{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3075 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 3076 static const struct {
2400 const char *name; 3077 const char *name;
2401 IV iv; 3078 IV iv;
2402 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2404 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2405 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2406 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2407 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2408 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2409 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2410 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2411 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2423 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2424 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2425 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2426 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2427 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),
2428 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2429 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2430 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2431 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2432 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2438 const_iv (GL_INTENSITY), 3120 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 3121 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 3122 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 3123 const_iv (GL_FLOAT),
2442 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),
2443 const_iv (GL_COMPILE), 3131 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 3132 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 3133 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 3134 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 3135 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3174 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 3175 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 3176 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 3177 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 3178 const_iv (GL_GENERATE_MIPMAP_HINT),
3179 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 3180 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 3181 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2496 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2497 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),
2498# undef const_iv 3190# undef const_iv
2499 }; 3191 };
2500 3192
2501 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--)
2502 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2503 3195
2504 texture_av = newAV (); 3196 texture_av = newAV ();
2505 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2506} 3198}
2507 3199
2508char * 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 *
2509gl_vendor () 3210gl_vendor ()
2510 CODE: 3211 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2512 OUTPUT: 3213 OUTPUT:
2513 RETVAL 3214 RETVAL
2514 3215
2515char * 3216const char *
2516gl_version () 3217gl_version ()
2517 CODE: 3218 CODE:
2518 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2519 OUTPUT: 3220 OUTPUT:
2520 RETVAL 3221 RETVAL
2521 3222
2522char * 3223const char *
2523gl_extensions () 3224gl_extensions ()
2524 CODE: 3225 CODE:
2525 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2526 OUTPUT: 3227 OUTPUT:
2527 RETVAL 3228 RETVAL
2528 3229
2529const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2530 3235
2531GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2532 CODE: 3237 CODE:
2533 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2534 OUTPUT: 3239 OUTPUT:
2542 3247
2543int glGetError () 3248int glGetError ()
2544 3249
2545void glFinish () 3250void glFinish ()
2546 3251
3252void glFlush ()
3253
2547void glClear (int mask) 3254void glClear (int mask)
2548 3255
2549void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2550 PROTOTYPE: @ 3257 PROTOTYPE: @
2551 3258
2560void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2561 3268
2562void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2563 CODE: 3270 CODE:
2564 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
2565 3274
2566void glDepthMask (int flag) 3275void glDepthMask (int flag)
2567 3276
2568void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2569 3278
2604void glRotate (float angle, float x, float y, float z) 3313void glRotate (float angle, float x, float y, float z)
2605 CODE: 3314 CODE:
2606 glRotatef (angle, x, y, z); 3315 glRotatef (angle, x, y, z);
2607 3316
2608void 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: @
2609 ALIAS: 3319 ALIAS:
2610 glColor_premultiply = 1 3320 glColor_premultiply = 1
2611 CODE: 3321 CODE:
2612 if (ix) 3322 if (ix)
2613 { 3323 {
2633 3343
2634void glRect (float x1, float y1, float x2, float y2) 3344void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 3345 CODE:
2636 glRectf (x1, y1, x2, y2); 3346 glRectf (x1, y1, x2, y2);
2637 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
2638PROTOTYPES: ENABLE 3357PROTOTYPES: ENABLE
2639 3358
2640void glBegin (int mode) 3359void glBegin (int mode)
2641 3360
2642void glEnd () 3361void glEnd ()
2674void 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)
2675 CODE: 3394 CODE:
2676 if (gl.SeparableFilter2D) 3395 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3396 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 3397
2679void 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)
2680 3399
2681void 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)
2682 3401
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 3402void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 3403
2710 3429
2711void glEndList () 3430void glEndList ()
2712 3431
2713void glCallList (int list) 3432void glCallList (int list)
2714 3433
2715MODULE = 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
2716 3440
2717PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
2718 3442
2719void 3443void
2720find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
2721 PPCODE: 3445 PPCODE:
2722{ 3446{
2723 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
2724 XPUSHs (self); 3448 XPUSHs (self);
2725} 3449}
2726 3450
2727BOOT: 3451BOOT:
2728{ 3452{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3453 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 3454
2731 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);
2732 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);
2733 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);
2734 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);
2735} 3459}
2736 3460
2737void 3461void
2738draw (SV *self) 3462draw (SV *self)
2739 CODE: 3463 CODE:
2740{ 3464{
2741 HV *hv; 3465 HV *hv;
2742 SV **svp; 3466 SV **svp;
2743 NV x, y, w, h; 3467 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 3472 double draw_x, draw_y;
2750 3473
2751 if (!SvROK (self)) 3474 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3475 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 3476
2754 hv = (HV *)SvRV (self); 3477 hv = (HV *)SvRV (self);
2755 3478
2756 if (SvTYPE (hv) != SVt_PVHV) 3479 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3480 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 3481
2759 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.;
2760 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.;
2761 3484
2762 if (!h || !w) 3485 if (!h || !w)
2782 { 3505 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3506 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 3507
2785 if (svp && SvTRUE (*svp)) 3508 if (svp && SvTRUE (*svp))
2786 { 3509 {
2787 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);
2788 glEnable (GL_BLEND); 3511 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3512 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 3513 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 3514 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 3515 glVertex2f (w, 0);
2795 glEnd (); 3518 glEnd ();
2796 glDisable (GL_BLEND); 3519 glDisable (GL_BLEND);
2797 } 3520 }
2798 } 3521 }
2799#if 0 3522#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 3523 // draw borders, for debugging
2801 glPushMatrix; 3524 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 3525 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 3526 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 3527 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 3528 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 3529 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 3530 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 3531 glVertex2f (0 , h - 1);
2809 glEnd; 3532 glEnd ();
2810 glPopMatrix; 3533 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 3534#endif
2814 PUSHMARK (SP); 3535 PUSHMARK (SP);
2815 XPUSHs (self); 3536 XPUSHs (self);
2816 PUTBACK; 3537 PUTBACK;
2817 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