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.233 by root, Tue Aug 21 02:39:17 2007 UTC vs.
Revision 1.333 by root, Mon Nov 19 01:23:01 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines