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.326 by root, Sun Nov 18 03:06:13 2018 UTC

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

Diff Legend

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