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.211 by root, Sat Jul 28 00:45:28 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
24// microsoft vs. C
25# define sqrtf(x) sqrt(x)
26# define atan2f(x,y) atan2(x,y)
27# define M_PI 3.14159265f
22#endif 28#endif
23 29
24#include <assert.h> 30#include <cassert>
25#include <math.h> 31#include <cmath>
26#include <string.h> 32#include <cstring>
27#include <stdio.h> 33#include <cstdio>
28#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
38
39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 40
30#include <SDL.h> 41#include <SDL.h>
31#include <SDL_thread.h> 42#include <SDL_thread.h>
32#include <SDL_endian.h> 43#include <SDL_endian.h>
33#include <SDL_image.h> 44#include <SDL_image.h>
34#include <SDL_mixer.h> 45#include <SDL_mixer.h>
35#include <SDL_opengl.h> 46#include <SDL_opengl.h>
36 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
37#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
39 57
40#include <glib/gmacros.h> 58#include <glib.h>
41 59
42#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
43 72
44#ifndef _WIN32 73#ifndef _WIN32
45# include <sys/types.h> 74# include <sys/types.h>
46# include <sys/socket.h> 75# include <sys/socket.h>
47# include <netinet/in.h> 76# include <netinet/in.h>
48# include <netinet/tcp.h> 77# include <netinet/tcp.h>
49# include <inttypes.h> 78# include <inttypes.h>
50#endif 79#endif
51 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
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 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 */
54#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
55 96
56#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
58 99
59#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
60 101
61#if 0 102/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 104
64# define PARACHUTE 0 105#define KMOD_LRAM 0x10000 // our extension
65#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}
66 128
67static AV *texture_av; 129static AV *texture_av;
68 130
69static struct 131static struct
70{ 132{
107 av_push (texture_av, (SV *)(size_t)name); 169 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 170 glDeleteTextures (1, &name);
109} 171}
110 172
111#include "texcache.c" 173#include "texcache.c"
174#include "rendercache.c"
112 175
113#include "pango-font.c" 176#include "pango-font.c"
114#include "pango-fontmap.c" 177#include "pango-fontmap.c"
115#include "pango-render.c" 178#include "pango-render.c"
116 179
180typedef IV DC__Channel;
181typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 182typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 183typedef Mix_Music *DC__MixMusic;
119 184
120typedef PangoFontDescription *CFPlus__Font; 185typedef PangoFontDescription *DC__Font;
121 186
122static int 187static int
123shape_attr_p (PangoLayoutRun *run) 188shape_attr_p (PangoLayoutRun *run)
124{ 189{
125 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
126 191
127 while (attrs) 192 while (attrs)
128 { 193 {
129 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
130 195
131 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
132 return 1; 197 return 1;
133 198
134 attrs = attrs->next; 199 attrs = attrs->next;
135 } 200 }
136 201
137 return 0; 202 return 0;
138} 203}
139 204
140typedef struct cf_layout { 205struct cf_layout {
141 PangoLayout *pl; 206 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
143 int base_height; 208 int base_height;
144 CFPlus__Font font; 209 DC__Font font;
145} *CFPlus__Layout; 210 rc_t *rc;
211};
146 212
213typedef cf_layout *DC__Layout;
214
147static CFPlus__Font default_font; 215static DC__Font default_font;
148static PangoContext *opengl_context; 216static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
150 218
151static void 219static void
152substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
153{ 221{
154 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
155#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
157#endif 225#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 227}
160 228
161static void 229static void
162layout_update_font (CFPlus__Layout self) 230layout_update_font (DC__Layout self)
163{ 231{
164 /* 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
165 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
166 */ 234 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
168 236
169 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 239
172 pango_layout_set_font_description (self->pl, font); 240 pango_layout_set_font_description (self->pl, font);
173} 241}
174 242
175static void 243static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 244layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 245{
178 PangoRectangle rect; 246 PangoRectangle rect;
179 247
180 // get_pixel_* wrongly rounds down 248 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 249 pango_layout_get_extents (self->pl, 0, &rect);
191} 259}
192 260
193typedef uint16_t tileid; 261typedef uint16_t tileid;
194typedef uint16_t faceid; 262typedef uint16_t faceid;
195 263
196typedef struct { 264struct maptex
265{
197 int name; 266 GLuint name;
198 int w, h; 267 int w, h;
199 float s, t; 268 float s, t;
200 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
201 tileid smoothtile; 270 tileid smoothtile;
202 uint8_t smoothlevel; 271 uint8_t smoothlevel;
203} maptex; 272 uint8_t unused; /* set to zero on use */
273};
204 274
205typedef struct { 275struct mapcell
276{
206 uint32_t player; 277 uint32_t player;
207 tileid tile[3]; 278 tileid tile[3];
208 uint16_t darkness; 279 uint16_t darkness;
209 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
210} mapcell; 281};
211 282
212typedef struct { 283struct maprow
284{
213 int32_t c0, c1; 285 int32_t c0, c1;
214 mapcell *col; 286 mapcell *col;
215} maprow; 287};
216 288
217typedef struct map { 289struct mapgrid {
218 int x, y, w, h; 290 int x, y, w, h;
219 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
220 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
222 294
223 int32_t rows; 295 int32_t rows;
224 maprow *row; 296 maprow *row;
225} *CFPlus__Map; 297};
298
299typedef mapgrid *DC__Map;
226 300
227static char * 301static char *
228prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
229{ 303{
230 char *p; 304 char *p;
248 322
249#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))
250#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))
251 325
252static void 326static void
253need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
254{ 328{
255 while (self->faces <= face) 329 while (self->faces <= face)
256 { 330 {
257 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2; 332 self->faces *= 2;
259 } 333 }
260} 334}
261 335
262static void 336static void
263need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
264{ 338{
265 while (self->texs <= texid) 339 while (self->texs <= texid)
266 { 340 {
267 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2; 342 self->texs *= 2;
269 } 343 }
270} 344}
271 345
272static maprow * 346static maprow *
273map_get_row (CFPlus__Map self, int y) 347map_get_row (mapgrid *self, int y)
274{ 348{
275 if (0 > y) 349 if (0 > y)
276 { 350 {
277 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
316 390
317 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
318} 392}
319 393
320static mapcell * 394static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
322{ 396{
323 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
324} 398}
325 399
326static void 400static void
327map_clear (CFPlus__Map self) 401map_clear (mapgrid *self)
328{ 402{
329 int r; 403 int r;
330 404
331 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
339 self->oy = 0; 413 self->oy = 0;
340 self->row = 0; 414 self->row = 0;
341 self->rows = 0; 415 self->rows = 0;
342} 416}
343 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
344static void 428static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
346{ 430{
347 int x, y; 431 int x, y;
348 maprow *row; 432 maprow *row;
349 mapcell *cell; 433 mapcell *cell;
350 434
362 if (x >= row->c1) 446 if (x >= row->c1)
363 break; 447 break;
364 448
365 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
366 450
367 cell->darkness = 0; 451 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 452 }
372 } 453 }
373} 454}
374 455
375typedef struct { 456struct smooth_key
457{
376 tileid tile; 458 tileid tile;
377 uint8_t x, y, level; 459 uint8_t x, y, level;
378} 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}
379 479
380static void 480static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
382{ 482{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
384 484
385 if (SvIOK (*sv)) 485 if (it == h.end ())
386 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
387 else 487 else
388 sv_setiv (*sv, bits); 488 it->second |= bits;
389} 489}
390 490
391static void 491static void
392music_finished (void) 492music_finished (void)
393{ 493{
410 ev.code = 1; 510 ev.code = 1;
411 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
412 ev.data2 = 0; 512 ev.data2 = 0;
413 513
414 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;
415} 522}
416 523
417static unsigned int 524static unsigned int
418minpot (unsigned int n) 525minpot (unsigned int n)
419{ 526{
429 n |= n >> 16; 536 n |= n >> 16;
430 537
431 return n + 1; 538 return n + 1;
432} 539}
433 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
434/* SDL should provide this, really. */ 552/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 553#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 554#define SDLK_MODIFIER_MAX 314
437 555
438/******************************************************************************/ 556/******************************************************************************/
476 return 0; 594 return 0;
477 595
478 return 1; 596 return 1;
479} 597}
480 598
481MODULE = 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
482 658
483PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
484 660
485BOOT: 661BOOT:
486{ 662{
487 HV *stash = gv_stashpv ("CFPlus", 1); 663 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 664 static const struct {
489 const char *name; 665 const char *name;
490 IV iv; 666 IV iv;
491 } *civ, const_iv[] = { 667 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 668# define const_iv(name) { # name, (IV)name }
514 690
515 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
518 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),
519 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 749 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 750 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 751 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 823 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
599 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)
600# undef const_iv 861# undef const_iv
601 }; 862 };
602 863
603 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--)
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
605 866
606 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
607 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
608} 869}
609 870
621 RETVAL 882 RETVAL
622 883
623NV floor (NV x) 884NV floor (NV x)
624 885
625NV 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
626 897
627void 898void
628pango_init () 899pango_init ()
629 CODE: 900 CODE:
630{ 901{
631 opengl_fontmap = pango_opengl_font_map_new (); 902 opengl_fontmap = pango_opengl_font_map_new ();
632 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);
633 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
634} 910}
635 911
636char *
637SDL_GetError () 912char *SDL_GetError ()
638 913
639int 914void SDL_main_hack (SV *real_main)
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
641 916
642void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
643SDL_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
644 934
645void 935void
646SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
647 PPCODE: 937 PPCODE:
648{ 938{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 953
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 956
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 958
672 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
673 while (*m) 960 while (*m)
674 { 961 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 963 {
677 AV *av = newAV (); 964 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
703 ); 990 );
704 991
705 if (RETVAL) 992 if (RETVAL)
706 { 993 {
707 av_clear (texture_av); 994 av_clear (texture_av);
708
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
710#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);
711#include "glfunc.h" 996#include "glfunc.h"
712#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
713 } 1000 }
714} 1001}
715 OUTPUT: 1002 OUTPUT:
716 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
717 1007
718void 1008void
719SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
720 1010
721char * 1011char *
722SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
723 1014
724int 1015int
725SDL_GetAppState () 1016SDL_GetAppState ()
726 1017
1018int
1019SDL_GetModState ()
1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
727void 1025void
1026SDL_PumpEvents ()
1027
1028void
728poll_events () 1029peep_events ()
729 PPCODE: 1030 PPCODE:
730{ 1031{
731 SDL_Event ev; 1032 SDL_Event ev;
732 1033
733 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
740 { 1041 {
741 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
742 case SDL_KEYUP: 1043 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 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);
746 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 */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 1049 break;
749 1050
750 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 1070 x = ev.motion.x;
770 y = ev.motion.y; 1071 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 1073 }
773 1074
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 1081 }
781 break; 1082 break;
782 1083
783 case SDL_MOUSEBUTTONDOWN: 1084 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1085 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1086 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1087
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1088 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1089 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1090 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1091 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1096 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1097 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1098 break;
798 } 1099 }
799 1100
800 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))));
801 } 1102 }
802} 1103}
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
803 1117
804int 1118int
805Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1120 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
809 1123
810void 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}
1139
1140void
811Mix_CloseAudio () 1141Mix_CloseAudio ()
812 1142
813int 1143int
814Mix_AllocateChannels (int numchans = -1) 1144Mix_AllocateChannels (int numchans = -1)
1145
1146const char *
1147Mix_GetError ()
815 1148
816void 1149void
817lowdelay (int fd, int val = 1) 1150lowdelay (int fd, int val = 1)
818 CODE: 1151 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1152 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1178 }
846 } 1179 }
847#endif 1180#endif
848} 1181}
849 1182
850void 1183int
851add_font (char *file) 1184add_font (char *file)
852 CODE: 1185 CODE:
853 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)
854 1196
855void 1197void
856load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
857 ALIAS: 1199 ALIAS:
858 load_image_file = 1 1200 load_image_file = 1
861 STRLEN image_len; 1203 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1204 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1205 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1206 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1207 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1208 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1209 : SDL_RWFromConstMem (image, image_len);
868 1210
869 if (!rw) 1211 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1212 croak ("load_image: %s", SDL_GetError ());
871 1213
904 1246
905 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
906 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
907 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
908 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
909 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
910 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)));
911 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
912 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
913 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
914 1256
944void 1286void
945error (char *message) 1287error (char *message)
946 CODE: 1288 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1289 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1290#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1291 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1292#endif
951 1293
952void 1294void
953fatal (char *message) 1295fatal (char *message)
954 CODE: 1296 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1297 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1298#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1299 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1300#endif
959 _exit (1); 1301 _exit (1);
960 1302
961void 1303void
962_exit (int retval = 0) 1304_exit (int retval = 0)
974#if DEBUG 1316#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
976#endif 1318#endif
977} 1319}
978 1320
979MODULE = 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
980 1329
981PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
982 1331
983CFPlus::Font 1332DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
985 CODE: 1334 CODE:
986{ 1335{
987 int count; 1336 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
989 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
991} 1340}
992 OUTPUT: 1341 OUTPUT:
993 RETVAL 1342 RETVAL
994 1343
995void 1344void
996DESTROY (CFPlus::Font self) 1345DESTROY (DC::Font self)
997 CODE: 1346 CODE:
998 pango_font_description_free (self); 1347 pango_font_description_free (self);
999 1348
1000void 1349void
1001make_default (CFPlus::Font self) 1350make_default (DC::Font self)
1002 PROTOTYPE: $ 1351 PROTOTYPE: $
1003 CODE: 1352 CODE:
1004 default_font = self; 1353 default_font = self;
1005 1354
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1355MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1356
1008PROTOTYPES: DISABLE 1357PROTOTYPES: DISABLE
1009 1358
1010void 1359void
1011reset_glyph_cache () 1360glyph_cache_backup ()
1012 PROTOTYPE: 1361 PROTOTYPE:
1013 CODE: 1362 CODE:
1363 tc_backup ();
1364
1365void
1366glyph_cache_restore ()
1367 PROTOTYPE:
1368 CODE:
1014 tc_clear (); 1369 tc_restore ();
1015 1370
1016CFPlus::Layout 1371DC::Layout
1017new (SV *class) 1372new (SV *klass)
1018 CODE: 1373 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1020 1375
1021 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1022 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1023 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1382 RETVAL->font = 0;
1383 RETVAL->rc = rc_alloc ();
1028 1384
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1385 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1386 layout_update_font (RETVAL);
1031 OUTPUT: 1387 OUTPUT:
1032 RETVAL 1388 RETVAL
1033 1389
1034void 1390void
1035DESTROY (CFPlus::Layout self) 1391DESTROY (DC::Layout self)
1036 CODE: 1392 CODE:
1037 g_object_unref (self->pl); 1393 g_object_unref (self->pl);
1394 rc_free (self->rc);
1038 Safefree (self); 1395 Safefree (self);
1039 1396
1040void 1397void
1041set_text (CFPlus::Layout self, SV *text_) 1398set_text (DC::Layout self, SV *text_)
1042 CODE: 1399 CODE:
1043{ 1400{
1044 STRLEN textlen; 1401 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1402 char *text = SvPVutf8 (text_, textlen);
1046 1403
1047 pango_layout_set_text (self->pl, text, textlen); 1404 pango_layout_set_text (self->pl, text, textlen);
1048} 1405}
1049 1406
1050void 1407void
1051set_markup (CFPlus::Layout self, SV *text_) 1408set_markup (DC::Layout self, SV *text_)
1052 CODE: 1409 CODE:
1053{ 1410{
1054 STRLEN textlen; 1411 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1412 char *text = SvPVutf8 (text_, textlen);
1056 1413
1057 pango_layout_set_markup (self->pl, text, textlen); 1414 pango_layout_set_markup (self->pl, text, textlen);
1058} 1415}
1059 1416
1060void 1417void
1061set_shapes (CFPlus::Layout self, ...) 1418set_shapes (DC::Layout self, ...)
1062 CODE: 1419 CODE:
1063{ 1420{
1064 PangoAttrList *attrs = 0; 1421 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1422 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1423 const char *pos = text;
1101 if (attrs) 1458 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1459 pango_layout_set_attributes (self->pl, attrs);
1103} 1460}
1104 1461
1105void 1462void
1106get_shapes (CFPlus::Layout self) 1463get_shapes (DC::Layout self)
1107 PPCODE: 1464 PPCODE:
1108{ 1465{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1466 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1467
1111 do 1468 do
1112 { 1469 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1470 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1471
1115 if (run && shape_attr_p (run)) 1472 if (run && shape_attr_p (run))
1116 { 1473 {
1117 PangoRectangle extents; 1474 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1475 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1483
1127 pango_layout_iter_free (iter); 1484 pango_layout_iter_free (iter);
1128} 1485}
1129 1486
1130int 1487int
1131has_wrapped (CFPlus::Layout self) 1488has_wrapped (DC::Layout self)
1132 CODE: 1489 CODE:
1133{ 1490{
1134 int lines = 1; 1491 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1492 const char *text = pango_layout_get_text (self->pl);
1136 1493
1141} 1498}
1142 OUTPUT: 1499 OUTPUT:
1143 RETVAL 1500 RETVAL
1144 1501
1145SV * 1502SV *
1146get_text (CFPlus::Layout self) 1503get_text (DC::Layout self)
1147 CODE: 1504 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1505 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1506 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1507 OUTPUT:
1151 RETVAL 1508 RETVAL
1152 1509
1153void 1510void
1154set_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.)
1155 CODE: 1512 CODE:
1156 self->r = r; 1513 self->r = r;
1157 self->g = g; 1514 self->g = g;
1158 self->b = b; 1515 self->b = b;
1159 self->a = a; 1516 self->a = a;
1160 1517
1161void 1518void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1519set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1520 CODE:
1164 if (self->font != font) 1521 if (self->font != font)
1165 { 1522 {
1166 self->font = font; 1523 self->font = font;
1167 layout_update_font (self); 1524 layout_update_font (self);
1168 } 1525 }
1169 1526
1170void 1527void
1171set_height (CFPlus::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1172 CODE: 1529 CODE:
1173 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1174 { 1531 {
1175 self->base_height = base_height; 1532 self->base_height = base_height;
1176 layout_update_font (self); 1533 layout_update_font (self);
1177 } 1534 }
1178 1535
1179void 1536void
1180set_width (CFPlus::Layout self, int max_width = -1) 1537set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1538 CODE:
1182 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);
1183 1540
1184void 1541void
1185set_indent (CFPlus::Layout self, int indent) 1542set_indent (DC::Layout self, int indent)
1186 CODE: 1543 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1544 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1545
1189void 1546void
1190set_spacing (CFPlus::Layout self, int spacing) 1547set_spacing (DC::Layout self, int spacing)
1191 CODE: 1548 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1549 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1550
1194void 1551void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1552set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1553 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1554 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1555 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1556 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1557 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1558 : PANGO_ELLIPSIZE_NONE
1202 ); 1559 );
1203 1560
1204void 1561void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1562set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1563 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1564 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1565
1209void 1566void
1210size (CFPlus::Layout self) 1567size (DC::Layout self)
1211 PPCODE: 1568 PPCODE:
1212{ 1569{
1213 int w, h; 1570 int w, h;
1214 1571
1215 layout_get_pixel_size (self, &w, &h); 1572 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1575 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1576 PUSHs (sv_2mortal (newSViv (h)));
1220} 1577}
1221 1578
1222int 1579int
1223descent (CFPlus::Layout self) 1580descent (DC::Layout self)
1224 CODE: 1581 CODE:
1225{ 1582{
1226 PangoRectangle rect; 1583 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1584 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1585 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1586 RETVAL = PANGO_DESCENT (rect);
1230} 1587}
1231 OUTPUT: 1588 OUTPUT:
1232 RETVAL 1589 RETVAL
1233 1590
1234int 1591int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1592xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1593 CODE:
1237{ 1594{
1238 int index, trailing; 1595 int index, trailing;
1239 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);
1240 RETVAL = index + trailing; 1597 RETVAL = index + trailing;
1241} 1598}
1242 OUTPUT: 1599 OUTPUT:
1243 RETVAL 1600 RETVAL
1244 1601
1245void 1602void
1246cursor_pos (CFPlus::Layout self, int index) 1603cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1604 PPCODE:
1248{ 1605{
1249 PangoRectangle strong_pos; 1606 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1607 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1608
1252 EXTEND (SP, 3); 1609 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1612 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1613}
1257 1614
1258void 1615void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1616index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1617 PPCODE:
1261{ 1618{
1262 int line, x; 1619 int line, x;
1263 1620
1264 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)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1623 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1624 --line;
1625#endif
1267 EXTEND (SP, 2); 1626 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1627 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1628 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1629}
1271 1630
1272void 1631void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1632line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1633 PPCODE:
1275{ 1634{
1276 PangoLayoutLine *lp; 1635 PangoLayoutLine *lp;
1277 int index, trailing; 1636 int index, trailing;
1278 1637
1279 if (line < 0) 1638 if (line < 0)
1280 XSRETURN_EMPTY; 1639 XSRETURN_EMPTY;
1281 1640
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1641 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1642 XSRETURN_EMPTY; /* do better */
1284 1643
1285 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);
1286 1645
1287 EXTEND (SP, 2); 1646 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1652 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1653 }
1295} 1654}
1296 1655
1297void 1656void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1657render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1658 CODE:
1659 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1660 pango_opengl_render_layout_subpixel (
1301 self->pl, 1661 self->pl,
1662 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1663 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1664 self->r, self->g, self->b, self->a,
1304 flags 1665 flags
1305 ); 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);
1306 1670
1307MODULE = 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
1308 1691
1309PROTOTYPES: ENABLE 1692PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1693
1313void 1694void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1695pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1696 CODE:
1316{ 1697{
1343 HV *hv = (HV *)SvRV (self); 1724 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1725 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1726 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1727 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1728
1729 if (name <= 0)
1730 XSRETURN_EMPTY;
1731
1348 if (items < 5) 1732 if (items < 5)
1349 { 1733 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1734 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1735 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1736 }
1379 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1381 } 1765 }
1382} 1766}
1383 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
1384IV 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)
1385 CODE: 1890 CODE:
1386{ 1891{
1387 GLint width; 1892 GLint width;
1388 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);
1390 RETVAL = width > 0; 1895 RETVAL = width > 0;
1391} 1896}
1392 OUTPUT: 1897 OUTPUT:
1393 RETVAL 1898 RETVAL
1394 1899
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1901
1397PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1398 1903
1399CFPlus::Map 1904DC::Map
1400new (SV *class) 1905new (SV *klass)
1401 CODE: 1906 CODE:
1402 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1403 RETVAL->x = 0; 1908 RETVAL->x = 0;
1404 RETVAL->y = 0; 1909 RETVAL->y = 0;
1405 RETVAL->w = 0; 1910 RETVAL->w = 0;
1406 RETVAL->h = 0; 1911 RETVAL->h = 0;
1407 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1412 RETVAL->row = 0; 1917 RETVAL->row = 0;
1413 OUTPUT: 1918 OUTPUT:
1414 RETVAL 1919 RETVAL
1415 1920
1416void 1921void
1417DESTROY (CFPlus::Map self) 1922DESTROY (DC::Map self)
1418 CODE: 1923 CODE:
1419{ 1924{
1420 map_clear (self); 1925 map_clear (self);
1421 Safefree (self->face2tile); 1926 Safefree (self->face2tile);
1422 Safefree (self->tex); 1927 Safefree (self->tex);
1423 Safefree (self); 1928 Safefree (self);
1424} 1929}
1425 1930
1426void 1931void
1427resize (CFPlus::Map self, int map_width, int map_height) 1932resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1933 CODE:
1429 self->w = map_width; 1934 self->w = map_width;
1430 self->h = map_height; 1935 self->h = map_height;
1431 1936
1432void 1937void
1433clear (CFPlus::Map self) 1938clear (DC::Map self)
1434 CODE: 1939 CODE:
1435 map_clear (self); 1940 map_clear (self);
1436 1941
1437void 1942void
1438set_tileid (CFPlus::Map self, int face, int tile) 1943set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1944 CODE:
1440{ 1945{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1946 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1947 need_texid (self, tile);
1443} 1948}
1444 1949
1445void 1950void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1952 CODE:
1448{ 1953{
1449 tileid texid; 1954 tileid texid;
1450 maptex *tex; 1955 maptex *tex;
1451 1956
1452 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1453 return; 1958 return;
1454 1959
1455 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1456 return; 1961 return;
1457 1962
1458 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1459 1964
1460 if (!texid) 1965 if (!texid)
1461 return; 1966 return;
1462 1967
1463 tex = self->tex + texid; 1968 tex = self->tex + texid;
1464 tex->smoothtile = self->face2tile [smooth]; 1969 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1970 tex->smoothlevel = level;
1466} 1971}
1467 1972
1468void 1973void
1469set_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)
1470 CODE: 1975 CODE:
1471{ 1976{
1472 need_texid (self, texid); 1977 need_texid (self, texid);
1473 1978
1474 { 1979 {
1493 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 2001}
1497 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
1498int 2023int
1499ox (CFPlus::Map self) 2024ox (DC::Map self)
1500 ALIAS: 2025 ALIAS:
1501 oy = 1 2026 oy = 1
1502 x = 2 2027 x = 2
1503 y = 3 2028 y = 3
1504 w = 4 2029 w = 4
1515 } 2040 }
1516 OUTPUT: 2041 OUTPUT:
1517 RETVAL 2042 RETVAL
1518 2043
1519void 2044void
1520scroll (CFPlus::Map self, int dx, int dy) 2045scroll (DC::Map self, int dx, int dy)
1521 CODE: 2046 CODE:
1522{ 2047{
1523 if (dx > 0) 2048 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 2049 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 2050 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 2065 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1542 } 2067 }
1543} 2068}
1544 2069
1545void 2070SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1547 CODE: 2072 CODE:
1548{ 2073{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 2076 mapcell *cell;
1552 int x, y, flags; 2077 int x, y, z, flags;
2078 AV *missing = newAV ();
2079 RETVAL = newRV_noinc ((SV *)missing);
1553 2080
1554 while (data < data_end - 1) 2081 while (data < data_end - 1)
1555 { 2082 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 2083 flags = (data [0] << 8) + data [1]; data += 2;
1557 2084
1570 2097
1571 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1572 2099
1573 if (flags & 8) 2100 if (flags & 8)
1574 { 2101 {
2102 uint8_t ext, cmd;
2103
1575 if (extmap) 2104 do
1576 { 2105 {
1577 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1578 2108
1579 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
1580 { 2112 {
1581 ext = *data++;
1582 cmd = ext & 0x3f;
1583
1584 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health
1587 {
1588 cell->stat_width = 1; 2113 cell->stat_width = 1;
1589 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1590 }
1591 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47)
1594 {
1595 if (*data == 4)
1596 ; // decode player count
1597
1598 data += *data + 1;
1599 }
1600 else if (cmd == 8) // cell flags
1601 cell->flags = *data++;
1602 else if (ext & 0x40) // unknown, multibyte => skip
1603 data += *data + 1;
1604 else
1605 data++;
1606 } 2115 }
1607 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++;
1608 } 2133 }
1609 else 2134 while (ext & 0x80);
1610 cell->darkness = *data++ + 1;
1611 } 2135 }
1612 2136
2137 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 2138 if (flags & (4 >> z))
1614 { 2139 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 2140 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 2141 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
2143
2144 if (cell->tile [z])
2145 {
2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
2148 if (!tex->name)
2149 av_push (missing, newSViv (cell->tile [z]));
2150
2151 if (tex->smoothtile)
2152 {
2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
2155 if (!smooth->name)
2156 av_push (missing, newSViv (tex->smoothtile));
2157 }
2158 }
1618 } 2159 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 2160 }
1634 else 2161 else
1635 cell->darkness = 0; 2162 CELL_CLEAR (cell);
1636 } 2163 }
1637} 2164}
2165 OUTPUT:
2166 RETVAL
1638 2167
1639SV * 2168SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2169mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 2170 CODE:
1642{ 2171{
1643 int x1, x; 2172 int x1, x;
1644 int y1, y; 2173 int y1, y;
1645 int z; 2174 int z;
1658 ? self->row + y 2187 ? self->row + y
1659 : 0; 2188 : 0;
1660 2189
1661 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1662 { 2191 {
1663 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1664 2193
1665 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1666 { 2195 {
1667 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1668 2197
1670 { 2199 {
1671 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1672 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1673 int a1 = tex.a; 2202 int a1 = tex.a;
1674 2203
1675 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1676 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1677 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1678 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1679 } 2208 }
1680 } 2209 }
1681 2210
1682 *map++ = (r ) 2211 *map++ = (r )
1683 | (g << 8) 2212 | (g << 8)
1684 | (b << 16) 2213 | (b << 16)
1685 | (a << 24); 2214 | (a << 24);
1686 } 2215 }
1687 } 2216 }
1688 2217
1689 RETVAL = map_sv; 2218 RETVAL = map_sv;
1690} 2219}
1691 OUTPUT: 2220 OUTPUT:
1692 RETVAL 2221 RETVAL
1693 2222
1694void 2223void
1695draw (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)
1696 CODE: 2225 CODE:
1697{ 2226{
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1701 smooth_key skey;
1702 int x, y, z; 2227 int x, y, z;
1703 int last_name;
1704 2228
2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2230 int pl_x, pl_y;
2231 maptex pl_tex;
2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
2234 rc_key_t key;
2235 rc_array_t *arr;
2236
2237 pl_tex.name = 0;
2238
1705 // thats current max. sorry. 2239 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1708 2242
1709 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2243 memset (&key, 0, sizeof (key));
1711 2244 key.r = 255;
1712 glColor4ub (255, 255, 255, 255); 2245 key.g = 255;
1713 2246 key.b = 255;
1714 glEnable (GL_BLEND); 2247 key.a = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2248 key.mode = GL_QUADS;
1716 glEnable (GL_TEXTURE_2D); 2249 key.format = GL_T2F_V3F;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1718
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2250
1723 mx += self->x; 2251 mx += self->x;
1724 my += self->y; 2252 my += self->y;
1725 2253
1726 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1727 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1728 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1729 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1730 2258
1731 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1732 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1733 { 2261 {
1734 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2271 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2272 self->tex [cell->tile [2]].smoothlevel));
1745 } 2273 }
1746 } 2274 }
1747 2275
2276 glEnable (GL_BLEND);
2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2279
1748 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1749 { 2281 {
1750 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;
1751 2286
1752 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
1754 { 2289 {
1755 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
1761 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
1762 2297
1763 if (tile) 2298 if (tile)
1764 { 2299 {
1765 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2301 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2302
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2303 if (key.texname != tex.name)
1772 { 2304 {
2305 self->tex [tile].unused = 0;
2306
1773 if (!tex.name) 2307 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2309
1776 glEnd (); 2310 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2311 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2312 }
1780 2313
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2314 px = (x + 1) * Th - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2315 py = (y + 1) * Tw - tex.h;
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785 2316
1786 if (cell->flags && z == 2) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
1787 { 2318 {
1788 if (cell->flags & 1) 2319 pl_x = px;
2320 pl_y = py;
2321 pl_tex = tex;
1789 { 2322 continue;
1790 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32;
1793
1794 glEnd ();
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1796 glBegin (GL_QUADS);
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 }
1803 } 2323 }
2324
2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2326 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2327 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2328 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1804 2329
1805 // update smooth hash 2330 // update smooth hash
1806 if (tex.smoothtile) 2331 if (tex.smoothtile)
1807 { 2332 {
1808 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
1809 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
1810 2335
1811 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
1812 2337
1813 // 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
1814 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
1815 2340
1816 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
1824 2349
1825 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1826 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
1827 2352
1828 // full tile 2353 // full tile
1829 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);
1830 2355
1831 // borders 2356 // borders
1832 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);
1833 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);
1834 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);
1835 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);
1836 2361
1837 // corners 2362 // corners
1838 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);
1839 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);
1840 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);
1841 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);
1842 } 2388 }
1843 } 2389 }
1844 } 2390 }
1845 } 2391 }
1846 2392
2393 rc_draw (rc);
2394 rc_clear (rc);
2395
1847 // go through all smoothlevels, lowest to highest, then draw. 2396 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2397 // this is basically counting sort
1849 { 2398 {
1850 int w, b; 2399 int w, b;
1851 2400
1852 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)
1853 { 2406 {
1854 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
1855 if (smask) 2408 IV bits = it->second;
1856 for (b = 0; b < 32; ++b) 2409
1857 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
1858 { 2413 {
1859 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
1860 HE *he; 2422 if (tex.name)
1861
1862 hv_iterinit (smooth);
1863 while ((he = hv_iternext (smooth)))
1864 { 2423 {
1865 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
1866 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
1867 2426 if (key.texname != tex.name)
1868 if (!(bits & 0x1000)
1869 && skey->level == level
1870 && level > smooth_max [skey->x][skey->y])
1871 { 2427 {
1872 maptex tex = self->tex [skey->tile]; 2428 self->tex [skey.tile].unused = 0;
1873 int px = (((int)skey->x) - 1) * T;
1874 int py = (((int)skey->y) - 1) * T;
1875 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column
1879 2429
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name)
1883 {
1884 if (!tex.name)
1885 continue; // smoothing not yet available
1886
1887 glEnd (); 2430 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
1890 } 2433 }
1891 2434
1892 if (border) 2435 if (border)
1893 { 2436 {
1894 float ox = border * dx; 2437 float ox = border * dx;
1895 2438
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1900 } 2443 }
1901 2444
1902 if (corner) 2445 if (corner)
1903 { 2446 {
1904 float ox = corner * dx; 2447 float ox = corner * dx;
1905 2448
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1910 }
1911 } 2453 }
1912 } 2454 }
1913 } 2455 }
1914 } 2456 }
2457
2458 glEnd ();
2459 glDisable (GL_TEXTURE_2D);
2460 key.texname = -1;
1915 } 2461 }
1916
1917 hv_clear (smooth);
1918 } 2462 }
1919 2463
1920 glEnd (); 2464 if (pl_tex.name)
2465 {
2466 maptex tex = pl_tex;
2467 int px = pl_x + sdx;
2468 int py = pl_y + sdy;
1921 2469
1922 glDisable (GL_TEXTURE_2D); 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
2478 rc_draw (rc);
2479 }
2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
1923 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2485 rc_free (rc);
2486 rc_free (rc_ov);
1924 2487
1925 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
1928 { 2491 {
1931 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
1932 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
1933 { 2496 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
1935 2498
1936 int px = x * T; 2499 int px = x * Tw;
1937 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 }
1938 2507
1939 if (cell->stat_hp) 2508 if (cell->stat_hp)
1940 { 2509 {
1941 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1943 2512
1944 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
1945 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
1946 px + width - 1, py); 2515 px + width - 1, py);
1947 2516
1953 } 2522 }
1954 } 2523 }
1955} 2524}
1956 2525
1957void 2526void
1958draw_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)
1959 CODE: 2528 CODE:
1960{ 2529{
1961 static float color[16][3] = { 2530 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
1963 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
1964 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
1965 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
1966 2535
1967 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
1968 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
1969 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
1970 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
1971 2540
1972 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
1973 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
1974 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
1975 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
1976 2545
1977 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
1978 2547
1979 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
1980 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
1981 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
1982 }; 2551 };
1983 2552
1984 int x, y; 2553 int x, y;
1985 2554
1986 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 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
1991 2566
1992 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
1996 2571
1997 if (m) 2572 if (m)
1998 { 2573 {
1999 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2000 2575
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2002 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2003 2578
2004 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2584 }
2013 glDisable (GL_BLEND); 2588 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2589 glDisable (GL_TEXTURE_2D);
2015} 2590}
2016 2591
2017void 2592void
2018fow_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)
2019 PPCODE: 2594 PPCODE:
2020{ 2595{
2021 int x, y; 2596 int x, y;
2022 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2024 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2025 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);
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2029 2605
2030 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2032 2608
2033 mx += self->x - 1; 2609 mx += self->x - 1;
2034 my += self->y - 1; 2610 my += self->y - 1;
2035
2036 memset (darkness1, 255, sw1 * sh1);
2037 2611
2038 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2040 { 2614 {
2041 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2044 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2045 { 2619 {
2046 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2047 2621
2048 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2050 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2051 } 2625 }
2052 } 2626 }
2053 2627
2054 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2074 2648
2075 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2076 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2077 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2078 2652
2079 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2080 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2081 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2082 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2083 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 */
2084 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2085 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2086 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2087 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2088 } 2662 }
2089 2663
2090 free (darkness1); 2664 free (darkness1);
2091 2665
2092 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2093 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2096} 2670}
2097 2671
2098SV * 2672SV *
2099get_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)
2100 CODE: 2674 CODE:
2101{ 2675{
2102 int x, y, x1, y1; 2676 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2677 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2735 else
2162 *data++ = 0; 2736 *data++ = 0;
2163 } 2737 }
2164 } 2738 }
2165 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 {
2166 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2745 }
2746
2168 RETVAL = data_sv; 2747 RETVAL = data_sv;
2169} 2748}
2170 OUTPUT: 2749 OUTPUT:
2171 RETVAL 2750 RETVAL
2172 2751
2173void 2752void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2753set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2754 PPCODE:
2176{ 2755{
2177 int x, y, z; 2756 int x, y, z;
2178 int w, h; 2757 int w, h;
2179 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;
2180 2769
2181 if (*data++ != 0) 2770 if (*data++ != 0)
2182 return; /* version mismatch */ 2771 XSRETURN_EMPTY; /* version mismatch */
2183 2772
2184 w = *data++ << 8; w |= *data++; 2773 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2774 h = *data++ << 8; h |= *data++;
2186 2775
2187 // 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
2199 { 2788 {
2200 maprow *row = map_get_row (self, y); 2789 maprow *row = map_get_row (self, y);
2201 2790
2202 for (x = x0; x < x1; x++) 2791 for (x = x0; x < x1; x++)
2203 { 2792 {
2793 uint8_t flags;
2794
2795 if (data + 7 >= end)
2796 XSRETURN_EMPTY;
2797
2204 uint8_t flags = *data++; 2798 flags = *data++;
2205 2799
2206 if (flags) 2800 if (flags)
2207 { 2801 {
2208 mapcell *cell = row_get_cell (row, x); 2802 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2803 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2806 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2807 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2808
2215 if (cell->darkness == 0) 2809 if (cell->darkness == 0)
2216 { 2810 {
2217 cell->darkness = 0; 2811 /*cell->darkness = 0;*/
2812 EXTEND (SP, 3);
2218 2813
2219 for (z = 0; z <= 2; z++) 2814 for (z = 0; z <= 2; z++)
2220 { 2815 {
2221 tileid t = tile [z]; 2816 tileid t = tile [z];
2222 2817
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2818 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2819 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2820 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2821 need_texid (self, t);
2227 } 2822 }
2228 2823
2229 cell->tile [z] = t; 2824 cell->tile [z] = t;
2230 } 2825 }
2232 } 2827 }
2233 } 2828 }
2234 } 2829 }
2235} 2830}
2236 2831
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2833
2239PROTOTYPES: DISABLE 2834DC::RW
2240
2241CFPlus::MixChunk
2242new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2243 CODE: 2836 CODE:
2244{ 2837{
2245 STRLEN datalen; 2838 STRLEN datalen;
2246 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2247 2840
2248 RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1); 2841 RETVAL = SDL_RWFromConstMem (data, datalen);
2249} 2842}
2250 OUTPUT: 2843 OUTPUT:
2251 RETVAL 2844 RETVAL
2252 2845
2253CFPlus::MixChunk 2846DC::RW
2254new_from_file (SV *class, char *path) 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2255 CODE: 2848 CODE:
2256 RETVAL = Mix_LoadWAV (path); 2849 RETVAL = SDL_RWFromFile (path, mode);
2257 OUTPUT: 2850 OUTPUT:
2258 RETVAL 2851 RETVAL
2259 2852
2853# fails on win32:
2854# dc.xs(2268) : error C2059: syntax error : '('
2260void 2855#void
2856#close (DC::RW self)
2857# CODE:
2858# (self->(close)) (self);
2859
2860MODULE = Deliantra::Client PACKAGE = DC::Channel
2861
2862PROTOTYPES: DISABLE
2863
2864DC::Channel
2865find ()
2866 CODE:
2867{
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2871 {
2872 RETVAL = Mix_GroupOldest (-1);
2873
2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2880 XSRETURN_UNDEF;
2881 }
2882 else
2883 Mix_HaltChannel (RETVAL);
2884 }
2885
2886 Mix_UnregisterAllEffects (RETVAL);
2887 Mix_Volume (RETVAL, 128);
2888}
2889 OUTPUT:
2890 RETVAL
2891
2892void
2893halt (DC::Channel self)
2894 CODE:
2895 Mix_HaltChannel (self);
2896
2897void
2898expire (DC::Channel self, int ticks = -1)
2899 CODE:
2900 Mix_ExpireChannel (self, ticks);
2901
2902void
2903fade_out (DC::Channel self, int ticks = -1)
2904 CODE:
2905 Mix_FadeOutChannel (self, ticks);
2906
2907int
2908volume (DC::Channel self, int volume)
2909 CODE:
2910 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2911 OUTPUT:
2912 RETVAL
2913
2914void
2915unregister_all_effects (DC::Channel self)
2916 CODE:
2917 Mix_UnregisterAllEffects (self);
2918
2919void
2920set_panning (DC::Channel self, int left, int right)
2921 CODE:
2922 left = CLAMP (left , 0, 255);
2923 right = CLAMP (right, 0, 255);
2924 Mix_SetPanning (self, left, right);
2925
2926void
2927set_distance (DC::Channel self, int distance)
2928 CODE:
2929 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2930
2931void
2932set_position (DC::Channel self, int angle, int distance)
2933 CODE:
2934
2935void
2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2937 CODE:
2938{
2939 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2940 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2942}
2943
2944void
2945set_reverse_stereo (DC::Channel self, int flip)
2946 CODE:
2947 Mix_SetReverseStereo (self, flip);
2948
2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2950
2951PROTOTYPES: DISABLE
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
2965DC::MixChunk
2966new (SV *klass, DC::RW rwops)
2967 CODE:
2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2969 OUTPUT:
2970 RETVAL
2971
2972void
2261DESTROY (CFPlus::MixChunk self) 2973DESTROY (DC::MixChunk self)
2262 CODE: 2974 CODE:
2263 Mix_FreeChunk (self); 2975 Mix_FreeChunk (self);
2264 2976
2265int 2977int
2266volume (CFPlus::MixChunk self, int volume = -1) 2978volume (DC::MixChunk self, int volume = -1)
2267 CODE: 2979 CODE:
2980 if (items > 1)
2981 volume = CLAMP (volume, 0, 128);
2268 RETVAL = Mix_VolumeChunk (self, volume); 2982 RETVAL = Mix_VolumeChunk (self, volume);
2269 OUTPUT: 2983 OUTPUT:
2270 RETVAL 2984 RETVAL
2271 2985
2272int 2986DC::Channel
2273play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2987play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2274 CODE: 2988 CODE:
2989{
2275 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2990 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2991
2992 if (RETVAL < 0)
2993 XSRETURN_UNDEF;
2994
2995 if (channel < 0)
2996 {
2997 Mix_UnregisterAllEffects (RETVAL);
2998 Mix_Volume (RETVAL, 128);
2999 }
3000}
2276 OUTPUT: 3001 OUTPUT:
2277 RETVAL 3002 RETVAL
2278 3003
2279MODULE = 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
2280 3017
2281int 3018int
2282volume (int volume = -1) 3019volume (int volume = -1)
2283 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2284 CODE: 3021 CODE:
3022 if (items > 0)
3023 volume = CLAMP (volume, 0, 128);
2285 RETVAL = Mix_VolumeMusic (volume); 3024 RETVAL = Mix_VolumeMusic (volume);
2286 OUTPUT: 3025 OUTPUT:
2287 RETVAL 3026 RETVAL
2288 3027
3028void
3029fade_out (int ms)
3030 CODE:
3031 Mix_FadeOutMusic (ms);
3032
3033void
3034halt ()
3035 CODE:
3036 Mix_HaltMusic ();
3037
2289int 3038int
2290fade_out (int ms) 3039playing ()
2291 CODE: 3040 CODE:
2292 RETVAL = Mix_FadeOutMusic (ms); 3041 RETVAL = Mix_PlayingMusic ();
2293 OUTPUT: 3042 OUTPUT:
2294 RETVAL 3043 RETVAL
2295 3044
2296CFPlus::MixMusic 3045DC::MixMusic
2297new_from_file (SV *class, char *path) 3046new (SV *klass, DC::RW rwops)
2298 CODE: 3047 CODE:
2299 RETVAL = Mix_LoadMUS (path); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2300 OUTPUT: 3049 OUTPUT:
2301 RETVAL 3050 RETVAL
2302 3051
2303void 3052void
2304DESTROY (CFPlus::MixMusic self) 3053DESTROY (DC::MixMusic self)
2305 CODE: 3054 CODE:
2306 Mix_FreeMusic (self); 3055 Mix_FreeMusic (self);
2307 3056
2308int 3057int
2309play (CFPlus::MixMusic self, int loops = -1) 3058play (DC::MixMusic self, int loops = -1)
2310 CODE: 3059 CODE:
2311 RETVAL = Mix_PlayMusic (self, loops); 3060 RETVAL = Mix_PlayMusic (self, loops);
2312 OUTPUT: 3061 OUTPUT:
2313 RETVAL 3062 RETVAL
2314 3063
2315int 3064void
2316fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3065fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2317 CODE: 3066 CODE:
2318 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3067 Mix_FadeInMusicPos (self, loops, ms, position);
2319 OUTPUT:
2320 RETVAL
2321 3068
2322MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3069MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2323 3070
2324PROTOTYPES: ENABLE 3071PROTOTYPES: ENABLE
2325 3072
2326BOOT: 3073BOOT:
2327{ 3074{
2328 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3075 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2329 static const struct { 3076 static const struct {
2330 const char *name; 3077 const char *name;
2331 IV iv; 3078 IV iv;
2332 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2333# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2334 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2335 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2336 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2337 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2338 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2339 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2340 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2341 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2353 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2354 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2355 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2356 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2357 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),
2358 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2359 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2360 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2361 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2362 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2368 const_iv (GL_INTENSITY), 3120 const_iv (GL_INTENSITY),
2369 const_iv (GL_LUMINANCE), 3121 const_iv (GL_LUMINANCE),
2370 const_iv (GL_LUMINANCE_ALPHA), 3122 const_iv (GL_LUMINANCE_ALPHA),
2371 const_iv (GL_FLOAT), 3123 const_iv (GL_FLOAT),
2372 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),
2373 const_iv (GL_COMPILE), 3131 const_iv (GL_COMPILE),
2374 const_iv (GL_PROXY_TEXTURE_1D), 3132 const_iv (GL_PROXY_TEXTURE_1D),
2375 const_iv (GL_PROXY_TEXTURE_2D), 3133 const_iv (GL_PROXY_TEXTURE_2D),
2376 const_iv (GL_TEXTURE_1D), 3134 const_iv (GL_TEXTURE_1D),
2377 const_iv (GL_TEXTURE_2D), 3135 const_iv (GL_TEXTURE_2D),
2416 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3174 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2417 const_iv (GL_POINT_SMOOTH_HINT), 3175 const_iv (GL_POINT_SMOOTH_HINT),
2418 const_iv (GL_LINE_SMOOTH_HINT), 3176 const_iv (GL_LINE_SMOOTH_HINT),
2419 const_iv (GL_POLYGON_SMOOTH_HINT), 3177 const_iv (GL_POLYGON_SMOOTH_HINT),
2420 const_iv (GL_GENERATE_MIPMAP_HINT), 3178 const_iv (GL_GENERATE_MIPMAP_HINT),
3179 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2421 const_iv (GL_FASTEST), 3180 const_iv (GL_FASTEST),
2422 const_iv (GL_DONT_CARE), 3181 const_iv (GL_DONT_CARE),
2423 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2424 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2425 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2426 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2427 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),
2428# undef const_iv 3190# undef const_iv
2429 }; 3191 };
2430 3192
2431 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--)
2432 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2433 3195
2434 texture_av = newAV (); 3196 texture_av = newAV ();
2435 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2436} 3198}
2437 3199
2438char * 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 *
2439gl_vendor () 3210gl_vendor ()
2440 CODE: 3211 CODE:
2441 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2442 OUTPUT: 3213 OUTPUT:
2443 RETVAL 3214 RETVAL
2444 3215
2445char * 3216const char *
2446gl_version () 3217gl_version ()
2447 CODE: 3218 CODE:
2448 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2449 OUTPUT: 3220 OUTPUT:
2450 RETVAL 3221 RETVAL
2451 3222
2452char * 3223const char *
2453gl_extensions () 3224gl_extensions ()
2454 CODE: 3225 CODE:
2455 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2456 OUTPUT: 3227 OUTPUT:
2457 RETVAL 3228 RETVAL
2458 3229
2459const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2460 3235
2461GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2462 CODE: 3237 CODE:
2463 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2464 OUTPUT: 3239 OUTPUT:
2472 3247
2473int glGetError () 3248int glGetError ()
2474 3249
2475void glFinish () 3250void glFinish ()
2476 3251
3252void glFlush ()
3253
2477void glClear (int mask) 3254void glClear (int mask)
2478 3255
2479void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2480 PROTOTYPE: @ 3257 PROTOTYPE: @
2481 3258
2490void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2491 3268
2492void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2493 CODE: 3270 CODE:
2494 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
2495 3274
2496void glDepthMask (int flag) 3275void glDepthMask (int flag)
2497 3276
2498void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2499 3278
2534void glRotate (float angle, float x, float y, float z) 3313void glRotate (float angle, float x, float y, float z)
2535 CODE: 3314 CODE:
2536 glRotatef (angle, x, y, z); 3315 glRotatef (angle, x, y, z);
2537 3316
2538void 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: @
2539 ALIAS: 3319 ALIAS:
2540 glColor_premultiply = 1 3320 glColor_premultiply = 1
2541 CODE: 3321 CODE:
2542 if (ix) 3322 if (ix)
2543 { 3323 {
2563 3343
2564void glRect (float x1, float y1, float x2, float y2) 3344void glRect (float x1, float y1, float x2, float y2)
2565 CODE: 3345 CODE:
2566 glRectf (x1, y1, x2, y2); 3346 glRectf (x1, y1, x2, y2);
2567 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
2568PROTOTYPES: ENABLE 3357PROTOTYPES: ENABLE
2569 3358
2570void glBegin (int mode) 3359void glBegin (int mode)
2571 3360
2572void glEnd () 3361void glEnd ()
2604void 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)
2605 CODE: 3394 CODE:
2606 if (gl.SeparableFilter2D) 3395 if (gl.SeparableFilter2D)
2607 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3396 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2608 3397
2609void 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)
2610 3399
2611void 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)
2612 3401
2613void glDrawPixels (int width, int height, int format, int type, char *pixels) 3402void glDrawPixels (int width, int height, int format, int type, char *pixels)
2614 3403
2640 3429
2641void glEndList () 3430void glEndList ()
2642 3431
2643void glCallList (int list) 3432void glCallList (int list)
2644 3433
2645MODULE = 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
2646 3440
2647PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
2648 3442
2649void 3443void
2650find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
2651 PPCODE: 3445 PPCODE:
2652{ 3446{
2653 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
2654 XPUSHs (self); 3448 XPUSHs (self);
2655} 3449}
2656 3450
2657BOOT: 3451BOOT:
2658{ 3452{
2659 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3453 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2660 3454
2661 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);
2662 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);
2663 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);
2664 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);
2665} 3459}
2666 3460
2667void 3461void
2668draw (SV *self) 3462draw (SV *self)
2669 CODE: 3463 CODE:
2670{ 3464{
2671 HV *hv; 3465 HV *hv;
2672 SV **svp; 3466 SV **svp;
2673 NV x, y, w, h; 3467 NV x, y, w, h;
2674 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
2675 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
2676 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
2677 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);
2678 SV *hover;
2679 double draw_x, draw_y, draw_w, draw_h; 3472 double draw_x, draw_y;
2680 3473
2681 if (!SvROK (self)) 3474 if (!SvROK (self))
2682 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3475 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2683 3476
2684 hv = (HV *)SvRV (self); 3477 hv = (HV *)SvRV (self);
2685 3478
2686 if (SvTYPE (hv) != SVt_PVHV) 3479 if (SvTYPE (hv) != SVt_PVHV)
2687 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3480 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2688 3481
2689 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.;
2690 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.;
2691 3484
2692 if (!h || !w) 3485 if (!h || !w)
2712 { 3505 {
2713 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3506 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2714 3507
2715 if (svp && SvTRUE (*svp)) 3508 if (svp && SvTRUE (*svp))
2716 { 3509 {
2717 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);
2718 glEnable (GL_BLEND); 3511 glEnable (GL_BLEND);
2719 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3512 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2720 glBegin (GL_QUADS); 3513 glBegin (GL_QUADS);
2721 glVertex2f (0, 0); 3514 glVertex2f (0, 0);
2722 glVertex2f (w, 0); 3515 glVertex2f (w, 0);
2725 glEnd (); 3518 glEnd ();
2726 glDisable (GL_BLEND); 3519 glDisable (GL_BLEND);
2727 } 3520 }
2728 } 3521 }
2729#if 0 3522#if 0
2730 if ($ENV{CFPLUS_DEBUG} & 1) { 3523 // draw borders, for debugging
2731 glPushMatrix; 3524 glPushMatrix ();
2732 glColor 1, 1, 0, 1; 3525 glColor4f (1., 1., 0., 1.);
2733 glTranslate 0.375, 0.375; 3526 glTranslatef (.5, .5, 0.);
2734 glBegin GL_LINE_LOOP; 3527 glBegin (GL_LINE_LOOP);
2735 glVertex 0 , 0; 3528 glVertex2f (0 , 0);
2736 glVertex $self->{w} - 1, 0; 3529 glVertex2f (w - 1, 0);
2737 glVertex $self->{w} - 1, $self->{h} - 1; 3530 glVertex2f (w - 1, h - 1);
2738 glVertex 0 , $self->{h} - 1; 3531 glVertex2f (0 , h - 1);
2739 glEnd; 3532 glEnd ();
2740 glPopMatrix; 3533 glPopMatrix ();
2741 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2742 }
2743#endif 3534#endif
2744 PUSHMARK (SP); 3535 PUSHMARK (SP);
2745 XPUSHs (self); 3536 XPUSHs (self);
2746 PUTBACK; 3537 PUTBACK;
2747 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