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.326 by root, Sun Nov 18 03:06:13 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 RETVAL = new 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.;
1034 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1035 OUTPUT: 1386 OUTPUT:
1036 RETVAL 1387 RETVAL
1037 1388
1038void 1389void
1039DESTROY (CFPlus::Layout self) 1390DESTROY (DC::Layout self)
1040 CODE: 1391 CODE:
1041 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1042 Safefree (self); 1393 delete self;
1043 1394
1044void 1395void
1045set_text (CFPlus::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1046 CODE: 1397 CODE:
1047{ 1398{
1048 STRLEN textlen; 1399 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1400 char *text = SvPVutf8 (text_, textlen);
1050 1401
1051 pango_layout_set_text (self->pl, text, textlen); 1402 pango_layout_set_text (self->pl, text, textlen);
1052} 1403}
1053 1404
1054void 1405void
1055set_markup (CFPlus::Layout self, SV *text_) 1406set_markup (DC::Layout self, SV *text_)
1056 CODE: 1407 CODE:
1057{ 1408{
1058 STRLEN textlen; 1409 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1410 char *text = SvPVutf8 (text_, textlen);
1060 1411
1061 pango_layout_set_markup (self->pl, text, textlen); 1412 pango_layout_set_markup (self->pl, text, textlen);
1062} 1413}
1063 1414
1064void 1415void
1065set_shapes (CFPlus::Layout self, ...) 1416set_shapes (DC::Layout self, ...)
1066 CODE: 1417 CODE:
1067{ 1418{
1068 PangoAttrList *attrs = 0; 1419 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1420 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1421 const char *pos = text;
1105 if (attrs) 1456 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1457 pango_layout_set_attributes (self->pl, attrs);
1107} 1458}
1108 1459
1109void 1460void
1110get_shapes (CFPlus::Layout self) 1461get_shapes (DC::Layout self)
1111 PPCODE: 1462 PPCODE:
1112{ 1463{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1464 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1465
1115 do 1466 do
1116 { 1467 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1468 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1469
1119 if (run && shape_attr_p (run)) 1470 if (run && shape_attr_p (run))
1120 { 1471 {
1121 PangoRectangle extents; 1472 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1473 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1481
1131 pango_layout_iter_free (iter); 1482 pango_layout_iter_free (iter);
1132} 1483}
1133 1484
1134int 1485int
1135has_wrapped (CFPlus::Layout self) 1486has_wrapped (DC::Layout self)
1136 CODE: 1487 CODE:
1137{ 1488{
1138 int lines = 1; 1489 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1490 const char *text = pango_layout_get_text (self->pl);
1140 1491
1145} 1496}
1146 OUTPUT: 1497 OUTPUT:
1147 RETVAL 1498 RETVAL
1148 1499
1149SV * 1500SV *
1150get_text (CFPlus::Layout self) 1501get_text (DC::Layout self)
1151 CODE: 1502 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1503 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1504 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1505 OUTPUT:
1155 RETVAL 1506 RETVAL
1156 1507
1157void 1508void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1509set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1510 CODE:
1160 self->r = r; 1511 self->r = r;
1161 self->g = g; 1512 self->g = g;
1162 self->b = b; 1513 self->b = b;
1163 self->a = a; 1514 self->a = a;
1164 1515
1165void 1516void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1517set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1518 CODE:
1168 if (self->font != font) 1519 if (self->font != font)
1169 { 1520 {
1170 self->font = font; 1521 self->font = font;
1171 layout_update_font (self); 1522 layout_update_font (self);
1172 } 1523 }
1173 1524
1174void 1525void
1175set_height (CFPlus::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1176 CODE: 1527 CODE:
1177 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1178 { 1529 {
1179 self->base_height = base_height; 1530 self->base_height = base_height;
1180 layout_update_font (self); 1531 layout_update_font (self);
1181 } 1532 }
1182 1533
1183void 1534void
1184set_width (CFPlus::Layout self, int max_width = -1) 1535set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1536 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1537 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1538
1188void 1539void
1189set_indent (CFPlus::Layout self, int indent) 1540set_indent (DC::Layout self, int indent)
1190 CODE: 1541 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1542 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1543
1193void 1544void
1194set_spacing (CFPlus::Layout self, int spacing) 1545set_spacing (DC::Layout self, int spacing)
1195 CODE: 1546 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1547 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1548
1198void 1549void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1550set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1551 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1552 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1553 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1554 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1555 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1556 : PANGO_ELLIPSIZE_NONE
1206 ); 1557 );
1207 1558
1208void 1559void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1560set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1561 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1562 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1563
1213void 1564void
1214size (CFPlus::Layout self) 1565size (DC::Layout self)
1215 PPCODE: 1566 PPCODE:
1216{ 1567{
1217 int w, h; 1568 int w, h;
1218 1569
1219 layout_get_pixel_size (self, &w, &h); 1570 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1573 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1574 PUSHs (sv_2mortal (newSViv (h)));
1224} 1575}
1225 1576
1226int 1577int
1227descent (CFPlus::Layout self) 1578descent (DC::Layout self)
1228 CODE: 1579 CODE:
1229{ 1580{
1230 PangoRectangle rect; 1581 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1582 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1583 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1584 RETVAL = PANGO_DESCENT (rect);
1234} 1585}
1235 OUTPUT: 1586 OUTPUT:
1236 RETVAL 1587 RETVAL
1237 1588
1238int 1589int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1590xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1591 CODE:
1241{ 1592{
1242 int index, trailing; 1593 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1594 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1595 RETVAL = index + trailing;
1245} 1596}
1246 OUTPUT: 1597 OUTPUT:
1247 RETVAL 1598 RETVAL
1248 1599
1249void 1600void
1250cursor_pos (CFPlus::Layout self, int index) 1601cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1602 PPCODE:
1252{ 1603{
1253 PangoRectangle strong_pos; 1604 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1605 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1606
1256 EXTEND (SP, 3); 1607 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1608 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1609 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1611}
1261 1612
1262void 1613void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1614index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1615 PPCODE:
1265{ 1616{
1266 int line, x; 1617 int line, x;
1267 1618
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1619 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1620#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1621 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1622 --line;
1623#endif
1271 EXTEND (SP, 2); 1624 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1625 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1626 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1627}
1275 1628
1276void 1629void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1630line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1631 PPCODE:
1279{ 1632{
1280 PangoLayoutLine *lp; 1633 PangoLayoutLine *lp;
1281 int index, trailing; 1634 int index, trailing;
1282 1635
1283 if (line < 0) 1636 if (line < 0)
1284 XSRETURN_EMPTY; 1637 XSRETURN_EMPTY;
1285 1638
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1639 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1640 XSRETURN_EMPTY; /* do better */
1288 1641
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1642 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1643
1291 EXTEND (SP, 2); 1644 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1650 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1651 }
1299} 1652}
1300 1653
1301void 1654void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1656 CODE:
1657 self->rc.clear ();
1304 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1305 self->pl, 1659 self->pl,
1660 &self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1308 flags 1663 flags
1309 ); 1664 );
1665 // we assume that context_change actually clears/frees stuff
1666 // and does not do any recomputation...
1667 pango_layout_context_changed (self->pl);
1310 1668
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1669void
1670draw (DC::Layout self)
1671 CODE:
1672{
1673 glEnable (GL_TEXTURE_2D);
1674 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1675 glEnable (GL_BLEND);
1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1678 glEnable (GL_ALPHA_TEST);
1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1680
1681 self->rc.draw ();
1682
1683 glDisable (GL_ALPHA_TEST);
1684 glDisable (GL_BLEND);
1685 glDisable (GL_TEXTURE_2D);
1686}
1687
1688MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1689
1313PROTOTYPES: ENABLE 1690PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1691
1317void 1692void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1693pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1694 CODE:
1320{ 1695{
1347 HV *hv = (HV *)SvRV (self); 1722 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1723 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1724 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1725 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1726
1727 if (name <= 0)
1728 XSRETURN_EMPTY;
1729
1352 if (items < 5) 1730 if (items < 5)
1353 { 1731 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1732 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1733 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1734 }
1383 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1385 } 1763 }
1386} 1764}
1387 1765
1766void
1767draw_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)
1768 PROTOTYPE: @
1769 CODE:
1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1773 glEnable (GL_TEXTURE_2D);
1774 glBindTexture (GL_TEXTURE_2D, name1);
1775
1776 glColor3f (intensity, intensity, intensity);
1777 glPushMatrix ();
1778 glScalef (1./3, 1./3, 1.);
1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1847 glBegin (GL_QUADS);
1848
1849 for (y = 1; y < h; y += 3)
1850 {
1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1879 glEnd ();
1880
1881 glPopMatrix ();
1882
1883 glDisable (GL_TEXTURE_2D);
1884 glDisable (GL_BLEND);
1885}
1886
1388IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1887IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1389 CODE: 1888 CODE:
1390{ 1889{
1391 GLint width; 1890 GLint width;
1392 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1891 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1394 RETVAL = width > 0; 1893 RETVAL = width > 0;
1395} 1894}
1396 OUTPUT: 1895 OUTPUT:
1397 RETVAL 1896 RETVAL
1398 1897
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1899
1401PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1402 1901
1403CFPlus::Map 1902DC::Map
1404new (SV *class) 1903new (SV *klass)
1405 CODE: 1904 CODE:
1406 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1407 RETVAL->x = 0; 1906 RETVAL->x = 0;
1408 RETVAL->y = 0; 1907 RETVAL->y = 0;
1409 RETVAL->w = 0; 1908 RETVAL->w = 0;
1410 RETVAL->h = 0; 1909 RETVAL->h = 0;
1411 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1416 RETVAL->row = 0; 1915 RETVAL->row = 0;
1417 OUTPUT: 1916 OUTPUT:
1418 RETVAL 1917 RETVAL
1419 1918
1420void 1919void
1421DESTROY (CFPlus::Map self) 1920DESTROY (DC::Map self)
1422 CODE: 1921 CODE:
1423{ 1922{
1424 map_clear (self); 1923 map_clear (self);
1425 Safefree (self->face2tile); 1924 Safefree (self->face2tile);
1426 Safefree (self->tex); 1925 Safefree (self->tex);
1427 Safefree (self); 1926 Safefree (self);
1428} 1927}
1429 1928
1430void 1929void
1431resize (CFPlus::Map self, int map_width, int map_height) 1930resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1931 CODE:
1433 self->w = map_width; 1932 self->w = map_width;
1434 self->h = map_height; 1933 self->h = map_height;
1435 1934
1436void 1935void
1437clear (CFPlus::Map self) 1936clear (DC::Map self)
1438 CODE: 1937 CODE:
1439 map_clear (self); 1938 map_clear (self);
1440 1939
1441void 1940void
1442set_tileid (CFPlus::Map self, int face, int tile) 1941set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1942 CODE:
1444{ 1943{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1944 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1945 need_texid (self, tile);
1447} 1946}
1448 1947
1449void 1948void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1950 CODE:
1452{ 1951{
1453 tileid texid; 1952 tileid texid;
1454 maptex *tex; 1953 maptex *tex;
1455 1954
1456 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1457 return; 1956 return;
1458 1957
1459 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1460 return; 1959 return;
1461 1960
1462 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1463 1962
1464 if (!texid) 1963 if (!texid)
1465 return; 1964 return;
1466 1965
1467 tex = self->tex + texid; 1966 tex = self->tex + texid;
1468 tex->smoothtile = self->face2tile [smooth]; 1967 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1968 tex->smoothlevel = level;
1470} 1969}
1471 1970
1472void 1971void
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) 1972set_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: 1973 CODE:
1475{ 1974{
1476 need_texid (self, texid); 1975 need_texid (self, texid);
1477 1976
1478 { 1977 {
1497 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1498 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1999}
1501 2000
2001void
2002expire_textures (DC::Map self, int texid, int count)
2003 PPCODE:
2004 for (; texid < self->texs && count; ++texid, --count)
2005 {
2006 maptex *tex = self->tex + texid;
2007
2008 if (tex->name)
2009 {
2010 if (tex->unused)
2011 {
2012 tex->name = 0;
2013 tex->unused = 0;
2014 XPUSHs (sv_2mortal (newSViv (texid)));
2015 }
2016 else
2017 tex->unused = 1;
2018 }
2019 }
2020
1502int 2021int
1503ox (CFPlus::Map self) 2022ox (DC::Map self)
1504 ALIAS: 2023 ALIAS:
1505 oy = 1 2024 oy = 1
1506 x = 2 2025 x = 2
1507 y = 3 2026 y = 3
1508 w = 4 2027 w = 4
1519 } 2038 }
1520 OUTPUT: 2039 OUTPUT:
1521 RETVAL 2040 RETVAL
1522 2041
1523void 2042void
1524scroll (CFPlus::Map self, int dx, int dy) 2043scroll (DC::Map self, int dx, int dy)
1525 CODE: 2044 CODE:
1526{ 2045{
1527 if (dx > 0) 2046 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 2047 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 2048 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 2063 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1546 } 2065 }
1547} 2066}
1548 2067
1549void 2068SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1551 CODE: 2070 CODE:
1552{ 2071{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 2074 mapcell *cell;
1556 int x, y, flags; 2075 int x, y, z, flags;
2076 AV *missing = newAV ();
2077 RETVAL = newRV_noinc ((SV *)missing);
1557 2078
1558 while (data < data_end - 1) 2079 while (data < data_end - 1)
1559 { 2080 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 2081 flags = (data [0] << 8) + data [1]; data += 2;
1561 2082
1574 2095
1575 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1576 2097
1577 if (flags & 8) 2098 if (flags & 8)
1578 { 2099 {
2100 uint8_t ext, cmd;
2101
1579 if (extmap) 2102 do
1580 { 2103 {
1581 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1582 2106
1583 do 2107 if (cmd < 4)
2108 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2109 else if (cmd == 5) // health
1584 { 2110 {
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; 2111 cell->stat_width = 1;
1593 cell->stat_hp = *data++; 2112 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 } 2113 }
1611 while (ext & 0x80); 2114 else if (cmd == 6) // monster width
2115 cell->stat_width = *data++ + 1;
2116 else if (cmd == 0x47)
2117 {
2118 if (*data == 1) cell->player = data [1];
2119 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2120 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2121 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2122
2123 data += *data + 1;
2124 }
2125 else if (cmd == 8) // cell flags
2126 cell->flags = *data++;
2127 else if (ext & 0x40) // unknown, multibyte => skip
2128 data += *data + 1;
2129 else
2130 data++;
1612 } 2131 }
1613 else 2132 while (ext & 0x80);
1614 cell->darkness = *data++ + 1;
1615 } 2133 }
1616 2134
2135 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 2136 if (flags & (4 >> z))
1618 { 2137 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 2138 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 2139 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
2141
2142 if (cell->tile [z])
2143 {
2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
2146 if (!tex->name)
2147 av_push (missing, newSViv (cell->tile [z]));
2148
2149 if (tex->smoothtile)
2150 {
2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
2153 if (!smooth->name)
2154 av_push (missing, newSViv (tex->smoothtile));
2155 }
2156 }
1622 } 2157 }
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 } 2158 }
1638 else 2159 else
1639 cell->darkness = 0; 2160 CELL_CLEAR (cell);
1640 } 2161 }
1641} 2162}
2163 OUTPUT:
2164 RETVAL
1642 2165
1643SV * 2166SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2167mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 2168 CODE:
1646{ 2169{
1647 int x1, x; 2170 int x1, x;
1648 int y1, y; 2171 int y1, y;
1649 int z; 2172 int z;
1662 ? self->row + y 2185 ? self->row + y
1663 : 0; 2186 : 0;
1664 2187
1665 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1666 { 2189 {
1667 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1668 2191
1669 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1670 { 2193 {
1671 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1672 2195
1674 { 2197 {
1675 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1676 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1677 int a1 = tex.a; 2200 int a1 = tex.a;
1678 2201
1679 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1680 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1681 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1682 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1683 } 2206 }
1684 } 2207 }
1685 2208
1686 *map++ = (r ) 2209 *map++ = (r )
1687 | (g << 8) 2210 | (g << 8)
1688 | (b << 16) 2211 | (b << 16)
1689 | (a << 24); 2212 | (a << 24);
1690 } 2213 }
1691 } 2214 }
1692 2215
1693 RETVAL = map_sv; 2216 RETVAL = map_sv;
1694} 2217}
1695 OUTPUT: 2218 OUTPUT:
1696 RETVAL 2219 RETVAL
1697 2220
1698void 2221void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2222draw (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: 2223 CODE:
1701{ 2224{
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; 2225 int x, y, z;
1707 int last_name;
1708 2226
2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2228 int pl_x, pl_y;
2229 maptex pl_tex;
2230 rc_t rc;
2231 rc_t rc_ov;
2232 rc_key_t key;
2233 rc_t::array_t *arr;
2234
2235 pl_tex.name = 0;
2236
1709 // thats current max. sorry. 2237 // that's current max. sorry.
1710 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1712 2240
1713 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 2241 memset (&key, 0, sizeof (key));
1715 2242 key.r = 255;
1716 glColor4ub (255, 255, 255, 255); 2243 key.g = 255;
1717 2244 key.b = 255;
1718 glEnable (GL_BLEND); 2245 key.a = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2246 key.mode = GL_QUADS;
1720 glEnable (GL_TEXTURE_2D); 2247 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 2248
1727 mx += self->x; 2249 mx += self->x;
1728 my += self->y; 2250 my += self->y;
1729 2251
1730 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1731 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1732 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1733 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1734 2256
1735 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1736 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1737 { 2259 {
1738 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2269 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2270 self->tex [cell->tile [2]].smoothlevel));
1749 } 2271 }
1750 } 2272 }
1751 2273
2274 glEnable (GL_BLEND);
2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2277
1752 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
1753 { 2279 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2283 key.texname = -1;
1755 2284
1756 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
1757 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
1758 { 2287 {
1759 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
1765 tileid tile = cell->tile [z]; 2294 tileid tile = cell->tile [z];
1766 2295
1767 if (tile) 2296 if (tile)
1768 { 2297 {
1769 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2299 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 2300
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2301 if (key.texname != tex.name)
1776 { 2302 {
2303 self->tex [tile].unused = 0;
2304
1777 if (!tex.name) 2305 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1779 2307
2308 key.texname = tex.name;
1780 glEnd (); 2309 arr = &rc.array (key);
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1782 glBegin (GL_QUADS);
1783 } 2310 }
1784 2311
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2312 px = (x + 1) * Th - tex.w;
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2313 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 2314
1790 if (cell->flags && z == 2) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
1791 { 2316 {
1792 if (cell->flags & 1) 2317 pl_x = px;
2318 pl_y = py;
2319 pl_tex = tex;
1793 { 2320 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 } 2321 }
2322
2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1808 2327
1809 // update smooth hash 2328 // update smooth hash
1810 if (tex.smoothtile) 2329 if (tex.smoothtile)
1811 { 2330 {
1812 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
1813 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
1814 2333
1815 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
1816 2335
1817 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
1818 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
1819 2338
1820 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
1828 2347
1829 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1830 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
1831 2350
1832 // full tile 2351 // full tile
1833 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1834 2353
1835 // borders 2354 // borders
1836 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 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); 2356 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); 2357 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); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1840 2359
1841 // corners 2360 // corners
1842 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 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); 2362 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); 2363 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); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2365 }
2366 }
2367
2368 if (expect_false (z == 2) && expect_false (cell->flags))
2369 {
2370 // overlays such as the speech bubble, probably more to come
2371 if (cell->flags & 1)
2372 {
2373 rc_key_t key_ov = key;
2374 maptex tex = self->tex[TEXID_SPEECH];
2375 int px = x * Tw + Tw * 2 / 32;
2376 int py = y * Th - Th * 6 / 32;
2377
2378 key_ov.texname = tex.name;
2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2380
2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1846 } 2385 }
1847 } 2386 }
1848 } 2387 }
1849 } 2388 }
1850 2389
2390 rc.draw ();
2391 rc.clear ();
2392
1851 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2394 // this is basically counting sort
1853 { 2395 {
1854 int w, b; 2396 int w, b;
1855 2397
1856 for (w = 0; w < 256 / 32; ++w) 2398 glEnable (GL_TEXTURE_2D);
2399 glBegin (GL_QUADS);
2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1857 { 2403 {
1858 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
1859 if (smask) 2405 IV bits = it->second;
1860 for (b = 0; b < 32; ++b) 2406
1861 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
1862 { 2410 {
1863 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
1864 HE *he; 2419 if (tex.name)
1865
1866 hv_iterinit (smooth);
1867 while ((he = hv_iternext (smooth)))
1868 { 2420 {
1869 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
1870 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
1871 2423 if (key.texname != tex.name)
1872 if (!(bits & 0x1000)
1873 && skey->level == level
1874 && level > smooth_max [skey->x][skey->y])
1875 { 2424 {
1876 maptex tex = self->tex [skey->tile]; 2425 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 2426
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 (); 2427 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
1894 } 2430 }
1895 2431
1896 if (border) 2432 if (border)
1897 { 2433 {
1898 float ox = border * dx; 2434 float ox = border * dx;
1899 2435
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1904 } 2440 }
1905 2441
1906 if (corner) 2442 if (corner)
1907 { 2443 {
1908 float ox = corner * dx; 2444 float ox = corner * dx;
1909 2445
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1914 }
1915 } 2450 }
1916 } 2451 }
1917 } 2452 }
1918 } 2453 }
2454
2455 glEnd ();
2456 glDisable (GL_TEXTURE_2D);
2457 key.texname = -1;
1919 } 2458 }
1920
1921 hv_clear (smooth);
1922 } 2459 }
1923 2460
1924 glEnd (); 2461 if (pl_tex.name)
2462 {
2463 maptex tex = pl_tex;
2464 int px = pl_x + sdx;
2465 int py = pl_y + sdy;
1925 2466
1926 glDisable (GL_TEXTURE_2D); 2467 key.texname = tex.name;
2468 rc_t::array_t &arr = rc.array (key);
2469
2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2474
2475 rc.draw ();
2476 }
2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
1927 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
1928 2482
1929 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
1935 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
1936 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
1937 { 2491 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
1939 2493
1940 int px = x * T; 2494 int px = x * Tw;
1941 int py = y * T; 2495 int py = y * Th;
2496
2497 if (expect_false (cell->player == player))
2498 {
2499 px += sdx;
2500 py += sdy;
2501 }
1942 2502
1943 if (cell->stat_hp) 2503 if (cell->stat_hp)
1944 { 2504 {
1945 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1947 2507
1948 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
1949 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
1950 px + width - 1, py); 2510 px + width - 1, py);
1951 2511
1957 } 2517 }
1958 } 2518 }
1959} 2519}
1960 2520
1961void 2521void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1963 CODE: 2523 CODE:
1964{ 2524{
1965 static float color[16][3] = { 2525 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
1967 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
1968 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
1969 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
1970 2530
1971 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
1972 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
1973 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
1974 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
1975 2535
1976 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
1977 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
1978 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
1979 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
1980 2540
1981 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
1982 2542
1983 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
1984 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
1985 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
1986 }; 2546 };
1987 2547
1988 int x, y; 2548 int x, y;
1989 2549
1990 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2553 * and takes the colour from god knows where instead of using
2554 * Cp. MODULATE results in the same colour, but slightly different
2555 * alpha, but atcually gives us the correct colour with nvidia.
2556 */
1991 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1992 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
1993 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1994 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
1995 2561
1996 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2000 2566
2001 if (m) 2567 if (m)
2002 { 2568 {
2003 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2004 2570
2005 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2006 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2007 2573
2008 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2009 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2010 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2011 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2012 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2013 } 2579 }
2017 glDisable (GL_BLEND); 2583 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2584 glDisable (GL_TEXTURE_2D);
2019} 2585}
2020 2586
2021void 2587void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2589 PPCODE:
2024{ 2590{
2025 int x, y; 2591 int x, y;
2026 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2028 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2029 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2030 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2031 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2032 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2033 2600
2034 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2036 2603
2037 mx += self->x - 1; 2604 mx += self->x - 1;
2038 my += self->y - 1; 2605 my += self->y - 1;
2039
2040 memset (darkness1, 255, sw1 * sh1);
2041 2606
2042 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2044 { 2609 {
2045 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2048 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2049 { 2614 {
2050 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2051 2616
2052 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2053 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2054 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2055 } 2620 }
2056 } 2621 }
2057 2622
2058 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2059 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2078 2643
2079 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2080 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2081 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2082 2647
2083 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2084 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2085 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2086 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2087 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 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); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2089 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2090 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2091 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2092 } 2657 }
2093 2658
2094 free (darkness1); 2659 free (darkness1);
2095 2660
2096 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2097 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2100} 2665}
2101 2666
2102SV * 2667SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2668get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2669 CODE:
2105{ 2670{
2106 int x, y, x1, y1; 2671 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2672 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2673 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2730 else
2166 *data++ = 0; 2731 *data++ = 0;
2167 } 2732 }
2168 } 2733 }
2169 2734
2735 /* if size is w*h + 5 then no data has been found */
2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2737 {
2170 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2740 }
2741
2172 RETVAL = data_sv; 2742 RETVAL = data_sv;
2173} 2743}
2174 OUTPUT: 2744 OUTPUT:
2175 RETVAL 2745 RETVAL
2176 2746
2177void 2747void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2748set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2749 PPCODE:
2180{ 2750{
2181 int x, y, z; 2751 int x, y, z;
2182 int w, h; 2752 int w, h;
2183 int x1, y1; 2753 int x1, y1;
2754 STRLEN len;
2755 uint8_t *data, *end;
2756
2757 len = SvLEN (data_sv);
2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2760 end = data + len + 8;
2761
2762 if (len < 5)
2763 XSRETURN_EMPTY;
2184 2764
2185 if (*data++ != 0) 2765 if (*data++ != 0)
2186 return; /* version mismatch */ 2766 XSRETURN_EMPTY; /* version mismatch */
2187 2767
2188 w = *data++ << 8; w |= *data++; 2768 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2769 h = *data++ << 8; h |= *data++;
2190 2770
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2771 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2783 {
2204 maprow *row = map_get_row (self, y); 2784 maprow *row = map_get_row (self, y);
2205 2785
2206 for (x = x0; x < x1; x++) 2786 for (x = x0; x < x1; x++)
2207 { 2787 {
2788 uint8_t flags;
2789
2790 if (data + 7 >= end)
2791 XSRETURN_EMPTY;
2792
2208 uint8_t flags = *data++; 2793 flags = *data++;
2209 2794
2210 if (flags) 2795 if (flags)
2211 { 2796 {
2212 mapcell *cell = row_get_cell (row, x); 2797 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2798 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2801 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2802 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2803
2219 if (cell->darkness == 0) 2804 if (cell->darkness == 0)
2220 { 2805 {
2221 cell->darkness = 0; 2806 /*cell->darkness = 0;*/
2807 EXTEND (SP, 3);
2222 2808
2223 for (z = 0; z <= 2; z++) 2809 for (z = 0; z <= 2; z++)
2224 { 2810 {
2225 tileid t = tile [z]; 2811 tileid t = tile [z];
2226 2812
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2813 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2814 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2815 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2816 need_texid (self, t);
2231 } 2817 }
2232 2818
2233 cell->tile [z] = t; 2819 cell->tile [z] = t;
2234 } 2820 }
2236 } 2822 }
2237 } 2823 }
2238 } 2824 }
2239} 2825}
2240 2826
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2828
2243CFPlus::RW 2829DC::RW
2244new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2245 CODE: 2831 CODE:
2246{ 2832{
2247 STRLEN datalen; 2833 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2249 2835
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2836 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2837}
2252 OUTPUT: 2838 OUTPUT:
2253 RETVAL 2839 RETVAL
2254 2840
2255CFPlus::RW 2841DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2257 CODE: 2843 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2845 OUTPUT:
2260 RETVAL 2846 RETVAL
2261 2847
2848# fails on win32:
2849# dc.xs(2268) : error C2059: syntax error : '('
2262void 2850#void
2263close (CFPlus::RW self) 2851#close (DC::RW self)
2264 CODE: 2852# CODE:
2265 SDL_RWclose (self); 2853# (self->(close)) (self);
2266 2854
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2855MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2856
2269PROTOTYPES: DISABLE 2857PROTOTYPES: DISABLE
2270 2858
2859DC::Channel
2860find ()
2861 CODE:
2862{
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2866 {
2867 RETVAL = Mix_GroupOldest (-1);
2868
2869 if (RETVAL < 0)
2870 {
2871 // happens sometimes, maybe it just stopped playing(?)
2872 RETVAL = Mix_GroupAvailable (-1);
2873
2874 if (RETVAL < 0)
2875 XSRETURN_UNDEF;
2876 }
2877 else
2878 Mix_HaltChannel (RETVAL);
2879 }
2880
2881 Mix_UnregisterAllEffects (RETVAL);
2882 Mix_Volume (RETVAL, 128);
2883}
2884 OUTPUT:
2885 RETVAL
2886
2887void
2888halt (DC::Channel self)
2889 CODE:
2890 Mix_HaltChannel (self);
2891
2892void
2893expire (DC::Channel self, int ticks = -1)
2894 CODE:
2895 Mix_ExpireChannel (self, ticks);
2896
2897void
2898fade_out (DC::Channel self, int ticks = -1)
2899 CODE:
2900 Mix_FadeOutChannel (self, ticks);
2901
2271int 2902int
2272volume (CFPlus::Channel self, int volume) 2903volume (DC::Channel self, int volume)
2273 CODE: 2904 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2905 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2275 OUTPUT: 2906 OUTPUT:
2276 RETVAL 2907 RETVAL
2277 2908
2278int 2909void
2279unregister_all_effects (CFPlus::Channel self) 2910unregister_all_effects (DC::Channel self)
2280 CODE: 2911 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2912 Mix_UnregisterAllEffects (self);
2282 OUTPUT:
2283 RETVAL
2284 2913
2285int 2914void
2286set_panning (CFPlus::Channel self, int left, int right) 2915set_panning (DC::Channel self, int left, int right)
2287 CODE: 2916 CODE:
2917 left = CLAMP (left , 0, 255);
2918 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2919 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2920
2292int 2921void
2293set_distance (CFPlus::Channel self, int distance) 2922set_distance (DC::Channel self, int distance)
2294 CODE: 2923 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2924 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2925
2299int 2926void
2300set_position (CFPlus::Channel self, int angle, int distance) 2927set_position (DC::Channel self, int angle, int distance)
2301 CODE: 2928 CODE:
2929
2930void
2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2932 CODE:
2933{
2934 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2937}
2304 RETVAL
2305 2938
2306int 2939void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2941 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2942 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2943
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2945
2315PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2316 2947
2948void
2949decoders ()
2950 PPCODE:
2951#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2952 int i, num = Mix_GetNumChunkDecoders ();
2953 EXTEND (SP, num);
2954 for (i = 0; i < num; ++i)
2955 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2956#else
2957 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2958#endif
2959
2317CFPlus::MixChunk 2960DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2961new (SV *klass, DC::RW rwops)
2319 CODE: 2962 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2964 OUTPUT:
2322 RETVAL 2965 RETVAL
2323 2966
2324void 2967void
2325DESTROY (CFPlus::MixChunk self) 2968DESTROY (DC::MixChunk self)
2326 CODE: 2969 CODE:
2327 Mix_FreeChunk (self); 2970 Mix_FreeChunk (self);
2328 2971
2329int 2972int
2330volume (CFPlus::MixChunk self, int volume = -1) 2973volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2974 CODE:
2975 if (items > 1)
2976 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2977 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2978 OUTPUT:
2334 RETVAL 2979 RETVAL
2335 2980
2336CFPlus::Channel 2981DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2982play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2983 CODE:
2984{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2985 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2986
2987 if (RETVAL < 0)
2988 XSRETURN_UNDEF;
2989
2990 if (channel < 0)
2991 {
2340 Mix_UnregisterAllEffects (RETVAL); 2992 Mix_UnregisterAllEffects (RETVAL);
2993 Mix_Volume (RETVAL, 128);
2994 }
2995}
2341 OUTPUT: 2996 OUTPUT:
2342 RETVAL 2997 RETVAL
2343 2998
2344MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
3000
3001void
3002decoders ()
3003 PPCODE:
3004#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3005 int i, num = Mix_GetNumMusicDecoders ();
3006 EXTEND (SP, num);
3007 for (i = 0; i < num; ++i)
3008 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3009#else
3010 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3011#endif
2345 3012
2346int 3013int
2347volume (int volume = -1) 3014volume (int volume = -1)
2348 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2349 CODE: 3016 CODE:
3017 if (items > 0)
3018 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 3019 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 3020 OUTPUT:
2352 RETVAL 3021 RETVAL
2353 3022
3023void
3024fade_out (int ms)
3025 CODE:
3026 Mix_FadeOutMusic (ms);
3027
3028void
3029halt ()
3030 CODE:
3031 Mix_HaltMusic ();
3032
2354int 3033int
2355fade_out (int ms) 3034playing ()
2356 CODE: 3035 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 3036 RETVAL = Mix_PlayingMusic ();
2358 OUTPUT: 3037 OUTPUT:
2359 RETVAL 3038 RETVAL
2360 3039
2361void
2362halt ()
2363 CODE:
2364 Mix_HaltMusic ();
2365
2366CFPlus::MixMusic 3040DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 3041new (SV *klass, DC::RW rwops)
2368 CODE: 3042 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 3044 OUTPUT:
2371 RETVAL 3045 RETVAL
2372 3046
2373void 3047void
2374DESTROY (CFPlus::MixMusic self) 3048DESTROY (DC::MixMusic self)
2375 CODE: 3049 CODE:
2376 Mix_FreeMusic (self); 3050 Mix_FreeMusic (self);
2377 3051
2378int 3052int
2379play (CFPlus::MixMusic self, int loops = -1) 3053play (DC::MixMusic self, int loops = -1)
2380 CODE: 3054 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 3055 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 3056 OUTPUT:
2383 RETVAL 3057 RETVAL
2384 3058
2385int 3059void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3060fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 3061 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3062 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 3063
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3064MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 3065
2394PROTOTYPES: ENABLE 3066PROTOTYPES: ENABLE
2395 3067
2396BOOT: 3068BOOT:
2397{ 3069{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3070 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 3071 static const struct {
2400 const char *name; 3072 const char *name;
2401 IV iv; 3073 IV iv;
2402 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2404 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2405 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2406 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2407 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2408 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2409 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2410 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2411 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2423 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2424 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2425 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2426 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2427 const_iv (GL_ONE_MINUS_DST_ALPHA), 3100 const_iv (GL_ONE_MINUS_DST_ALPHA),
3101 const_iv (GL_SRC_COLOR),
3102 const_iv (GL_DST_COLOR),
3103 const_iv (GL_ONE_MINUS_SRC_COLOR),
3104 const_iv (GL_ONE_MINUS_DST_COLOR),
2428 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2429 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2430 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2431 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2432 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2438 const_iv (GL_INTENSITY), 3115 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 3116 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 3117 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 3118 const_iv (GL_FLOAT),
2442 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3119 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3120 const_iv (GL_COMPRESSED_ALPHA_ARB),
3121 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3122 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3123 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3124 const_iv (GL_COMPRESSED_RGB_ARB),
3125 const_iv (GL_COMPRESSED_RGBA_ARB),
2443 const_iv (GL_COMPILE), 3126 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 3127 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 3128 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 3129 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 3130 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3169 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 3170 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 3171 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 3172 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 3173 const_iv (GL_GENERATE_MIPMAP_HINT),
3174 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 3175 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 3176 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2496 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2497 const_iv (GL_T2F_N3F_V3F), 3181 const_iv (GL_T2F_N3F_V3F),
3182 const_iv (GL_FUNC_ADD),
3183 const_iv (GL_FUNC_SUBTRACT),
3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2498# undef const_iv 3185# undef const_iv
2499 }; 3186 };
2500 3187
2501 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3188 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2502 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2503 3190
2504 texture_av = newAV (); 3191 texture_av = newAV ();
2505 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2506} 3193}
2507 3194
2508char * 3195void
3196disable_GL_EXT_blend_func_separate ()
3197 CODE:
3198 gl.BlendFuncSeparate = 0;
3199 gl.BlendFuncSeparateEXT = 0;
3200
3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2509gl_vendor () 3205gl_vendor ()
2510 CODE: 3206 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2512 OUTPUT: 3208 OUTPUT:
2513 RETVAL 3209 RETVAL
2514 3210
2515char * 3211const char *
2516gl_version () 3212gl_version ()
2517 CODE: 3213 CODE:
2518 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2519 OUTPUT: 3215 OUTPUT:
2520 RETVAL 3216 RETVAL
2521 3217
2522char * 3218const char *
2523gl_extensions () 3219gl_extensions ()
2524 CODE: 3220 CODE:
2525 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2526 OUTPUT: 3222 OUTPUT:
2527 RETVAL 3223 RETVAL
2528 3224
2529const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2530 3230
2531GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2532 CODE: 3232 CODE:
2533 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2534 OUTPUT: 3234 OUTPUT:
2542 3242
2543int glGetError () 3243int glGetError ()
2544 3244
2545void glFinish () 3245void glFinish ()
2546 3246
3247void glFlush ()
3248
2547void glClear (int mask) 3249void glClear (int mask)
2548 3250
2549void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2550 PROTOTYPE: @ 3252 PROTOTYPE: @
2551 3253
2560void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2561 3263
2562void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2563 CODE: 3265 CODE:
2564 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2565 3269
2566void glDepthMask (int flag) 3270void glDepthMask (int flag)
2567 3271
2568void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2569 3273
2604void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2605 CODE: 3309 CODE:
2606 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2607 3311
2608void glColor (float r, float g, float b, float a = 1.0) 3312void glColor (float r, float g, float b, float a = 1.0)
3313 PROTOTYPE: @
2609 ALIAS: 3314 ALIAS:
2610 glColor_premultiply = 1 3315 glColor_premultiply = 1
2611 CODE: 3316 CODE:
2612 if (ix) 3317 if (ix)
2613 { 3318 {
2633 3338
2634void glRect (float x1, float y1, float x2, float y2) 3339void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 3340 CODE:
2636 glRectf (x1, y1, x2, y2); 3341 glRectf (x1, y1, x2, y2);
2637 3342
3343void glRect_lineloop (float x1, float y1, float x2, float y2)
3344 CODE:
3345 glBegin (GL_LINE_LOOP);
3346 glVertex2f (x1, y1);
3347 glVertex2f (x2, y1);
3348 glVertex2f (x2, y2);
3349 glVertex2f (x1, y2);
3350 glEnd ();
3351
2638PROTOTYPES: ENABLE 3352PROTOTYPES: ENABLE
2639 3353
2640void glBegin (int mode) 3354void glBegin (int mode)
2641 3355
2642void glEnd () 3356void glEnd ()
2674void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3388void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2675 CODE: 3389 CODE:
2676 if (gl.SeparableFilter2D) 3390 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3391 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 3392
2679void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3393void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2680 3394
2681void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3395void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2682 3396
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 3397void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 3398
2710 3424
2711void glEndList () 3425void glEndList ()
2712 3426
2713void glCallList (int list) 3427void glCallList (int list)
2714 3428
2715MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2716 3435
2717PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
2718 3437
2719void 3438void
2720find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
2721 PPCODE: 3440 PPCODE:
2722{ 3441{
2723 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
2724 XPUSHs (self); 3443 XPUSHs (self);
2725} 3444}
2726 3445
2727BOOT: 3446BOOT:
2728{ 3447{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3448 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 3449
2731 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3450 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); 3451 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); 3452 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); 3453 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2735} 3454}
2736 3455
2737void 3456void
2738draw (SV *self) 3457draw (SV *self)
2739 CODE: 3458 CODE:
2740{ 3459{
2741 HV *hv; 3460 HV *hv;
2742 SV **svp; 3461 SV **svp;
2743 NV x, y, w, h; 3462 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 3467 double draw_x, draw_y;
2750 3468
2751 if (!SvROK (self)) 3469 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3470 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 3471
2754 hv = (HV *)SvRV (self); 3472 hv = (HV *)SvRV (self);
2755 3473
2756 if (SvTYPE (hv) != SVt_PVHV) 3474 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3475 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 3476
2759 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3477 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.; 3478 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2761 3479
2762 if (!h || !w) 3480 if (!h || !w)
2782 { 3500 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3501 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 3502
2785 if (svp && SvTRUE (*svp)) 3503 if (svp && SvTRUE (*svp))
2786 { 3504 {
2787 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3505 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2788 glEnable (GL_BLEND); 3506 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3507 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 3508 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 3509 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 3510 glVertex2f (w, 0);
2795 glEnd (); 3513 glEnd ();
2796 glDisable (GL_BLEND); 3514 glDisable (GL_BLEND);
2797 } 3515 }
2798 } 3516 }
2799#if 0 3517#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 3518 // draw borders, for debugging
2801 glPushMatrix; 3519 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 3520 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 3521 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 3522 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 3523 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 3524 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 3525 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 3526 glVertex2f (0 , h - 1);
2809 glEnd; 3527 glEnd ();
2810 glPopMatrix; 3528 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 3529#endif
2814 PUSHMARK (SP); 3530 PUSHMARK (SP);
2815 XPUSHs (self); 3531 XPUSHs (self);
2816 PUTBACK; 3532 PUTBACK;
2817 call_method ("_draw", G_VOID | G_DISCARD); 3533 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines