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.332 by root, Mon Nov 19 00:56:08 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines