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

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