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

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