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

Diff Legend

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