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.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 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
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
637 888
638void 889void
639pango_init () 890pango_init ()
640 CODE: 891 CODE:
641{ 892{
642 opengl_fontmap = pango_opengl_font_map_new (); 893 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 894 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); 895 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
896 /*pango_context_set_font_description (opengl_context, default_font);*/
897#if PANGO_VERSION_CHECK (1, 15, 2)
898 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
899 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
900#endif
645} 901}
646 902
647char *
648SDL_GetError () 903char *SDL_GetError ()
649 904
650int 905void SDL_main_hack (SV *real_main)
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 906 PROTOTYPE: &
652 907
653void 908int SDL_Init (U32 flags)
909
910int SDL_InitSubSystem (U32 flags)
911
912void SDL_QuitSubSystem (U32 flags)
913
654SDL_Quit () 914void SDL_Quit ()
915
916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
918
919int SDL_GL_GetAttribute (int attr)
920 CODE:
921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
922 XSRETURN_UNDEF;
923 OUTPUT:
924 RETVAL
655 925
656void 926void
657SDL_ListModes (int rgb, int alpha) 927SDL_ListModes (int rgb, int alpha)
658 PPCODE: 928 PPCODE:
659{ 929{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 941 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 944
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 945 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); 946 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 947
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 948 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 949
683 if (m && m != (SDL_Rect **)-1) 950 if (m && m != (SDL_Rect **)-1)
684 while (*m) 951 while (*m)
685 { 952 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 953 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 954 {
688 AV *av = newAV (); 955 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 956 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 957 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 958 av_push (av, newSViv (rgb));
714 ); 981 );
715 982
716 if (RETVAL) 983 if (RETVAL)
717 { 984 {
718 av_clear (texture_av); 985 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); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 987#include "glfunc.h"
723#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
724 } 991 }
725} 992}
726 OUTPUT: 993 OUTPUT:
727 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
728 998
729void 999void
730SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
731 1001
732char * 1002char *
733SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
734 1005
735int 1006int
736SDL_GetAppState () 1007SDL_GetAppState ()
737 1008
1009int
1010SDL_GetModState ()
1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
738void 1016void
1017SDL_PumpEvents ()
1018
1019void
739poll_events () 1020peep_events ()
740 PPCODE: 1021 PPCODE:
741{ 1022{
742 SDL_Event ev; 1023 SDL_Event ev;
743 1024
744 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
751 { 1032 {
752 case SDL_KEYDOWN: 1033 case SDL_KEYDOWN:
753 case SDL_KEYUP: 1034 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1035 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1036 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1037 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 */ 1038 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); 1039 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 1040 break;
760 1041
761 case SDL_ACTIVEEVENT: 1042 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1043 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 1061 x = ev.motion.x;
781 y = ev.motion.y; 1062 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1063 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 1064 }
784 1065
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1066 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 1067 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 1068 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 1069 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1070 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1071 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 1072 }
792 break; 1073 break;
793 1074
794 case SDL_MOUSEBUTTONDOWN: 1075 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 1076 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1077 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 1078
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1079 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1080 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1081 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1082 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1087 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1088 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1089 break;
809 } 1090 }
810 1091
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 1093 }
813} 1094}
814 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
815int 1109int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 1111 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
1114
1115void
1116Mix_QuerySpec ()
1117 PPCODE:
1118{
1119 int freq, channels;
1120 Uint16 format;
1121
1122 if (Mix_QuerySpec (&freq, &format, &channels))
1123 {
1124 EXTEND (SP, 3);
1125 PUSHs (sv_2mortal (newSViv (freq)));
1126 PUSHs (sv_2mortal (newSViv (format)));
1127 PUSHs (sv_2mortal (newSViv (channels)));
1128 }
1129}
820 1130
821void 1131void
822Mix_CloseAudio () 1132Mix_CloseAudio ()
823 1133
824int 1134int
859 } 1169 }
860 } 1170 }
861#endif 1171#endif
862} 1172}
863 1173
864void 1174int
865add_font (char *file) 1175add_font (char *file)
866 CODE: 1176 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1178 OUTPUT:
1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
868 1187
869void 1188void
870load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
871 ALIAS: 1190 ALIAS:
872 load_image_file = 1 1191 load_image_file = 1
918 1237
919 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
920 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
921 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
922 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
923 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 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))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
925 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
926 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
927 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
928 1247
958void 1277void
959error (char *message) 1278error (char *message)
960 CODE: 1279 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1280 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1281#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1282 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1283#endif
965 1284
966void 1285void
967fatal (char *message) 1286fatal (char *message)
968 CODE: 1287 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1288 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1289#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1290 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1291#endif
973 _exit (1); 1292 _exit (1);
974 1293
975void 1294void
976_exit (int retval = 0) 1295_exit (int retval = 0)
988#if DEBUG 1307#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
990#endif 1309#endif
991} 1310}
992 1311
993MODULE = CFPlus PACKAGE = CFPlus::Font 1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
1318
1319MODULE = Deliantra::Client PACKAGE = DC::Font
994 1320
995PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
996 1322
997CFPlus::Font 1323DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
999 CODE: 1325 CODE:
1000{ 1326{
1001 int count; 1327 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1005} 1331}
1006 OUTPUT: 1332 OUTPUT:
1007 RETVAL 1333 RETVAL
1008 1334
1009void 1335void
1010DESTROY (CFPlus::Font self) 1336DESTROY (DC::Font self)
1011 CODE: 1337 CODE:
1012 pango_font_description_free (self); 1338 pango_font_description_free (self);
1013 1339
1014void 1340void
1015make_default (CFPlus::Font self) 1341make_default (DC::Font self)
1016 PROTOTYPE: $ 1342 PROTOTYPE: $
1017 CODE: 1343 CODE:
1018 default_font = self; 1344 default_font = self;
1019 1345
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1346MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1347
1022PROTOTYPES: DISABLE 1348PROTOTYPES: DISABLE
1023 1349
1024void 1350void
1025reset_glyph_cache () 1351glyph_cache_backup ()
1026 PROTOTYPE: 1352 PROTOTYPE:
1027 CODE: 1353 CODE:
1354 tc_backup ();
1355
1356void
1357glyph_cache_restore ()
1358 PROTOTYPE:
1359 CODE:
1028 tc_clear (); 1360 tc_restore ();
1029 1361
1030CFPlus::Layout 1362DC::Layout
1031new (SV *class) 1363new (SV *klass)
1032 CODE: 1364 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1034 1366
1035 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1037 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1038 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1039 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1040 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1041 RETVAL->font = 0; 1373 RETVAL->font = 0;
1042 RETVAL->rc = rc_alloc ();
1043 1374
1044 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1045 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1046 OUTPUT: 1377 OUTPUT:
1047 RETVAL 1378 RETVAL
1048 1379
1049void 1380void
1050DESTROY (CFPlus::Layout self) 1381DESTROY (DC::Layout self)
1051 CODE: 1382 CODE:
1052 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1053 rc_free (self->rc);
1054 Safefree (self); 1384 delete self;
1055 1385
1056void 1386void
1057set_text (CFPlus::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1058 CODE: 1388 CODE:
1059{ 1389{
1060 STRLEN textlen; 1390 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1391 char *text = SvPVutf8 (text_, textlen);
1062 1392
1063 pango_layout_set_text (self->pl, text, textlen); 1393 pango_layout_set_text (self->pl, text, textlen);
1064} 1394}
1065 1395
1066void 1396void
1067set_markup (CFPlus::Layout self, SV *text_) 1397set_markup (DC::Layout self, SV *text_)
1068 CODE: 1398 CODE:
1069{ 1399{
1070 STRLEN textlen; 1400 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1401 char *text = SvPVutf8 (text_, textlen);
1072 1402
1073 pango_layout_set_markup (self->pl, text, textlen); 1403 pango_layout_set_markup (self->pl, text, textlen);
1074} 1404}
1075 1405
1076void 1406void
1077set_shapes (CFPlus::Layout self, ...) 1407set_shapes (DC::Layout self, ...)
1078 CODE: 1408 CODE:
1079{ 1409{
1080 PangoAttrList *attrs = 0; 1410 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1411 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1412 const char *pos = text;
1117 if (attrs) 1447 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1448 pango_layout_set_attributes (self->pl, attrs);
1119} 1449}
1120 1450
1121void 1451void
1122get_shapes (CFPlus::Layout self) 1452get_shapes (DC::Layout self)
1123 PPCODE: 1453 PPCODE:
1124{ 1454{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1455 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1456
1127 do 1457 do
1128 { 1458 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1459 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1460
1131 if (run && shape_attr_p (run)) 1461 if (run && shape_attr_p (run))
1132 { 1462 {
1133 PangoRectangle extents; 1463 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1464 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1472
1143 pango_layout_iter_free (iter); 1473 pango_layout_iter_free (iter);
1144} 1474}
1145 1475
1146int 1476int
1147has_wrapped (CFPlus::Layout self) 1477has_wrapped (DC::Layout self)
1148 CODE: 1478 CODE:
1149{ 1479{
1150 int lines = 1; 1480 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1481 const char *text = pango_layout_get_text (self->pl);
1152 1482
1157} 1487}
1158 OUTPUT: 1488 OUTPUT:
1159 RETVAL 1489 RETVAL
1160 1490
1161SV * 1491SV *
1162get_text (CFPlus::Layout self) 1492get_text (DC::Layout self)
1163 CODE: 1493 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1494 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1495 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1496 OUTPUT:
1167 RETVAL 1497 RETVAL
1168 1498
1169void 1499void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1500set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1501 CODE:
1172 self->r = r; 1502 self->r = r;
1173 self->g = g; 1503 self->g = g;
1174 self->b = b; 1504 self->b = b;
1175 self->a = a; 1505 self->a = a;
1176 1506
1177void 1507void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1508set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1509 CODE:
1180 if (self->font != font) 1510 if (self->font != font)
1181 { 1511 {
1182 self->font = font; 1512 self->font = font;
1183 layout_update_font (self); 1513 layout_update_font (self);
1184 } 1514 }
1185 1515
1186void 1516void
1187set_height (CFPlus::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1188 CODE: 1518 CODE:
1189 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1190 { 1520 {
1191 self->base_height = base_height; 1521 self->base_height = base_height;
1192 layout_update_font (self); 1522 layout_update_font (self);
1193 } 1523 }
1194 1524
1195void 1525void
1196set_width (CFPlus::Layout self, int max_width = -1) 1526set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1527 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1528 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1529
1200void 1530void
1201set_indent (CFPlus::Layout self, int indent) 1531set_indent (DC::Layout self, int indent)
1202 CODE: 1532 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1533 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1534
1205void 1535void
1206set_spacing (CFPlus::Layout self, int spacing) 1536set_spacing (DC::Layout self, int spacing)
1207 CODE: 1537 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1538 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1539
1210void 1540void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1541set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1542 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1543 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1544 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1545 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1546 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1547 : PANGO_ELLIPSIZE_NONE
1218 ); 1548 );
1219 1549
1220void 1550void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1551set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1552 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1553 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1554
1225void 1555void
1226size (CFPlus::Layout self) 1556size (DC::Layout self)
1227 PPCODE: 1557 PPCODE:
1228{ 1558{
1229 int w, h; 1559 int w, h;
1230 1560
1231 layout_get_pixel_size (self, &w, &h); 1561 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1564 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1565 PUSHs (sv_2mortal (newSViv (h)));
1236} 1566}
1237 1567
1238int 1568int
1239descent (CFPlus::Layout self) 1569descent (DC::Layout self)
1240 CODE: 1570 CODE:
1241{ 1571{
1242 PangoRectangle rect; 1572 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1573 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1574 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1575 RETVAL = PANGO_DESCENT (rect);
1246} 1576}
1247 OUTPUT: 1577 OUTPUT:
1248 RETVAL 1578 RETVAL
1249 1579
1250int 1580int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1581xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1582 CODE:
1253{ 1583{
1254 int index, trailing; 1584 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1585 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1586 RETVAL = index + trailing;
1257} 1587}
1258 OUTPUT: 1588 OUTPUT:
1259 RETVAL 1589 RETVAL
1260 1590
1261void 1591void
1262cursor_pos (CFPlus::Layout self, int index) 1592cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1593 PPCODE:
1264{ 1594{
1265 PangoRectangle strong_pos; 1595 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1596 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1597
1268 EXTEND (SP, 3); 1598 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1599 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1600 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1601 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1602}
1273 1603
1274void 1604void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1605index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1606 PPCODE:
1277{ 1607{
1278 int line, x; 1608 int line, x;
1279 1609
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1610 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1611#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1612 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1613 --line;
1614#endif
1283 EXTEND (SP, 2); 1615 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1616 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1617 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1618}
1287 1619
1288void 1620void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1621line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1622 PPCODE:
1291{ 1623{
1292 PangoLayoutLine *lp; 1624 PangoLayoutLine *lp;
1293 int index, trailing; 1625 int index, trailing;
1294 1626
1295 if (line < 0) 1627 if (line < 0)
1296 XSRETURN_EMPTY; 1628 XSRETURN_EMPTY;
1297 1629
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1630 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1631 XSRETURN_EMPTY; /* do better */
1300 1632
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1633 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1634
1303 EXTEND (SP, 2); 1635 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1641 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1642 }
1311} 1643}
1312 1644
1313void 1645void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1647 CODE:
1316 rc_clear (self->rc); 1648 self->rc.clear ();
1317 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1318 self->pl, 1650 self->pl,
1319 self->rc, 1651 &self->rc,
1320 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1321 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1322 flags 1654 flags
1323 ); 1655 );
1324 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1657 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1658 pango_layout_context_changed (self->pl);
1327 1659
1328void 1660void
1329draw (CFPlus::Layout self) 1661draw (DC::Layout self)
1330 CODE: 1662 CODE:
1331{ 1663{
1332 glEnable (GL_TEXTURE_2D); 1664 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1665 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1666 glEnable (GL_BLEND);
1335 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1336 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1337 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1338 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1339 1671
1340 rc_draw (self->rc); 1672 self->rc.draw ();
1341 1673
1342 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1345} 1677}
1346 1678
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1679MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1680
1349PROTOTYPES: ENABLE 1681PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1682
1353void 1683void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1684pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1685 CODE:
1356{ 1686{
1422 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1423 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1424 } 1754 }
1425} 1755}
1426 1756
1757void
1758draw_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)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1427IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1428 CODE: 1879 CODE:
1429{ 1880{
1430 GLint width; 1881 GLint width;
1431 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1433 RETVAL = width > 0; 1884 RETVAL = width > 0;
1434} 1885}
1435 OUTPUT: 1886 OUTPUT:
1436 RETVAL 1887 RETVAL
1437 1888
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1890
1440PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1441 1892
1442CFPlus::Map 1893DC::Map
1443new (SV *class) 1894new (SV *klass)
1444 CODE: 1895 CODE:
1445 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1446 RETVAL->x = 0; 1897 RETVAL->x = 0;
1447 RETVAL->y = 0; 1898 RETVAL->y = 0;
1448 RETVAL->w = 0; 1899 RETVAL->w = 0;
1449 RETVAL->h = 0; 1900 RETVAL->h = 0;
1450 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1455 RETVAL->row = 0; 1906 RETVAL->row = 0;
1456 OUTPUT: 1907 OUTPUT:
1457 RETVAL 1908 RETVAL
1458 1909
1459void 1910void
1460DESTROY (CFPlus::Map self) 1911DESTROY (DC::Map self)
1461 CODE: 1912 CODE:
1462{ 1913{
1463 map_clear (self); 1914 map_clear (self);
1464 Safefree (self->face2tile); 1915 Safefree (self->face2tile);
1465 Safefree (self->tex); 1916 Safefree (self->tex);
1466 Safefree (self); 1917 Safefree (self);
1467} 1918}
1468 1919
1469void 1920void
1470resize (CFPlus::Map self, int map_width, int map_height) 1921resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1922 CODE:
1472 self->w = map_width; 1923 self->w = map_width;
1473 self->h = map_height; 1924 self->h = map_height;
1474 1925
1475void 1926void
1476clear (CFPlus::Map self) 1927clear (DC::Map self)
1477 CODE: 1928 CODE:
1478 map_clear (self); 1929 map_clear (self);
1479 1930
1480void 1931void
1481set_tileid (CFPlus::Map self, int face, int tile) 1932set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1933 CODE:
1483{ 1934{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1935 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1936 need_texid (self, tile);
1486} 1937}
1487 1938
1488void 1939void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1941 CODE:
1491{ 1942{
1492 tileid texid; 1943 tileid texid;
1493 maptex *tex; 1944 maptex *tex;
1494 1945
1495 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1496 return; 1947 return;
1497 1948
1498 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1499 return; 1950 return;
1500 1951
1501 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1502 1953
1503 if (!texid) 1954 if (!texid)
1504 return; 1955 return;
1505 1956
1506 tex = self->tex + texid; 1957 tex = self->tex + texid;
1507 tex->smoothtile = self->face2tile [smooth]; 1958 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1959 tex->smoothlevel = level;
1509} 1960}
1510 1961
1511void 1962void
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) 1963set_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: 1964 CODE:
1514{ 1965{
1515 need_texid (self, texid); 1966 need_texid (self, texid);
1516 1967
1517 { 1968 {
1536 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1537 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1990}
1540 1991
1992void
1993expire_textures (DC::Map self, int texid, int count)
1994 PPCODE:
1995 for (; texid < self->texs && count; ++texid, --count)
1996 {
1997 maptex *tex = self->tex + texid;
1998
1999 if (tex->name)
2000 {
2001 if (tex->unused)
2002 {
2003 tex->name = 0;
2004 tex->unused = 0;
2005 XPUSHs (sv_2mortal (newSViv (texid)));
2006 }
2007 else
2008 tex->unused = 1;
2009 }
2010 }
2011
1541int 2012int
1542ox (CFPlus::Map self) 2013ox (DC::Map self)
1543 ALIAS: 2014 ALIAS:
1544 oy = 1 2015 oy = 1
1545 x = 2 2016 x = 2
1546 y = 3 2017 y = 3
1547 w = 4 2018 w = 4
1558 } 2029 }
1559 OUTPUT: 2030 OUTPUT:
1560 RETVAL 2031 RETVAL
1561 2032
1562void 2033void
1563scroll (CFPlus::Map self, int dx, int dy) 2034scroll (DC::Map self, int dx, int dy)
1564 CODE: 2035 CODE:
1565{ 2036{
1566 if (dx > 0) 2037 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 2038 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 2039 else if (dx < 0)
1576 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1577 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1578 2049
1579 while (self->y < 0) 2050 while (self->y < 0)
1580 { 2051 {
1581 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1582 2053
1583 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1584 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1585 } 2056 }
1586} 2057}
1587 2058
1588SV * 2059SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1590 CODE: 2061 CODE:
1591{ 2062{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 2065 mapcell *cell;
1615 2086
1616 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1617 2088
1618 if (flags & 8) 2089 if (flags & 8)
1619 { 2090 {
2091 uint8_t ext, cmd;
2092
1620 if (extmap) 2093 do
1621 { 2094 {
1622 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1623 2097
1624 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1625 { 2101 {
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; 2102 cell->stat_width = 1;
1634 cell->stat_hp = *data++; 2103 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 } 2104 }
1652 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1653 } 2122 }
1654 else 2123 while (ext & 0x80);
1655 cell->darkness = *data++ + 1;
1656 } 2124 }
1657 2125
1658 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1659 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1660 { 2128 {
1663 cell->tile [z] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
1664 2132
1665 if (cell->tile [z]) 2133 if (cell->tile [z])
1666 { 2134 {
1667 maptex *tex = self->tex + cell->tile [z]; 2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
1668 if (!tex->name) 2137 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z])); 2138 av_push (missing, newSViv (cell->tile [z]));
1670 2139
1671 if (tex->smoothtile) 2140 if (tex->smoothtile)
1672 { 2141 {
1673 maptex *smooth = self->tex + tex->smoothtile; 2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
1674 if (!smooth->name) 2144 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile)); 2145 av_push (missing, newSViv (tex->smoothtile));
1676 } 2146 }
1677 } 2147 }
1678 } 2148 }
1679 } 2149 }
1680 else 2150 else
1681 cell->darkness = 0; 2151 CELL_CLEAR (cell);
1682 } 2152 }
1683} 2153}
1684 OUTPUT: 2154 OUTPUT:
1685 RETVAL 2155 RETVAL
1686 2156
1687SV * 2157SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2158mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 2159 CODE:
1690{ 2160{
1691 int x1, x; 2161 int x1, x;
1692 int y1, y; 2162 int y1, y;
1693 int z; 2163 int z;
1706 ? self->row + y 2176 ? self->row + y
1707 : 0; 2177 : 0;
1708 2178
1709 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1710 { 2180 {
1711 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1712 2182
1713 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1714 { 2184 {
1715 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1716 2186
1718 { 2188 {
1719 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1720 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1721 int a1 = tex.a; 2191 int a1 = tex.a;
1722 2192
1723 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1724 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1725 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1726 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1727 } 2197 }
1728 } 2198 }
1729 2199
1730 *map++ = (r ) 2200 *map++ = (r )
1731 | (g << 8) 2201 | (g << 8)
1732 | (b << 16) 2202 | (b << 16)
1733 | (a << 24); 2203 | (a << 24);
1734 } 2204 }
1735 } 2205 }
1736 2206
1737 RETVAL = map_sv; 2207 RETVAL = map_sv;
1738} 2208}
1739 OUTPUT: 2209 OUTPUT:
1740 RETVAL 2210 RETVAL
1741 2211
1742void 2212void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2213draw (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: 2214 CODE:
1745{ 2215{
1746 int x, y, z; 2216 int x, y, z;
1747 2217
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, fats and wasteful on memory (64k) 2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1751 smooth_key skey; 2219 int pl_x, pl_y;
1752 2220 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
1754 rc_key_t key; 2223 rc_key_t key;
1755 rc_array_t *arr; 2224 rc_t::array_t *arr;
1756 2225
2226 pl_tex.name = 0;
2227
1757 // thats current max. sorry. 2228 // that's current max. sorry.
1758 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1760
1761 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey));
1763 2231
1764 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
1765 key.r = 255; 2233 key.r = 255;
1766 key.g = 255; 2234 key.g = 255;
1767 key.b = 255; 2235 key.b = 255;
1768 key.a = 255; 2236 key.a = 255;
1769 key.mode = GL_QUADS; 2237 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F; 2238 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772 2239
1773 mx += self->x; 2240 mx += self->x;
1774 my += self->y; 2241 my += self->y;
1775 2242
1776 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1777 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1778 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1779 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1780 2247
1781 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1782 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1783 { 2250 {
1784 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
1799 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801 2268
1802 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
1803 { 2270 {
1804 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2274 key.texname = -1;
1805 2275
1806 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
1807 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
1808 { 2278 {
1809 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
1817 if (tile) 2287 if (tile)
1818 { 2288 {
1819 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
1820 int px, py; 2290 int px, py;
1821 2291
1822 // suppressing texture state switches here
1823 // is only moderately effective, but worth the extra effort
1824 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
1825 { 2293 {
2294 self->tex [tile].unused = 0;
2295
1826 if (!tex.name) 2296 if (!tex.name)
1827 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1828 2298
1829 key.texname = tex.name; 2299 key.texname = tex.name;
1830 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
1831 } 2301 }
1832 2302
1833 px = (x + 1) * T - tex.w; 2303 px = (x + 1) * Th - tex.w;
1834 py = (y + 1) * T - tex.h; 2304 py = (y + 1) * Tw - tex.h;
1835 2305
1836 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1837 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1838 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1839 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1840
1841 if (cell->flags && z == 2)
1842 { 2307 {
1843 // overlays such as the speech bubble, probably more to come 2308 pl_x = px;
1844 if (cell->flags & 1) 2309 pl_y = py;
2310 pl_tex = tex;
1845 { 2311 continue;
1846 maptex tex = self->tex [1];
1847 int px = x * T + T * 2 / 32;
1848 int py = y * T - T * 6 / 32;
1849
1850 if (tex.name)
1851 {
1852 if (key.texname != tex.name)
1853 {
1854 key.texname = tex.name;
1855 arr = rc_array (rc, &key);
1856 }
1857
1858 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1859 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1860 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1861 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1862 }
1863 }
1864 } 2312 }
2313
2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1865 2318
1866 // update smooth hash 2319 // update smooth hash
1867 if (tex.smoothtile) 2320 if (tex.smoothtile)
1868 { 2321 {
1869 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
1870 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
1871 2324
1872 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
1873 2326
1874 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
1875 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
1876 2329
1877 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
1885 2338
1886 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1887 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
1888 2341
1889 // full tile 2342 // full tile
1890 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1891 2344
1892 // borders 2345 // borders
1893 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1894 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2347 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1895 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2348 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1896 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1897 2350
1898 // corners 2351 // corners
1899 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1900 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2353 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1901 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1902 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1903 } 2376 }
1904 } 2377 }
1905 } 2378 }
1906 } 2379 }
1907 2380
1908 rc_draw (rc); 2381 rc.draw ();
1909 rc_clear (rc); 2382 rc.clear ();
1910 2383
1911 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
1912 // this is basically counting sort 2385 // this is basically counting sort
1913 { 2386 {
1914 int w, b; 2387 int w, b;
1915 2388
1916 for (w = 0; w < 256 / 32; ++w) 2389 glEnable (GL_TEXTURE_2D);
2390 glBegin (GL_QUADS);
2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1917 { 2394 {
1918 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
1919 if (smask) 2396 IV bits = it->second;
1920 for (b = 0; b < 32; ++b) 2397
1921 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
1922 { 2401 {
1923 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
1924 HE *he; 2410 if (tex.name)
1925
1926 hv_iterinit (smooth);
1927 while ((he = hv_iternext (smooth)))
1928 { 2411 {
1929 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
1930 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
1931 2414 if (key.texname != tex.name)
1932 if (!(bits & 0x1000)
1933 && skey->level == level
1934 && level > smooth_max [skey->x][skey->y])
1935 { 2415 {
1936 maptex tex = self->tex [skey->tile]; 2416 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 2417
1944 if (tex.name)
1945 { 2418 glEnd ();
1946 // this time avoiding texture state changes
1947 // save gobs of state changes.
1948 if (key.texname != tex.name) 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1949 { 2420 glBegin (GL_QUADS);
1950 key.texname = tex.name;
1951 arr = rc_array (rc, &key);
1952 }
1953
1954 if (border)
1955 {
1956 float ox = border * dx;
1957
1958 rc_t2f_v3f (arr, ox , 0.f , px , py , 0);
1959 rc_t2f_v3f (arr, ox , dy , px , py + T, 0);
1960 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);
1961 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);
1962 }
1963
1964 if (corner)
1965 {
1966 float ox = corner * dx;
1967
1968 rc_t2f_v3f (arr, ox , dy , px , py , 0);
1969 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);
1970 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);
1971 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);
1972 }
1973 } 2421 }
2422
2423 if (border)
2424 {
2425 float ox = border * dx;
2426
2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2431 }
2432
2433 if (corner)
2434 {
2435 float ox = corner * dx;
2436
2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1974 } 2441 }
1975 } 2442 }
1976 } 2443 }
1977 } 2444 }
2445
2446 glEnd ();
2447 glDisable (GL_TEXTURE_2D);
2448 key.texname = -1;
1978 } 2449 }
1979
1980 hv_clear (smooth);
1981 rc_draw (rc);
1982 rc_clear (rc);
1983 } 2450 }
1984 2451
2452 if (pl_tex.name)
2453 {
2454 maptex tex = pl_tex;
2455 int px = pl_x + sdx;
2456 int py = pl_y + sdy;
2457
2458 key.texname = tex.name;
2459 rc_t::array_t &arr = rc.array (key);
2460
2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2465
2466 rc.draw ();
2467 }
2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
1985 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
1986 rc_free (rc);
1987 2473
1988 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
1989 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
1990 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
1991 { 2477 {
1994 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
1995 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
1996 { 2482 {
1997 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
1998 2484
1999 int px = x * T; 2485 int px = x * Tw;
2000 int py = y * T; 2486 int py = y * Th;
2487
2488 if (ecb_expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2001 2493
2002 if (cell->stat_hp) 2494 if (cell->stat_hp)
2003 { 2495 {
2004 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2005 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2006 2498
2007 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2008 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2009 px + width - 1, py); 2501 px + width - 1, py);
2010 2502
2016 } 2508 }
2017 } 2509 }
2018} 2510}
2019 2511
2020void 2512void
2021draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2022 CODE: 2514 CODE:
2023{ 2515{
2024 static float color[16][3] = { 2516 static float color[16][3] = {
2025 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2026 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2027 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2028 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2029 2521
2030 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2031 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2032 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2033 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2034 2526
2035 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2036 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2037 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2038 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2039 2531
2040 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2041 2533
2042 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2043 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2044 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2045 }; 2537 };
2046 2538
2047 int x, y; 2539 int x, y;
2048 2540
2049 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2050 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2051 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2052 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2053 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2054 2552
2055 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2059 2557
2060 if (m) 2558 if (m)
2061 { 2559 {
2062 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2063 2561
2064 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2065 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2066 2564
2067 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2068 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2069 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2070 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2071 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2072 } 2570 }
2076 glDisable (GL_BLEND); 2574 glDisable (GL_BLEND);
2077 glDisable (GL_TEXTURE_2D); 2575 glDisable (GL_TEXTURE_2D);
2078} 2576}
2079 2577
2080void 2578void
2081fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2082 PPCODE: 2580 PPCODE:
2083{ 2581{
2084 int x, y; 2582 int x, y;
2085 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2086 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2087 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2088 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2089 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2090 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2091 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2092 2591
2093 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2094 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2095 2594
2096 mx += self->x - 1; 2595 mx += self->x - 1;
2097 my += self->y - 1; 2596 my += self->y - 1;
2098
2099 memset (darkness1, 255, sw1 * sh1);
2100 2597
2101 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2102 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2103 { 2600 {
2104 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2107 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2108 { 2605 {
2109 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2110 2607
2111 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2112 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2113 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2114 } 2611 }
2115 } 2612 }
2116 2613
2117 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2118 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2137 2634
2138 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2139 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2140 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2141 2638
2142 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2143 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2144 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2145 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2146 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2147 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2148 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2149 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2150 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2151 } 2648 }
2152 2649
2153 free (darkness1); 2650 free (darkness1);
2154 2651
2155 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2156 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2157 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2158 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2159} 2656}
2160 2657
2161SV * 2658SV *
2162get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2659get_rect (DC::Map self, int x0, int y0, int w, int h)
2163 CODE: 2660 CODE:
2164{ 2661{
2165 int x, y, x1, y1; 2662 int x, y, x1, y1;
2166 SV *data_sv = newSV (w * h * 7 + 5); 2663 SV *data_sv = newSV (w * h * 7 + 5);
2167 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2664 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2224 else 2721 else
2225 *data++ = 0; 2722 *data++ = 0;
2226 } 2723 }
2227 } 2724 }
2228 2725
2726 /* if size is w*h + 5 then no data has been found */
2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2728 {
2229 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2230 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2731 }
2732
2231 RETVAL = data_sv; 2733 RETVAL = data_sv;
2232} 2734}
2233 OUTPUT: 2735 OUTPUT:
2234 RETVAL 2736 RETVAL
2235 2737
2236void 2738void
2237set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2739set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2238 PPCODE: 2740 PPCODE:
2239{ 2741{
2240 int x, y, z; 2742 int x, y, z;
2241 int w, h; 2743 int w, h;
2242 int x1, y1; 2744 int x1, y1;
2745 STRLEN len;
2746 uint8_t *data, *end;
2747
2748 len = SvLEN (data_sv);
2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2751 end = data + len + 8;
2752
2753 if (len < 5)
2754 XSRETURN_EMPTY;
2243 2755
2244 if (*data++ != 0) 2756 if (*data++ != 0)
2245 return; /* version mismatch */ 2757 XSRETURN_EMPTY; /* version mismatch */
2246 2758
2247 w = *data++ << 8; w |= *data++; 2759 w = *data++ << 8; w |= *data++;
2248 h = *data++ << 8; h |= *data++; 2760 h = *data++ << 8; h |= *data++;
2249 2761
2250 // we need to do this 'cause we don't keep an absolute coord system for rows 2762 // we need to do this 'cause we don't keep an absolute coord system for rows
2262 { 2774 {
2263 maprow *row = map_get_row (self, y); 2775 maprow *row = map_get_row (self, y);
2264 2776
2265 for (x = x0; x < x1; x++) 2777 for (x = x0; x < x1; x++)
2266 { 2778 {
2779 uint8_t flags;
2780
2781 if (data + 7 >= end)
2782 XSRETURN_EMPTY;
2783
2267 uint8_t flags = *data++; 2784 flags = *data++;
2268 2785
2269 if (flags) 2786 if (flags)
2270 { 2787 {
2271 mapcell *cell = row_get_cell (row, x); 2788 mapcell *cell = row_get_cell (row, x);
2272 tileid tile[3] = { 0, 0, 0 }; 2789 tileid tile[3] = { 0, 0, 0 };
2275 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2792 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2276 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2793 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2277 2794
2278 if (cell->darkness == 0) 2795 if (cell->darkness == 0)
2279 { 2796 {
2280 cell->darkness = 0; 2797 /*cell->darkness = 0;*/
2798 EXTEND (SP, 3);
2281 2799
2282 for (z = 0; z <= 2; z++) 2800 for (z = 0; z <= 2; z++)
2283 { 2801 {
2284 tileid t = tile [z]; 2802 tileid t = tile [z];
2285 2803
2286 if (t >= self->texs || (t && !self->tex [t].name)) 2804 if (t >= self->texs || (t && !self->tex [t].name))
2287 { 2805 {
2288 XPUSHs (sv_2mortal (newSViv (t))); 2806 PUSHs (sv_2mortal (newSViv (t)));
2289 need_texid (self, t); 2807 need_texid (self, t);
2290 } 2808 }
2291 2809
2292 cell->tile [z] = t; 2810 cell->tile [z] = t;
2293 } 2811 }
2295 } 2813 }
2296 } 2814 }
2297 } 2815 }
2298} 2816}
2299 2817
2300MODULE = CFPlus PACKAGE = CFPlus::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2301 2819
2302CFPlus::RW 2820DC::RW
2303new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2304 CODE: 2822 CODE:
2305{ 2823{
2306 STRLEN datalen; 2824 STRLEN datalen;
2307 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2308 2826
2309 RETVAL = SDL_RWFromConstMem (data, datalen); 2827 RETVAL = SDL_RWFromConstMem (data, datalen);
2310} 2828}
2311 OUTPUT: 2829 OUTPUT:
2312 RETVAL 2830 RETVAL
2313 2831
2314CFPlus::RW 2832DC::RW
2315new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2316 CODE: 2834 CODE:
2317 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2318 OUTPUT: 2836 OUTPUT:
2319 RETVAL 2837 RETVAL
2320 2838
2321# fails on win32: 2839# fails on win32:
2322# CFPlus.xs(2268) : error C2059: syntax error : '(' 2840# dc.xs(2268) : error C2059: syntax error : '('
2323#void 2841#void
2324#close (CFPlus::RW self) 2842#close (DC::RW self)
2325# CODE: 2843# CODE:
2326# (self->(close)) (self); 2844# (self->(close)) (self);
2327 2845
2328MODULE = CFPlus PACKAGE = CFPlus::Channel 2846MODULE = Deliantra::Client PACKAGE = DC::Channel
2329 2847
2330PROTOTYPES: DISABLE 2848PROTOTYPES: DISABLE
2331 2849
2332CFPlus::Channel 2850DC::Channel
2333find () 2851find ()
2334 CODE: 2852 CODE:
2335{ 2853{
2336 RETVAL = Mix_GroupAvailable (-1); 2854 RETVAL = Mix_GroupAvailable (-1);
2337 2855
2338 if (RETVAL < 0) 2856 if (RETVAL < 0)
2339 { 2857 {
2340 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2341 2859
2342 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2343 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2344 2867 }
2868 else
2345 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2346 } 2870 }
2347 2871
2348 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2349 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2350} 2874}
2351 OUTPUT: 2875 OUTPUT:
2352 RETVAL 2876 RETVAL
2353 2877
2354void 2878void
2355halt (CFPlus::Channel self) 2879halt (DC::Channel self)
2356 CODE: 2880 CODE:
2357 Mix_HaltChannel (self); 2881 Mix_HaltChannel (self);
2358 2882
2359void 2883void
2360expire (CFPlus::Channel self, int ticks = -1) 2884expire (DC::Channel self, int ticks = -1)
2361 CODE: 2885 CODE:
2362 Mix_ExpireChannel (self, ticks); 2886 Mix_ExpireChannel (self, ticks);
2363 2887
2364void 2888void
2365fade_out (CFPlus::Channel self, int ticks = -1) 2889fade_out (DC::Channel self, int ticks = -1)
2366 CODE: 2890 CODE:
2367 Mix_FadeOutChannel (self, ticks); 2891 Mix_FadeOutChannel (self, ticks);
2368 2892
2369int 2893int
2370volume (CFPlus::Channel self, int volume) 2894volume (DC::Channel self, int volume)
2371 CODE: 2895 CODE:
2372 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2896 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373 OUTPUT: 2897 OUTPUT:
2374 RETVAL 2898 RETVAL
2375 2899
2376void 2900void
2377unregister_all_effects (CFPlus::Channel self) 2901unregister_all_effects (DC::Channel self)
2378 CODE: 2902 CODE:
2379 Mix_UnregisterAllEffects (self); 2903 Mix_UnregisterAllEffects (self);
2380 2904
2381void 2905void
2382set_panning (CFPlus::Channel self, int left, int right) 2906set_panning (DC::Channel self, int left, int right)
2383 CODE: 2907 CODE:
2384 left = CLAMP (left , 0, 255); 2908 left = CLAMP (left , 0, 255);
2385 right = CLAMP (right, 0, 255); 2909 right = CLAMP (right, 0, 255);
2386 Mix_SetPanning (self, left, right); 2910 Mix_SetPanning (self, left, right);
2387 2911
2388void 2912void
2389set_distance (CFPlus::Channel self, int distance) 2913set_distance (DC::Channel self, int distance)
2390 CODE: 2914 CODE:
2391 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2915 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392 2916
2393void 2917void
2394set_position (CFPlus::Channel self, int angle, int distance) 2918set_position (DC::Channel self, int angle, int distance)
2395 CODE: 2919 CODE:
2396 2920
2397void 2921void
2398set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399 CODE: 2923 CODE:
2400{ 2924{
2401 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2403 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404} 2928}
2405 2929
2406void 2930void
2407set_reverse_stereo (CFPlus::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2408 CODE: 2932 CODE:
2409 Mix_SetReverseStereo (self, flip); 2933 Mix_SetReverseStereo (self, flip);
2410 2934
2411MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412 2936
2413PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2414 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2415CFPlus::MixChunk 2951DC::MixChunk
2416new (SV *class, CFPlus::RW rwops) 2952new (SV *klass, DC::RW rwops)
2417 CODE: 2953 CODE:
2418 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419 OUTPUT: 2955 OUTPUT:
2420 RETVAL 2956 RETVAL
2421 2957
2422void 2958void
2423DESTROY (CFPlus::MixChunk self) 2959DESTROY (DC::MixChunk self)
2424 CODE: 2960 CODE:
2425 Mix_FreeChunk (self); 2961 Mix_FreeChunk (self);
2426 2962
2427int 2963int
2428volume (CFPlus::MixChunk self, int volume = -1) 2964volume (DC::MixChunk self, int volume = -1)
2429 CODE: 2965 CODE:
2430 if (items > 1) 2966 if (items > 1)
2431 volume = CLAMP (volume, 0, 128); 2967 volume = CLAMP (volume, 0, 128);
2432 RETVAL = Mix_VolumeChunk (self, volume); 2968 RETVAL = Mix_VolumeChunk (self, volume);
2433 OUTPUT: 2969 OUTPUT:
2434 RETVAL 2970 RETVAL
2435 2971
2436CFPlus::Channel 2972DC::Channel
2437play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2973play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2438 CODE: 2974 CODE:
2439{ 2975{
2440 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2976 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441 2977
2442 if (RETVAL < 0) 2978 if (RETVAL < 0)
2449 } 2985 }
2450} 2986}
2451 OUTPUT: 2987 OUTPUT:
2452 RETVAL 2988 RETVAL
2453 2989
2454MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
2455 3003
2456int 3004int
2457volume (int volume = -1) 3005volume (int volume = -1)
2458 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2459 CODE: 3007 CODE:
2471void 3019void
2472halt () 3020halt ()
2473 CODE: 3021 CODE:
2474 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2475 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2476CFPlus::MixMusic 3031DC::MixMusic
2477new (SV *class, CFPlus::RW rwops) 3032new (SV *klass, DC::RW rwops)
2478 CODE: 3033 CODE:
2479 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2480 OUTPUT: 3035 OUTPUT:
2481 RETVAL 3036 RETVAL
2482 3037
2483void 3038void
2484DESTROY (CFPlus::MixMusic self) 3039DESTROY (DC::MixMusic self)
2485 CODE: 3040 CODE:
2486 Mix_FreeMusic (self); 3041 Mix_FreeMusic (self);
2487 3042
2488int 3043int
2489play (CFPlus::MixMusic self, int loops = -1) 3044play (DC::MixMusic self, int loops = -1)
2490 CODE: 3045 CODE:
2491 RETVAL = Mix_PlayMusic (self, loops); 3046 RETVAL = Mix_PlayMusic (self, loops);
2492 OUTPUT: 3047 OUTPUT:
2493 RETVAL 3048 RETVAL
2494 3049
2495void 3050void
2496fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3051fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497 CODE: 3052 CODE:
2498 Mix_FadeInMusicPos (self, loops, ms, position); 3053 Mix_FadeInMusicPos (self, loops, ms, position);
2499 3054
2500MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3055MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501 3056
2502PROTOTYPES: ENABLE 3057PROTOTYPES: ENABLE
2503 3058
2504BOOT: 3059BOOT:
2505{ 3060{
2506 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3061 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507 static const struct { 3062 static const struct {
2508 const char *name; 3063 const char *name;
2509 IV iv; 3064 IV iv;
2510 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2511# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2512 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2513 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2514 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2515 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2516 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2517 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2518 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2519 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2531 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2532 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2533 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2534 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2535 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2536 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2537 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2538 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2539 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2540 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2546 const_iv (GL_INTENSITY), 3106 const_iv (GL_INTENSITY),
2547 const_iv (GL_LUMINANCE), 3107 const_iv (GL_LUMINANCE),
2548 const_iv (GL_LUMINANCE_ALPHA), 3108 const_iv (GL_LUMINANCE_ALPHA),
2549 const_iv (GL_FLOAT), 3109 const_iv (GL_FLOAT),
2550 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3110 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3111 const_iv (GL_COMPRESSED_ALPHA_ARB),
3112 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3113 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3114 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3115 const_iv (GL_COMPRESSED_RGB_ARB),
3116 const_iv (GL_COMPRESSED_RGBA_ARB),
2551 const_iv (GL_COMPILE), 3117 const_iv (GL_COMPILE),
2552 const_iv (GL_PROXY_TEXTURE_1D), 3118 const_iv (GL_PROXY_TEXTURE_1D),
2553 const_iv (GL_PROXY_TEXTURE_2D), 3119 const_iv (GL_PROXY_TEXTURE_2D),
2554 const_iv (GL_TEXTURE_1D), 3120 const_iv (GL_TEXTURE_1D),
2555 const_iv (GL_TEXTURE_2D), 3121 const_iv (GL_TEXTURE_2D),
2594 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3160 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595 const_iv (GL_POINT_SMOOTH_HINT), 3161 const_iv (GL_POINT_SMOOTH_HINT),
2596 const_iv (GL_LINE_SMOOTH_HINT), 3162 const_iv (GL_LINE_SMOOTH_HINT),
2597 const_iv (GL_POLYGON_SMOOTH_HINT), 3163 const_iv (GL_POLYGON_SMOOTH_HINT),
2598 const_iv (GL_GENERATE_MIPMAP_HINT), 3164 const_iv (GL_GENERATE_MIPMAP_HINT),
3165 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599 const_iv (GL_FASTEST), 3166 const_iv (GL_FASTEST),
2600 const_iv (GL_DONT_CARE), 3167 const_iv (GL_DONT_CARE),
2601 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2602 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2603 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2604 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2605 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2606# undef const_iv 3176# undef const_iv
2607 }; 3177 };
2608 3178
2609 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2610 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2611 3181
2612 texture_av = newAV (); 3182 texture_av = newAV ();
2613 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2614} 3184}
2615 3185
2616char * 3186void
3187disable_GL_EXT_blend_func_separate ()
3188 CODE:
3189 gl.BlendFuncSeparate = 0;
3190 gl.BlendFuncSeparateEXT = 0;
3191
3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2617gl_vendor () 3196gl_vendor ()
2618 CODE: 3197 CODE:
2619 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2620 OUTPUT: 3199 OUTPUT:
2621 RETVAL 3200 RETVAL
2622 3201
2623char * 3202const char *
2624gl_version () 3203gl_version ()
2625 CODE: 3204 CODE:
2626 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2627 OUTPUT: 3206 OUTPUT:
2628 RETVAL 3207 RETVAL
2629 3208
2630char * 3209const char *
2631gl_extensions () 3210gl_extensions ()
2632 CODE: 3211 CODE:
2633 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2634 OUTPUT: 3213 OUTPUT:
2635 RETVAL 3214 RETVAL
2636 3215
2637const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2638 3221
2639GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2640 CODE: 3223 CODE:
2641 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2642 OUTPUT: 3225 OUTPUT:
2650 3233
2651int glGetError () 3234int glGetError ()
2652 3235
2653void glFinish () 3236void glFinish ()
2654 3237
3238void glFlush ()
3239
2655void glClear (int mask) 3240void glClear (int mask)
2656 3241
2657void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2658 PROTOTYPE: @ 3243 PROTOTYPE: @
2659 3244
2668void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2669 3254
2670void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2671 CODE: 3256 CODE:
2672 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2673 3260
2674void glDepthMask (int flag) 3261void glDepthMask (int flag)
2675 3262
2676void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2677 3264
2712void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2713 CODE: 3300 CODE:
2714 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2715 3302
2716void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
2717 ALIAS: 3305 ALIAS:
2718 glColor_premultiply = 1 3306 glColor_premultiply = 1
2719 CODE: 3307 CODE:
2720 if (ix) 3308 if (ix)
2721 { 3309 {
2741 3329
2742void glRect (float x1, float y1, float x2, float y2) 3330void glRect (float x1, float y1, float x2, float y2)
2743 CODE: 3331 CODE:
2744 glRectf (x1, y1, x2, y2); 3332 glRectf (x1, y1, x2, y2);
2745 3333
3334void glRect_lineloop (float x1, float y1, float x2, float y2)
3335 CODE:
3336 glBegin (GL_LINE_LOOP);
3337 glVertex2f (x1, y1);
3338 glVertex2f (x2, y1);
3339 glVertex2f (x2, y2);
3340 glVertex2f (x1, y2);
3341 glEnd ();
3342
2746PROTOTYPES: ENABLE 3343PROTOTYPES: ENABLE
2747 3344
2748void glBegin (int mode) 3345void glBegin (int mode)
2749 3346
2750void glEnd () 3347void glEnd ()
2782void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3379void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2783 CODE: 3380 CODE:
2784 if (gl.SeparableFilter2D) 3381 if (gl.SeparableFilter2D)
2785 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3382 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786 3383
2787void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3384void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2788 3385
2789void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3386void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2790 3387
2791void glDrawPixels (int width, int height, int format, int type, char *pixels) 3388void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792 3389
2818 3415
2819void glEndList () 3416void glEndList ()
2820 3417
2821void glCallList (int list) 3418void glCallList (int list)
2822 3419
2823MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2824 3426
2825PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
2826 3428
2827void 3429void
2828find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
2829 PPCODE: 3431 PPCODE:
2830{ 3432{
2831 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
2832 XPUSHs (self); 3434 XPUSHs (self);
2833} 3435}
2834 3436
2835BOOT: 3437BOOT:
2836{ 3438{
2837 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3439 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838 3440
2839 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3441 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2840 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3442 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2841 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3443 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2842 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3444 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2843} 3445}
2844 3446
2845void 3447void
2846draw (SV *self) 3448draw (SV *self)
2847 CODE: 3449 CODE:
2848{ 3450{
2849 HV *hv; 3451 HV *hv;
2850 SV **svp; 3452 SV **svp;
2851 NV x, y, w, h; 3453 NV x, y, w, h;
2852 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
2853 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
2854 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
2855 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);
2856 SV *hover;
2857 double draw_x, draw_y, draw_w, draw_h; 3458 double draw_x, draw_y;
2858 3459
2859 if (!SvROK (self)) 3460 if (!SvROK (self))
2860 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3461 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861 3462
2862 hv = (HV *)SvRV (self); 3463 hv = (HV *)SvRV (self);
2863 3464
2864 if (SvTYPE (hv) != SVt_PVHV) 3465 if (SvTYPE (hv) != SVt_PVHV)
2865 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3466 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866 3467
2867 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3468 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2868 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3469 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2869 3470
2870 if (!h || !w) 3471 if (!h || !w)
2890 { 3491 {
2891 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3492 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892 3493
2893 if (svp && SvTRUE (*svp)) 3494 if (svp && SvTRUE (*svp))
2894 { 3495 {
2895 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3496 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2896 glEnable (GL_BLEND); 3497 glEnable (GL_BLEND);
2897 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3498 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898 glBegin (GL_QUADS); 3499 glBegin (GL_QUADS);
2899 glVertex2f (0, 0); 3500 glVertex2f (0, 0);
2900 glVertex2f (w, 0); 3501 glVertex2f (w, 0);
2903 glEnd (); 3504 glEnd ();
2904 glDisable (GL_BLEND); 3505 glDisable (GL_BLEND);
2905 } 3506 }
2906 } 3507 }
2907#if 0 3508#if 0
2908 if ($ENV{CFPLUS_DEBUG} & 1) { 3509 // draw borders, for debugging
2909 glPushMatrix; 3510 glPushMatrix ();
2910 glColor 1, 1, 0, 1; 3511 glColor4f (1., 1., 0., 1.);
2911 glTranslate 0.375, 0.375; 3512 glTranslatef (.5, .5, 0.);
2912 glBegin GL_LINE_LOOP; 3513 glBegin (GL_LINE_LOOP);
2913 glVertex 0 , 0; 3514 glVertex2f (0 , 0);
2914 glVertex $self->{w} - 1, 0; 3515 glVertex2f (w - 1, 0);
2915 glVertex $self->{w} - 1, $self->{h} - 1; 3516 glVertex2f (w - 1, h - 1);
2916 glVertex 0 , $self->{h} - 1; 3517 glVertex2f (0 , h - 1);
2917 glEnd; 3518 glEnd ();
2918 glPopMatrix; 3519 glPopMatrix ();
2919 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920 }
2921#endif 3520#endif
2922 PUSHMARK (SP); 3521 PUSHMARK (SP);
2923 XPUSHs (self); 3522 XPUSHs (self);
2924 PUTBACK; 3523 PUTBACK;
2925 call_method ("_draw", G_VOID | G_DISCARD); 3524 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines