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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 2018 UTC

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

Diff Legend

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