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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines