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.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC

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

Diff Legend

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