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.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

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