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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines