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.212 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines