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.202 by root, Tue Jul 17 18:34:24 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>
38
39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 40
30#include <SDL.h> 41#include <SDL.h>
31#include <SDL_thread.h> 42#include <SDL_thread.h>
32#include <SDL_endian.h> 43#include <SDL_endian.h>
33#include <SDL_image.h> 44#include <SDL_image.h>
34#include <SDL_mixer.h> 45#include <SDL_mixer.h>
35#include <SDL_opengl.h> 46#include <SDL_opengl.h>
36 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
37#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
39 57
40#include <glib/gmacros.h> 58#include <glib.h>
41 59
42#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
43 72
44#ifndef _WIN32 73#ifndef _WIN32
45# include <sys/types.h> 74# include <sys/types.h>
46# include <sys/socket.h> 75# include <sys/socket.h>
47# include <netinet/in.h> 76# include <netinet/in.h>
48# include <netinet/tcp.h> 77# include <netinet/tcp.h>
49# include <inttypes.h> 78# include <inttypes.h>
50#endif 79#endif
51 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
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 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 */
54#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
55 96
56#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
58 99
59#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
60 101
61#if 0 102/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 104
64# define PARACHUTE 0 105#define KMOD_LRAM 0x10000 // our extension
65#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}
66 128
67static AV *texture_av; 129static AV *texture_av;
68 130
69static struct 131static struct
70{ 132{
… …
107 av_push (texture_av, (SV *)(size_t)name); 169 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 170 glDeleteTextures (1, &name);
109} 171}
110 172
111#include "texcache.c" 173#include "texcache.c"
174#include "rendercache.c"
112 175
113#include "pango-font.c" 176#include "pango-font.c"
114#include "pango-fontmap.c" 177#include "pango-fontmap.c"
115#include "pango-render.c" 178#include "pango-render.c"
116 179
180typedef IV DC__Channel;
181typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 182typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 183typedef Mix_Music *DC__MixMusic;
119 184
120typedef PangoFontDescription *CFPlus__Font; 185typedef PangoFontDescription *DC__Font;
121 186
122static int 187static int
123shape_attr_p (PangoLayoutRun *run) 188shape_attr_p (PangoLayoutRun *run)
124{ 189{
125 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
126 191
127 while (attrs) 192 while (attrs)
128 { 193 {
129 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
130 195
131 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
132 return 1; 197 return 1;
133 198
134 attrs = attrs->next; 199 attrs = attrs->next;
135 } 200 }
136 201
137 return 0; 202 return 0;
138} 203}
139 204
140typedef struct cf_layout { 205struct cf_layout {
141 PangoLayout *pl; 206 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
143 int base_height; 208 int base_height;
144 CFPlus__Font font; 209 DC__Font font;
145} *CFPlus__Layout; 210 rc_t rc;
211};
146 212
213typedef cf_layout *DC__Layout;
214
147static CFPlus__Font default_font; 215static DC__Font default_font;
148static PangoContext *opengl_context; 216static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
150 218
151static void 219static void
152substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
153{ 221{
154 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
155#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
157#endif 225#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 227}
160 228
161static void 229static void
162layout_update_font (CFPlus__Layout self) 230layout_update_font (DC__Layout self)
163{ 231{
164 /* 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
165 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
166 */ 234 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
168 236
169 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 239
172 pango_layout_set_font_description (self->pl, font); 240 pango_layout_set_font_description (self->pl, font);
173} 241}
174 242
175static void 243static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 244layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 245{
178 PangoRectangle rect; 246 PangoRectangle rect;
179 247
180 // get_pixel_* wrongly rounds down 248 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 249 pango_layout_get_extents (self->pl, 0, &rect);
… …
191} 259}
192 260
193typedef uint16_t tileid; 261typedef uint16_t tileid;
194typedef uint16_t faceid; 262typedef uint16_t faceid;
195 263
196typedef struct { 264struct maptex
265{
197 int name; 266 GLuint name;
198 int w, h; 267 int w, h;
199 float s, t; 268 float s, t;
200 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
201 tileid smoothtile; 270 tileid smoothtile;
202 uint8_t smoothlevel; 271 uint8_t smoothlevel;
203} maptex; 272 uint8_t unused; /* set to zero on use */
273};
204 274
205typedef struct { 275struct mapcell
276{
206 uint32_t player; 277 uint32_t player;
207 tileid tile[3]; 278 tileid tile[3];
208 uint16_t darkness; 279 uint16_t darkness;
209 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
210} mapcell; 281};
211 282
212typedef struct { 283struct maprow
284{
213 int32_t c0, c1; 285 int32_t c0, c1;
214 mapcell *col; 286 mapcell *col;
215} maprow; 287};
216 288
217typedef struct map { 289struct mapgrid {
218 int x, y, w, h; 290 int x, y, w, h;
219 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
220 int faces; tileid *face2tile; // [faceid] 292 std::vector<tileid> tile;
221 int texs; maptex *tex; // [tileid] 293 std::vector<maptex> tex;
222 294
223 int32_t rows; 295 int32_t rows;
224 maprow *row; 296 maprow *row;
225} *CFPlus__Map; 297
298 ~mapgrid ()
299 {
300 clear_cells ();
301 }
302
303 void clear_cells ();
304};
305
306typedef mapgrid *DC__Map;
226 307
227static char * 308static char *
228prepend (char *ptr, int sze, int inc) 309prepend (char *ptr, int sze, int inc)
229{ 310{
230 char *p; 311 char *p;
… …
247} 328}
248 329
249#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))
250#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))
251 332
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
271
272static maprow * 333static maprow *
273map_get_row (CFPlus__Map self, int y) 334map_get_row (mapgrid *self, int y)
274{ 335{
275 if (0 > y) 336 if (0 > y)
276 { 337 {
277 int extend = - y + MAP_EXTEND_Y; 338 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 339 Prepend (maprow, self->row, self->rows, extend);
… …
316 377
317 return row->col + (x - row->c0); 378 return row->col + (x - row->c0);
318} 379}
319 380
320static mapcell * 381static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 382map_get_cell (mapgrid *self, int x, int y)
322{ 383{
323 return row_get_cell (map_get_row (self, y), x); 384 return row_get_cell (map_get_row (self, y), x);
324} 385}
325 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
326static void 414static void
327map_clear (CFPlus__Map self)
328{
329 int r;
330
331 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col);
333
334 Safefree (self->row);
335
336 self->x = 0;
337 self->y = 0;
338 self->ox = 0;
339 self->oy = 0;
340 self->row = 0;
341 self->rows = 0;
342}
343
344static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 415map_blank (mapgrid *self, int x0, int y0, int w, int h)
346{ 416{
347 int x, y; 417 int x, y;
348 maprow *row; 418 maprow *row;
349 mapcell *cell; 419 mapcell *cell;
350 420
… …
362 if (x >= row->c1) 432 if (x >= row->c1)
363 break; 433 break;
364 434
365 cell = row->col + x - row->c0; 435 cell = row->col + x - row->c0;
366 436
367 cell->darkness = 0; 437 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 438 }
372 } 439 }
373} 440}
374 441
375typedef struct { 442struct smooth_key
443{
376 tileid tile; 444 tileid tile;
377 uint8_t x, y, level; 445 uint8_t x, y, level;
378} 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}
379 465
380static void 466static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits) 467smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
382{ 468{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 469 auto &&it = h.find (key);
384 470
385 if (SvIOK (*sv)) 471 if (it == h.end ())
386 SvIV_set (*sv, SvIVX (*sv) | bits); 472 h.insert (std::make_pair (key, bits));
387 else 473 else
388 sv_setiv (*sv, bits); 474 it->second |= bits;
389} 475}
390 476
391static void 477static void
392music_finished (void) 478music_finished (void)
393{ 479{
… …
410 ev.code = 1; 496 ev.code = 1;
411 ev.data1 = (void *)(long)channel; 497 ev.data1 = (void *)(long)channel;
412 ev.data2 = 0; 498 ev.data2 = 0;
413 499
414 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;
415} 508}
416 509
417static unsigned int 510static unsigned int
418minpot (unsigned int n) 511minpot (unsigned int n)
419{ 512{
… …
429 n |= n >> 16; 522 n |= n >> 16;
430 523
431 return n + 1; 524 return n + 1;
432} 525}
433 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
434/* SDL should provide this, really. */ 538/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 539#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 540#define SDLK_MODIFIER_MAX 314
437 541
438MODULE = CFPlus PACKAGE = CFPlus 542/******************************************************************************/
543
544static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
545static GV *hover_gv;
546
547static int
548within_widget (SV *widget, NV x, NV y)
549{
550 HV *self;
551 SV **svp;
552 NV wx, ww, wy, wh;
553
554 if (!SvROK (widget))
555 return 0;
556
557 self = (HV *)SvRV (widget);
558
559 if (SvTYPE (self) != SVt_PVHV)
560 return 0;
561
562 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
563 if (y < wy)
564 return 0;
565
566 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
567 if (y >= wy + wh)
568 return 0;
569
570 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
571 if (x < wx)
572 return 0;
573
574 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
575 if (x >= wx + ww)
576 return 0;
577
578 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
579 if (!svp || !SvTRUE (*svp))
580 return 0;
581
582 return 1;
583}
584
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
439 644
440PROTOTYPES: ENABLE 645PROTOTYPES: ENABLE
441 646
442BOOT: 647BOOT:
443{ 648{
444 HV *stash = gv_stashpv ("CFPlus", 1); 649 HV *stash = gv_stashpv ("DC", 1);
445 static const struct { 650 static const struct {
446 const char *name; 651 const char *name;
447 IV iv; 652 IV iv;
448 } *civ, const_iv[] = { 653 } *civ, const_iv[] = {
449# define const_iv(name) { # name, (IV)name } 654# define const_iv(name) { # name, (IV)name }
… …
471 676
472 const_iv (SDL_APPINPUTFOCUS), 677 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS), 678 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE), 679 const_iv (SDL_APPACTIVE),
475 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),
476 const_iv (SDLK_KP0), 733 const_iv (SDLK_KP0),
477 const_iv (SDLK_KP1), 734 const_iv (SDLK_KP1),
478 const_iv (SDLK_KP2), 735 const_iv (SDLK_KP2),
479 const_iv (SDLK_KP3), 736 const_iv (SDLK_KP3),
480 const_iv (SDLK_KP4), 737 const_iv (SDLK_KP4),
… …
552 const_iv (KMOD_LMETA), 809 const_iv (KMOD_LMETA),
553 const_iv (KMOD_RMETA), 810 const_iv (KMOD_RMETA),
554 const_iv (KMOD_NUM), 811 const_iv (KMOD_NUM),
555 const_iv (KMOD_CAPS), 812 const_iv (KMOD_CAPS),
556 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)
557# undef const_iv 847# undef const_iv
558 }; 848 };
559 849
560 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--)
561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 851 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
562 852
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 853 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 854 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
565} 855}
566 856
… …
578 RETVAL 868 RETVAL
579 869
580NV floor (NV x) 870NV floor (NV x)
581 871
582NV 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
583 883
584void 884void
585pango_init () 885pango_init ()
586 CODE: 886 CODE:
587{ 887{
588 opengl_fontmap = pango_opengl_font_map_new (); 888 opengl_fontmap = pango_opengl_font_map_new ();
589 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);
590 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
591} 896}
592 897
593char *
594SDL_GetError () 898char *SDL_GetError ()
595 899
596int 900void SDL_main_hack (SV *real_main)
597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 901 PROTOTYPE: &
598 902
599void 903int SDL_Init (U32 flags)
904
905int SDL_InitSubSystem (U32 flags)
906
907void SDL_QuitSubSystem (U32 flags)
908
600SDL_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
601 920
602void 921void
603SDL_ListModes (int rgb, int alpha) 922SDL_ListModes (int rgb, int alpha)
604 PPCODE: 923 PPCODE:
605{ 924{
… …
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 936 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 937 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 938 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
620 939
621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 940 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
622#if SDL_VERSION_ATLEAST(1,2,10)
623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 941 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
626 942
627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 943 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
628 944
629 if (m && m != (SDL_Rect **)-1) 945 if (m && m != (SDL_Rect **)-1)
630 while (*m) 946 while (*m)
631 { 947 {
632 if ((*m)->w >= 640 && (*m)->h >= 480) 948 if ((*m)->w >= 400 && (*m)->h >= 300)
633 { 949 {
634 AV *av = newAV (); 950 AV *av = newAV ();
635 av_push (av, newSViv ((*m)->w)); 951 av_push (av, newSViv ((*m)->w));
636 av_push (av, newSViv ((*m)->h)); 952 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb)); 953 av_push (av, newSViv (rgb));
… …
660 ); 976 );
661 977
662 if (RETVAL) 978 if (RETVAL)
663 { 979 {
664 av_clear (texture_av); 980 av_clear (texture_av);
665
666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
667#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);
668#include "glfunc.h" 982#include "glfunc.h"
669#undef GL_FUNC 983#undef GL_FUNC
984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
670 } 986 }
671} 987}
672 OUTPUT: 988 OUTPUT:
673 RETVAL 989 RETVAL
990
991void
992SDL_WM_SetCaption (const char *title, const char *icon)
674 993
675void 994void
676SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
677 996
678char * 997char *
679SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
680 1000
681int 1001int
682SDL_GetAppState () 1002SDL_GetAppState ()
683 1003
1004int
1005SDL_GetModState ()
1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
684void 1011void
1012SDL_PumpEvents ()
1013
1014void
685poll_events () 1015peep_events ()
686 PPCODE: 1016 PPCODE:
687{ 1017{
688 SDL_Event ev; 1018 SDL_Event ev;
689 1019
690 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
… …
697 { 1027 {
698 case SDL_KEYDOWN: 1028 case SDL_KEYDOWN:
699 case SDL_KEYUP: 1029 case SDL_KEYUP:
700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1030 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1031 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
702 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);
703 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 */
704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1034 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
705 break; 1035 break;
706 1036
707 case SDL_ACTIVEEVENT: 1037 case SDL_ACTIVEEVENT:
708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1038 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
726 x = ev.motion.x; 1056 x = ev.motion.x;
727 y = ev.motion.y; 1057 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1058 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 } 1059 }
730 1060
731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1061 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
732 hv_store (hv, "state", 5, newSViv (state), 0); 1062 hv_store (hv, "state", 5, newSViv (state), 0);
733 hv_store (hv, "x", 1, newSViv (x), 0); 1063 hv_store (hv, "x", 1, newSViv (x), 0);
734 hv_store (hv, "y", 1, newSViv (y), 0); 1064 hv_store (hv, "y", 1, newSViv (y), 0);
735 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1065 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
736 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1066 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 } 1067 }
738 break; 1068 break;
739 1069
740 case SDL_MOUSEBUTTONDOWN: 1070 case SDL_MOUSEBUTTONDOWN:
741 case SDL_MOUSEBUTTONUP: 1071 case SDL_MOUSEBUTTONUP:
742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1072 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
743 1073
744 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1074 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
745 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1075 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
746 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1076 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
747 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1077 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1082 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1083 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
754 break; 1084 break;
755 } 1085 }
756 1086
757 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))));
758 } 1088 }
759} 1089}
760 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
761int 1104int
762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1105Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
763 POSTCALL: 1106 POSTCALL:
764 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
765 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
766 1109
767void 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}
1125
1126void
768Mix_CloseAudio () 1127Mix_CloseAudio ()
769 1128
770int 1129int
771Mix_AllocateChannels (int numchans = -1) 1130Mix_AllocateChannels (int numchans = -1)
1131
1132const char *
1133Mix_GetError ()
772 1134
773void 1135void
774lowdelay (int fd, int val = 1) 1136lowdelay (int fd, int val = 1)
775 CODE: 1137 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1138 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
802 } 1164 }
803 } 1165 }
804#endif 1166#endif
805} 1167}
806 1168
807void 1169int
808add_font (char *file) 1170add_font (char *file)
809 CODE: 1171 CODE:
810 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)
811 1182
812void 1183void
813load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
814 ALIAS: 1185 ALIAS:
815 load_image_file = 1 1186 load_image_file = 1
… …
818 STRLEN image_len; 1189 STRLEN image_len;
819 char *image = (char *)SvPVbyte (image_, image_len); 1190 char *image = (char *)SvPVbyte (image_, image_len);
820 SDL_Surface *surface, *surface2; 1191 SDL_Surface *surface, *surface2;
821 SDL_PixelFormat fmt; 1192 SDL_PixelFormat fmt;
822 SDL_RWops *rw = ix 1193 SDL_RWops *rw = ix
823 ? SDL_RWFromFile (image, "r") 1194 ? SDL_RWFromFile (image, "rb")
824 : SDL_RWFromConstMem (image, image_len); 1195 : SDL_RWFromConstMem (image, image_len);
825 1196
826 if (!rw) 1197 if (!rw)
827 croak ("load_image: %s", SDL_GetError ()); 1198 croak ("load_image: %s", SDL_GetError ());
828 1199
… …
861 1232
862 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
863 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
864 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
865 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
866 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
867 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)));
868 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
869 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
870 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
871 1242
… …
901void 1272void
902error (char *message) 1273error (char *message)
903 CODE: 1274 CODE:
904 fprintf (stderr, "ERROR: %s\n", message); 1275 fprintf (stderr, "ERROR: %s\n", message);
905#ifdef _WIN32 1276#ifdef _WIN32
906 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1277 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
907#endif 1278#endif
908 1279
909void 1280void
910fatal (char *message) 1281fatal (char *message)
911 CODE: 1282 CODE:
912 fprintf (stderr, "FATAL: %s\n", message); 1283 fprintf (stderr, "FATAL: %s\n", message);
913#ifdef _WIN32 1284#ifdef _WIN32
914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1285 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
915#endif 1286#endif
916 _exit (1); 1287 _exit (1);
917 1288
918void 1289void
919_exit (int retval = 0) 1290_exit (int retval = 0)
… …
931#if DEBUG 1302#if DEBUG
932 VALGRIND_DO_LEAK_CHECK; 1303 VALGRIND_DO_LEAK_CHECK;
933#endif 1304#endif
934} 1305}
935 1306
936MODULE = CFPlus PACKAGE = CFPlus::Font 1307int
1308SvREFCNT (SV *sv)
1309 CODE:
1310 RETVAL = SvREFCNT (sv);
1311 OUTPUT:
1312 RETVAL
937 1313
938CFPlus::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1315
1316PROTOTYPES: DISABLE
1317
1318DC::Font
939new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
940 CODE: 1320 CODE:
941{ 1321{
942 int count; 1322 int count;
943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
944 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
946} 1326}
947 OUTPUT: 1327 OUTPUT:
948 RETVAL 1328 RETVAL
949 1329
950void 1330void
951DESTROY (CFPlus::Font self) 1331DESTROY (DC::Font self)
952 CODE: 1332 CODE:
953 pango_font_description_free (self); 1333 pango_font_description_free (self);
954 1334
955void 1335void
956make_default (CFPlus::Font self) 1336make_default (DC::Font self)
1337 PROTOTYPE: $
957 CODE: 1338 CODE:
958 default_font = self; 1339 default_font = self;
959 1340
960MODULE = CFPlus PACKAGE = CFPlus::Layout 1341MODULE = Deliantra::Client PACKAGE = DC::Layout
961 1342
1343PROTOTYPES: DISABLE
1344
962void 1345void
963reset_glyph_cache () 1346glyph_cache_backup ()
1347 PROTOTYPE:
964 CODE: 1348 CODE:
1349 tc_backup ();
1350
1351void
1352glyph_cache_restore ()
1353 PROTOTYPE:
1354 CODE:
965 tc_clear (); 1355 tc_restore ();
966 1356
967CFPlus::Layout 1357DC::Layout
968new (SV *class) 1358new (SV *klass)
969 CODE: 1359 CODE:
970 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
971 1361
972 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
973 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
974 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
975 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
… …
981 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
982 OUTPUT: 1372 OUTPUT:
983 RETVAL 1373 RETVAL
984 1374
985void 1375void
986DESTROY (CFPlus::Layout self) 1376DESTROY (DC::Layout self)
987 CODE: 1377 CODE:
988 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
989 Safefree (self); 1379 delete self;
990 1380
991void 1381void
992set_text (CFPlus::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
993 CODE: 1383 CODE:
994{ 1384{
995 STRLEN textlen; 1385 STRLEN textlen;
996 char *text = SvPVutf8 (text_, textlen); 1386 char *text = SvPVutf8 (text_, textlen);
997 1387
998 pango_layout_set_text (self->pl, text, textlen); 1388 pango_layout_set_text (self->pl, text, textlen);
999} 1389}
1000 1390
1001void 1391void
1002set_markup (CFPlus::Layout self, SV *text_) 1392set_markup (DC::Layout self, SV *text_)
1003 CODE: 1393 CODE:
1004{ 1394{
1005 STRLEN textlen; 1395 STRLEN textlen;
1006 char *text = SvPVutf8 (text_, textlen); 1396 char *text = SvPVutf8 (text_, textlen);
1007 1397
1008 pango_layout_set_markup (self->pl, text, textlen); 1398 pango_layout_set_markup (self->pl, text, textlen);
1009} 1399}
1010 1400
1011void 1401void
1012set_shapes (CFPlus::Layout self, ...) 1402set_shapes (DC::Layout self, ...)
1013 CODE: 1403 CODE:
1014{ 1404{
1015 PangoAttrList *attrs = 0; 1405 PangoAttrList *attrs = 0;
1016 const char *text = pango_layout_get_text (self->pl); 1406 const char *text = pango_layout_get_text (self->pl);
1017 const char *pos = text; 1407 const char *pos = text;
… …
1052 if (attrs) 1442 if (attrs)
1053 pango_layout_set_attributes (self->pl, attrs); 1443 pango_layout_set_attributes (self->pl, attrs);
1054} 1444}
1055 1445
1056void 1446void
1057get_shapes (CFPlus::Layout self) 1447get_shapes (DC::Layout self)
1058 PPCODE: 1448 PPCODE:
1059{ 1449{
1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1450 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1061 1451
1062 do 1452 do
1063 { 1453 {
1064 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1454 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1065 1455
1066 if (run && shape_attr_p (run)) 1456 if (run && shape_attr_p (run))
1067 { 1457 {
1068 PangoRectangle extents; 1458 PangoRectangle extents;
1069 pango_layout_iter_get_run_extents (iter, 0, &extents); 1459 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1077 1467
1078 pango_layout_iter_free (iter); 1468 pango_layout_iter_free (iter);
1079} 1469}
1080 1470
1081int 1471int
1082has_wrapped (CFPlus::Layout self) 1472has_wrapped (DC::Layout self)
1083 CODE: 1473 CODE:
1084{ 1474{
1085 int lines = 1; 1475 int lines = 1;
1086 const char *text = pango_layout_get_text (self->pl); 1476 const char *text = pango_layout_get_text (self->pl);
1087 1477
… …
1092} 1482}
1093 OUTPUT: 1483 OUTPUT:
1094 RETVAL 1484 RETVAL
1095 1485
1096SV * 1486SV *
1097get_text (CFPlus::Layout self) 1487get_text (DC::Layout self)
1098 CODE: 1488 CODE:
1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1489 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1100 sv_utf8_decode (RETVAL); 1490 sv_utf8_decode (RETVAL);
1101 OUTPUT: 1491 OUTPUT:
1102 RETVAL 1492 RETVAL
1103 1493
1104void 1494void
1105set_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.)
1106 CODE: 1496 CODE:
1107 self->r = r; 1497 self->r = r;
1108 self->g = g; 1498 self->g = g;
1109 self->b = b; 1499 self->b = b;
1110 self->a = a; 1500 self->a = a;
1111 1501
1112void 1502void
1113set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1503set_font (DC::Layout self, DC::Font font = 0)
1114 CODE: 1504 CODE:
1115 if (self->font != font) 1505 if (self->font != font)
1116 { 1506 {
1117 self->font = font; 1507 self->font = font;
1118 layout_update_font (self); 1508 layout_update_font (self);
1119 } 1509 }
1120 1510
1121void 1511void
1122set_height (CFPlus::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1123 CODE: 1513 CODE:
1124 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1125 { 1515 {
1126 self->base_height = base_height; 1516 self->base_height = base_height;
1127 layout_update_font (self); 1517 layout_update_font (self);
1128 } 1518 }
1129 1519
1130void 1520void
1131set_width (CFPlus::Layout self, int max_width = -1) 1521set_width (DC::Layout self, int max_width = -1)
1132 CODE: 1522 CODE:
1133 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);
1134 1524
1135void 1525void
1136set_indent (CFPlus::Layout self, int indent) 1526set_indent (DC::Layout self, int indent)
1137 CODE: 1527 CODE:
1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1528 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1139 1529
1140void 1530void
1141set_spacing (CFPlus::Layout self, int spacing) 1531set_spacing (DC::Layout self, int spacing)
1142 CODE: 1532 CODE:
1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1533 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1144 1534
1145void 1535void
1146set_ellipsise (CFPlus::Layout self, int ellipsise) 1536set_ellipsise (DC::Layout self, int ellipsise)
1147 CODE: 1537 CODE:
1148 pango_layout_set_ellipsize (self->pl, 1538 pango_layout_set_ellipsize (self->pl,
1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1539 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1540 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1541 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1152 : PANGO_ELLIPSIZE_NONE 1542 : PANGO_ELLIPSIZE_NONE
1153 ); 1543 );
1154 1544
1155void 1545void
1156set_single_paragraph_mode (CFPlus::Layout self, int spm) 1546set_single_paragraph_mode (DC::Layout self, int spm)
1157 CODE: 1547 CODE:
1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1548 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1159 1549
1160void 1550void
1161size (CFPlus::Layout self) 1551size (DC::Layout self)
1162 PPCODE: 1552 PPCODE:
1163{ 1553{
1164 int w, h; 1554 int w, h;
1165 1555
1166 layout_get_pixel_size (self, &w, &h); 1556 layout_get_pixel_size (self, &w, &h);
… …
1169 PUSHs (sv_2mortal (newSViv (w))); 1559 PUSHs (sv_2mortal (newSViv (w)));
1170 PUSHs (sv_2mortal (newSViv (h))); 1560 PUSHs (sv_2mortal (newSViv (h)));
1171} 1561}
1172 1562
1173int 1563int
1174descent (CFPlus::Layout self) 1564descent (DC::Layout self)
1175 CODE: 1565 CODE:
1176{ 1566{
1177 PangoRectangle rect; 1567 PangoRectangle rect;
1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1568 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1179 pango_layout_line_get_pixel_extents (line, 0, &rect); 1569 pango_layout_line_get_pixel_extents (line, 0, &rect);
1180 RETVAL = PANGO_DESCENT (rect); 1570 RETVAL = PANGO_DESCENT (rect);
1181} 1571}
1182 OUTPUT: 1572 OUTPUT:
1183 RETVAL 1573 RETVAL
1184 1574
1185int 1575int
1186xy_to_index (CFPlus::Layout self, int x, int y) 1576xy_to_index (DC::Layout self, int x, int y)
1187 CODE: 1577 CODE:
1188{ 1578{
1189 int index, trailing; 1579 int index, trailing;
1190 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);
1191 RETVAL = index + trailing; 1581 RETVAL = index + trailing;
1192} 1582}
1193 OUTPUT: 1583 OUTPUT:
1194 RETVAL 1584 RETVAL
1195 1585
1196void 1586void
1197cursor_pos (CFPlus::Layout self, int index) 1587cursor_pos (DC::Layout self, int index)
1198 PPCODE: 1588 PPCODE:
1199{ 1589{
1200 PangoRectangle strong_pos; 1590 PangoRectangle pos;
1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1591 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1202 1592
1203 EXTEND (SP, 3); 1593 EXTEND (SP, 3);
1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1595 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1596 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1207} 1597}
1208 1598
1209void 1599void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1600index_to_line_x (DC::Layout self, int index, int trailing = 0)
1211 PPCODE: 1601 PPCODE:
1212{ 1602{
1213 int line, x; 1603 int line, x;
1214 1604
1215 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)
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1607 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217 1608 --line;
1609#endif
1218 EXTEND (SP, 2); 1610 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1))); 1611 PUSHs (sv_2mortal (newSViv (line)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1612 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221} 1613}
1222 1614
1223void 1615void
1224line_x_to_index (CFPlus::Layout self, int line, int x) 1616line_x_to_index (DC::Layout self, int line, int x)
1225 PPCODE: 1617 PPCODE:
1226{ 1618{
1227 PangoLayoutLine *lp; 1619 PangoLayoutLine *lp;
1228 int index, trailing; 1620 int index, trailing;
1229 1621
1230 if (line < 0) 1622 if (line < 0)
1231 XSRETURN_EMPTY; 1623 XSRETURN_EMPTY;
1232 1624
1233 if (!(lp = pango_layout_get_line (self->pl, line))) 1625 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */ 1626 XSRETURN_EMPTY; /* do better */
1235 1627
1236 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);
1237 1629
1238 EXTEND (SP, 2); 1630 EXTEND (SP, 2);
… …
1244 PUSHs (sv_2mortal (newSViv (trailing))); 1636 PUSHs (sv_2mortal (newSViv (trailing)));
1245 } 1637 }
1246} 1638}
1247 1639
1248void 1640void
1249render (CFPlus::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1250 PPCODE: 1642 CODE:
1643 self->rc.clear ();
1251 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1252 self->pl, 1645 self->pl,
1646 &self->rc,
1253 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1254 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1255 flags 1649 flags
1256 ); 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);
1257 1654
1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1259
1260int minpot (int n)
1261
1262void 1655void
1263pad2pot (SV *data_, SV *w_, SV *h_) 1656draw (DC::Layout self)
1264 CODE: 1657 CODE:
1265{ 1658{
1266 int ow = SvIV (w_); 1659 glEnable (GL_TEXTURE_2D);
1267 int oh = SvIV (h_); 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);
1268 1666
1269 if (ow && oh) 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
1675
1676PROTOTYPES: ENABLE
1677
1678void
1679pad (SV *data_, int ow, int oh, int nw, int nh)
1680 CODE:
1681{
1682 if ((nw != ow || nh != oh) && SvOK (data_))
1270 { 1683 {
1271 int nw = minpot (ow);
1272 int nh = minpot (oh);
1273
1274 if (nw != ow || nh != oh)
1275 {
1276 if (SvOK (data_))
1277 {
1278 STRLEN datalen; 1684 STRLEN datalen;
1279 char *data = SvPVbyte (data_, datalen); 1685 char *data = SvPVbyte (data_, datalen);
1280 int bpp = datalen / (ow * oh); 1686 int bpp = datalen / (ow * oh);
1281 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1687 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1282 1688
1283 SvPOK_only (result_); 1689 SvPOK_only (result_);
1284 SvCUR_set (result_, nw * nh * bpp); 1690 SvCUR_set (result_, nw * nh * bpp);
1285 1691
1286 memset (SvPVX (result_), 0, nw * nh * bpp); 1692 memset (SvPVX (result_), 0, nw * nh * bpp);
1287 while (oh--) 1693 while (oh--)
1288 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1694 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1289 1695
1290 sv_setsv (data_, result_); 1696 sv_setsv (data_, result_);
1291 }
1292
1293 sv_setiv (w_, nw);
1294 sv_setiv (h_, nh);
1295 }
1296 } 1697 }
1297} 1698}
1298 1699
1299void 1700void
1300draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1701draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1306{ 1707{
1307 HV *hv = (HV *)SvRV (self); 1708 HV *hv = (HV *)SvRV (self);
1308 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1709 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1309 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1710 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1310 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1711 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1712
1713 if (name <= 0)
1714 XSRETURN_EMPTY;
1311 1715
1312 if (items < 5) 1716 if (items < 5)
1313 { 1717 {
1314 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1718 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1315 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1719 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1343 glDisable (GL_ALPHA_TEST); 1747 glDisable (GL_ALPHA_TEST);
1344 glDisable (GL_BLEND); 1748 glDisable (GL_BLEND);
1345 } 1749 }
1346} 1750}
1347 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
1348IV 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)
1349 CODE: 1874 CODE:
1350{ 1875{
1351 GLint width; 1876 GLint width;
1352 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);
… …
1354 RETVAL = width > 0; 1879 RETVAL = width > 0;
1355} 1880}
1356 OUTPUT: 1881 OUTPUT:
1357 RETVAL 1882 RETVAL
1358 1883
1359MODULE = CFPlus PACKAGE = CFPlus::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1360 1885
1361CFPlus::Map 1886PROTOTYPES: DISABLE
1887
1888DC::Map
1362new (SV *class) 1889new (SV *klass)
1363 CODE: 1890 CODE:
1364 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1365 RETVAL->x = 0; 1892 RETVAL->x = 0;
1366 RETVAL->y = 0; 1893 RETVAL->y = 0;
1367 RETVAL->w = 0; 1894 RETVAL->w = 0;
1368 RETVAL->h = 0; 1895 RETVAL->h = 0;
1369 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1370 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1371 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1372 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1373 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1374 RETVAL->row = 0; 1899 RETVAL->row = 0;
1375 OUTPUT: 1900 OUTPUT:
1376 RETVAL 1901 RETVAL
1377 1902
1378void 1903void
1379DESTROY (CFPlus::Map self) 1904DESTROY (DC::Map self)
1380 CODE: 1905 CODE:
1381{ 1906{
1382 map_clear (self);
1383 Safefree (self->face2tile);
1384 Safefree (self->tex);
1385 Safefree (self); 1907 delete self;
1386} 1908}
1387 1909
1388void 1910void
1389resize (CFPlus::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1390 CODE: 1912 CODE:
1391 self->w = map_width; 1913 self->w = map_width;
1392 self->h = map_height; 1914 self->h = map_height;
1393 1915
1394void 1916void
1395clear (CFPlus::Map self) 1917clear (DC::Map self)
1396 CODE: 1918 CODE:
1397 map_clear (self); 1919 self->clear_cells ();
1398 1920
1399void 1921void
1400set_tileid (CFPlus::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1401 CODE: 1923 CODE:
1402{ 1924{
1403 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1404 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1405} 1928}
1406 1929
1407void 1930void
1408set_smooth (CFPlus::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1409 CODE: 1932 CODE:
1410{ 1933{
1411 tileid texid;
1412 maptex *tex;
1413
1414 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1415 return; 1935 return;
1416 1936
1417 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1418 return; 1938 return;
1419 1939
1420 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1421 1941
1422 if (!texid) 1942 if (!texid)
1423 return; 1943 return;
1424 1944
1425 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1426 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1427 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1428} 1948}
1429 1949
1430void 1950void
1431set_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)
1432 CODE: 1952 CODE:
1433{ 1953{
1434 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1435 1955
1436 { 1956 {
1437 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1438 1958
1439 tex->name = name; 1959 tex.name = name;
1440 tex->w = w; 1960 tex.w = w;
1441 tex->h = h; 1961 tex.h = h;
1442 tex->s = s; 1962 tex.s = s;
1443 tex->t = t; 1963 tex.t = t;
1444 tex->r = r; 1964 tex.r = r;
1445 tex->g = g; 1965 tex.g = g;
1446 tex->b = b; 1966 tex.b = b;
1447 tex->a = a; 1967 tex.a = a;
1448 } 1968 }
1449 1969
1450 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1451 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1452 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
… …
1455 // use uglier nearest interpolation because linear suffers 1975 // use uglier nearest interpolation because linear suffers
1456 // from transparent color bleeding and ugly wrapping effects. 1976 // from transparent color bleeding and ugly wrapping effects.
1457 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1977 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1458} 1978}
1459 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
1460int 2000int
1461ox (CFPlus::Map self) 2001ox (DC::Map self)
1462 ALIAS: 2002 ALIAS:
1463 oy = 1 2003 oy = 1
1464 x = 2 2004 x = 2
1465 y = 3 2005 y = 3
1466 w = 4 2006 w = 4
… …
1477 } 2017 }
1478 OUTPUT: 2018 OUTPUT:
1479 RETVAL 2019 RETVAL
1480 2020
1481void 2021void
1482scroll (CFPlus::Map self, int dx, int dy) 2022scroll (DC::Map self, int dx, int dy)
1483 CODE: 2023 CODE:
1484{ 2024{
1485 if (dx > 0) 2025 if (dx > 0)
1486 map_blank (self, self->x, self->y, dx, self->h); 2026 map_blank (self, self->x, self->y, dx, self->h);
1487 else if (dx < 0) 2027 else if (dx < 0)
… …
1502 self->rows += MAP_EXTEND_Y; 2042 self->rows += MAP_EXTEND_Y;
1503 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1504 } 2044 }
1505} 2045}
1506 2046
1507void 2047SV *
1508map1a_update (CFPlus::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1509 CODE: 2049 CODE:
1510{ 2050{
1511 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1512 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1513 mapcell *cell; 2053 mapcell *cell;
1514 int x, y, flags; 2054 int x, y, z, flags;
2055 AV *missing = newAV ();
2056 RETVAL = newRV_noinc ((SV *)missing);
1515 2057
1516 while (data < data_end - 1) 2058 while (data < data_end - 1)
1517 { 2059 {
1518 flags = (data [0] << 8) + data [1]; data += 2; 2060 flags = (data [0] << 8) + data [1]; data += 2;
1519 2061
… …
1532 2074
1533 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
1534 2076
1535 if (flags & 8) 2077 if (flags & 8)
1536 { 2078 {
2079 uint8_t ext, cmd;
2080
1537 if (extmap) 2081 do
1538 { 2082 {
1539 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
1540 2085
1541 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
1542 { 2089 {
1543 ext = *data++;
1544 cmd = ext & 0x3f;
1545
1546 if (cmd < 4)
1547 cell->darkness = 255 - ext * 64 + 1;
1548 else if (cmd == 5) // health
1549 {
1550 cell->stat_width = 1; 2090 cell->stat_width = 1;
1551 cell->stat_hp = *data++; 2091 cell->stat_hp = *data++;
1552 }
1553 else if (cmd == 6) // monster width
1554 cell->stat_width = *data++ + 1;
1555 else if (cmd == 0x47)
1556 {
1557 if (*data == 4)
1558 ; // decode player count
1559
1560 data += *data + 1;
1561 }
1562 else if (cmd == 8) // cell flags
1563 cell->flags = *data++;
1564 else if (ext & 0x40) // unknown, multibyte => skip
1565 data += *data + 1;
1566 else
1567 data++;
1568 } 2092 }
1569 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++;
1570 } 2110 }
1571 else 2111 while (ext & 0x80);
1572 cell->darkness = *data++ + 1;
1573 } 2112 }
1574 2113
2114 for (z = 0; z <= 2; ++z)
1575 if (flags & 4) 2115 if (flags & (4 >> z))
1576 { 2116 {
1577 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
1578 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
1579 cell->tile [0] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
2120
2121 if (cell->tile[z])
2122 {
2123 maptex &tex = self->tex[cell->tile[z]];
2124 tex.unused = 0;
2125 if (!tex.name)
2126 av_push (missing, newSViv (cell->tile [z]));
2127
2128 if (tex.smoothtile)
2129 {
2130 maptex &smooth = self->tex[tex.smoothtile];
2131 smooth.unused = 0;
2132 if (!smooth.name)
2133 av_push (missing, newSViv (tex.smoothtile));
2134 }
2135 }
1580 } 2136 }
1581
1582 if (flags & 2)
1583 {
1584 faceid face = (data [0] << 8) + data [1]; data += 2;
1585 need_facenum (self, face);
1586 cell->tile [1] = self->face2tile [face];
1587 }
1588
1589 if (flags & 1)
1590 {
1591 faceid face = (data [0] << 8) + data [1]; data += 2;
1592 need_facenum (self, face);
1593 cell->tile [2] = self->face2tile [face];
1594 }
1595 } 2137 }
1596 else 2138 else
1597 cell->darkness = 0; 2139 CELL_CLEAR (cell);
1598 } 2140 }
1599} 2141}
2142 OUTPUT:
2143 RETVAL
1600 2144
1601SV * 2145SV *
1602mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2146mapmap (DC::Map self, int x0, int y0, int w, int h)
1603 CODE: 2147 CODE:
1604{ 2148{
1605 int x1, x; 2149 int x1, x;
1606 int y1, y; 2150 int y1, y;
1607 int z; 2151 int z;
… …
1620 ? self->row + y 2164 ? self->row + y
1621 : 0; 2165 : 0;
1622 2166
1623 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
1624 { 2168 {
1625 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
1626 2170
1627 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
1628 { 2172 {
1629 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
1630 2174
… …
1632 { 2176 {
1633 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
1634 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
1635 int a1 = tex.a; 2179 int a1 = tex.a;
1636 2180
1637 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
1638 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
1639 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
1640 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
1641 } 2185 }
1642 } 2186 }
1643 2187
1644 *map++ = (r ) 2188 *map++ = (r )
1645 | (g << 8) 2189 | (g << 8)
1646 | (b << 16) 2190 | (b << 16)
1647 | (a << 24); 2191 | (a << 24);
1648 } 2192 }
1649 } 2193 }
1650 2194
1651 RETVAL = map_sv; 2195 RETVAL = map_sv;
1652} 2196}
1653 OUTPUT: 2197 OUTPUT:
1654 RETVAL 2198 RETVAL
1655 2199
1656void 2200void
1657draw (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)
1658 CODE: 2202 CODE:
1659{ 2203{
1660 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1661 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1662 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1663 smooth_key skey;
1664 int x, y, z; 2204 int x, y, z;
1665 int last_name;
1666 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
1667 // thats current max. sorry. 2216 // that's current max. sorry.
1668 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
1669 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
1670 2219
1671 // clear key, in case of extra padding
1672 memset (&skey, 0, sizeof (skey)); 2220 memset (&key, 0, sizeof (key));
1673 2221 key.r = 255;
1674 glColor4ub (255, 255, 255, 255); 2222 key.g = 255;
1675 2223 key.b = 255;
1676 glEnable (GL_BLEND); 2224 key.a = 255;
1677 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2225 key.mode = GL_QUADS;
1678 glEnable (GL_TEXTURE_2D); 2226 key.format = GL_T2F_V3F;
1679 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1680
1681 glBegin (GL_QUADS);
1682
1683 last_name = 0;
1684 2227
1685 mx += self->x; 2228 mx += self->x;
1686 my += self->y; 2229 my += self->y;
1687 2230
1688 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1689 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
1690 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
1691 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1692 2235
1693 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
1694 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
1695 { 2238 {
1696 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
… …
1705 MAX (self->tex [cell->tile [1]].smoothlevel, 2248 MAX (self->tex [cell->tile [1]].smoothlevel,
1706 self->tex [cell->tile [2]].smoothlevel)); 2249 self->tex [cell->tile [2]].smoothlevel));
1707 } 2250 }
1708 } 2251 }
1709 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
1710 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
1711 { 2258 {
1712 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;
1713 2263
1714 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
1715 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
1716 { 2266 {
1717 maprow *row = self->row + (y + my); 2267 maprow *row = self->row + (y + my);
… …
1723 tileid tile = cell->tile [z]; 2273 tileid tile = cell->tile [z];
1724 2274
1725 if (tile) 2275 if (tile)
1726 { 2276 {
1727 maptex tex = self->tex [tile]; 2277 maptex tex = self->tex [tile];
1728 int px = (x + 1) * T - tex.w; 2278 int px, py;
1729 int py = (y + 1) * T - tex.h;
1730 2279
1731 // suppressing texture state switches here
1732 // is only moderately effective, but worth the extra effort
1733 if (last_name != tex.name) 2280 if (key.texname != tex.name)
1734 { 2281 {
2282 self->tex [tile].unused = 0;
2283
1735 if (!tex.name) 2284 if (!tex.name)
1736 tex = self->tex [2]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1737 2286
2287 key.texname = tex.name;
1738 glEnd (); 2288 arr = &rc.array (key);
1739 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1740 glBegin (GL_QUADS);
1741 } 2289 }
1742 2290
1743 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2291 px = (x + 1) * Th - tex.w;
1744 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2292 py = (y + 1) * Tw - tex.h;
1745 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1746 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1747 2293
1748 if (cell->flags && z == 2) 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
1749 { 2295 {
1750 if (cell->flags & 1) 2296 pl_x = px;
2297 pl_y = py;
2298 pl_tex = tex;
1751 { 2299 continue;
1752 maptex tex = self->tex [1];
1753 int px = x * T + T * 2 / 32;
1754 int py = y * T - T * 6 / 32;
1755
1756 glEnd ();
1757 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1758 glBegin (GL_QUADS);
1759
1760 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1761 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1762 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1763 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1764 }
1765 } 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);
1766 2306
1767 // update smooth hash 2307 // update smooth hash
1768 if (tex.smoothtile) 2308 if (tex.smoothtile)
1769 { 2309 {
1770 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
1771 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
1772 2312
1773 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
1774 2314
1775 // 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
1776 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
1777 2317
1778 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
… …
1786 2326
1787 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1788 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
1789 2329
1790 // full tile 2330 // full tile
1791 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);
1792 2332
1793 // borders 2333 // borders
1794 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);
1795 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);
1796 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);
1797 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);
1798 2338
1799 // corners 2339 // corners
1800 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);
1801 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);
1802 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);
1803 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);
1804 } 2364 }
1805 } 2365 }
1806 } 2366 }
1807 } 2367 }
1808 2368
2369 rc.draw ();
2370 rc.clear ();
2371
1809 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
1810 // this is basically counting sort 2373 // this is basically counting sort
1811 { 2374 {
1812 int w, b; 2375 int w, b;
1813 2376
1814 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)
1815 { 2382 {
1816 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
1817 if (smask) 2384 IV bits = it->second;
1818 for (b = 0; b < 32; ++b) 2385
1819 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
1820 { 2389 {
1821 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
1822 HE *he; 2398 if (tex.name)
1823
1824 hv_iterinit (smooth);
1825 while ((he = hv_iternext (smooth)))
1826 { 2399 {
1827 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
1828 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
1829 2402 if (key.texname != tex.name)
1830 if (!(bits & 0x1000)
1831 && skey->level == level
1832 && level > smooth_max [skey->x][skey->y])
1833 { 2403 {
1834 maptex tex = self->tex [skey->tile]; 2404 self->tex [skey.tile].unused = 0;
1835 int px = (((int)skey->x) - 1) * T;
1836 int py = (((int)skey->y) - 1) * T;
1837 int border = bits & 15;
1838 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1839 float dx = tex.s * .0625f; // 16 images/row
1840 float dy = tex.t * .5f ; // 2 images/column
1841 2405
1842 // this time naively avoiding texture state changes
1843 // save gobs of state changes.
1844 if (last_name != tex.name)
1845 {
1846 if (!tex.name)
1847 continue; // smoothing not yet available
1848
1849 glEnd (); 2406 glEnd ();
1850 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1851 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
1852 } 2409 }
1853 2410
1854 if (border) 2411 if (border)
1855 { 2412 {
1856 float ox = border * dx; 2413 float ox = border * dx;
1857 2414
1858 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1859 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1860 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1861 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1862 } 2419 }
1863 2420
1864 if (corner) 2421 if (corner)
1865 { 2422 {
1866 float ox = corner * dx; 2423 float ox = corner * dx;
1867 2424
1868 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1869 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1870 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1871 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1872 }
1873 } 2429 }
1874 } 2430 }
1875 } 2431 }
1876 } 2432 }
2433
2434 glEnd ();
2435 glDisable (GL_TEXTURE_2D);
2436 key.texname = -1;
1877 } 2437 }
1878
1879 hv_clear (smooth);
1880 } 2438 }
1881 2439
1882 glEnd (); 2440 if (pl_tex.name)
2441 {
2442 maptex tex = pl_tex;
2443 int px = pl_x + sdx;
2444 int py = pl_y + sdy;
1883 2445
1884 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
1885 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
1886 2461
1887 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
1888 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
1889 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
… …
1893 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
1894 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
1895 { 2470 {
1896 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
1897 2472
1898 int px = x * T; 2473 int px = x * Tw;
1899 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 }
1900 2481
1901 if (cell->stat_hp) 2482 if (cell->stat_hp)
1902 { 2483 {
1903 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
1904 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1905 2486
1906 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
1907 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
1908 px + width - 1, py); 2489 px + width - 1, py);
1909 2490
… …
1915 } 2496 }
1916 } 2497 }
1917} 2498}
1918 2499
1919void 2500void
1920draw_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)
1921 CODE: 2502 CODE:
1922{ 2503{
1923 static float color[16][3] = { 2504 static float color[16][3] = {
1924 { 0.00F, 0.00F, 0.00F }, 2505 { 0.00f, 0.00f, 0.00f },
1925 { 1.00F, 1.00F, 1.00F }, 2506 { 1.00f, 1.00f, 1.00f },
1926 { 0.00F, 0.00F, 0.55F }, 2507 { 0.00f, 0.00f, 0.55f },
1927 { 1.00F, 0.00F, 0.00F }, 2508 { 1.00f, 0.00f, 0.00f },
1928 2509
1929 { 1.00F, 0.54F, 0.00F }, 2510 { 1.00f, 0.54f, 0.00f },
1930 { 0.11F, 0.56F, 1.00F }, 2511 { 0.11f, 0.56f, 1.00f },
1931 { 0.93F, 0.46F, 0.00F }, 2512 { 0.93f, 0.46f, 0.00f },
1932 { 0.18F, 0.54F, 0.34F }, 2513 { 0.18f, 0.54f, 0.34f },
1933 2514
1934 { 0.56F, 0.73F, 0.56F }, 2515 { 0.56f, 0.73f, 0.56f },
1935 { 0.80F, 0.80F, 0.80F }, 2516 { 0.80f, 0.80f, 0.80f },
1936 { 0.55F, 0.41F, 0.13F }, 2517 { 0.55f, 0.41f, 0.13f },
1937 { 0.99F, 0.77F, 0.26F }, 2518 { 0.99f, 0.77f, 0.26f },
1938 2519
1939 { 0.74F, 0.65F, 0.41F }, 2520 { 0.74f, 0.65f, 0.41f },
1940 2521
1941 { 0.00F, 1.00F, 1.00F }, 2522 { 0.00f, 1.00f, 1.00f },
1942 { 1.00F, 0.00F, 1.00F }, 2523 { 1.00f, 0.00f, 1.00f },
1943 { 1.00F, 1.00F, 0.00F }, 2524 { 1.00f, 1.00f, 0.00f },
1944 }; 2525 };
1945 2526
1946 int x, y; 2527 int x, y;
1947 2528
1948 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 */
1949 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2536 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1950 glEnable (GL_BLEND); 2537 glEnable (GL_BLEND);
1951 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2538 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1952 glBegin (GL_QUADS); 2539 glBegin (GL_QUADS);
1953 2540
1954 for (y = 0; y < h; y++) 2541 for (y = 0; y < h; y++)
… …
1958 2545
1959 if (m) 2546 if (m)
1960 { 2547 {
1961 float *c = color [m & 15]; 2548 float *c = color [m & 15];
1962 2549
1963 float tx1 = m & 0x40 ? 0.5 : 0.; 2550 float tx1 = m & 0x40 ? 0.5f : 0.f;
1964 float tx2 = tx1 + 0.5; 2551 float tx2 = tx1 + 0.5f;
1965 2552
1966 glColor4f (c[0], c[1], c[2], 0.75); 2553 glColor4f (c[0], c[1], c[2], 1);
1967 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2554 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1968 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2555 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1969 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2556 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1970 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2557 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1971 } 2558 }
… …
1975 glDisable (GL_BLEND); 2562 glDisable (GL_BLEND);
1976 glDisable (GL_TEXTURE_2D); 2563 glDisable (GL_TEXTURE_2D);
1977} 2564}
1978 2565
1979void 2566void
1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2567fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1981 PPCODE: 2568 PPCODE:
1982{ 2569{
1983 int x, y; 2570 int x, y;
1984 int sw4 = (sw + 3) & ~3; 2571 int sw1 = sw + 2;
2572 int sh1 = sh + 2;
2573 int sh3 = sh * 3;
2574 int sw3 = sw * 3;
1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2575 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1986 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2576 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1987 2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1988 memset (darkness, 255, sw4 * sh); 2578 memset (darkness1, 0, sw1*sh1);
2579
1989 SvPOK_only (darkness_sv); 2580 SvPOK_only (darkness3_sv);
1990 SvCUR_set (darkness_sv, sw4 * sh); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
1991 2582
1992 mx += self->x; 2583 mx += self->x - 1;
1993 my += self->y; 2584 my += self->y - 1;
1994 2585
1995 for (y = 0; y < sh; y++) 2586 for (y = 0; y < sh1; y++)
1996 if (0 <= y + my && y + my < self->rows) 2587 if (0 <= y + my && y + my < self->rows)
1997 { 2588 {
1998 maprow *row = self->row + (y + my); 2589 maprow *row = self->row + (y + my);
1999 2590
2000 for (x = 0; x < sw; x++) 2591 for (x = 0; x < sw1; x++)
2001 if (row->c0 <= x + mx && x + mx < row->c1) 2592 if (row->c0 <= x + mx && x + mx < row->c1)
2002 { 2593 {
2003 mapcell *cell = row->col + (x + mx - row->c0); 2594 mapcell *cell = row->col + (x + mx - row->c0);
2004 2595
2005 darkness[y * sw4 + x] = cell->darkness 2596 darkness1 [y * sw1 + x] = cell->darkness
2006 ? 255 - (cell->darkness - 1) 2597 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2007 : 255 - FOW_DARKNESS; 2598 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2008 } 2599 }
2009 } 2600 }
2010 2601
2011 if (smoothing)
2012 {
2013 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2014 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2015
2016 SvPOK_only (darkness2_sv);
2017 SvCUR_set (darkness2_sv, sw4 * sh);
2018
2019 for (y = 0; y < sh; ++y) 2602 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x) 2603 for (x = 0; x < sw; ++x)
2021 { 2604 {
2022 float *f = (float *)matrix; 2605 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2023 int dx, dy; 2606 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2024 float sum = 0.f; 2607 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2608 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2609 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2610 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2611 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2612 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2613 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2025 2614
2026 for (dy = -1; dy <= 1; ++dy) 2615 uint8_t r11 = (d11 + d21 + d12) / 3;
2027 for (dx = -1; dx <= 1; ++dx) 2616 uint8_t r21 = d21;
2028 { 2617 uint8_t r31 = (d21 + d31 + d32) / 3;
2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
2031 2618
2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2619 uint8_t r12 = d12;
2033 } 2620 uint8_t r22 = d22;
2621 uint8_t r32 = d32;
2034 2622
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2623 uint8_t r13 = (d13 + d23 + d12) / 3;
2036 } 2624 uint8_t r23 = d23;
2625 uint8_t r33 = (d23 + d33 + d32) / 3;
2037 2626
2038 darkness_sv = darkness2_sv; 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2629 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2631 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2632 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2635 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2039 } 2636 }
2637
2638 free (darkness1);
2040 2639
2041 EXTEND (SP, 3); 2640 EXTEND (SP, 3);
2042 PUSHs (sv_2mortal (newSViv (sw4))); 2641 PUSHs (sv_2mortal (newSViv (sw3)));
2043 PUSHs (sv_2mortal (newSViv (sh))); 2642 PUSHs (sv_2mortal (newSViv (sh3)));
2044 PUSHs (darkness_sv); 2643 PUSHs (darkness3_sv);
2045} 2644}
2046 2645
2047SV * 2646SV *
2048get_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)
2049 CODE: 2648 CODE:
2050{ 2649{
2051 int x, y, x1, y1; 2650 int x, y, x1, y1;
2052 SV *data_sv = newSV (w * h * 7 + 5); 2651 SV *data_sv = newSV (w * h * 7 + 5);
2053 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2652 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2110 else 2709 else
2111 *data++ = 0; 2710 *data++ = 0;
2112 } 2711 }
2113 } 2712 }
2114 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 {
2115 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2116 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2719 }
2720
2117 RETVAL = data_sv; 2721 RETVAL = data_sv;
2118} 2722}
2119 OUTPUT: 2723 OUTPUT:
2120 RETVAL 2724 RETVAL
2121 2725
2122void 2726void
2123set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2727set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2124 PPCODE: 2728 PPCODE:
2125{ 2729{
2126 int x, y, z; 2730 int x, y, z;
2127 int w, h; 2731 int w, h;
2128 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;
2129 2743
2130 if (*data++ != 0) 2744 if (*data++ != 0)
2131 return; /* version mismatch */ 2745 XSRETURN_EMPTY; /* version mismatch */
2132 2746
2133 w = *data++ << 8; w |= *data++; 2747 w = *data++ << 8; w |= *data++;
2134 h = *data++ << 8; h |= *data++; 2748 h = *data++ << 8; h |= *data++;
2135 2749
2136 // 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
… …
2148 { 2762 {
2149 maprow *row = map_get_row (self, y); 2763 maprow *row = map_get_row (self, y);
2150 2764
2151 for (x = x0; x < x1; x++) 2765 for (x = x0; x < x1; x++)
2152 { 2766 {
2767 uint8_t flags;
2768
2769 if (data + 7 >= end)
2770 XSRETURN_EMPTY;
2771
2153 uint8_t flags = *data++; 2772 flags = *data++;
2154 2773
2155 if (flags) 2774 if (flags)
2156 { 2775 {
2157 mapcell *cell = row_get_cell (row, x); 2776 mapcell *cell = row_get_cell (row, x);
2158 tileid tile[3] = { 0, 0, 0 }; 2777 tileid tile[3] = { 0, 0, 0 };
… …
2161 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2780 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2162 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2781 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2163 2782
2164 if (cell->darkness == 0) 2783 if (cell->darkness == 0)
2165 { 2784 {
2166 cell->darkness = 0; 2785 /*cell->darkness = 0;*/
2786 EXTEND (SP, 3);
2167 2787
2168 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2169 { 2789 {
2170 tileid t = tile [z]; 2790 tileid t = tile [z];
2171 2791
2172 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2173 { 2793 {
2174 XPUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2175 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2176 } 2796 }
2177 2797
2178 cell->tile [z] = t; 2798 cell->tile[z] = t;
2179 } 2799 }
2180 } 2800 }
2181 } 2801 }
2182 } 2802 }
2183 } 2803 }
2184} 2804}
2185 2805
2186MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2187 2807
2188CFPlus::MixChunk 2808DC::RW
2189new_from_file (SV *class, char *path) 2809new (SV *klass, SV *data_sv)
2190 CODE: 2810 CODE:
2191 RETVAL = Mix_LoadWAV (path); 2811{
2812 STRLEN datalen;
2813 char *data = SvPVbyte (data_sv, datalen);
2814
2815 RETVAL = SDL_RWFromConstMem (data, datalen);
2816}
2192 OUTPUT: 2817 OUTPUT:
2193 RETVAL 2818 RETVAL
2194 2819
2820DC::RW
2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2822 CODE:
2823 RETVAL = SDL_RWFromFile (path, mode);
2824 OUTPUT:
2825 RETVAL
2826
2827# fails on win32:
2828# dc.xs(2268) : error C2059: syntax error : '('
2195void 2829#void
2830#close (DC::RW self)
2831# CODE:
2832# (self->(close)) (self);
2833
2834MODULE = Deliantra::Client PACKAGE = DC::Channel
2835
2836PROTOTYPES: DISABLE
2837
2838DC::Channel
2839find ()
2840 CODE:
2841{
2842 RETVAL = Mix_GroupAvailable (-1);
2843
2844 if (RETVAL < 0)
2845 {
2846 RETVAL = Mix_GroupOldest (-1);
2847
2848 if (RETVAL < 0)
2849 {
2850 // happens sometimes, maybe it just stopped playing(?)
2851 RETVAL = Mix_GroupAvailable (-1);
2852
2853 if (RETVAL < 0)
2854 XSRETURN_UNDEF;
2855 }
2856 else
2857 Mix_HaltChannel (RETVAL);
2858 }
2859
2860 Mix_UnregisterAllEffects (RETVAL);
2861 Mix_Volume (RETVAL, 128);
2862}
2863 OUTPUT:
2864 RETVAL
2865
2866void
2867halt (DC::Channel self)
2868 CODE:
2869 Mix_HaltChannel (self);
2870
2871void
2872expire (DC::Channel self, int ticks = -1)
2873 CODE:
2874 Mix_ExpireChannel (self, ticks);
2875
2876void
2877fade_out (DC::Channel self, int ticks = -1)
2878 CODE:
2879 Mix_FadeOutChannel (self, ticks);
2880
2881int
2882volume (DC::Channel self, int volume)
2883 CODE:
2884 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2885 OUTPUT:
2886 RETVAL
2887
2888void
2889unregister_all_effects (DC::Channel self)
2890 CODE:
2891 Mix_UnregisterAllEffects (self);
2892
2893void
2894set_panning (DC::Channel self, int left, int right)
2895 CODE:
2896 left = CLAMP (left , 0, 255);
2897 right = CLAMP (right, 0, 255);
2898 Mix_SetPanning (self, left, right);
2899
2900void
2901set_distance (DC::Channel self, int distance)
2902 CODE:
2903 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2904
2905void
2906set_position (DC::Channel self, int angle, int distance)
2907 CODE:
2908
2909void
2910set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2911 CODE:
2912{
2913 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2914 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2915 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2916}
2917
2918void
2919set_reverse_stereo (DC::Channel self, int flip)
2920 CODE:
2921 Mix_SetReverseStereo (self, flip);
2922
2923MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2924
2925PROTOTYPES: DISABLE
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
2939DC::MixChunk
2940new (SV *klass, DC::RW rwops)
2941 CODE:
2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2943 OUTPUT:
2944 RETVAL
2945
2946void
2196DESTROY (CFPlus::MixChunk self) 2947DESTROY (DC::MixChunk self)
2197 CODE: 2948 CODE:
2198 Mix_FreeChunk (self); 2949 Mix_FreeChunk (self);
2199 2950
2200int 2951int
2201volume (CFPlus::MixChunk self, int volume = -1) 2952volume (DC::MixChunk self, int volume = -1)
2202 CODE: 2953 CODE:
2954 if (items > 1)
2955 volume = CLAMP (volume, 0, 128);
2203 RETVAL = Mix_VolumeChunk (self, volume); 2956 RETVAL = Mix_VolumeChunk (self, volume);
2204 OUTPUT: 2957 OUTPUT:
2205 RETVAL 2958 RETVAL
2206 2959
2207int 2960DC::Channel
2208play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2961play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2209 CODE: 2962 CODE:
2963{
2210 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2964 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2965
2966 if (RETVAL < 0)
2967 XSRETURN_UNDEF;
2968
2969 if (channel < 0)
2970 {
2971 Mix_UnregisterAllEffects (RETVAL);
2972 Mix_Volume (RETVAL, 128);
2973 }
2974}
2211 OUTPUT: 2975 OUTPUT:
2212 RETVAL 2976 RETVAL
2213 2977
2214MODULE = 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
2215 2991
2216int 2992int
2217volume (int volume = -1) 2993volume (int volume = -1)
2994 PROTOTYPE: ;$
2218 CODE: 2995 CODE:
2996 if (items > 0)
2997 volume = CLAMP (volume, 0, 128);
2219 RETVAL = Mix_VolumeMusic (volume); 2998 RETVAL = Mix_VolumeMusic (volume);
2220 OUTPUT: 2999 OUTPUT:
2221 RETVAL 3000 RETVAL
2222 3001
3002void
3003fade_out (int ms)
3004 CODE:
3005 Mix_FadeOutMusic (ms);
3006
3007void
3008halt ()
3009 CODE:
3010 Mix_HaltMusic ();
3011
2223int 3012int
2224fade_out (int ms) 3013playing ()
2225 CODE: 3014 CODE:
2226 RETVAL = Mix_FadeOutMusic (ms); 3015 RETVAL = Mix_PlayingMusic ();
2227 OUTPUT: 3016 OUTPUT:
2228 RETVAL 3017 RETVAL
2229 3018
2230CFPlus::MixMusic 3019DC::MixMusic
2231new_from_file (SV *class, char *path) 3020new (SV *klass, DC::RW rwops)
2232 CODE: 3021 CODE:
2233 RETVAL = Mix_LoadMUS (path); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2234 OUTPUT: 3023 OUTPUT:
2235 RETVAL 3024 RETVAL
2236 3025
2237void 3026void
2238DESTROY (CFPlus::MixMusic self) 3027DESTROY (DC::MixMusic self)
2239 CODE: 3028 CODE:
2240 Mix_FreeMusic (self); 3029 Mix_FreeMusic (self);
2241 3030
2242int 3031int
2243play (CFPlus::MixMusic self, int loops = -1) 3032play (DC::MixMusic self, int loops = -1)
2244 CODE: 3033 CODE:
2245 RETVAL = Mix_PlayMusic (self, loops); 3034 RETVAL = Mix_PlayMusic (self, loops);
2246 OUTPUT: 3035 OUTPUT:
2247 RETVAL 3036 RETVAL
2248 3037
2249int 3038void
2250fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3039fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2251 CODE: 3040 CODE:
2252 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3041 Mix_FadeInMusicPos (self, loops, ms, position);
2253 OUTPUT:
2254 RETVAL
2255 3042
2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3043MODULE = Deliantra::Client PACKAGE = DC::OpenGL
3044
3045PROTOTYPES: ENABLE
2257 3046
2258BOOT: 3047BOOT:
2259{ 3048{
2260 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3049 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2261 static const struct { 3050 static const struct {
2262 const char *name; 3051 const char *name;
2263 IV iv; 3052 IV iv;
2264 } *civ, const_iv[] = { 3053 } *civ, const_iv[] = {
2265# define const_iv(name) { # name, (IV)name } 3054# define const_iv(name) { # name, (IV)name }
2266 const_iv (GL_VENDOR), 3055 const_iv (GL_VENDOR),
2267 const_iv (GL_VERSION), 3056 const_iv (GL_VERSION),
2268 const_iv (GL_EXTENSIONS), 3057 const_iv (GL_EXTENSIONS),
3058 const_iv (GL_MAX_TEXTURE_UNITS),
2269 const_iv (GL_COLOR_MATERIAL), 3059 const_iv (GL_COLOR_MATERIAL),
2270 const_iv (GL_SMOOTH), 3060 const_iv (GL_SMOOTH),
2271 const_iv (GL_FLAT), 3061 const_iv (GL_FLAT),
2272 const_iv (GL_DITHER), 3062 const_iv (GL_DITHER),
2273 const_iv (GL_BLEND), 3063 const_iv (GL_BLEND),
… …
2277 const_iv (GL_ALPHA_TEST), 3067 const_iv (GL_ALPHA_TEST),
2278 const_iv (GL_NORMALIZE), 3068 const_iv (GL_NORMALIZE),
2279 const_iv (GL_RESCALE_NORMAL), 3069 const_iv (GL_RESCALE_NORMAL),
2280 const_iv (GL_FRONT), 3070 const_iv (GL_FRONT),
2281 const_iv (GL_BACK), 3071 const_iv (GL_BACK),
3072 const_iv (GL_AUX0),
2282 const_iv (GL_AND), 3073 const_iv (GL_AND),
2283 const_iv (GL_ONE), 3074 const_iv (GL_ONE),
2284 const_iv (GL_ZERO), 3075 const_iv (GL_ZERO),
2285 const_iv (GL_SRC_ALPHA), 3076 const_iv (GL_SRC_ALPHA),
2286 const_iv (GL_DST_ALPHA), 3077 const_iv (GL_DST_ALPHA),
2287 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3078 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2288 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),
2289 const_iv (GL_SRC_ALPHA_SATURATE), 3084 const_iv (GL_SRC_ALPHA_SATURATE),
2290 const_iv (GL_RGB), 3085 const_iv (GL_RGB),
2291 const_iv (GL_RGBA), 3086 const_iv (GL_RGBA),
2292 const_iv (GL_RGBA4), 3087 const_iv (GL_RGBA4),
2293 const_iv (GL_RGBA8), 3088 const_iv (GL_RGBA8),
… …
2299 const_iv (GL_INTENSITY), 3094 const_iv (GL_INTENSITY),
2300 const_iv (GL_LUMINANCE), 3095 const_iv (GL_LUMINANCE),
2301 const_iv (GL_LUMINANCE_ALPHA), 3096 const_iv (GL_LUMINANCE_ALPHA),
2302 const_iv (GL_FLOAT), 3097 const_iv (GL_FLOAT),
2303 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),
2304 const_iv (GL_COMPILE), 3105 const_iv (GL_COMPILE),
2305 const_iv (GL_PROXY_TEXTURE_1D), 3106 const_iv (GL_PROXY_TEXTURE_1D),
2306 const_iv (GL_PROXY_TEXTURE_2D), 3107 const_iv (GL_PROXY_TEXTURE_2D),
2307 const_iv (GL_TEXTURE_1D), 3108 const_iv (GL_TEXTURE_1D),
2308 const_iv (GL_TEXTURE_2D), 3109 const_iv (GL_TEXTURE_2D),
… …
2332 const_iv (GL_COLOR_LOGIC_OP), 3133 const_iv (GL_COLOR_LOGIC_OP),
2333 const_iv (GL_SEPARABLE_2D), 3134 const_iv (GL_SEPARABLE_2D),
2334 const_iv (GL_CONVOLUTION_2D), 3135 const_iv (GL_CONVOLUTION_2D),
2335 const_iv (GL_CONVOLUTION_BORDER_MODE), 3136 const_iv (GL_CONVOLUTION_BORDER_MODE),
2336 const_iv (GL_CONSTANT_BORDER), 3137 const_iv (GL_CONSTANT_BORDER),
3138 const_iv (GL_POINTS),
2337 const_iv (GL_LINES), 3139 const_iv (GL_LINES),
2338 const_iv (GL_LINE_STRIP), 3140 const_iv (GL_LINE_STRIP),
2339 const_iv (GL_LINE_LOOP), 3141 const_iv (GL_LINE_LOOP),
2340 const_iv (GL_QUADS), 3142 const_iv (GL_QUADS),
2341 const_iv (GL_QUAD_STRIP), 3143 const_iv (GL_QUAD_STRIP),
2342 const_iv (GL_TRIANGLES), 3144 const_iv (GL_TRIANGLES),
2343 const_iv (GL_TRIANGLE_STRIP), 3145 const_iv (GL_TRIANGLE_STRIP),
2344 const_iv (GL_TRIANGLE_FAN), 3146 const_iv (GL_TRIANGLE_FAN),
3147 const_iv (GL_POLYGON),
2345 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3148 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3149 const_iv (GL_POINT_SMOOTH_HINT),
3150 const_iv (GL_LINE_SMOOTH_HINT),
3151 const_iv (GL_POLYGON_SMOOTH_HINT),
3152 const_iv (GL_GENERATE_MIPMAP_HINT),
3153 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2346 const_iv (GL_FASTEST), 3154 const_iv (GL_FASTEST),
3155 const_iv (GL_DONT_CARE),
3156 const_iv (GL_NICEST),
2347 const_iv (GL_V2F), 3157 const_iv (GL_V2F),
2348 const_iv (GL_V3F), 3158 const_iv (GL_V3F),
2349 const_iv (GL_T2F_V3F), 3159 const_iv (GL_T2F_V3F),
2350 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),
2351# undef const_iv 3164# undef const_iv
2352 }; 3165 };
2353 3166
2354 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--)
2355 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2356 3169
2357 texture_av = newAV (); 3170 texture_av = newAV ();
2358 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
2359} 3172}
2360 3173
2361char * 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 *
2362gl_vendor () 3184gl_vendor ()
2363 CODE: 3185 CODE:
2364 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
2365 OUTPUT: 3187 OUTPUT:
2366 RETVAL 3188 RETVAL
2367 3189
2368char * 3190const char *
2369gl_version () 3191gl_version ()
2370 CODE: 3192 CODE:
2371 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
2372 OUTPUT: 3194 OUTPUT:
2373 RETVAL 3195 RETVAL
2374 3196
2375char * 3197const char *
2376gl_extensions () 3198gl_extensions ()
2377 CODE: 3199 CODE:
2378 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2379 OUTPUT: 3201 OUTPUT:
2380 RETVAL 3202 RETVAL
2381 3203
2382const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
2383 3209
2384GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
2385 CODE: 3211 CODE:
2386 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
2387 OUTPUT: 3213 OUTPUT:
… …
2395 3221
2396int glGetError () 3222int glGetError ()
2397 3223
2398void glFinish () 3224void glFinish ()
2399 3225
3226void glFlush ()
3227
2400void glClear (int mask) 3228void glClear (int mask)
2401 3229
2402void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
2403 PROTOTYPE: @ 3231 PROTOTYPE: @
2404 3232
… …
2414 3242
2415void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3243void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2416 CODE: 3244 CODE:
2417 gl_BlendFuncSeparate (sa, da, saa, daa); 3245 gl_BlendFuncSeparate (sa, da, saa, daa);
2418 3246
3247# void glBlendEquation (int se)
3248
2419void glDepthMask (int flag) 3249void glDepthMask (int flag)
2420 3250
2421void glLogicOp (int opcode) 3251void glLogicOp (int opcode)
2422 3252
2423void glColorMask (int red, int green, int blue, int alpha) 3253void glColorMask (int red, int green, int blue, int alpha)
… …
2437# near_ and far_ are due to microsofts buggy "c" compiler 3267# near_ and far_ are due to microsofts buggy "c" compiler
2438void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3268void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2439 3269
2440# near_ and far_ are due to microsofts buggy "c" compiler 3270# near_ and far_ are due to microsofts buggy "c" compiler
2441void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3271void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3272
3273PROTOTYPES: DISABLE
2442 3274
2443void glViewport (int x, int y, int width, int height) 3275void glViewport (int x, int y, int width, int height)
2444 3276
2445void glScissor (int x, int y, int width, int height) 3277void glScissor (int x, int y, int width, int height)
2446 3278
… …
2454 3286
2455void glRotate (float angle, float x, float y, float z) 3287void glRotate (float angle, float x, float y, float z)
2456 CODE: 3288 CODE:
2457 glRotatef (angle, x, y, z); 3289 glRotatef (angle, x, y, z);
2458 3290
2459void glBegin (int mode)
2460
2461void glEnd ()
2462
2463void glColor (float r, float g, float b, float a = 1.0) 3291void glColor (float r, float g, float b, float a = 1.0)
2464 PROTOTYPE: @ 3292 PROTOTYPE: @
2465 ALIAS: 3293 ALIAS:
2466 glColor_premultiply = 1 3294 glColor_premultiply = 1
2467 CODE: 3295 CODE:
2468 if (ix) 3296 if (ix)
2469 { 3297 {
… …
2472 b *= a; 3300 b *= a;
2473 } 3301 }
2474 // microsoft visual "c" rounds instead of truncating... 3302 // microsoft visual "c" rounds instead of truncating...
2475 glColor4f (r, g, b, a); 3303 glColor4f (r, g, b, a);
2476 3304
2477void glInterleavedArrays (int format, int stride, char *data)
2478
2479void glDrawElements (int mode, int count, int type, char *indices)
2480
2481# 1.2 void glDrawRangeElements (int mode, int start, int end
2482
2483void glRasterPos (float x, float y, float z = 0.) 3305void glRasterPos (float x, float y, float z = 0.)
2484 CODE: 3306 CODE:
2485 glRasterPos3f (0, 0, z); 3307 glRasterPos3f (0, 0, z);
2486 glBitmap (0, 0, 0, 0, x, y, 0); 3308 glBitmap (0, 0, 0, 0, x, y, 0);
2487 3309
… …
2491 3313
2492void glTexCoord (float s, float t) 3314void glTexCoord (float s, float t)
2493 CODE: 3315 CODE:
2494 glTexCoord2f (s, t); 3316 glTexCoord2f (s, t);
2495 3317
3318void glRect (float x1, float y1, float x2, float y2)
3319 CODE:
3320 glRectf (x1, y1, x2, y2);
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
3331PROTOTYPES: ENABLE
3332
3333void glBegin (int mode)
3334
3335void glEnd ()
3336
3337void glPointSize (GLfloat size)
3338
3339void glLineWidth (GLfloat width)
3340
3341void glInterleavedArrays (int format, int stride, char *data)
3342
3343void glDrawElements (int mode, int count, int type, char *indices)
3344
3345# 1.2 void glDrawRangeElements (int mode, int start, int end
3346
2496void glTexEnv (int target, int pname, float param) 3347void glTexEnv (int target, int pname, float param)
2497 CODE: 3348 CODE:
2498 glTexEnvf (target, pname, param); 3349 glTexEnvf (target, pname, param);
2499 3350
2500void glTexParameter (int target, int pname, float param) 3351void glTexParameter (int target, int pname, float param)
… …
2516void 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)
2517 CODE: 3368 CODE:
2518 if (gl.SeparableFilter2D) 3369 if (gl.SeparableFilter2D)
2519 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3370 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2520 3371
2521void 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)
2522 3373
2523void 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)
2524 3375
2525void glDrawPixels (int width, int height, int format, int type, char *pixels) 3376void glDrawPixels (int width, int height, int format, int type, char *pixels)
2526 3377
… …
2552 3403
2553void glEndList () 3404void glEndList ()
2554 3405
2555void glCallList (int list) 3406void glCallList (int list)
2556 3407
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
3414
3415PROTOTYPES: DISABLE
3416
3417void
3418find_widget (SV *self, NV x, NV y)
3419 PPCODE:
3420{
3421 if (within_widget (self, x, y))
3422 XPUSHs (self);
3423}
3424
3425BOOT:
3426{
3427 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3428
3429 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3430 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3431 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3432 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3433}
3434
3435void
3436draw (SV *self)
3437 CODE:
3438{
3439 HV *hv;
3440 SV **svp;
3441 NV x, y, w, h;
3442 SV *draw_x_sv = GvSV (draw_x_gv);
3443 SV *draw_y_sv = GvSV (draw_y_gv);
3444 SV *draw_w_sv = GvSV (draw_w_gv);
3445 SV *draw_h_sv = GvSV (draw_h_gv);
3446 double draw_x, draw_y;
3447
3448 if (!SvROK (self))
3449 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3450
3451 hv = (HV *)SvRV (self);
3452
3453 if (SvTYPE (hv) != SVt_PVHV)
3454 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3455
3456 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3457 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3458
3459 if (!h || !w)
3460 XSRETURN_EMPTY;
3461
3462 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3463 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3464
3465 draw_x = SvNV (draw_x_sv) + x;
3466 draw_y = SvNV (draw_y_sv) + y;
3467
3468 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3469 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3470 XSRETURN_EMPTY;
3471
3472 sv_setnv (draw_x_sv, draw_x);
3473 sv_setnv (draw_y_sv, draw_y);
3474
3475 glPushMatrix ();
3476 glTranslated (x, y, 0);
3477
3478 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3479 {
3480 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3481
3482 if (svp && SvTRUE (*svp))
3483 {
3484 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3485 glEnable (GL_BLEND);
3486 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3487 glBegin (GL_QUADS);
3488 glVertex2f (0, 0);
3489 glVertex2f (w, 0);
3490 glVertex2f (w, h);
3491 glVertex2f (0, h);
3492 glEnd ();
3493 glDisable (GL_BLEND);
3494 }
3495 }
3496#if 0
3497 // draw borders, for debugging
3498 glPushMatrix ();
3499 glColor4f (1., 1., 0., 1.);
3500 glTranslatef (.5, .5, 0.);
3501 glBegin (GL_LINE_LOOP);
3502 glVertex2f (0 , 0);
3503 glVertex2f (w - 1, 0);
3504 glVertex2f (w - 1, h - 1);
3505 glVertex2f (0 , h - 1);
3506 glEnd ();
3507 glPopMatrix ();
3508#endif
3509 PUSHMARK (SP);
3510 XPUSHs (self);
3511 PUTBACK;
3512 call_method ("_draw", G_VOID | G_DISCARD);
3513 SPAGAIN;
3514
3515 glPopMatrix ();
3516
3517 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3518 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3519}
3520

Diff Legend

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