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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines