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.223 by root, Sat Aug 11 11:07:08 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
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 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
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#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
50 71
51#ifndef _WIN32 72#ifndef _WIN32
52# include <sys/types.h> 73# include <sys/types.h>
53# include <sys/socket.h> 74# include <sys/socket.h>
54# include <netinet/in.h> 75# include <netinet/in.h>
55# include <netinet/tcp.h> 76# include <netinet/tcp.h>
56# include <inttypes.h> 77# include <inttypes.h>
57#endif 78#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 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 */
61#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
62 95
63#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
65 98
66#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
67 100
68#if 0 101/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 103
71# define PARACHUTE 0 104#define KMOD_LRAM 0x10000 // our extension
72#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}
73 127
74static AV *texture_av; 128static AV *texture_av;
75 129
76static struct 130static struct
77{ 131{
… …
120 174
121#include "pango-font.c" 175#include "pango-font.c"
122#include "pango-fontmap.c" 176#include "pango-fontmap.c"
123#include "pango-render.c" 177#include "pango-render.c"
124 178
125typedef IV CFPlus__Channel; 179typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 180typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 181typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 182typedef Mix_Music *DC__MixMusic;
129 183
130typedef PangoFontDescription *CFPlus__Font; 184typedef PangoFontDescription *DC__Font;
131 185
132static int 186static int
133shape_attr_p (PangoLayoutRun *run) 187shape_attr_p (PangoLayoutRun *run)
134{ 188{
135 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
136 190
137 while (attrs) 191 while (attrs)
138 { 192 {
139 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 194
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 196 return 1;
143 197
144 attrs = attrs->next; 198 attrs = attrs->next;
145 } 199 }
146 200
147 return 0; 201 return 0;
148} 202}
149 203
150typedef struct cf_layout { 204struct cf_layout {
151 PangoLayout *pl; 205 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
153 int base_height; 207 int base_height;
154 CFPlus__Font font; 208 DC__Font font;
155} *CFPlus__Layout; 209 rc_t *rc;
210};
156 211
212typedef cf_layout *DC__Layout;
213
157static CFPlus__Font default_font; 214static DC__Font default_font;
158static PangoContext *opengl_context; 215static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
160 217
161static void 218static void
162substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
163{ 220{
164 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
165#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
166 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
167#endif 224#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 226}
170 227
171static void 228static void
172layout_update_font (CFPlus__Layout self) 229layout_update_font (DC__Layout self)
173{ 230{
174 /* 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
175 * reasonably well with bitstream vera 232 * reasonably well with dejavu/bistream fonts
176 */ 233 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 234 PangoFontDescription *font = self->font ? self->font : default_font;
178 235
179 pango_font_description_set_absolute_size (font, 236 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 237 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 238
182 pango_layout_set_font_description (self->pl, font); 239 pango_layout_set_font_description (self->pl, font);
183} 240}
184 241
185static void 242static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 243layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 244{
188 PangoRectangle rect; 245 PangoRectangle rect;
189 246
190 // get_pixel_* wrongly rounds down 247 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 248 pango_layout_get_extents (self->pl, 0, &rect);
… …
201} 258}
202 259
203typedef uint16_t tileid; 260typedef uint16_t tileid;
204typedef uint16_t faceid; 261typedef uint16_t faceid;
205 262
206typedef struct { 263struct maptex
264{
207 int name; 265 GLuint name;
208 int w, h; 266 int w, h;
209 float s, t; 267 float s, t;
210 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
211 tileid smoothtile; 269 tileid smoothtile;
212 uint8_t smoothlevel; 270 uint8_t smoothlevel;
213} maptex; 271 uint8_t unused; /* set to zero on use */
272};
214 273
215typedef struct { 274struct mapcell
275{
216 uint32_t player; 276 uint32_t player;
217 tileid tile[3]; 277 tileid tile[3];
218 uint16_t darkness; 278 uint16_t darkness;
219 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
220} mapcell; 280};
221 281
222typedef struct { 282struct maprow
283{
223 int32_t c0, c1; 284 int32_t c0, c1;
224 mapcell *col; 285 mapcell *col;
225} maprow; 286};
226 287
227typedef struct map { 288struct mapgrid {
228 int x, y, w, h; 289 int x, y, w, h;
229 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
230 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
232 293
233 int32_t rows; 294 int32_t rows;
234 maprow *row; 295 maprow *row;
235} *CFPlus__Map; 296};
297
298typedef mapgrid *DC__Map;
236 299
237static char * 300static char *
238prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
239{ 302{
240 char *p; 303 char *p;
… …
258 321
259#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))
260#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))
261 324
262static void 325static void
263need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
264{ 327{
265 while (self->faces <= face) 328 while (self->faces <= face)
266 { 329 {
267 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
268 self->faces *= 2; 331 self->faces *= 2;
269 } 332 }
270} 333}
271 334
272static void 335static void
273need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
274{ 337{
275 while (self->texs <= texid) 338 while (self->texs <= texid)
276 { 339 {
277 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
278 self->texs *= 2; 341 self->texs *= 2;
279 } 342 }
280} 343}
281 344
282static maprow * 345static maprow *
283map_get_row (CFPlus__Map self, int y) 346map_get_row (mapgrid *self, int y)
284{ 347{
285 if (0 > y) 348 if (0 > y)
286 { 349 {
287 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
… …
326 389
327 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
328} 391}
329 392
330static mapcell * 393static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
332{ 395{
333 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
334} 397}
335 398
336static void 399static void
337map_clear (CFPlus__Map self) 400map_clear (mapgrid *self)
338{ 401{
339 int r; 402 int r;
340 403
341 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
… …
349 self->oy = 0; 412 self->oy = 0;
350 self->row = 0; 413 self->row = 0;
351 self->rows = 0; 414 self->rows = 0;
352} 415}
353 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
354static void 427static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
356{ 429{
357 int x, y; 430 int x, y;
358 maprow *row; 431 maprow *row;
359 mapcell *cell; 432 mapcell *cell;
360 433
… …
372 if (x >= row->c1) 445 if (x >= row->c1)
373 break; 446 break;
374 447
375 cell = row->col + x - row->c0; 448 cell = row->col + x - row->c0;
376 449
377 cell->darkness = 0; 450 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 451 }
382 } 452 }
383} 453}
384 454
385typedef struct { 455struct smooth_key
456{
386 tileid tile; 457 tileid tile;
387 uint8_t x, y, level; 458 uint8_t x, y, level;
388} 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}
389 478
390static void 479static void
391smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
392{ 481{
393 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
394 483
395 if (SvIOK (*sv)) 484 if (it == h.end ())
396 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
397 else 486 else
398 sv_setiv (*sv, bits); 487 it->second |= bits;
399} 488}
400 489
401static void 490static void
402music_finished (void) 491music_finished (void)
403{ 492{
… …
420 ev.code = 1; 509 ev.code = 1;
421 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
422 ev.data2 = 0; 511 ev.data2 = 0;
423 512
424 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;
425} 521}
426 522
427static unsigned int 523static unsigned int
428minpot (unsigned int n) 524minpot (unsigned int n)
429{ 525{
… …
439 n |= n >> 16; 535 n |= n >> 16;
440 536
441 return n + 1; 537 return n + 1;
442} 538}
443 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
444/* SDL should provide this, really. */ 551/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 552#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 553#define SDLK_MODIFIER_MAX 314
447 554
448/******************************************************************************/ 555/******************************************************************************/
… …
486 return 0; 593 return 0;
487 594
488 return 1; 595 return 1;
489} 596}
490 597
491MODULE = 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
492 657
493PROTOTYPES: ENABLE 658PROTOTYPES: ENABLE
494 659
495BOOT: 660BOOT:
496{ 661{
497 HV *stash = gv_stashpv ("CFPlus", 1); 662 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 663 static const struct {
499 const char *name; 664 const char *name;
500 IV iv; 665 IV iv;
501 } *civ, const_iv[] = { 666 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 667# define const_iv(name) { # name, (IV)name }
… …
524 689
525 const_iv (SDL_APPINPUTFOCUS), 690 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 691 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 692 const_iv (SDL_APPACTIVE),
528 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),
529 const_iv (SDLK_KP0), 746 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 747 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 748 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 749 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 750 const_iv (SDLK_KP4),
… …
605 const_iv (KMOD_LMETA), 822 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 823 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 824 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 825 const_iv (KMOD_CAPS),
609 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)
610# undef const_iv 860# undef const_iv
611 }; 861 };
612 862
613 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--)
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
615 865
616 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
617 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
618} 868}
619 869
… …
631 RETVAL 881 RETVAL
632 882
633NV floor (NV x) 883NV floor (NV x)
634 884
635NV 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
636 896
637void 897void
638pango_init () 898pango_init ()
639 CODE: 899 CODE:
640{ 900{
641 opengl_fontmap = pango_opengl_font_map_new (); 901 opengl_fontmap = pango_opengl_font_map_new ();
642 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);
643 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
644} 909}
645 910
646char *
647SDL_GetError () 911char *SDL_GetError ()
648 912
649int 913void SDL_main_hack (SV *real_main)
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 914 PROTOTYPE: &
651 915
652void 916int SDL_Init (U32 flags)
917
918int SDL_InitSubSystem (U32 flags)
919
920void SDL_QuitSubSystem (U32 flags)
921
653SDL_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
654 933
655void 934void
656SDL_ListModes (int rgb, int alpha) 935SDL_ListModes (int rgb, int alpha)
657 PPCODE: 936 PPCODE:
658{ 937{
… …
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 949 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 952
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 953 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675#if SDL_VERSION_ATLEAST(1,2,10)
676 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 954 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 955
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 956 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 957
682 if (m && m != (SDL_Rect **)-1) 958 if (m && m != (SDL_Rect **)-1)
683 while (*m) 959 while (*m)
684 { 960 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 961 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 962 {
687 AV *av = newAV (); 963 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 964 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 965 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 966 av_push (av, newSViv (rgb));
… …
713 ); 989 );
714 990
715 if (RETVAL) 991 if (RETVAL)
716 { 992 {
717 av_clear (texture_av); 993 av_clear (texture_av);
718
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
720#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);
721#include "glfunc.h" 995#include "glfunc.h"
722#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
723 } 999 }
724} 1000}
725 OUTPUT: 1001 OUTPUT:
726 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
727 1006
728void 1007void
729SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
730 1009
731char * 1010char *
732SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
733 1013
734int 1014int
735SDL_GetAppState () 1015SDL_GetAppState ()
736 1016
1017int
1018SDL_GetModState ()
1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
737void 1024void
1025SDL_PumpEvents ()
1026
1027void
738poll_events () 1028peep_events ()
739 PPCODE: 1029 PPCODE:
740{ 1030{
741 SDL_Event ev; 1031 SDL_Event ev;
742 1032
743 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
… …
750 { 1040 {
751 case SDL_KEYDOWN: 1041 case SDL_KEYDOWN:
752 case SDL_KEYUP: 1042 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1043 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1044 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 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);
756 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 */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1047 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 1048 break;
759 1049
760 case SDL_ACTIVEEVENT: 1050 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1051 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
779 x = ev.motion.x; 1069 x = ev.motion.x;
780 y = ev.motion.y; 1070 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1071 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 1072 }
783 1073
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1074 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 1075 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 1076 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 1077 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1078 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1079 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 1080 }
791 break; 1081 break;
792 1082
793 case SDL_MOUSEBUTTONDOWN: 1083 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 1084 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1085 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 1086
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1087 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1088 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1089 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1090 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1095 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1096 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 1097 break;
808 } 1098 }
809 1099
810 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))));
811 } 1101 }
812} 1102}
813 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
1116
814int 1117int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 1119 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
1122
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}
819 1138
820void 1139void
821Mix_CloseAudio () 1140Mix_CloseAudio ()
822 1141
823int 1142int
… …
858 } 1177 }
859 } 1178 }
860#endif 1179#endif
861} 1180}
862 1181
863void 1182int
864add_font (char *file) 1183add_font (char *file)
865 CODE: 1184 CODE:
866 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)
867 1195
868void 1196void
869load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
870 ALIAS: 1198 ALIAS:
871 load_image_file = 1 1199 load_image_file = 1
… …
917 1245
918 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
919 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
920 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
921 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
922 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
923 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)));
924 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
925 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
926 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
927 1255
… …
957void 1285void
958error (char *message) 1286error (char *message)
959 CODE: 1287 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1288 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1289#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1290 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1291#endif
964 1292
965void 1293void
966fatal (char *message) 1294fatal (char *message)
967 CODE: 1295 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1296 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1297#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1298 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1299#endif
972 _exit (1); 1300 _exit (1);
973 1301
974void 1302void
975_exit (int retval = 0) 1303_exit (int retval = 0)
… …
987#if DEBUG 1315#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1316 VALGRIND_DO_LEAK_CHECK;
989#endif 1317#endif
990} 1318}
991 1319
992MODULE = 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
993 1328
994PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
995 1330
996CFPlus::Font 1331DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
998 CODE: 1333 CODE:
999{ 1334{
1000 int count; 1335 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1002 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1004} 1339}
1005 OUTPUT: 1340 OUTPUT:
1006 RETVAL 1341 RETVAL
1007 1342
1008void 1343void
1009DESTROY (CFPlus::Font self) 1344DESTROY (DC::Font self)
1010 CODE: 1345 CODE:
1011 pango_font_description_free (self); 1346 pango_font_description_free (self);
1012 1347
1013void 1348void
1014make_default (CFPlus::Font self) 1349make_default (DC::Font self)
1015 PROTOTYPE: $ 1350 PROTOTYPE: $
1016 CODE: 1351 CODE:
1017 default_font = self; 1352 default_font = self;
1018 1353
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1354MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1355
1021PROTOTYPES: DISABLE 1356PROTOTYPES: DISABLE
1022 1357
1023void 1358void
1024reset_glyph_cache () 1359glyph_cache_backup ()
1025 PROTOTYPE: 1360 PROTOTYPE:
1026 CODE: 1361 CODE:
1362 tc_backup ();
1363
1364void
1365glyph_cache_restore ()
1366 PROTOTYPE:
1367 CODE:
1027 tc_clear (); 1368 tc_restore ();
1028 1369
1029CFPlus::Layout 1370DC::Layout
1030new (SV *class) 1371new (SV *klass)
1031 CODE: 1372 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1033 1374
1034 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1036 RETVAL->g = 1.; 1377 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1378 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1379 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1380 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1381 RETVAL->font = 0;
1382 RETVAL->rc = rc_alloc ();
1041 1383
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1044 OUTPUT: 1386 OUTPUT:
1045 RETVAL 1387 RETVAL
1046 1388
1047void 1389void
1048DESTROY (CFPlus::Layout self) 1390DESTROY (DC::Layout self)
1049 CODE: 1391 CODE:
1050 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1393 rc_free (self->rc);
1051 Safefree (self); 1394 Safefree (self);
1052 1395
1053void 1396void
1054set_text (CFPlus::Layout self, SV *text_) 1397set_text (DC::Layout self, SV *text_)
1055 CODE: 1398 CODE:
1056{ 1399{
1057 STRLEN textlen; 1400 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1401 char *text = SvPVutf8 (text_, textlen);
1059 1402
1060 pango_layout_set_text (self->pl, text, textlen); 1403 pango_layout_set_text (self->pl, text, textlen);
1061} 1404}
1062 1405
1063void 1406void
1064set_markup (CFPlus::Layout self, SV *text_) 1407set_markup (DC::Layout self, SV *text_)
1065 CODE: 1408 CODE:
1066{ 1409{
1067 STRLEN textlen; 1410 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1411 char *text = SvPVutf8 (text_, textlen);
1069 1412
1070 pango_layout_set_markup (self->pl, text, textlen); 1413 pango_layout_set_markup (self->pl, text, textlen);
1071} 1414}
1072 1415
1073void 1416void
1074set_shapes (CFPlus::Layout self, ...) 1417set_shapes (DC::Layout self, ...)
1075 CODE: 1418 CODE:
1076{ 1419{
1077 PangoAttrList *attrs = 0; 1420 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1421 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1422 const char *pos = text;
… …
1114 if (attrs) 1457 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1458 pango_layout_set_attributes (self->pl, attrs);
1116} 1459}
1117 1460
1118void 1461void
1119get_shapes (CFPlus::Layout self) 1462get_shapes (DC::Layout self)
1120 PPCODE: 1463 PPCODE:
1121{ 1464{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1465 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1466
1124 do 1467 do
1125 { 1468 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1469 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1470
1128 if (run && shape_attr_p (run)) 1471 if (run && shape_attr_p (run))
1129 { 1472 {
1130 PangoRectangle extents; 1473 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1474 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1139 1482
1140 pango_layout_iter_free (iter); 1483 pango_layout_iter_free (iter);
1141} 1484}
1142 1485
1143int 1486int
1144has_wrapped (CFPlus::Layout self) 1487has_wrapped (DC::Layout self)
1145 CODE: 1488 CODE:
1146{ 1489{
1147 int lines = 1; 1490 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1491 const char *text = pango_layout_get_text (self->pl);
1149 1492
… …
1154} 1497}
1155 OUTPUT: 1498 OUTPUT:
1156 RETVAL 1499 RETVAL
1157 1500
1158SV * 1501SV *
1159get_text (CFPlus::Layout self) 1502get_text (DC::Layout self)
1160 CODE: 1503 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1504 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1505 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1506 OUTPUT:
1164 RETVAL 1507 RETVAL
1165 1508
1166void 1509void
1167set_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.)
1168 CODE: 1511 CODE:
1169 self->r = r; 1512 self->r = r;
1170 self->g = g; 1513 self->g = g;
1171 self->b = b; 1514 self->b = b;
1172 self->a = a; 1515 self->a = a;
1173 1516
1174void 1517void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1518set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1519 CODE:
1177 if (self->font != font) 1520 if (self->font != font)
1178 { 1521 {
1179 self->font = font; 1522 self->font = font;
1180 layout_update_font (self); 1523 layout_update_font (self);
1181 } 1524 }
1182 1525
1183void 1526void
1184set_height (CFPlus::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1185 CODE: 1528 CODE:
1186 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1187 { 1530 {
1188 self->base_height = base_height; 1531 self->base_height = base_height;
1189 layout_update_font (self); 1532 layout_update_font (self);
1190 } 1533 }
1191 1534
1192void 1535void
1193set_width (CFPlus::Layout self, int max_width = -1) 1536set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1537 CODE:
1195 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);
1196 1539
1197void 1540void
1198set_indent (CFPlus::Layout self, int indent) 1541set_indent (DC::Layout self, int indent)
1199 CODE: 1542 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1543 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1544
1202void 1545void
1203set_spacing (CFPlus::Layout self, int spacing) 1546set_spacing (DC::Layout self, int spacing)
1204 CODE: 1547 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1548 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1549
1207void 1550void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1551set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1552 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1553 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1554 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1555 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1556 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1557 : PANGO_ELLIPSIZE_NONE
1215 ); 1558 );
1216 1559
1217void 1560void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1561set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1562 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1563 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1564
1222void 1565void
1223size (CFPlus::Layout self) 1566size (DC::Layout self)
1224 PPCODE: 1567 PPCODE:
1225{ 1568{
1226 int w, h; 1569 int w, h;
1227 1570
1228 layout_get_pixel_size (self, &w, &h); 1571 layout_get_pixel_size (self, &w, &h);
… …
1231 PUSHs (sv_2mortal (newSViv (w))); 1574 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1575 PUSHs (sv_2mortal (newSViv (h)));
1233} 1576}
1234 1577
1235int 1578int
1236descent (CFPlus::Layout self) 1579descent (DC::Layout self)
1237 CODE: 1580 CODE:
1238{ 1581{
1239 PangoRectangle rect; 1582 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1583 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1584 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1585 RETVAL = PANGO_DESCENT (rect);
1243} 1586}
1244 OUTPUT: 1587 OUTPUT:
1245 RETVAL 1588 RETVAL
1246 1589
1247int 1590int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1591xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1592 CODE:
1250{ 1593{
1251 int index, trailing; 1594 int index, trailing;
1252 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);
1253 RETVAL = index + trailing; 1596 RETVAL = index + trailing;
1254} 1597}
1255 OUTPUT: 1598 OUTPUT:
1256 RETVAL 1599 RETVAL
1257 1600
1258void 1601void
1259cursor_pos (CFPlus::Layout self, int index) 1602cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1603 PPCODE:
1261{ 1604{
1262 PangoRectangle strong_pos; 1605 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1606 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1607
1265 EXTEND (SP, 3); 1608 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1609 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1612}
1270 1613
1271void 1614void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1615index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1616 PPCODE:
1274{ 1617{
1275 int line, x; 1618 int line, x;
1276 1619
1277 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)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1622 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1623 --line;
1624#endif
1280 EXTEND (SP, 2); 1625 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1626 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1627 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1628}
1284 1629
1285void 1630void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1631line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1632 PPCODE:
1288{ 1633{
1289 PangoLayoutLine *lp; 1634 PangoLayoutLine *lp;
1290 int index, trailing; 1635 int index, trailing;
1291 1636
1292 if (line < 0) 1637 if (line < 0)
1293 XSRETURN_EMPTY; 1638 XSRETURN_EMPTY;
1294 1639
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1640 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1641 XSRETURN_EMPTY; /* do better */
1297 1642
1298 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);
1299 1644
1300 EXTEND (SP, 2); 1645 EXTEND (SP, 2);
… …
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1651 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1652 }
1308} 1653}
1309 1654
1310void 1655void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1656render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1657 CODE:
1658 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1659 pango_opengl_render_layout_subpixel (
1314 self->pl, 1660 self->pl,
1661 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1662 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1663 self->r, self->g, self->b, self->a,
1317 flags 1664 flags
1318 ); 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);
1319 1669
1320MODULE = 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
1321 1690
1322PROTOTYPES: ENABLE 1691PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1692
1326void 1693void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1694pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1695 CODE:
1329{ 1696{
… …
1395 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1396 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1397 } 1764 }
1398} 1765}
1399 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
1400IV 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)
1401 CODE: 1889 CODE:
1402{ 1890{
1403 GLint width; 1891 GLint width;
1404 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);
… …
1406 RETVAL = width > 0; 1894 RETVAL = width > 0;
1407} 1895}
1408 OUTPUT: 1896 OUTPUT:
1409 RETVAL 1897 RETVAL
1410 1898
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1900
1413PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1414 1902
1415CFPlus::Map 1903DC::Map
1416new (SV *class) 1904new (SV *klass)
1417 CODE: 1905 CODE:
1418 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1419 RETVAL->x = 0; 1907 RETVAL->x = 0;
1420 RETVAL->y = 0; 1908 RETVAL->y = 0;
1421 RETVAL->w = 0; 1909 RETVAL->w = 0;
1422 RETVAL->h = 0; 1910 RETVAL->h = 0;
1423 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
… …
1428 RETVAL->row = 0; 1916 RETVAL->row = 0;
1429 OUTPUT: 1917 OUTPUT:
1430 RETVAL 1918 RETVAL
1431 1919
1432void 1920void
1433DESTROY (CFPlus::Map self) 1921DESTROY (DC::Map self)
1434 CODE: 1922 CODE:
1435{ 1923{
1436 map_clear (self); 1924 map_clear (self);
1437 Safefree (self->face2tile); 1925 Safefree (self->face2tile);
1438 Safefree (self->tex); 1926 Safefree (self->tex);
1439 Safefree (self); 1927 Safefree (self);
1440} 1928}
1441 1929
1442void 1930void
1443resize (CFPlus::Map self, int map_width, int map_height) 1931resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1932 CODE:
1445 self->w = map_width; 1933 self->w = map_width;
1446 self->h = map_height; 1934 self->h = map_height;
1447 1935
1448void 1936void
1449clear (CFPlus::Map self) 1937clear (DC::Map self)
1450 CODE: 1938 CODE:
1451 map_clear (self); 1939 map_clear (self);
1452 1940
1453void 1941void
1454set_tileid (CFPlus::Map self, int face, int tile) 1942set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1943 CODE:
1456{ 1944{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1945 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1946 need_texid (self, tile);
1459} 1947}
1460 1948
1461void 1949void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1951 CODE:
1464{ 1952{
1465 tileid texid; 1953 tileid texid;
1466 maptex *tex; 1954 maptex *tex;
1467 1955
1468 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1469 return; 1957 return;
1470 1958
1471 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1472 return; 1960 return;
1473 1961
1474 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1475 1963
1476 if (!texid) 1964 if (!texid)
1477 return; 1965 return;
1478 1966
1479 tex = self->tex + texid; 1967 tex = self->tex + texid;
1480 tex->smoothtile = self->face2tile [smooth]; 1968 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1969 tex->smoothlevel = level;
1482} 1970}
1483 1971
1484void 1972void
1485set_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)
1486 CODE: 1974 CODE:
1487{ 1975{
1488 need_texid (self, texid); 1976 need_texid (self, texid);
1489 1977
1490 { 1978 {
… …
1509 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1510 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 2000}
1513 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
1514int 2022int
1515ox (CFPlus::Map self) 2023ox (DC::Map self)
1516 ALIAS: 2024 ALIAS:
1517 oy = 1 2025 oy = 1
1518 x = 2 2026 x = 2
1519 y = 3 2027 y = 3
1520 w = 4 2028 w = 4
… …
1531 } 2039 }
1532 OUTPUT: 2040 OUTPUT:
1533 RETVAL 2041 RETVAL
1534 2042
1535void 2043void
1536scroll (CFPlus::Map self, int dx, int dy) 2044scroll (DC::Map self, int dx, int dy)
1537 CODE: 2045 CODE:
1538{ 2046{
1539 if (dx > 0) 2047 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 2048 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 2049 else if (dx < 0)
… …
1557 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1558 } 2066 }
1559} 2067}
1560 2068
1561SV * 2069SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1563 CODE: 2071 CODE:
1564{ 2072{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 2075 mapcell *cell;
… …
1588 2096
1589 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1590 2098
1591 if (flags & 8) 2099 if (flags & 8)
1592 { 2100 {
2101 uint8_t ext, cmd;
2102
1593 if (extmap) 2103 do
1594 { 2104 {
1595 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1596 2107
1597 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
1598 { 2111 {
1599 ext = *data++;
1600 cmd = ext & 0x3f;
1601
1602 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health
1605 {
1606 cell->stat_width = 1; 2112 cell->stat_width = 1;
1607 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1608 }
1609 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47)
1612 {
1613 if (*data == 4)
1614 ; // decode player count
1615
1616 data += *data + 1;
1617 }
1618 else if (cmd == 8) // cell flags
1619 cell->flags = *data++;
1620 else if (ext & 0x40) // unknown, multibyte => skip
1621 data += *data + 1;
1622 else
1623 data++;
1624 } 2114 }
1625 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++;
1626 } 2132 }
1627 else 2133 while (ext & 0x80);
1628 cell->darkness = *data++ + 1;
1629 } 2134 }
1630 2135
1631 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
1632 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
1633 { 2138 {
… …
1636 cell->tile [z] = self->face2tile [face]; 2141 cell->tile [z] = self->face2tile [face];
1637 2142
1638 if (cell->tile [z]) 2143 if (cell->tile [z])
1639 { 2144 {
1640 maptex *tex = self->tex + cell->tile [z]; 2145 maptex *tex = self->tex + cell->tile [z];
2146 tex->unused = 0;
1641 if (!tex->name) 2147 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 2148 av_push (missing, newSViv (cell->tile [z]));
1643 2149
1644 if (tex->smoothtile) 2150 if (tex->smoothtile)
1645 { 2151 {
1646 maptex *smooth = self->tex + tex->smoothtile; 2152 maptex *smooth = self->tex + tex->smoothtile;
2153 smooth->unused = 0;
1647 if (!smooth->name) 2154 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 2155 av_push (missing, newSViv (tex->smoothtile));
1649 } 2156 }
1650 } 2157 }
1651 } 2158 }
1652 } 2159 }
1653 else 2160 else
1654 cell->darkness = 0; 2161 CELL_CLEAR (cell);
1655 } 2162 }
1656} 2163}
1657 OUTPUT: 2164 OUTPUT:
1658 RETVAL 2165 RETVAL
1659 2166
1660SV * 2167SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2168mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 2169 CODE:
1663{ 2170{
1664 int x1, x; 2171 int x1, x;
1665 int y1, y; 2172 int y1, y;
1666 int z; 2173 int z;
… …
1679 ? self->row + y 2186 ? self->row + y
1680 : 0; 2187 : 0;
1681 2188
1682 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1683 { 2190 {
1684 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1685 2192
1686 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1687 { 2194 {
1688 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1689 2196
… …
1691 { 2198 {
1692 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1693 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1694 int a1 = tex.a; 2201 int a1 = tex.a;
1695 2202
1696 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1697 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1698 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1699 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1700 } 2207 }
1701 } 2208 }
1702 2209
1703 *map++ = (r ) 2210 *map++ = (r )
1704 | (g << 8) 2211 | (g << 8)
1705 | (b << 16) 2212 | (b << 16)
1706 | (a << 24); 2213 | (a << 24);
1707 } 2214 }
1708 } 2215 }
1709 2216
1710 RETVAL = map_sv; 2217 RETVAL = map_sv;
1711} 2218}
1712 OUTPUT: 2219 OUTPUT:
1713 RETVAL 2220 RETVAL
1714 2221
1715void 2222void
1716draw (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)
1717 CODE: 2224 CODE:
1718{ 2225{
1719 int x, y, z; 2226 int x, y, z;
1720 2227
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 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
1723 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)
1724 smooth_key skey; 2230 smooth_key skey;
1725 2231 int pl_x, pl_y;
2232 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2234 rc_t *rc_ov = rc_alloc ();
1727 rc_key_t key; 2235 rc_key_t key;
1728 rc_array_t *arr; 2236 rc_array_t *arr;
1729 2237
2238 pl_tex.name = 0;
2239
1730 // thats current max. sorry. 2240 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1733 2243
1734 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
… …
1739 key.g = 255; 2249 key.g = 255;
1740 key.b = 255; 2250 key.b = 255;
1741 key.a = 255; 2251 key.a = 255;
1742 key.mode = GL_QUADS; 2252 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2253 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2254
1746 mx += self->x; 2255 mx += self->x;
1747 my += self->y; 2256 my += self->y;
1748 2257
1749 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
… …
1772 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2283
1775 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1776 { 2285 {
2286 smooth_hash smooth;
1777 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1778 2289
1779 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1781 { 2292 {
1782 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
… …
1790 if (tile) 2301 if (tile)
1791 { 2302 {
1792 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1793 int px, py; 2304 int px, py;
1794 2305
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2306 if (key.texname != tex.name)
1798 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1799 if (!tex.name) 2310 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2312
1802 key.texname = tex.name; 2313 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
1804 } 2315 }
1805 2316
1806 px = (x + 1) * T - tex.w; 2317 px = (x + 1) * Th - tex.w;
1807 py = (y + 1) * T - tex.h; 2318 py = (y + 1) * Tw - tex.h;
2319
2320 if (expect_false (cell->player == player) && expect_false (z == 2))
2321 {
2322 pl_x = px;
2323 pl_y = py;
2324 pl_tex = tex;
2325 continue;
2326 }
1808 2327
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2329 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2330 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2331 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813
1814 if (cell->flags && z == 2)
1815 {
1816 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1)
1818 {
1819 maptex tex = self->tex [1];
1820 int px = x * T + T * 2 / 32;
1821 int py = y * T - T * 6 / 32;
1822
1823 if (tex.name)
1824 {
1825 if (key.texname != tex.name)
1826 {
1827 key.texname = tex.name;
1828 arr = rc_array (rc, &key);
1829 }
1830
1831 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1832 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1833 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1834 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1835 }
1836 }
1837 }
1838 2332
1839 // update smooth hash 2333 // update smooth hash
1840 if (tex.smoothtile) 2334 if (tex.smoothtile)
1841 { 2335 {
1842 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
… …
1858 2352
1859 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1860 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
1861 2355
1862 // full tile 2356 // full tile
1863 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);
1864 2358
1865 // borders 2359 // borders
1866 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);
1867 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);
1868 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);
1869 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);
1870 2364
1871 // corners 2365 // corners
1872 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);
1873 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);
1874 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);
1875 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);
1876 } 2391 }
1877 } 2392 }
1878 } 2393 }
1879 } 2394 }
1880 2395
2396 rc_draw (rc);
2397 rc_clear (rc);
2398
1881 // go through all smoothlevels, lowest to highest, then draw. 2399 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 2400 // this is basically counting sort
1883 { 2401 {
1884 int w, b; 2402 int w, b;
1885 2403
2404 glEnable (GL_TEXTURE_2D);
2405 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 2406 for (w = 0; w < 256 / 32; ++w)
1887 { 2407 {
1888 uint32_t smask = smooth_level [w]; 2408 uint32_t smask = smooth_level [w];
1889 if (smask) 2409 if (smask)
1890 for (b = 0; b < 32; ++b) 2410 for (b = 0; b < 32; ++b)
1891 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
1892 { 2412 {
1893 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
1894 HE *he; 2414 HE *he;
1895 2415
1896 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1897 while ((he = hv_iternext (smooth)))
1898 { 2417 {
1899 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
1900 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
1901 2420
1902 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
1903 && skey->level == level 2422 && skey.level == level
1904 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
1905 { 2424 {
1906 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
1907 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
1908 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
1909 int border = bits & 15; 2428 int border = bits & 15;
1910 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1911 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
1912 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
1913 2432
… …
1915 { 2434 {
1916 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
1917 // save gobs of state changes. 2436 // save gobs of state changes.
1918 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
1919 { 2438 {
2439 self->tex [skey.tile].unused = 0;
2440
2441 glEnd ();
1920 key.texname = tex.name; 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2443 glBegin (GL_QUADS);
1922 } 2444 }
1923 2445
1924 if (border) 2446 if (border)
1925 { 2447 {
1926 float ox = border * dx; 2448 float ox = border * dx;
1927 2449
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1932 } 2454 }
1933 2455
1934 if (corner) 2456 if (corner)
1935 { 2457 {
1936 float ox = corner * dx; 2458 float ox = corner * dx;
1937 2459
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1942 } 2464 }
1943 } 2465 }
1944 } 2466 }
1945 } 2467 }
1946 } 2468 }
1947 } 2469 }
2470
2471 glEnd ();
2472 glDisable (GL_TEXTURE_2D);
2473 key.texname = -1;
1948 } 2474 }
2475 }
1949 2476
1950 hv_clear (smooth); 2477 if (pl_tex.name)
2478 {
2479 maptex tex = pl_tex;
2480 int px = pl_x + sdx;
2481 int py = pl_y + sdy;
2482
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
1951 rc_draw (rc); 2491 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2492 }
2493
2494 rc_draw (rc_ov);
2495 rc_clear (rc_ov);
1954 2496
1955 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
1956 rc_free (rc); 2498 rc_free (rc);
2499 rc_free (rc_ov);
1957 2500
1958 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
1959 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
1960 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
1961 { 2504 {
… …
1964 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
1965 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
1966 { 2509 {
1967 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
1968 2511
1969 int px = x * T; 2512 int px = x * Tw;
1970 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 }
1971 2520
1972 if (cell->stat_hp) 2521 if (cell->stat_hp)
1973 { 2522 {
1974 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
1975 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1976 2525
1977 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
1978 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
1979 px + width - 1, py); 2528 px + width - 1, py);
1980 2529
… …
1986 } 2535 }
1987 } 2536 }
1988} 2537}
1989 2538
1990void 2539void
1991draw_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)
1992 CODE: 2541 CODE:
1993{ 2542{
1994 static float color[16][3] = { 2543 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
1996 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
1997 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
1998 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
1999 2548
2000 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
2001 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
2002 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
2003 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
2004 2553
2005 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
2006 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
2007 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
2008 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
2009 2558
2010 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
2011 2560
2012 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
2013 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
2014 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
2015 }; 2564 };
2016 2565
2017 int x, y; 2566 int x, y;
2018 2567
2019 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 */
2020 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2021 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2022 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2023 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
2024 2579
2025 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
… …
2029 2584
2030 if (m) 2585 if (m)
2031 { 2586 {
2032 float *c = color [m & 15]; 2587 float *c = color [m & 15];
2033 2588
2034 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
2035 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
2036 2591
2037 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
2038 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2039 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2040 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2041 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2042 } 2597 }
… …
2046 glDisable (GL_BLEND); 2601 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2602 glDisable (GL_TEXTURE_2D);
2048} 2603}
2049 2604
2050void 2605void
2051fow_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)
2052 PPCODE: 2607 PPCODE:
2053{ 2608{
2054 int x, y; 2609 int x, y;
2055 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2057 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2058 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);
2059 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2060 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2061 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2062 2618
2063 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2064 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2065 2621
2066 mx += self->x - 1; 2622 mx += self->x - 1;
2067 my += self->y - 1; 2623 my += self->y - 1;
2068
2069 memset (darkness1, 255, sw1 * sh1);
2070 2624
2071 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2072 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2073 { 2627 {
2074 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
… …
2077 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
2078 { 2632 {
2079 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
2080 2634
2081 darkness1 [y * sw1 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
2082 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2083 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2084 } 2638 }
2085 } 2639 }
2086 2640
2087 for (y = 0; y < sh; ++y) 2641 for (y = 0; y < sh; ++y)
2088 for (x = 0; x < sw; ++x) 2642 for (x = 0; x < sw; ++x)
… …
2107 2661
2108 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2109 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2110 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2111 2665
2112 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2113 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2114 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2115 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2116 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 */
2117 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2118 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2119 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2120 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2121 } 2675 }
2122 2676
2123 free (darkness1); 2677 free (darkness1);
2124 2678
2125 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2126 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2129} 2683}
2130 2684
2131SV * 2685SV *
2132get_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)
2133 CODE: 2687 CODE:
2134{ 2688{
2135 int x, y, x1, y1; 2689 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2690 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2691 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2194 else 2748 else
2195 *data++ = 0; 2749 *data++ = 0;
2196 } 2750 }
2197 } 2751 }
2198 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 {
2199 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2200 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2758 }
2759
2201 RETVAL = data_sv; 2760 RETVAL = data_sv;
2202} 2761}
2203 OUTPUT: 2762 OUTPUT:
2204 RETVAL 2763 RETVAL
2205 2764
2206void 2765void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2766set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208 PPCODE: 2767 PPCODE:
2209{ 2768{
2210 int x, y, z; 2769 int x, y, z;
2211 int w, h; 2770 int w, h;
2212 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;
2213 2782
2214 if (*data++ != 0) 2783 if (*data++ != 0)
2215 return; /* version mismatch */ 2784 XSRETURN_EMPTY; /* version mismatch */
2216 2785
2217 w = *data++ << 8; w |= *data++; 2786 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2787 h = *data++ << 8; h |= *data++;
2219 2788
2220 // 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
… …
2232 { 2801 {
2233 maprow *row = map_get_row (self, y); 2802 maprow *row = map_get_row (self, y);
2234 2803
2235 for (x = x0; x < x1; x++) 2804 for (x = x0; x < x1; x++)
2236 { 2805 {
2806 uint8_t flags;
2807
2808 if (data + 7 >= end)
2809 XSRETURN_EMPTY;
2810
2237 uint8_t flags = *data++; 2811 flags = *data++;
2238 2812
2239 if (flags) 2813 if (flags)
2240 { 2814 {
2241 mapcell *cell = row_get_cell (row, x); 2815 mapcell *cell = row_get_cell (row, x);
2242 tileid tile[3] = { 0, 0, 0 }; 2816 tileid tile[3] = { 0, 0, 0 };
… …
2245 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2819 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2820 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247 2821
2248 if (cell->darkness == 0) 2822 if (cell->darkness == 0)
2249 { 2823 {
2250 cell->darkness = 0; 2824 /*cell->darkness = 0;*/
2825 EXTEND (SP, 3);
2251 2826
2252 for (z = 0; z <= 2; z++) 2827 for (z = 0; z <= 2; z++)
2253 { 2828 {
2254 tileid t = tile [z]; 2829 tileid t = tile [z];
2255 2830
2256 if (t >= self->texs || (t && !self->tex [t].name)) 2831 if (t >= self->texs || (t && !self->tex [t].name))
2257 { 2832 {
2258 XPUSHs (sv_2mortal (newSViv (t))); 2833 PUSHs (sv_2mortal (newSViv (t)));
2259 need_texid (self, t); 2834 need_texid (self, t);
2260 } 2835 }
2261 2836
2262 cell->tile [z] = t; 2837 cell->tile [z] = t;
2263 } 2838 }
… …
2265 } 2840 }
2266 } 2841 }
2267 } 2842 }
2268} 2843}
2269 2844
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2846
2272CFPlus::RW 2847DC::RW
2273new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2274 CODE: 2849 CODE:
2275{ 2850{
2276 STRLEN datalen; 2851 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2278 2853
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2854 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2855}
2281 OUTPUT: 2856 OUTPUT:
2282 RETVAL 2857 RETVAL
2283 2858
2284CFPlus::RW 2859DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2286 CODE: 2861 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2863 OUTPUT:
2289 RETVAL 2864 RETVAL
2290 2865
2291# fails on win32: 2866# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2867# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2868#void
2294#close (CFPlus::RW self) 2869#close (DC::RW self)
2295# CODE: 2870# CODE:
2296# (self->(close)) (self); 2871# (self->(close)) (self);
2297 2872
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2873MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2874
2300PROTOTYPES: DISABLE 2875PROTOTYPES: DISABLE
2301 2876
2302CFPlus::Channel 2877DC::Channel
2303find () 2878find ()
2304 CODE: 2879 CODE:
2305{ 2880{
2306 RETVAL = Mix_GroupAvailable (-1); 2881 RETVAL = Mix_GroupAvailable (-1);
2307 2882
2308 if (RETVAL < 0) 2883 if (RETVAL < 0)
2309 { 2884 {
2310 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2311 2886
2312 if (RETVAL < 0) 2887 if (RETVAL < 0)
2888 {
2889 // happens sometimes, maybe it just stopped playing(?)
2890 RETVAL = Mix_GroupAvailable (-1);
2891
2892 if (RETVAL < 0)
2313 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2314 2894 }
2895 else
2315 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2316 } 2897 }
2317 2898
2318 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2319 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2320} 2901}
2321 OUTPUT: 2902 OUTPUT:
2322 RETVAL 2903 RETVAL
2323 2904
2324void 2905void
2325halt (CFPlus::Channel self) 2906halt (DC::Channel self)
2326 CODE: 2907 CODE:
2327 Mix_HaltChannel (self); 2908 Mix_HaltChannel (self);
2328 2909
2329void 2910void
2330expire (CFPlus::Channel self, int ticks = -1) 2911expire (DC::Channel self, int ticks = -1)
2331 CODE: 2912 CODE:
2332 Mix_ExpireChannel (self, ticks); 2913 Mix_ExpireChannel (self, ticks);
2333 2914
2334void 2915void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2916fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2917 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2918 Mix_FadeOutChannel (self, ticks);
2338 2919
2339int 2920int
2340volume (CFPlus::Channel self, int volume) 2921volume (DC::Channel self, int volume)
2341 CODE: 2922 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2923 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2924 OUTPUT:
2344 RETVAL 2925 RETVAL
2345 2926
2346void 2927void
2347unregister_all_effects (CFPlus::Channel self) 2928unregister_all_effects (DC::Channel self)
2348 CODE: 2929 CODE:
2349 Mix_UnregisterAllEffects (self); 2930 Mix_UnregisterAllEffects (self);
2350 2931
2351void 2932void
2352set_panning (CFPlus::Channel self, int left, int right) 2933set_panning (DC::Channel self, int left, int right)
2353 CODE: 2934 CODE:
2354 left = CLAMP (left , 0, 255); 2935 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2936 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2937 Mix_SetPanning (self, left, right);
2357 2938
2358void 2939void
2359set_distance (CFPlus::Channel self, int distance) 2940set_distance (DC::Channel self, int distance)
2360 CODE: 2941 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2942 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2943
2363void 2944void
2364set_position (CFPlus::Channel self, int angle, int distance) 2945set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2946 CODE:
2366 2947
2367void 2948void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2950 CODE:
2370{ 2951{
2371 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2952 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2372 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2953 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2955}
2375 2956
2376void 2957void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2958set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2959 CODE:
2379 Mix_SetReverseStereo (self, flip); 2960 Mix_SetReverseStereo (self, flip);
2380 2961
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2963
2383PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2384 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
2385CFPlus::MixChunk 2978DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2979new (SV *klass, DC::RW rwops)
2387 CODE: 2980 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2982 OUTPUT:
2390 RETVAL 2983 RETVAL
2391 2984
2392void 2985void
2393DESTROY (CFPlus::MixChunk self) 2986DESTROY (DC::MixChunk self)
2394 CODE: 2987 CODE:
2395 Mix_FreeChunk (self); 2988 Mix_FreeChunk (self);
2396 2989
2397int 2990int
2398volume (CFPlus::MixChunk self, int volume = -1) 2991volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2992 CODE:
2400 if (items > 1) 2993 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2994 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2995 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2996 OUTPUT:
2404 RETVAL 2997 RETVAL
2405 2998
2406CFPlus::Channel 2999DC::Channel
2407play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 3000play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408 CODE: 3001 CODE:
2409{ 3002{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 3003 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 3004
2412 if (RETVAL < 0) 3005 if (RETVAL < 0)
… …
2419 } 3012 }
2420} 3013}
2421 OUTPUT: 3014 OUTPUT:
2422 RETVAL 3015 RETVAL
2423 3016
2424MODULE = 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
2425 3030
2426int 3031int
2427volume (int volume = -1) 3032volume (int volume = -1)
2428 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2429 CODE: 3034 CODE:
… …
2441void 3046void
2442halt () 3047halt ()
2443 CODE: 3048 CODE:
2444 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2445 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2446CFPlus::MixMusic 3058DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 3059new (SV *klass, DC::RW rwops)
2448 CODE: 3060 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 3062 OUTPUT:
2451 RETVAL 3063 RETVAL
2452 3064
2453void 3065void
2454DESTROY (CFPlus::MixMusic self) 3066DESTROY (DC::MixMusic self)
2455 CODE: 3067 CODE:
2456 Mix_FreeMusic (self); 3068 Mix_FreeMusic (self);
2457 3069
2458int 3070int
2459play (CFPlus::MixMusic self, int loops = -1) 3071play (DC::MixMusic self, int loops = -1)
2460 CODE: 3072 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 3073 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 3074 OUTPUT:
2463 RETVAL 3075 RETVAL
2464 3076
2465void 3077void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3078fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 3079 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 3080 Mix_FadeInMusicPos (self, loops, ms, position);
2469 3081
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3082MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 3083
2472PROTOTYPES: ENABLE 3084PROTOTYPES: ENABLE
2473 3085
2474BOOT: 3086BOOT:
2475{ 3087{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3088 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 3089 static const struct {
2478 const char *name; 3090 const char *name;
2479 IV iv; 3091 IV iv;
2480 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 3093# define const_iv(name) { # name, (IV)name }
2482 const_iv (GL_VENDOR), 3094 const_iv (GL_VENDOR),
2483 const_iv (GL_VERSION), 3095 const_iv (GL_VERSION),
2484 const_iv (GL_EXTENSIONS), 3096 const_iv (GL_EXTENSIONS),
3097 const_iv (GL_MAX_TEXTURE_UNITS),
2485 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2486 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2487 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2488 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2489 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
… …
2501 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2502 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2503 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2504 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2505 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),
2506 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2507 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2508 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2509 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2510 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
… …
2516 const_iv (GL_INTENSITY), 3133 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 3134 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 3135 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 3136 const_iv (GL_FLOAT),
2520 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),
2521 const_iv (GL_COMPILE), 3144 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 3145 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 3146 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 3147 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 3148 const_iv (GL_TEXTURE_2D),
… …
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3187 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 3188 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 3189 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 3190 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 3191 const_iv (GL_GENERATE_MIPMAP_HINT),
3192 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 3193 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 3194 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 3195 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2574 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2575 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),
2576# undef const_iv 3203# undef const_iv
2577 }; 3204 };
2578 3205
2579 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--)
2580 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2581 3208
2582 texture_av = newAV (); 3209 texture_av = newAV ();
2583 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
2584} 3211}
2585 3212
2586char * 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 *
2587gl_vendor () 3223gl_vendor ()
2588 CODE: 3224 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2590 OUTPUT: 3226 OUTPUT:
2591 RETVAL 3227 RETVAL
2592 3228
2593char * 3229const char *
2594gl_version () 3230gl_version ()
2595 CODE: 3231 CODE:
2596 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2597 OUTPUT: 3233 OUTPUT:
2598 RETVAL 3234 RETVAL
2599 3235
2600char * 3236const char *
2601gl_extensions () 3237gl_extensions ()
2602 CODE: 3238 CODE:
2603 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2604 OUTPUT: 3240 OUTPUT:
2605 RETVAL 3241 RETVAL
2606 3242
2607const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
2608 3248
2609GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
2610 CODE: 3250 CODE:
2611 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
2612 OUTPUT: 3252 OUTPUT:
… …
2620 3260
2621int glGetError () 3261int glGetError ()
2622 3262
2623void glFinish () 3263void glFinish ()
2624 3264
3265void glFlush ()
3266
2625void glClear (int mask) 3267void glClear (int mask)
2626 3268
2627void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2628 PROTOTYPE: @ 3270 PROTOTYPE: @
2629 3271
… …
2638void glBlendFunc (int sfactor, int dfactor) 3280void glBlendFunc (int sfactor, int dfactor)
2639 3281
2640void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2641 CODE: 3283 CODE:
2642 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
3285
3286# void glBlendEquation (int se)
2643 3287
2644void glDepthMask (int flag) 3288void glDepthMask (int flag)
2645 3289
2646void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2647 3291
… …
2682void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2683 CODE: 3327 CODE:
2684 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2685 3329
2686void 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: @
2687 ALIAS: 3332 ALIAS:
2688 glColor_premultiply = 1 3333 glColor_premultiply = 1
2689 CODE: 3334 CODE:
2690 if (ix) 3335 if (ix)
2691 { 3336 {
… …
2711 3356
2712void glRect (float x1, float y1, float x2, float y2) 3357void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 3358 CODE:
2714 glRectf (x1, y1, x2, y2); 3359 glRectf (x1, y1, x2, y2);
2715 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
2716PROTOTYPES: ENABLE 3370PROTOTYPES: ENABLE
2717 3371
2718void glBegin (int mode) 3372void glBegin (int mode)
2719 3373
2720void glEnd () 3374void glEnd ()
… …
2752void 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)
2753 CODE: 3407 CODE:
2754 if (gl.SeparableFilter2D) 3408 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3409 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 3410
2757void 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)
2758 3412
2759void 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)
2760 3414
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 3415void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 3416
… …
2788 3442
2789void glEndList () 3443void glEndList ()
2790 3444
2791void glCallList (int list) 3445void glCallList (int list)
2792 3446
2793MODULE = 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
2794 3453
2795PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
2796 3455
2797void 3456void
2798find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
2799 PPCODE: 3458 PPCODE:
2800{ 3459{
2801 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
2802 XPUSHs (self); 3461 XPUSHs (self);
2803} 3462}
2804 3463
2805BOOT: 3464BOOT:
2806{ 3465{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3466 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 3467
2809 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);
2810 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);
2811 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);
2812 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);
2813} 3472}
2814 3473
2815void 3474void
2816draw (SV *self) 3475draw (SV *self)
2817 CODE: 3476 CODE:
2818{ 3477{
2819 HV *hv; 3478 HV *hv;
2820 SV **svp; 3479 SV **svp;
2821 NV x, y, w, h; 3480 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 3485 double draw_x, draw_y;
2828 3486
2829 if (!SvROK (self)) 3487 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3488 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 3489
2832 hv = (HV *)SvRV (self); 3490 hv = (HV *)SvRV (self);
2833 3491
2834 if (SvTYPE (hv) != SVt_PVHV) 3492 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3493 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 3494
2837 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.;
2838 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.;
2839 3497
2840 if (!h || !w) 3498 if (!h || !w)
… …
2860 { 3518 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3519 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 3520
2863 if (svp && SvTRUE (*svp)) 3521 if (svp && SvTRUE (*svp))
2864 { 3522 {
2865 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);
2866 glEnable (GL_BLEND); 3524 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3525 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 3526 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 3527 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 3528 glVertex2f (w, 0);
… …
2873 glEnd (); 3531 glEnd ();
2874 glDisable (GL_BLEND); 3532 glDisable (GL_BLEND);
2875 } 3533 }
2876 } 3534 }
2877#if 0 3535#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 3536 // draw borders, for debugging
2879 glPushMatrix; 3537 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 3538 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3539 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3540 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3541 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3542 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3543 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3544 glVertex2f (0 , h - 1);
2887 glEnd; 3545 glEnd ();
2888 glPopMatrix; 3546 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3547#endif
2892 PUSHMARK (SP); 3548 PUSHMARK (SP);
2893 XPUSHs (self); 3549 XPUSHs (self);
2894 PUTBACK; 3550 PUTBACK;
2895 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