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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines