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.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 2018 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines