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.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines