ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 2018 UTC

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

Diff Legend

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