ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines