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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines