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.155 by root, Thu Sep 21 00:16:42 2006 UTC vs.
Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
15#endif 27#endif
16 28
29#include <assert.h>
17#include <math.h> 30#include <math.h>
18#include <string.h> 31#include <string.h>
19#include <stdio.h> 32#include <stdio.h>
20#include <stdlib.h> 33#include <stdlib.h>
21 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
22#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
23#include <SDL_endian.h> 39#include <SDL_endian.h>
24#include <SDL_image.h> 40#include <SDL_image.h>
25#include <SDL_mixer.h> 41#include <SDL_mixer.h>
26#include <SDL_opengl.h> 42#include <SDL_opengl.h>
27 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
28#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
30 51
31#include <glib/gmacros.h> 52#include <glib/gmacros.h>
32 53
33#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
34 66
35#ifndef _WIN32 67#ifndef _WIN32
36# include <sys/types.h> 68# include <sys/types.h>
37# include <sys/socket.h> 69# include <sys/socket.h>
38# include <netinet/in.h> 70# include <netinet/in.h>
39# include <netinet/tcp.h> 71# include <netinet/tcp.h>
40# include <inttypes.h> 72# include <inttypes.h>
73#endif
74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
41#else 77#else
42 typedef unsigned char uint8_t; 78# define expect(expr,value) (expr)
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 79#endif
49 80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 85
52#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
53 87
54#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
56 90
57#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
58 92
59#if 0 93/* mask out modifiers we are not interested in */
60# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
61#else 95
62# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
63#endif 97
98static AV *texture_av;
64 99
65static struct 100static struct
66{ 101{
67#define GL_FUNC(ptr,name) ptr name; 102#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 103#include "glfunc.h"
69#undef GL_FUNC 104#undef GL_FUNC
70} gl; 105} gl;
71 106
107static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 108gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 109{
74 if (gl.BlendFuncSeparate) 110 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 111 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 112 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 113 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 114 else
79 glBlendFunc (sa, da); 115 glBlendFunc (sa, da);
80} 116}
81 117
118static GLuint
119gen_texture ()
120{
121 GLuint name;
122
123 if (AvFILL (texture_av) >= 0)
124 name = (GLuint)(size_t)av_pop (texture_av);
125 else
126 glGenTextures (1, &name);
127
128 return name;
129}
130
131static void
132del_texture (GLuint name)
133{
134 /* make a half-assed attempt at returning the memory used by the texture */
135 /* textures are frequently being reused by cfplus anyway */
136 /*glBindTexture (GL_TEXTURE_2D, name);*/
137 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
138 av_push (texture_av, (SV *)(size_t)name);
139 glDeleteTextures (1, &name);
140}
141
82#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
83 144
84#include "pango-font.c" 145#include "pango-font.c"
85#include "pango-fontmap.c" 146#include "pango-fontmap.c"
86#include "pango-render.c" 147#include "pango-render.c"
87 148
149typedef IV DC__Channel;
150typedef SDL_RWops *DC__RW;
88typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
89typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
90 153
91typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
92 155
93static int 156static int
94shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
95{ 158{
96 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
… …
110 173
111typedef struct cf_layout { 174typedef struct cf_layout {
112 PangoLayout *pl; 175 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
114 int base_height; 177 int base_height;
115 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
116} *CFPlus__Layout; 180} *DC__Layout;
117 181
118static CFPlus__Font default_font; 182static DC__Font default_font;
119static PangoContext *opengl_context; 183static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
121 185
122static void 186static void
123substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
… …
128#endif 192#endif
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130} 194}
131 195
132static void 196static void
133layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
134{ 198{
135 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
136 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
137 */ 201 */
138 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
139 203
140 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
141 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
142 206
143 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
144} 208}
145 209
146static void 210static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
148{ 212{
149 PangoRectangle rect; 213 PangoRectangle rect;
150 214
151 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
152 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
… …
159 223
160 *w = rect.width; 224 *w = rect.width;
161 *h = rect.height; 225 *h = rect.height;
162} 226}
163 227
228typedef uint16_t tileid;
164typedef uint16_t mapface; 229typedef uint16_t faceid;
165 230
166typedef struct { 231typedef struct {
167 GLint name; 232 GLuint name;
168 int w, h; 233 int w, h;
169 float s, t; 234 float s, t;
170 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
236 tileid smoothtile;
237 uint8_t smoothlevel;
171} maptex; 238} maptex;
172 239
173typedef struct { 240typedef struct {
174 uint32_t player; 241 uint32_t player;
175 mapface face[3]; 242 tileid tile[3];
176 uint16_t darkness; 243 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags; 244 uint8_t stat_width, stat_hp, flags, smoothmax;
178} mapcell; 245} mapcell;
179 246
180typedef struct { 247typedef struct {
181 int32_t c0, c1; 248 int32_t c0, c1;
182 mapcell *col; 249 mapcell *col;
183} maprow; 250} maprow;
184 251
185typedef struct map { 252typedef struct map {
186 int x, y, w, h; 253 int x, y, w, h;
187 int ox, oy; /* offset to virtual global coordinate system */ 254 int ox, oy; /* offset to virtual global coordinate system */
188 int faces; 255 int faces; tileid *face2tile; // [faceid]
189 mapface *face; 256 int texs; maptex *tex; // [tileid]
190
191 int texs;
192 maptex *tex;
193 257
194 int32_t rows; 258 int32_t rows;
195 maprow *row; 259 maprow *row;
196} *CFPlus__Map; 260} *DC__Map;
197 261
198static char * 262static char *
199prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
200{ 264{
201 char *p; 265 char *p;
… …
218} 282}
219 283
220#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 284#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
221#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 285#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
222 286
287static void
288need_facenum (struct map *self, faceid face)
289{
290 while (self->faces <= face)
291 {
292 Append (tileid, self->face2tile, self->faces, self->faces);
293 self->faces *= 2;
294 }
295}
296
297static void
298need_texid (struct map *self, int texid)
299{
300 while (self->texs <= texid)
301 {
302 Append (maptex, self->tex, self->texs, self->texs);
303 self->texs *= 2;
304 }
305}
306
223static maprow * 307static maprow *
224map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
225{ 309{
226 if (0 > y) 310 if (0 > y)
227 { 311 {
228 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
229 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
… …
267 351
268 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
269} 353}
270 354
271static mapcell * 355static mapcell *
272map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
273{ 357{
274 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
275} 359}
276 360
277static void 361static void
278map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
279{ 363{
280 int r; 364 int r;
281 365
282 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
283 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
… …
290 self->oy = 0; 374 self->oy = 0;
291 self->row = 0; 375 self->row = 0;
292 self->rows = 0; 376 self->rows = 0;
293} 377}
294 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
295static void 389static void
296map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
297{ 391{
298 int x, y; 392 int x, y;
299 maprow *row; 393 maprow *row;
300 mapcell *cell; 394 mapcell *cell;
301 395
… …
313 if (x >= row->c1) 407 if (x >= row->c1)
314 break; 408 break;
315 409
316 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
317 411
318 cell->darkness = 0; 412 CELL_CLEAR (cell);
319 cell->stat_hp = 0;
320 cell->flags = 0;
321 cell->player = 0;
322 } 413 }
323 } 414 }
415}
416
417typedef struct {
418 tileid tile;
419 uint8_t x, y, level;
420} smooth_key;
421
422static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits)
424{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
426
427 if (SvIOK (*sv))
428 SvIV_set (*sv, SvIVX (*sv) | bits);
429 else
430 sv_setiv (*sv, bits);
324} 431}
325 432
326static void 433static void
327music_finished (void) 434music_finished (void)
328{ 435{
… …
364 n |= n >> 16; 471 n |= n >> 16;
365 472
366 return n + 1; 473 return n + 1;
367} 474}
368 475
369MODULE = CFPlus PACKAGE = CFPlus 476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
487/* SDL should provide this, really. */
488#define SDLK_MODIFIER_MIN 300
489#define SDLK_MODIFIER_MAX 314
490
491/******************************************************************************/
492
493static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
494static GV *hover_gv;
495
496static int
497within_widget (SV *widget, NV x, NV y)
498{
499 HV *self;
500 SV **svp;
501 NV wx, ww, wy, wh;
502
503 if (!SvROK (widget))
504 return 0;
505
506 self = (HV *)SvRV (widget);
507
508 if (SvTYPE (self) != SVt_PVHV)
509 return 0;
510
511 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
512 if (y < wy)
513 return 0;
514
515 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
516 if (y >= wy + wh)
517 return 0;
518
519 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
520 if (x < wx)
521 return 0;
522
523 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
524 if (x >= wx + ww)
525 return 0;
526
527 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
528 if (!svp || !SvTRUE (*svp))
529 return 0;
530
531 return 1;
532}
533
534/* process keyboard modifiers */
535static int
536mod_munge (int mod)
537{
538 mod &= MOD_MASK;
539
540 if (mod & (KMOD_META | KMOD_ALT))
541 mod |= KMOD_LRAM;
542
543 return mod;
544}
545
546static void
547deliantra_main ()
548{
549 char *argv[] = { 0 };
550 call_argv ("::main", G_DISCARD | G_VOID, argv);
551}
552
553#ifdef __MACOSX__
554 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main()
556 * on OS X, so... we provide one and call the original main(), which,
557 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
558 * and which calls our main (== SDL_main) back.
559 */
560 extern C_LINKAGE int
561 main (int argc, char *argv[])
562 {
563 deliantra_main ();
564 }
565
566 #undef main
567
568 extern C_LINKAGE int main (int argc, char *argv[]);
569
570 static void
571 SDL_braino (void)
572 {
573 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv);
575 }
576#else
577 static void
578 SDL_braino (void)
579 {
580 deliantra_main ();
581 }
582#endif
583
584MODULE = Deliantra::Client PACKAGE = DC
370 585
371PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
372 587
373BOOT: 588BOOT:
374{ 589{
375 HV *stash = gv_stashpv ("CFPlus", 1); 590 HV *stash = gv_stashpv ("DC", 1);
376 static const struct { 591 static const struct {
377 const char *name; 592 const char *name;
378 IV iv; 593 IV iv;
379 } *civ, const_iv[] = { 594 } *civ, const_iv[] = {
380# define const_iv(name) { # name, (IV)name } 595# define const_iv(name) { # name, (IV)name }
596 const_iv (SDLK_MODIFIER_MIN),
597 const_iv (SDLK_MODIFIER_MAX),
598
381 const_iv (SDL_ACTIVEEVENT), 599 const_iv (SDL_ACTIVEEVENT),
382 const_iv (SDL_KEYDOWN), 600 const_iv (SDL_KEYDOWN),
383 const_iv (SDL_KEYUP), 601 const_iv (SDL_KEYUP),
384 const_iv (SDL_MOUSEMOTION), 602 const_iv (SDL_MOUSEMOTION),
385 const_iv (SDL_MOUSEBUTTONDOWN), 603 const_iv (SDL_MOUSEBUTTONDOWN),
… …
394 const_iv (SDL_EVENT_RESERVEDA), 612 const_iv (SDL_EVENT_RESERVEDA),
395 const_iv (SDL_EVENT_RESERVEDB), 613 const_iv (SDL_EVENT_RESERVEDB),
396 const_iv (SDL_VIDEORESIZE), 614 const_iv (SDL_VIDEORESIZE),
397 const_iv (SDL_VIDEOEXPOSE), 615 const_iv (SDL_VIDEOEXPOSE),
398 const_iv (SDL_USEREVENT), 616 const_iv (SDL_USEREVENT),
617
618 const_iv (SDL_APPINPUTFOCUS),
619 const_iv (SDL_APPMOUSEFOCUS),
620 const_iv (SDL_APPACTIVE),
621
622
623 const_iv (SDLK_UNKNOWN),
624 const_iv (SDLK_FIRST),
625 const_iv (SDLK_BACKSPACE),
626 const_iv (SDLK_TAB),
627 const_iv (SDLK_CLEAR),
628 const_iv (SDLK_RETURN),
629 const_iv (SDLK_PAUSE),
630 const_iv (SDLK_ESCAPE),
631 const_iv (SDLK_SPACE),
632 const_iv (SDLK_EXCLAIM),
633 const_iv (SDLK_QUOTEDBL),
634 const_iv (SDLK_HASH),
635 const_iv (SDLK_DOLLAR),
636 const_iv (SDLK_AMPERSAND),
637 const_iv (SDLK_QUOTE),
638 const_iv (SDLK_LEFTPAREN),
639 const_iv (SDLK_RIGHTPAREN),
640 const_iv (SDLK_ASTERISK),
641 const_iv (SDLK_PLUS),
642 const_iv (SDLK_COMMA),
643 const_iv (SDLK_MINUS),
644 const_iv (SDLK_PERIOD),
645 const_iv (SDLK_SLASH),
646 const_iv (SDLK_0),
647 const_iv (SDLK_1),
648 const_iv (SDLK_2),
649 const_iv (SDLK_3),
650 const_iv (SDLK_4),
651 const_iv (SDLK_5),
652 const_iv (SDLK_6),
653 const_iv (SDLK_7),
654 const_iv (SDLK_8),
655 const_iv (SDLK_9),
656 const_iv (SDLK_COLON),
657 const_iv (SDLK_SEMICOLON),
658 const_iv (SDLK_LESS),
659 const_iv (SDLK_EQUALS),
660 const_iv (SDLK_GREATER),
661 const_iv (SDLK_QUESTION),
662 const_iv (SDLK_AT),
663
664 const_iv (SDLK_LEFTBRACKET),
665 const_iv (SDLK_BACKSLASH),
666 const_iv (SDLK_RIGHTBRACKET),
667 const_iv (SDLK_CARET),
668 const_iv (SDLK_UNDERSCORE),
669 const_iv (SDLK_BACKQUOTE),
670 const_iv (SDLK_DELETE),
671
672 const_iv (SDLK_FIRST),
673 const_iv (SDLK_LAST),
399 const_iv (SDLK_KP0), 674 const_iv (SDLK_KP0),
400 const_iv (SDLK_KP1), 675 const_iv (SDLK_KP1),
401 const_iv (SDLK_KP2), 676 const_iv (SDLK_KP2),
402 const_iv (SDLK_KP3), 677 const_iv (SDLK_KP3),
403 const_iv (SDLK_KP4), 678 const_iv (SDLK_KP4),
… …
458 const_iv (SDLK_BREAK), 733 const_iv (SDLK_BREAK),
459 const_iv (SDLK_MENU), 734 const_iv (SDLK_MENU),
460 const_iv (SDLK_POWER), 735 const_iv (SDLK_POWER),
461 const_iv (SDLK_EURO), 736 const_iv (SDLK_EURO),
462 const_iv (SDLK_UNDO), 737 const_iv (SDLK_UNDO),
738
463 const_iv (KMOD_NONE), 739 const_iv (KMOD_NONE),
740 const_iv (KMOD_SHIFT),
464 const_iv (KMOD_LSHIFT), 741 const_iv (KMOD_LSHIFT),
465 const_iv (KMOD_RSHIFT), 742 const_iv (KMOD_RSHIFT),
743 const_iv (KMOD_CTRL),
466 const_iv (KMOD_LCTRL), 744 const_iv (KMOD_LCTRL),
467 const_iv (KMOD_RCTRL), 745 const_iv (KMOD_RCTRL),
746 const_iv (KMOD_ALT),
468 const_iv (KMOD_LALT), 747 const_iv (KMOD_LALT),
469 const_iv (KMOD_RALT), 748 const_iv (KMOD_RALT),
749 const_iv (KMOD_META),
470 const_iv (KMOD_LMETA), 750 const_iv (KMOD_LMETA),
471 const_iv (KMOD_RMETA), 751 const_iv (KMOD_RMETA),
472 const_iv (KMOD_NUM), 752 const_iv (KMOD_NUM),
473 const_iv (KMOD_CAPS), 753 const_iv (KMOD_CAPS),
474 const_iv (KMOD_MODE), 754 const_iv (KMOD_MODE),
475 const_iv (KMOD_CTRL), 755
476 const_iv (KMOD_SHIFT), 756 const_iv (KMOD_LRAM),
477 const_iv (KMOD_ALT), 757
478 const_iv (KMOD_META) 758 const_iv (MIX_DEFAULT_FORMAT),
759
760 const_iv (SDL_INIT_TIMER),
761 const_iv (SDL_INIT_AUDIO),
762 const_iv (SDL_INIT_VIDEO),
763 const_iv (SDL_INIT_CDROM),
764 const_iv (SDL_INIT_JOYSTICK),
765 const_iv (SDL_INIT_EVERYTHING),
766 const_iv (SDL_INIT_NOPARACHUTE),
767 const_iv (SDL_INIT_EVENTTHREAD),
768
769 const_iv (SDL_GL_RED_SIZE),
770 const_iv (SDL_GL_GREEN_SIZE),
771 const_iv (SDL_GL_BLUE_SIZE),
772 const_iv (SDL_GL_ALPHA_SIZE),
773 const_iv (SDL_GL_DOUBLEBUFFER),
774 const_iv (SDL_GL_BUFFER_SIZE),
775 const_iv (SDL_GL_DEPTH_SIZE),
776 const_iv (SDL_GL_STENCIL_SIZE),
777 const_iv (SDL_GL_ACCUM_RED_SIZE),
778 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
779 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
780 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
781 const_iv (SDL_GL_STEREO),
782 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
783 const_iv (SDL_GL_MULTISAMPLESAMPLES),
784 const_iv (SDL_GL_ACCELERATED_VISUAL),
785 const_iv (SDL_GL_SWAP_CONTROL),
786
787 const_iv (FOW_DARKNESS)
479# undef const_iv 788# undef const_iv
480 }; 789 };
481 790
482 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
483 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
793
794 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
484} 796}
797
798void
799weaken (SV *rv)
800 PROTOTYPE: $
801 CODE:
802 sv_rvweaken (rv);
485 803
486int 804int
487in_destruct () 805in_destruct ()
488 CODE: 806 CODE:
489 RETVAL = PL_main_cv == Nullcv; 807 RETVAL = PL_main_cv == Nullcv;
… …
492 810
493NV floor (NV x) 811NV floor (NV x)
494 812
495NV ceil (NV x) 813NV ceil (NV x)
496 814
815IV minpot (UV n)
816
817IV popcount (UV n)
818
497void 819void
498pango_init () 820pango_init ()
499 CODE: 821 CODE:
500{ 822{
501 opengl_fontmap = pango_opengl_font_map_new (); 823 opengl_fontmap = pango_opengl_font_map_new ();
502 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 824 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
503 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 825 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
826 /*pango_context_set_font_description (opengl_context, default_font);*/
827#if PANGO_VERSION_CHECK (1, 15, 2)
828 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
829 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
830#endif
504} 831}
505 832
506int 833char *SDL_GetError ()
507SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
508 834
509void 835void SDL_braino ()
836
837int SDL_Init (U32 flags)
838
839int SDL_InitSubSystem (U32 flags)
840
841void SDL_QuitSubSystem (U32 flags)
842
510SDL_Quit () 843void SDL_Quit ()
511 844
845int SDL_GL_SetAttribute (int attr, int value)
846
847int SDL_GL_GetAttribute (int attr)
848 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL))
850 XSRETURN_UNDEF;
851 OUTPUT:
852 RETVAL
853
512void 854void
513SDL_ListModes () 855SDL_ListModes (int rgb, int alpha)
514 PPCODE: 856 PPCODE:
515{ 857{
516 SDL_Rect **m; 858 SDL_Rect **m;
517 859
518 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 860 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
519 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 861 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
520 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 862 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
521 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 863 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
522 864
523 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 865 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
524 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 866 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
525 867
526 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 868 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
527 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
528 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
529 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
530 872
531 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 873 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
532#if SDL_VERSION_ATLEAST(1,2,10)
533 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
534 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 874 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
535#endif
536
537 SDL_EnableUNICODE (1);
538 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
539 875
540 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 876 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
541 877
542 if (m && m != (SDL_Rect **)-1) 878 if (m && m != (SDL_Rect **)-1)
543 while (*m) 879 while (*m)
544 { 880 {
881 if ((*m)->w >= 400 && (*m)->h >= 300)
882 {
545 AV *av = newAV (); 883 AV *av = newAV ();
546 av_push (av, newSViv ((*m)->w)); 884 av_push (av, newSViv ((*m)->w));
547 av_push (av, newSViv ((*m)->h)); 885 av_push (av, newSViv ((*m)->h));
886 av_push (av, newSViv (rgb));
887 av_push (av, newSViv (alpha));
548 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 888 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
889 }
549 890
550 ++m; 891 ++m;
551 } 892 }
552} 893}
553 894
554char *
555SDL_GetError ()
556
557int 895int
558SDL_SetVideoMode (int w, int h, int fullscreen) 896SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
559 CODE: 897 CODE:
898{
899 SDL_EnableUNICODE (1);
900 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
901
902 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
903 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
904 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
905 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
906
560 RETVAL = !!SDL_SetVideoMode ( 907 RETVAL = !!SDL_SetVideoMode (
561 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 908 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
562 ); 909 );
910
563 if (RETVAL) 911 if (RETVAL)
564 { 912 {
565 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 913 av_clear (texture_av);
914
915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
566# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
567# include "glfunc.h" 917#include "glfunc.h"
568# undef GL_FUNC 918#undef GL_FUNC
569 } 919 }
920}
570 OUTPUT: 921 OUTPUT:
571 RETVAL 922 RETVAL
572 923
573void 924void
574SDL_GL_SwapBuffers () 925SDL_GL_SwapBuffers ()
575 926
576char * 927char *
577SDL_GetKeyName (int sym) 928SDL_GetKeyName (int sym)
578 929
930int
931SDL_GetAppState ()
932
933int
934SDL_GetModState ()
935
579void 936void
580SDL_PollEvent () 937poll_events ()
581 PPCODE: 938 PPCODE:
582{ 939{
583 SDL_Event ev; 940 SDL_Event ev;
584 941
585 while (SDL_PollEvent (&ev)) 942 SDL_PumpEvents ();
943 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
586 { 944 {
587 HV *hv = newHV (); 945 HV *hv = newHV ();
588 hv_store (hv, "type", 4, newSViv (ev.type), 0); 946 hv_store (hv, "type", 4, newSViv (ev.type), 0);
589 947
590 switch (ev.type) 948 switch (ev.type)
591 { 949 {
592 case SDL_KEYDOWN: 950 case SDL_KEYDOWN:
593 case SDL_KEYUP: 951 case SDL_KEYUP:
594 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 952 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
595 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 953 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
596 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 954 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
955 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
597 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 956 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
598 break; 957 break;
599 958
600 case SDL_ACTIVEEVENT: 959 case SDL_ACTIVEEVENT:
601 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 960 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
602 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 961 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
603 break; 962 break;
604 963
605 case SDL_MOUSEMOTION: 964 case SDL_MOUSEMOTION:
965 {
966 int state = ev.motion.state;
967 int x = ev.motion.x;
968 int y = ev.motion.y;
969 int xrel = ev.motion.xrel;
970 int yrel = ev.motion.yrel;
971
972 /* do simplistic event compression */
973 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
974 && state == ev.motion.state)
975 {
976 xrel += ev.motion.xrel;
977 yrel += ev.motion.yrel;
978 x = ev.motion.x;
979 y = ev.motion.y;
980 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
981 }
982
606 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 983 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
607
608 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 984 hv_store (hv, "state", 5, newSViv (state), 0);
609 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 985 hv_store (hv, "x", 1, newSViv (x), 0);
610 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 986 hv_store (hv, "y", 1, newSViv (y), 0);
611 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 987 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
612 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 988 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
989 }
613 break; 990 break;
614 991
615 case SDL_MOUSEBUTTONDOWN: 992 case SDL_MOUSEBUTTONDOWN:
616 case SDL_MOUSEBUTTONUP: 993 case SDL_MOUSEBUTTONUP:
617 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 994 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
618 995
619 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 996 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
620 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 997 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
621 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 998 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
622 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 999 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
627 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1004 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
628 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1005 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
629 break; 1006 break;
630 } 1007 }
631 1008
632 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1009 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
633 } 1010 }
634} 1011}
635 1012
636int 1013int
637Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
638 POSTCALL: 1015 POSTCALL:
639 Mix_HookMusicFinished (music_finished); 1016 Mix_HookMusicFinished (music_finished);
640 Mix_ChannelFinished (channel_finished); 1017 Mix_ChannelFinished (channel_finished);
641 1018
642void 1019void
1020Mix_QuerySpec ()
1021 PPCODE:
1022{
1023 int freq, channels;
1024 Uint16 format;
1025
1026 if (Mix_QuerySpec (&freq, &format, &channels))
1027 {
1028 EXTEND (SP, 3);
1029 PUSHs (sv_2mortal (newSViv (freq)));
1030 PUSHs (sv_2mortal (newSViv (format)));
1031 PUSHs (sv_2mortal (newSViv (channels)));
1032 }
1033}
1034
1035void
643Mix_CloseAudio () 1036Mix_CloseAudio ()
644 1037
645int 1038int
646Mix_AllocateChannels (int numchans = -1) 1039Mix_AllocateChannels (int numchans = -1)
647 1040
1041const char *
1042Mix_GetError ()
1043
648void 1044void
649lowdelay (int fd, int val = 1) 1045lowdelay (int fd, int val = 1)
650 CODE: 1046 CODE:
1047 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
1048
1049void
1050win32_proxy_info ()
1051 PPCODE:
1052{
651#ifndef _WIN32 1053#ifdef _WIN32
652 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 1054 char buffer[2048];
1055 DWORD buflen;
1056
1057 EXTEND (SP, 3);
1058
1059 buflen = sizeof (buffer);
1060 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
1061 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
1062 {
1063 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
1064
1065 buflen = sizeof (buffer);
1066 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
1067 {
1068 PUSHs (newSVpv (buffer, 0));
1069
1070 buflen = sizeof (buffer);
1071 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
1072 PUSHs (newSVpv (buffer, 0));
1073 }
1074 }
653#endif 1075#endif
1076}
654 1077
655void 1078int
656add_font (char *file) 1079add_font (char *file)
657 CODE: 1080 CODE:
658 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT:
1083 RETVAL
659 1084
660void 1085void
661load_image_inline (SV *image_) 1086load_image_inline (SV *image_)
662 ALIAS: 1087 ALIAS:
663 load_image_file = 1 1088 load_image_file = 1
… …
666 STRLEN image_len; 1091 STRLEN image_len;
667 char *image = (char *)SvPVbyte (image_, image_len); 1092 char *image = (char *)SvPVbyte (image_, image_len);
668 SDL_Surface *surface, *surface2; 1093 SDL_Surface *surface, *surface2;
669 SDL_PixelFormat fmt; 1094 SDL_PixelFormat fmt;
670 SDL_RWops *rw = ix 1095 SDL_RWops *rw = ix
671 ? SDL_RWFromFile (image, "r") 1096 ? SDL_RWFromFile (image, "rb")
672 : SDL_RWFromConstMem (image, image_len); 1097 : SDL_RWFromConstMem (image, image_len);
673 1098
674 if (!rw) 1099 if (!rw)
675 croak ("load_image: %s", SDL_GetError ()); 1100 croak ("load_image: %s", SDL_GetError ());
676 1101
… …
749void 1174void
750error (char *message) 1175error (char *message)
751 CODE: 1176 CODE:
752 fprintf (stderr, "ERROR: %s\n", message); 1177 fprintf (stderr, "ERROR: %s\n", message);
753#ifdef _WIN32 1178#ifdef _WIN32
754 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1179 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
755#endif 1180#endif
756 1181
757void 1182void
758fatal (char *message) 1183fatal (char *message)
759 CODE: 1184 CODE:
760 fprintf (stderr, "FATAL: %s\n", message); 1185 fprintf (stderr, "FATAL: %s\n", message);
761#ifdef _WIN32 1186#ifdef _WIN32
762 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
763#endif 1188#endif
764 _exit (1); 1189 _exit (1);
765 1190
766void 1191void
767_exit (int retval) 1192_exit (int retval = 0)
768 CODE: 1193 CODE:
1194#ifdef WIN32
1195 ExitThread (retval); // unclean, please beam me up
1196#else
769 _exit (retval); 1197 _exit (retval);
1198#endif
770 1199
771MODULE = CFPlus PACKAGE = CFPlus::Font 1200void
1201debug ()
1202 CODE:
1203{
1204#if DEBUG
1205 VALGRIND_DO_LEAK_CHECK;
1206#endif
1207}
772 1208
773CFPlus::Font 1209MODULE = Deliantra::Client PACKAGE = DC::Font
1210
1211PROTOTYPES: DISABLE
1212
1213DC::Font
774new_from_file (SV *class, char *path, int id = 0) 1214new_from_file (SV *class, char *path, int id = 0)
775 CODE: 1215 CODE:
776{ 1216{
777 int count; 1217 int count;
778 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
781} 1221}
782 OUTPUT: 1222 OUTPUT:
783 RETVAL 1223 RETVAL
784 1224
785void 1225void
786DESTROY (CFPlus::Font self) 1226DESTROY (DC::Font self)
787 CODE: 1227 CODE:
788 pango_font_description_free (self); 1228 pango_font_description_free (self);
789 1229
790void 1230void
791make_default (CFPlus::Font self) 1231make_default (DC::Font self)
1232 PROTOTYPE: $
792 CODE: 1233 CODE:
793 default_font = self; 1234 default_font = self;
794 1235
795MODULE = CFPlus PACKAGE = CFPlus::Layout 1236MODULE = Deliantra::Client PACKAGE = DC::Layout
796 1237
1238PROTOTYPES: DISABLE
1239
797void 1240void
798reset_glyph_cache () 1241glyph_cache_backup ()
1242 PROTOTYPE:
799 CODE: 1243 CODE:
1244 tc_backup ();
1245
1246void
1247glyph_cache_restore ()
1248 PROTOTYPE:
1249 CODE:
800 tc_clear (); 1250 tc_restore ();
801 1251
802CFPlus::Layout 1252DC::Layout
803new (SV *class) 1253new (SV *class)
804 CODE: 1254 CODE:
805 New (0, RETVAL, 1, struct cf_layout); 1255 New (0, RETVAL, 1, struct cf_layout);
806 1256
807 RETVAL->pl = pango_layout_new (opengl_context); 1257 RETVAL->pl = pango_layout_new (opengl_context);
… …
809 RETVAL->g = 1.; 1259 RETVAL->g = 1.;
810 RETVAL->b = 1.; 1260 RETVAL->b = 1.;
811 RETVAL->a = 1.; 1261 RETVAL->a = 1.;
812 RETVAL->base_height = MIN_FONT_HEIGHT; 1262 RETVAL->base_height = MIN_FONT_HEIGHT;
813 RETVAL->font = 0; 1263 RETVAL->font = 0;
1264 RETVAL->rc = rc_alloc ();
814 1265
815 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1266 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
816 layout_update_font (RETVAL); 1267 layout_update_font (RETVAL);
817 OUTPUT: 1268 OUTPUT:
818 RETVAL 1269 RETVAL
819 1270
820void 1271void
821DESTROY (CFPlus::Layout self) 1272DESTROY (DC::Layout self)
822 CODE: 1273 CODE:
823 g_object_unref (self->pl); 1274 g_object_unref (self->pl);
1275 rc_free (self->rc);
824 Safefree (self); 1276 Safefree (self);
825 1277
826void 1278void
827set_text (CFPlus::Layout self, SV *text_) 1279set_text (DC::Layout self, SV *text_)
828 CODE: 1280 CODE:
829{ 1281{
830 STRLEN textlen; 1282 STRLEN textlen;
831 char *text = SvPVutf8 (text_, textlen); 1283 char *text = SvPVutf8 (text_, textlen);
832 1284
833 pango_layout_set_text (self->pl, text, textlen); 1285 pango_layout_set_text (self->pl, text, textlen);
834} 1286}
835 1287
836void 1288void
837set_markup (CFPlus::Layout self, SV *text_) 1289set_markup (DC::Layout self, SV *text_)
838 CODE: 1290 CODE:
839{ 1291{
840 STRLEN textlen; 1292 STRLEN textlen;
841 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
842 1294
843 pango_layout_set_markup (self->pl, text, textlen); 1295 pango_layout_set_markup (self->pl, text, textlen);
844} 1296}
845 1297
846void 1298void
847set_shapes (CFPlus::Layout self, ...) 1299set_shapes (DC::Layout self, ...)
848 CODE: 1300 CODE:
849{ 1301{
850 PangoAttrList *attrs = 0; 1302 PangoAttrList *attrs = 0;
851 const char *text = pango_layout_get_text (self->pl); 1303 const char *text = pango_layout_get_text (self->pl);
852 const char *pos = text; 1304 const char *pos = text;
… …
887 if (attrs) 1339 if (attrs)
888 pango_layout_set_attributes (self->pl, attrs); 1340 pango_layout_set_attributes (self->pl, attrs);
889} 1341}
890 1342
891void 1343void
892get_shapes (CFPlus::Layout self) 1344get_shapes (DC::Layout self)
893 PPCODE: 1345 PPCODE:
894{ 1346{
895 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1347 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
896 1348
897 do 1349 do
898 { 1350 {
899 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1351 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
900 1352
901 if (run && shape_attr_p (run)) 1353 if (run && shape_attr_p (run))
902 { 1354 {
903 PangoRectangle extents; 1355 PangoRectangle extents;
904 pango_layout_iter_get_run_extents (iter, 0, &extents); 1356 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
912 1364
913 pango_layout_iter_free (iter); 1365 pango_layout_iter_free (iter);
914} 1366}
915 1367
916int 1368int
917has_wrapped (CFPlus::Layout self) 1369has_wrapped (DC::Layout self)
918 CODE: 1370 CODE:
919{ 1371{
920 int lines = 1; 1372 int lines = 1;
921 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
922 1374
… …
927} 1379}
928 OUTPUT: 1380 OUTPUT:
929 RETVAL 1381 RETVAL
930 1382
931SV * 1383SV *
932get_text (CFPlus::Layout self) 1384get_text (DC::Layout self)
933 CODE: 1385 CODE:
934 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1386 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
935 sv_utf8_decode (RETVAL); 1387 sv_utf8_decode (RETVAL);
936 OUTPUT: 1388 OUTPUT:
937 RETVAL 1389 RETVAL
938 1390
939void 1391void
940set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1392set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
941 CODE: 1393 CODE:
942 self->r = r; 1394 self->r = r;
943 self->g = g; 1395 self->g = g;
944 self->b = b; 1396 self->b = b;
945 self->a = a; 1397 self->a = a;
946 1398
947void 1399void
948set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1400set_font (DC::Layout self, DC::Font font = 0)
949 CODE: 1401 CODE:
950 if (self->font != font) 1402 if (self->font != font)
951 { 1403 {
952 self->font = font; 1404 self->font = font;
953 layout_update_font (self); 1405 layout_update_font (self);
954 } 1406 }
955 1407
956void 1408void
957set_height (CFPlus::Layout self, int base_height) 1409set_height (DC::Layout self, int base_height)
958 CODE: 1410 CODE:
959 if (self->base_height != base_height) 1411 if (self->base_height != base_height)
960 { 1412 {
961 self->base_height = base_height; 1413 self->base_height = base_height;
962 layout_update_font (self); 1414 layout_update_font (self);
963 } 1415 }
964 1416
965void 1417void
966set_width (CFPlus::Layout self, int max_width = -1) 1418set_width (DC::Layout self, int max_width = -1)
967 CODE: 1419 CODE:
968 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1420 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
969 1421
970void 1422void
971set_indent (CFPlus::Layout self, int indent) 1423set_indent (DC::Layout self, int indent)
972 CODE: 1424 CODE:
973 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1425 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
974 1426
975void 1427void
976set_spacing (CFPlus::Layout self, int spacing) 1428set_spacing (DC::Layout self, int spacing)
977 CODE: 1429 CODE:
978 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1430 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
979 1431
980void 1432void
981set_ellipsise (CFPlus::Layout self, int ellipsise) 1433set_ellipsise (DC::Layout self, int ellipsise)
982 CODE: 1434 CODE:
983 pango_layout_set_ellipsize (self->pl, 1435 pango_layout_set_ellipsize (self->pl,
984 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1436 ellipsise == 1 ? PANGO_ELLIPSIZE_START
985 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1437 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
986 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1438 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
987 : PANGO_ELLIPSIZE_NONE 1439 : PANGO_ELLIPSIZE_NONE
988 ); 1440 );
989 1441
990void 1442void
991set_single_paragraph_mode (CFPlus::Layout self, int spm) 1443set_single_paragraph_mode (DC::Layout self, int spm)
992 CODE: 1444 CODE:
993 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1445 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
994 1446
995void 1447void
996size (CFPlus::Layout self) 1448size (DC::Layout self)
997 PPCODE: 1449 PPCODE:
998{ 1450{
999 int w, h; 1451 int w, h;
1000 1452
1001 layout_get_pixel_size (self, &w, &h); 1453 layout_get_pixel_size (self, &w, &h);
… …
1004 PUSHs (sv_2mortal (newSViv (w))); 1456 PUSHs (sv_2mortal (newSViv (w)));
1005 PUSHs (sv_2mortal (newSViv (h))); 1457 PUSHs (sv_2mortal (newSViv (h)));
1006} 1458}
1007 1459
1008int 1460int
1009descent (CFPlus::Layout self) 1461descent (DC::Layout self)
1010 CODE: 1462 CODE:
1011{ 1463{
1012 PangoRectangle rect; 1464 PangoRectangle rect;
1013 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1465 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1014 pango_layout_line_get_pixel_extents (line, 0, &rect); 1466 pango_layout_line_get_pixel_extents (line, 0, &rect);
1015 RETVAL = PANGO_DESCENT (rect); 1467 RETVAL = PANGO_DESCENT (rect);
1016} 1468}
1017 OUTPUT: 1469 OUTPUT:
1018 RETVAL 1470 RETVAL
1019 1471
1020int 1472int
1021xy_to_index (CFPlus::Layout self, int x, int y) 1473xy_to_index (DC::Layout self, int x, int y)
1022 CODE: 1474 CODE:
1023{ 1475{
1024 int index, trailing; 1476 int index, trailing;
1025 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1477 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1026 RETVAL = index; 1478 RETVAL = index + trailing;
1027} 1479}
1028 OUTPUT: 1480 OUTPUT:
1029 RETVAL 1481 RETVAL
1030 1482
1031void 1483void
1032cursor_pos (CFPlus::Layout self, int index) 1484cursor_pos (DC::Layout self, int index)
1033 PPCODE: 1485 PPCODE:
1034{ 1486{
1035 PangoRectangle strong_pos; 1487 PangoRectangle pos;
1036 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1488 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1037 1489
1038 EXTEND (SP, 3); 1490 EXTEND (SP, 3);
1039 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1491 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1492 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1042} 1494}
1043 1495
1044void 1496void
1045render (CFPlus::Layout self, float x, float y, int flags = 0) 1497index_to_line_x (DC::Layout self, int index, int trailing = 0)
1046 PPCODE: 1498 PPCODE:
1499{
1500 int line, x;
1501
1502 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1503#if !PANGO_VERSION_CHECK (1, 17, 3)
1504 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1505 --line;
1506#endif
1507 EXTEND (SP, 2);
1508 PUSHs (sv_2mortal (newSViv (line)));
1509 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1510}
1511
1512void
1513line_x_to_index (DC::Layout self, int line, int x)
1514 PPCODE:
1515{
1516 PangoLayoutLine *lp;
1517 int index, trailing;
1518
1519 if (line < 0)
1520 XSRETURN_EMPTY;
1521
1522 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1523 XSRETURN_EMPTY; /* do better */
1524
1525 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1526
1527 EXTEND (SP, 2);
1528 if (GIMME_V == G_SCALAR)
1529 PUSHs (sv_2mortal (newSViv (index + trailing)));
1530 else
1531 {
1532 PUSHs (sv_2mortal (newSViv (index)));
1533 PUSHs (sv_2mortal (newSViv (trailing)));
1534 }
1535}
1536
1537void
1538render (DC::Layout self, float x, float y, int flags = 0)
1539 CODE:
1540 rc_clear (self->rc);
1047 pango_opengl_render_layout_subpixel ( 1541 pango_opengl_render_layout_subpixel (
1048 self->pl, 1542 self->pl,
1543 self->rc,
1049 x * PANGO_SCALE, y * PANGO_SCALE, 1544 x * PANGO_SCALE, y * PANGO_SCALE,
1050 self->r, self->g, self->b, self->a, 1545 self->r, self->g, self->b, self->a,
1051 flags 1546 flags
1052 ); 1547 );
1548 // we assume that context_change actually clears/frees stuff
1549 // and does not do any recomputation...
1550 pango_layout_context_changed (self->pl);
1053 1551
1054MODULE = CFPlus PACKAGE = CFPlus::Texture
1055
1056void 1552void
1057pad2pot (SV *data_, SV *w_, SV *h_) 1553draw (DC::Layout self)
1058 CODE: 1554 CODE:
1059{ 1555{
1060 int ow = SvIV (w_); 1556 glEnable (GL_TEXTURE_2D);
1061 int oh = SvIV (h_); 1557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1558 glEnable (GL_BLEND);
1559 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1560 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1561 glEnable (GL_ALPHA_TEST);
1562 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1062 1563
1063 if (ow && oh) 1564 rc_draw (self->rc);
1565
1566 glDisable (GL_ALPHA_TEST);
1567 glDisable (GL_BLEND);
1568 glDisable (GL_TEXTURE_2D);
1569}
1570
1571MODULE = Deliantra::Client PACKAGE = DC::Texture
1572
1573PROTOTYPES: ENABLE
1574
1575void
1576pad (SV *data_, int ow, int oh, int nw, int nh)
1577 CODE:
1578{
1579 if ((nw != ow || nh != oh) && SvOK (data_))
1064 { 1580 {
1065 int nw = minpot (ow);
1066 int nh = minpot (oh);
1067
1068 if (nw != ow || nh != oh)
1069 {
1070 if (SvOK (data_))
1071 {
1072 STRLEN datalen; 1581 STRLEN datalen;
1073 char *data = SvPVbyte (data_, datalen); 1582 char *data = SvPVbyte (data_, datalen);
1074 int bpp = datalen / (ow * oh); 1583 int bpp = datalen / (ow * oh);
1075 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1584 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1076 1585
1077 SvPOK_only (result_); 1586 SvPOK_only (result_);
1078 SvCUR_set (result_, nw * nh * bpp); 1587 SvCUR_set (result_, nw * nh * bpp);
1079 1588
1080 memset (SvPVX (result_), 0, nw * nh * bpp); 1589 memset (SvPVX (result_), 0, nw * nh * bpp);
1081 while (oh--) 1590 while (oh--)
1082 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1591 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1083 1592
1084 sv_setsv (data_, result_); 1593 sv_setsv (data_, result_);
1085 }
1086
1087 sv_setiv (w_, nw);
1088 sv_setiv (h_, nh);
1089 }
1090 } 1594 }
1091} 1595}
1092 1596
1093void 1597void
1094draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1598draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1100{ 1604{
1101 HV *hv = (HV *)SvRV (self); 1605 HV *hv = (HV *)SvRV (self);
1102 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1606 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1103 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1607 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1104 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1608 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1609
1610 if (name <= 0)
1611 XSRETURN_EMPTY;
1105 1612
1106 if (items < 5) 1613 if (items < 5)
1107 { 1614 {
1108 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1615 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1109 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1616 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1137 glDisable (GL_ALPHA_TEST); 1644 glDisable (GL_ALPHA_TEST);
1138 glDisable (GL_BLEND); 1645 glDisable (GL_BLEND);
1139 } 1646 }
1140} 1647}
1141 1648
1142MODULE = CFPlus PACKAGE = CFPlus::Map 1649IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1650 CODE:
1651{
1652 GLint width;
1653 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1654 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1655 RETVAL = width > 0;
1656}
1657 OUTPUT:
1658 RETVAL
1143 1659
1144CFPlus::Map 1660MODULE = Deliantra::Client PACKAGE = DC::Map
1145new (SV *class, int map_width, int map_height) 1661
1662PROTOTYPES: DISABLE
1663
1664DC::Map
1665new (SV *class)
1146 CODE: 1666 CODE:
1147 New (0, RETVAL, 1, struct map); 1667 New (0, RETVAL, 1, struct map);
1148 RETVAL->x = 0; 1668 RETVAL->x = 0;
1149 RETVAL->y = 0; 1669 RETVAL->y = 0;
1150 RETVAL->w = map_width; 1670 RETVAL->w = 0;
1151 RETVAL->h = map_height; 1671 RETVAL->h = 0;
1152 RETVAL->ox = 0; 1672 RETVAL->ox = 0;
1153 RETVAL->oy = 0; 1673 RETVAL->oy = 0;
1154 RETVAL->faces = 8192; 1674 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1155 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1675 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1156 RETVAL->texs = 8192;
1157 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1158 RETVAL->rows = 0; 1676 RETVAL->rows = 0;
1159 RETVAL->row = 0; 1677 RETVAL->row = 0;
1160 OUTPUT: 1678 OUTPUT:
1161 RETVAL 1679 RETVAL
1162 1680
1163void 1681void
1164DESTROY (CFPlus::Map self) 1682DESTROY (DC::Map self)
1165 CODE: 1683 CODE:
1166{ 1684{
1167 map_clear (self); 1685 map_clear (self);
1168 Safefree (self->face); 1686 Safefree (self->face2tile);
1169 Safefree (self->tex); 1687 Safefree (self->tex);
1170 Safefree (self); 1688 Safefree (self);
1171} 1689}
1172 1690
1173void 1691void
1692resize (DC::Map self, int map_width, int map_height)
1693 CODE:
1694 self->w = map_width;
1695 self->h = map_height;
1696
1697void
1174clear (CFPlus::Map self) 1698clear (DC::Map self)
1175 CODE: 1699 CODE:
1176 map_clear (self); 1700 map_clear (self);
1177 1701
1178void 1702void
1179set_face (CFPlus::Map self, int face, int texid) 1703set_tileid (DC::Map self, int face, int tile)
1180 CODE: 1704 CODE:
1181{ 1705{
1182 while (self->faces <= face) 1706 need_facenum (self, face); self->face2tile [face] = tile;
1183 { 1707 need_texid (self, tile);
1184 Append (mapface, self->face, self->faces, self->faces);
1185 self->faces *= 2;
1186 }
1187
1188 self->face [face] = texid;
1189} 1708}
1190 1709
1191void 1710void
1711set_smooth (DC::Map self, int face, int smooth, int level)
1712 CODE:
1713{
1714 tileid texid;
1715 maptex *tex;
1716
1717 if (face < 0 || face >= self->faces)
1718 return;
1719
1720 if (smooth < 0 || smooth >= self->faces)
1721 return;
1722
1723 texid = self->face2tile [face];
1724
1725 if (!texid)
1726 return;
1727
1728 tex = self->tex + texid;
1729 tex->smoothtile = self->face2tile [smooth];
1730 tex->smoothlevel = level;
1731}
1732
1733void
1192set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1734set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1193 CODE: 1735 CODE:
1194{ 1736{
1195 while (self->texs <= texid) 1737 need_texid (self, texid);
1196 {
1197 Append (maptex, self->tex, self->texs, self->texs);
1198 self->texs *= 2;
1199 }
1200 1738
1201 { 1739 {
1202 maptex *tex = self->tex + texid; 1740 maptex *tex = self->tex + texid;
1203 1741
1204 tex->name = name; 1742 tex->name = name;
… …
1221 // from transparent color bleeding and ugly wrapping effects. 1759 // from transparent color bleeding and ugly wrapping effects.
1222 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1223} 1761}
1224 1762
1225int 1763int
1226ox (CFPlus::Map self) 1764ox (DC::Map self)
1227 ALIAS: 1765 ALIAS:
1228 oy = 1 1766 oy = 1
1229 x = 2 1767 x = 2
1230 y = 3 1768 y = 3
1231 w = 4 1769 w = 4
… …
1242 } 1780 }
1243 OUTPUT: 1781 OUTPUT:
1244 RETVAL 1782 RETVAL
1245 1783
1246void 1784void
1247scroll (CFPlus::Map self, int dx, int dy) 1785scroll (DC::Map self, int dx, int dy)
1248 CODE: 1786 CODE:
1249{ 1787{
1250 if (dx > 0) 1788 if (dx > 0)
1251 map_blank (self, self->x, self->y, dx, self->h); 1789 map_blank (self, self->x, self->y, dx, self->h);
1252 else if (dx < 0) 1790 else if (dx < 0)
1253 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1791 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1254 1792
1255 if (dy > 0) 1793 if (dy > 0)
1256 map_blank (self, self->x, self->y, self->w, dy); 1794 map_blank (self, self->x, self->y, self->w, dy);
1257 else if (dy < 0) 1795 else if (dy < 0)
1258 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1796 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1259 1797
1260 self->ox += dx; self->x += dx; 1798 self->ox += dx; self->x += dx;
1261 self->oy += dy; self->y += dy; 1799 self->oy += dy; self->y += dy;
1262 1800
1263 while (self->y < 0) 1801 while (self->y < 0)
… …
1267 self->rows += MAP_EXTEND_Y; 1805 self->rows += MAP_EXTEND_Y;
1268 self->y += MAP_EXTEND_Y; 1806 self->y += MAP_EXTEND_Y;
1269 } 1807 }
1270} 1808}
1271 1809
1272void 1810SV *
1273map1a_update (CFPlus::Map self, SV *data_, int extmap) 1811map1a_update (DC::Map self, SV *data_, int extmap)
1274 CODE: 1812 CODE:
1275{ 1813{
1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1277 uint8_t *data_end = (uint8_t *)SvEND (data_); 1815 uint8_t *data_end = (uint8_t *)SvEND (data_);
1278 mapcell *cell; 1816 mapcell *cell;
1279 int x, y, flags; 1817 int x, y, z, flags;
1818 AV *missing = newAV ();
1819 RETVAL = newRV_noinc ((SV *)missing);
1280 1820
1281 while (data < data_end - 1) 1821 while (data < data_end - 1)
1282 { 1822 {
1283 flags = (data [0] << 8) + data [1]; data += 2; 1823 flags = (data [0] << 8) + data [1]; data += 2;
1284 1824
… …
1304 uint8_t ext, cmd; 1844 uint8_t ext, cmd;
1305 1845
1306 do 1846 do
1307 { 1847 {
1308 ext = *data++; 1848 ext = *data++;
1309 cmd = ext & 0x3f; 1849 cmd = ext & 0x7f;
1310 1850
1311 if (cmd < 4) 1851 if (cmd < 4)
1312 cell->darkness = 255 - ext * 64 + 1; 1852 cell->darkness = 255 - ext * 64 + 1;
1313 else if (cmd == 5) // health 1853 else if (cmd == 5) // health
1314 { 1854 {
1315 cell->stat_width = 1; 1855 cell->stat_width = 1;
1316 cell->stat_hp = *data++; 1856 cell->stat_hp = *data++;
1317 } 1857 }
1318 else if (cmd == 6) // monster width 1858 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1; 1859 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width 1860 else if (cmd == 0x47)
1321 { 1861 {
1322 if (*data == 4) 1862 if (*data == 1) cell->player = data [1];
1323 ; // decode player tag 1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1324 1866
1325 data += *data + 1; 1867 data += *data + 1;
1326 } 1868 }
1327 else if (cmd == 8) // cell flags 1869 else if (cmd == 8) // cell flags
1328 cell->flags = *data++; 1870 cell->flags = *data++;
… …
1333 } 1875 }
1334 while (ext & 0x80); 1876 while (ext & 0x80);
1335 } 1877 }
1336 else 1878 else
1337 cell->darkness = *data++ + 1; 1879 cell->darkness = *data++ + 1;
1338
1339 } 1880 }
1340 1881
1882 for (z = 0; z <= 2; ++z)
1341 if (flags & 4) 1883 if (flags & (4 >> z))
1342 { 1884 {
1343 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1885 faceid face = (data [0] << 8) + data [1]; data += 2;
1886 need_facenum (self, face);
1887 cell->tile [z] = self->face2tile [face];
1888
1889 if (cell->tile [z])
1890 {
1891 maptex *tex = self->tex + cell->tile [z];
1892 if (!tex->name)
1893 av_push (missing, newSViv (cell->tile [z]));
1894
1895 if (tex->smoothtile)
1896 {
1897 maptex *smooth = self->tex + tex->smoothtile;
1898 if (!smooth->name)
1899 av_push (missing, newSViv (tex->smoothtile));
1900 }
1901 }
1344 } 1902 }
1345
1346 if (flags & 2)
1347 {
1348 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
1349 }
1350
1351 if (flags & 1)
1352 {
1353 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1354 }
1355 } 1903 }
1356 else 1904 else
1357 cell->darkness = 0; 1905 CELL_CLEAR (cell);
1358 } 1906 }
1359} 1907}
1908 OUTPUT:
1909 RETVAL
1360 1910
1361SV * 1911SV *
1362mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1912mapmap (DC::Map self, int x0, int y0, int w, int h)
1363 CODE: 1913 CODE:
1364{ 1914{
1365 int x1, x; 1915 int x1, x;
1366 int y1, y; 1916 int y1, y;
1367 int z; 1917 int z;
… …
1388 { 1938 {
1389 mapcell *cell = row->col + (x - row->c0); 1939 mapcell *cell = row->col + (x - row->c0);
1390 1940
1391 for (z = 0; z <= 0; z++) 1941 for (z = 0; z <= 0; z++)
1392 { 1942 {
1393 mapface face = cell->face [z];
1394
1395 if (face)
1396 {
1397 maptex tex = self->tex [face]; 1943 maptex tex = self->tex [cell->tile [z]];
1398 int a0 = 255 - tex.a; 1944 int a0 = 255 - tex.a;
1399 int a1 = tex.a; 1945 int a1 = tex.a;
1400 1946
1401 r = (r * a0 + tex.r * a1) / 255; 1947 r = (r * a0 + tex.r * a1) / 255;
1402 g = (g * a0 + tex.g * a1) / 255; 1948 g = (g * a0 + tex.g * a1) / 255;
1403 b = (b * a0 + tex.b * a1) / 255; 1949 b = (b * a0 + tex.b * a1) / 255;
1404 a = (a * a0 + tex.a * a1) / 255; 1950 a = (a * a0 + tex.a * a1) / 255;
1405 }
1406 } 1951 }
1407 } 1952 }
1408 1953
1409 *map++ = (r ) 1954 *map++ = (r )
1410 | (g << 8) 1955 | (g << 8)
… …
1417} 1962}
1418 OUTPUT: 1963 OUTPUT:
1419 RETVAL 1964 RETVAL
1420 1965
1421void 1966void
1422draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1423 CODE: 1968 CODE:
1424{ 1969{
1425 int vx, vy;
1426 int x, y, z; 1970 int x, y, z;
1427 int last_name;
1428 mapface face;
1429 1971
1430 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1431 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1975 smooth_key skey;
1976 int pl_x, pl_y;
1977 maptex pl_tex;
1978 rc_t *rc = rc_alloc ();
1979 rc_key_t key;
1980 rc_array_t *arr;
1432 1981
1433 /* 1982 pl_tex.name = 0;
1434 int vx = self->vx = self->w >= sw
1435 ? self->x + (self->w - sw) / 2
1436 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1437 1983
1438 int vy = self->vy = self->h >= sh 1984 // thats current max. sorry.
1439 ? self->y + (self->h - sh) / 2 1985 if (sw > 255) sw = 255;
1440 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1986 if (sh > 255) sh = 255;
1441 */
1442 1987
1443 glColor4ub (255, 255, 255, 255); 1988 // clear key, in case of extra padding
1989 memset (&skey, 0, sizeof (skey));
1990
1991 memset (&key, 0, sizeof (key));
1992 key.r = 255;
1993 key.g = 255;
1994 key.b = 255;
1995 key.a = 255;
1996 key.mode = GL_QUADS;
1997 key.format = GL_T2F_V3F;
1998 key.texname = -1;
1999
2000 mx += self->x;
2001 my += self->y;
2002
2003 // first pass: determine smooth_max
2004 // rather ugly, if you ask me
2005 // could also be stored inside mapcell and updated on change
2006 memset (smooth_max, 0, sizeof (smooth_max));
2007
2008 for (y = 0; y < sh; y++)
2009 if (0 <= y + my && y + my < self->rows)
2010 {
2011 maprow *row = self->row + (y + my);
2012
2013 for (x = 0; x < sw; x++)
2014 if (row->c0 <= x + mx && x + mx < row->c1)
2015 {
2016 mapcell *cell = row->col + (x + mx - row->c0);
2017
2018 smooth_max[x + 1][y + 1] =
2019 MAX (self->tex [cell->tile [0]].smoothlevel,
2020 MAX (self->tex [cell->tile [1]].smoothlevel,
2021 self->tex [cell->tile [2]].smoothlevel));
2022 }
2023 }
1444 2024
1445 glEnable (GL_BLEND); 2025 glEnable (GL_BLEND);
1446 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1447 glEnable (GL_TEXTURE_2D);
1448 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1449 2028
1450 glBegin (GL_QUADS);
1451
1452 last_name = 0;
1453
1454 for (z = 0; z < 3; z++) 2029 for (z = 0; z <= 2; z++)
2030 {
2031 memset (smooth_level, 0, sizeof (smooth_level));
2032
1455 for (y = 0; y < sh; y++) 2033 for (y = 0; y < sh; y++)
1456 if (0 <= y + vy && y + vy < self->rows) 2034 if (0 <= y + my && y + my < self->rows)
1457 { 2035 {
1458 maprow *row = self->row + (y + vy); 2036 maprow *row = self->row + (y + my);
1459 2037
1460 for (x = 0; x < sw; x++) 2038 for (x = 0; x < sw; x++)
1461 if (row->c0 <= x + vx && x + vx < row->c1) 2039 if (row->c0 <= x + mx && x + mx < row->c1)
1462 { 2040 {
1463 mapcell *cell = row->col + (x + vx - row->c0); 2041 mapcell *cell = row->col + (x + mx - row->c0);
1464
1465 face = cell->face [z]; 2042 tileid tile = cell->tile [z];
2043
2044 if (tile)
2045 {
2046 maptex tex = self->tex [tile];
2047 int px = (x + 1) * T - tex.w;
2048 int py = (y + 1) * T - tex.h;
1466 2049
1467 if (face && face < self->texs) 2050 if (key.texname != tex.name)
2051 {
2052 if (!tex.name)
2053 tex = self->tex [2]; /* missing, replace by noface */
2054
2055 key.texname = tex.name;
2056 arr = rc_array (rc, &key);
2057 }
2058
2059 if (expect_false (cell->player == player) && expect_false (z == 2))
2060 {
2061 pl_x = px;
2062 pl_y = py;
2063 pl_tex = tex;
2064 continue;
2065 }
2066
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2071
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
2075 if (cell->flags & 1)
2076 {
2077 maptex tex = self->tex [1];
2078 int px = x * T + T * 2 / 32;
2079 int py = y * T - T * 6 / 32;
2080
2081 if (tex.name)
2082 {
2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093 }
2094 }
2095 }
2096
2097 // update smooth hash
2098 if (tex.smoothtile)
2099 {
2100 skey.tile = tex.smoothtile;
2101 skey.level = tex.smoothlevel;
2102
2103 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
2104
2105 // add bits to current tile and all neighbours. skey.x|y is
2106 // shifted +1|+1 so we always stay positive.
2107
2108 // bits is ___n cccc CCCC bbbb
2109 // n do not draw borders&corners
2110 // c draw these corners, but...
2111 // C ... not these
2112 // b draw these borders
2113
2114 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
2115 // ┃· ·· ·┃ ━━
2116
2117 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2118 // ·· ·· ·┏ ┓·
2119
2120 // full tile
2121 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
2122
2123 // borders
2124 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
2125 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
2126 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
2127 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
2128
2129 // corners
2130 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2131 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2132 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2133 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2134 }
2135 }
2136 }
2137 }
2138
2139 rc_draw (rc);
2140 rc_clear (rc);
2141
2142 // go through all smoothlevels, lowest to highest, then draw.
2143 // this is basically counting sort
2144 {
2145 int w, b;
2146
2147 glEnable (GL_TEXTURE_2D);
2148 glBegin (GL_QUADS);
2149 for (w = 0; w < 256 / 32; ++w)
2150 {
2151 uint32_t smask = smooth_level [w];
2152 if (smask)
2153 for (b = 0; b < 32; ++b)
2154 if (smask & (((uint32_t)1) << b))
1468 { 2155 {
1469 maptex tex = self->tex [face]; 2156 int level = (w << 5) | b;
1470 int px = (x + 1) * 32 - tex.w; 2157 HE *he;
1471 int py = (y + 1) * 32 - tex.h;
1472 2158
1473 if (last_name != tex.name) 2159 hv_iterinit (smooth);
2160 while ((he = hv_iternext (smooth)))
1474 { 2161 {
1475 glEnd (); 2162 smooth_key *skey = (smooth_key *)HeKEY (he);
1476 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2163 IV bits = SvIVX (HeVAL (he));
1477 glBegin (GL_QUADS);
1478 }
1479 2164
1480 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1481 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1482 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1483 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1484 }
1485
1486 if (cell->flags && z == 2)
1487 {
1488 if (cell->flags & 1) 2165 if (!(bits & 0x1000)
2166 && skey->level == level
2167 && level > smooth_max [skey->x][skey->y])
1489 { 2168 {
1490 maptex tex = self->tex [1]; 2169 maptex tex = self->tex [skey->tile];
1491 int px = (x + 1) * 32 - tex.w + 2; 2170 int px = (((int)skey->x) - 1) * T;
1492 int py = (y + 1) * 32 - tex.h - 6; 2171 int py = (((int)skey->y) - 1) * T;
2172 int border = bits & 15;
2173 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174 float dx = tex.s * .0625f; // 16 images/row
2175 float dy = tex.t * .5f ; // 2 images/column
1493 2176
2177 if (tex.name)
2178 {
2179 // this time avoiding texture state changes
2180 // save gobs of state changes.
2181 if (key.texname != tex.name)
2182 {
1494 glEnd (); 2183 glEnd ();
1495 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1496 glBegin (GL_QUADS); 2185 glBegin (GL_QUADS);
2186 }
1497 2187
2188 if (border)
2189 {
2190 float ox = border * dx;
2191
2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2196 }
2197
2198 if (corner)
2199 {
2200 float ox = corner * dx;
2201
1498 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2202 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1499 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1500 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1501 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2206 }
2207 }
2208 }
1502 } 2209 }
1503 } 2210 }
1504 }
1505 } 2211 }
1506 2212
1507 glEnd (); 2213 glEnd ();
1508
1509 glDisable (GL_TEXTURE_2D); 2214 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1;
2216 }
2217
2218 hv_clear (smooth);
2219 }
2220
2221 if (pl_tex.name)
2222 {
2223 maptex tex = pl_tex;
2224 int px = pl_x + sdx;
2225 int py = pl_y + sdy;
2226
2227 key.texname = tex.name;
2228 arr = rc_array (rc, &key);
2229
2230 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2231 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2232 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234
2235 rc_draw (rc);
2236 }
2237
1510 glDisable (GL_BLEND); 2238 glDisable (GL_BLEND);
2239 rc_free (rc);
1511 2240
1512 // top layer: overlays such as the health bar 2241 // top layer: overlays such as the health bar
1513 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1514 if (0 <= y + vy && y + vy < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1515 { 2244 {
1516 maprow *row = self->row + (y + vy); 2245 maprow *row = self->row + (y + my);
1517 2246
1518 for (x = 0; x < sw; x++) 2247 for (x = 0; x < sw; x++)
1519 if (row->c0 <= x + vx && x + vx < row->c1) 2248 if (row->c0 <= x + mx && x + mx < row->c1)
1520 { 2249 {
1521 mapcell *cell = row->col + (x + vx - row->c0); 2250 mapcell *cell = row->col + (x + mx - row->c0);
1522 2251
1523 int px = x * 32; 2252 int px = x * T;
1524 int py = y * 32; 2253 int py = y * T;
1525 2254
1526 if (cell->stat_hp) 2255 if (cell->stat_hp)
1527 { 2256 {
1528 int width = cell->stat_width * 32; 2257 int width = cell->stat_width * T;
1529 int thick = sh / 28 + 1 + cell->stat_width; 2258 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1530 2259
1531 glColor3ub (0, 0, 0); 2260 glColor3ub (0, 0, 0);
1532 glRectf (px + 1, py - thick - 2, 2261 glRectf (px + 1, py - thick - 2,
1533 px + width - 1, py); 2262 px + width - 1, py);
1534 2263
… …
1540 } 2269 }
1541 } 2270 }
1542} 2271}
1543 2272
1544void 2273void
1545draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1546 CODE: 2275 CODE:
1547{ 2276{
1548 static float color[16][3] = { 2277 static float color[16][3] = {
1549 { 0.00F, 0.00F, 0.00F }, 2278 { 0.00F, 0.00F, 0.00F },
1550 { 1.00F, 1.00F, 1.00F }, 2279 { 1.00F, 1.00F, 1.00F },
… …
1600 glDisable (GL_BLEND); 2329 glDisable (GL_BLEND);
1601 glDisable (GL_TEXTURE_2D); 2330 glDisable (GL_TEXTURE_2D);
1602} 2331}
1603 2332
1604void 2333void
1605fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2334fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1606 PPCODE: 2335 PPCODE:
1607{ 2336{
1608 int vx, vy;
1609 int x, y; 2337 int x, y;
2338 int sw1 = sw + 2;
2339 int sh1 = sh + 2;
2340 int sh3 = sh * 3;
1610 int sw4 = (sw + 3) & ~3; 2341 int sw34 = (sw * 3 + 3) & ~3;
2342 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1611 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2343 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1612 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2344 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1613 2345
1614 memset (darkness, 255, sw4 * sh);
1615 SvPOK_only (darkness_sv); 2346 SvPOK_only (darkness3_sv);
1616 SvCUR_set (darkness_sv, sw4 * sh); 2347 SvCUR_set (darkness3_sv, sw34 * sh3);
1617 2348
1618 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2349 mx += self->x - 1;
1619 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2350 my += self->y - 1;
1620 2351
2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353
1621 for (y = 0; y < sh; y++) 2354 for (y = 0; y < sh1; y++)
1622 if (0 <= y + vy && y + vy < self->rows) 2355 if (0 <= y + my && y + my < self->rows)
1623 { 2356 {
1624 maprow *row = self->row + (y + vy); 2357 maprow *row = self->row + (y + my);
1625 2358
1626 for (x = 0; x < sw; x++) 2359 for (x = 0; x < sw1; x++)
1627 if (row->c0 <= x + vx && x + vx < row->c1) 2360 if (row->c0 <= x + mx && x + mx < row->c1)
1628 { 2361 {
1629 mapcell *cell = row->col + (x + vx - row->c0); 2362 mapcell *cell = row->col + (x + mx - row->c0);
1630 2363
1631 darkness[y * sw4 + x] = cell->darkness 2364 darkness1 [y * sw1 + x] = cell->darkness
1632 ? 255 - (cell->darkness - 1) 2365 ? 255 - (cell->darkness - 1)
1633 : 255 - FOW_DARKNESS; 2366 : 255 - FOW_DARKNESS;
1634 } 2367 }
1635 } 2368 }
1636 2369
2370 for (y = 0; y < sh; ++y)
2371 for (x = 0; x < sw; ++x)
2372 {
2373 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2374 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2375 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2376 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2377 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2378 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2379 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2380 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2381 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2382
2383 uint8_t r11 = (d11 + d21 + d12) / 3;
2384 uint8_t r21 = d21;
2385 uint8_t r31 = (d21 + d31 + d32) / 3;
2386
2387 uint8_t r12 = d12;
2388 uint8_t r22 = d22;
2389 uint8_t r32 = d32;
2390
2391 uint8_t r13 = (d13 + d23 + d12) / 3;
2392 uint8_t r23 = d23;
2393 uint8_t r33 = (d23 + d33 + d32) / 3;
2394
2395 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2396 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2398 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2399 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2401 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2402 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2404 }
2405
2406 free (darkness1);
2407
1637 EXTEND (SP, 3); 2408 EXTEND (SP, 3);
1638 PUSHs (sv_2mortal (newSViv (sw4))); 2409 PUSHs (sv_2mortal (newSViv (sw34)));
1639 PUSHs (sv_2mortal (newSViv (sh))); 2410 PUSHs (sv_2mortal (newSViv (sh3)));
1640 PUSHs (darkness_sv); 2411 PUSHs (darkness3_sv);
1641} 2412}
1642 2413
1643SV * 2414SV *
1644get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2415get_rect (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 2416 CODE:
1646{ 2417{
1647 int x, y, x1, y1; 2418 int x, y, x1, y1;
1648 SV *data_sv = newSV (w * h * 7 + 5); 2419 SV *data_sv = newSV (w * h * 7 + 5);
1649 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2420 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1674 if (row && row->c0 <= x && x < row->c1) 2445 if (row && row->c0 <= x && x < row->c1)
1675 { 2446 {
1676 mapcell *cell = row->col + (x - row->c0); 2447 mapcell *cell = row->col + (x - row->c0);
1677 uint8_t flags = 0; 2448 uint8_t flags = 0;
1678 2449
1679 if (cell->face [0]) flags |= 1; 2450 if (cell->tile [0]) flags |= 1;
1680 if (cell->face [1]) flags |= 2; 2451 if (cell->tile [1]) flags |= 2;
1681 if (cell->face [2]) flags |= 4; 2452 if (cell->tile [2]) flags |= 4;
1682 2453
1683 *data++ = flags; 2454 *data++ = flags;
1684 2455
1685 if (flags & 1) 2456 if (flags & 1)
1686 { 2457 {
2458 tileid tile = cell->tile [0];
1687 *data++ = cell->face [0] >> 8; 2459 *data++ = tile >> 8;
1688 *data++ = cell->face [0]; 2460 *data++ = tile;
1689 } 2461 }
1690 2462
1691 if (flags & 2) 2463 if (flags & 2)
1692 { 2464 {
2465 tileid tile = cell->tile [1];
1693 *data++ = cell->face [1] >> 8; 2466 *data++ = tile >> 8;
1694 *data++ = cell->face [1]; 2467 *data++ = tile;
1695 } 2468 }
1696 2469
1697 if (flags & 4) 2470 if (flags & 4)
1698 { 2471 {
2472 tileid tile = cell->tile [2];
1699 *data++ = cell->face [2] >> 8; 2473 *data++ = tile >> 8;
1700 *data++ = cell->face [2]; 2474 *data++ = tile;
1701 } 2475 }
1702 } 2476 }
1703 else 2477 else
1704 *data++ = 0; 2478 *data++ = 0;
1705 } 2479 }
1706 } 2480 }
1707 2481
2482 /* if size is w*h + 5 then no data has been found */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 {
1708 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
1709 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 }
2488
1710 RETVAL = data_sv; 2489 RETVAL = data_sv;
1711} 2490}
1712 OUTPUT: 2491 OUTPUT:
1713 RETVAL 2492 RETVAL
1714 2493
1715void 2494void
1716set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2495set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1717 PPCODE: 2496 PPCODE:
1718{ 2497{
1719 int x, y, z; 2498 int x, y, z;
1720 int w, h; 2499 int w, h;
1721 int x1, y1; 2500 int x1, y1;
2501 STRLEN len;
2502 uint8_t *data, *end;
2503
2504 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv);
2507 end = data + len + 8;
2508
2509 if (len < 5)
2510 XSRETURN_EMPTY;
1722 2511
1723 if (*data++ != 0) 2512 if (*data++ != 0)
1724 return; /* version mismatch */ 2513 XSRETURN_EMPTY; /* version mismatch */
1725 2514
1726 w = *data++ << 8; w |= *data++; 2515 w = *data++ << 8; w |= *data++;
1727 h = *data++ << 8; h |= *data++; 2516 h = *data++ << 8; h |= *data++;
1728 2517
1729 // we need to do this 'cause we don't keep an absolute coord system for rows 2518 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
1741 { 2530 {
1742 maprow *row = map_get_row (self, y); 2531 maprow *row = map_get_row (self, y);
1743 2532
1744 for (x = x0; x < x1; x++) 2533 for (x = x0; x < x1; x++)
1745 { 2534 {
2535 uint8_t flags;
2536
2537 if (data + 7 >= end)
2538 XSRETURN_EMPTY;
2539
1746 uint8_t flags = *data++; 2540 flags = *data++;
1747 2541
1748 if (flags) 2542 if (flags)
1749 { 2543 {
1750 mapface face[3] = { 0, 0, 0 };
1751
1752 mapcell *cell = row_get_cell (row, x); 2544 mapcell *cell = row_get_cell (row, x);
2545 tileid tile[3] = { 0, 0, 0 };
1753 2546
1754 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2547 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1755 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2548 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1756 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2549 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1757 2550
1758 if (cell->darkness == 0) 2551 if (cell->darkness == 0)
1759 { 2552 {
1760 cell->darkness = 0; 2553 /*cell->darkness = 0;*/
2554 EXTEND (SP, 3);
1761 2555
1762 for (z = 0; z <= 2; z++) 2556 for (z = 0; z <= 2; z++)
1763 { 2557 {
1764 cell->face[z] = face[z]; 2558 tileid t = tile [z];
1765 2559
1766 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2560 if (t >= self->texs || (t && !self->tex [t].name))
2561 {
1767 XPUSHs (sv_2mortal (newSViv (face[z]))); 2562 PUSHs (sv_2mortal (newSViv (t)));
2563 need_texid (self, t);
2564 }
2565
2566 cell->tile [z] = t;
1768 } 2567 }
1769 } 2568 }
1770 } 2569 }
1771 } 2570 }
1772 } 2571 }
1773} 2572}
1774 2573
1775MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2574MODULE = Deliantra::Client PACKAGE = DC::RW
1776 2575
1777CFPlus::MixChunk 2576DC::RW
1778new_from_file (SV *class, char *path) 2577new (SV *class, SV *data_sv)
1779 CODE: 2578 CODE:
1780 RETVAL = Mix_LoadWAV (path); 2579{
2580 STRLEN datalen;
2581 char *data = SvPVbyte (data_sv, datalen);
2582
2583 RETVAL = SDL_RWFromConstMem (data, datalen);
2584}
1781 OUTPUT: 2585 OUTPUT:
1782 RETVAL 2586 RETVAL
1783 2587
2588DC::RW
2589new_from_file (SV *class, const char *path, const char *mode = "rb")
2590 CODE:
2591 RETVAL = SDL_RWFromFile (path, mode);
2592 OUTPUT:
2593 RETVAL
2594
2595# fails on win32:
2596# dc.xs(2268) : error C2059: syntax error : '('
1784void 2597#void
2598#close (DC::RW self)
2599# CODE:
2600# (self->(close)) (self);
2601
2602MODULE = Deliantra::Client PACKAGE = DC::Channel
2603
2604PROTOTYPES: DISABLE
2605
2606DC::Channel
2607find ()
2608 CODE:
2609{
2610 RETVAL = Mix_GroupAvailable (-1);
2611
2612 if (RETVAL < 0)
2613 {
2614 RETVAL = Mix_GroupOldest (-1);
2615
2616 if (RETVAL < 0)
2617 XSRETURN_UNDEF;
2618
2619 Mix_HaltChannel (RETVAL);
2620 }
2621
2622 Mix_UnregisterAllEffects (RETVAL);
2623 Mix_Volume (RETVAL, 128);
2624}
2625 OUTPUT:
2626 RETVAL
2627
2628void
2629halt (DC::Channel self)
2630 CODE:
2631 Mix_HaltChannel (self);
2632
2633void
2634expire (DC::Channel self, int ticks = -1)
2635 CODE:
2636 Mix_ExpireChannel (self, ticks);
2637
2638void
2639fade_out (DC::Channel self, int ticks = -1)
2640 CODE:
2641 Mix_FadeOutChannel (self, ticks);
2642
2643int
2644volume (DC::Channel self, int volume)
2645 CODE:
2646 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2647 OUTPUT:
2648 RETVAL
2649
2650void
2651unregister_all_effects (DC::Channel self)
2652 CODE:
2653 Mix_UnregisterAllEffects (self);
2654
2655void
2656set_panning (DC::Channel self, int left, int right)
2657 CODE:
2658 left = CLAMP (left , 0, 255);
2659 right = CLAMP (right, 0, 255);
2660 Mix_SetPanning (self, left, right);
2661
2662void
2663set_distance (DC::Channel self, int distance)
2664 CODE:
2665 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2666
2667void
2668set_position (DC::Channel self, int angle, int distance)
2669 CODE:
2670
2671void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE:
2674{
2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678}
2679
2680void
2681set_reverse_stereo (DC::Channel self, int flip)
2682 CODE:
2683 Mix_SetReverseStereo (self, flip);
2684
2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686
2687PROTOTYPES: DISABLE
2688
2689DC::MixChunk
2690new (SV *class, DC::RW rwops)
2691 CODE:
2692 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2693 OUTPUT:
2694 RETVAL
2695
2696void
1785DESTROY (CFPlus::MixChunk self) 2697DESTROY (DC::MixChunk self)
1786 CODE: 2698 CODE:
1787 Mix_FreeChunk (self); 2699 Mix_FreeChunk (self);
1788 2700
1789int 2701int
1790volume (CFPlus::MixChunk self, int volume = -1) 2702volume (DC::MixChunk self, int volume = -1)
1791 CODE: 2703 CODE:
2704 if (items > 1)
2705 volume = CLAMP (volume, 0, 128);
1792 RETVAL = Mix_VolumeChunk (self, volume); 2706 RETVAL = Mix_VolumeChunk (self, volume);
1793 OUTPUT: 2707 OUTPUT:
1794 RETVAL 2708 RETVAL
1795 2709
1796int 2710DC::Channel
1797play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2711play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
1798 CODE: 2712 CODE:
2713{
1799 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2714 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2715
2716 if (RETVAL < 0)
2717 XSRETURN_UNDEF;
2718
2719 if (channel < 0)
2720 {
2721 Mix_UnregisterAllEffects (RETVAL);
2722 Mix_Volume (RETVAL, 128);
2723 }
2724}
1800 OUTPUT: 2725 OUTPUT:
1801 RETVAL 2726 RETVAL
1802 2727
1803MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1804 2729
1805int 2730int
1806volume (int volume = -1) 2731volume (int volume = -1)
2732 PROTOTYPE: ;$
1807 CODE: 2733 CODE:
2734 if (items > 0)
2735 volume = CLAMP (volume, 0, 128);
1808 RETVAL = Mix_VolumeMusic (volume); 2736 RETVAL = Mix_VolumeMusic (volume);
1809 OUTPUT: 2737 OUTPUT:
1810 RETVAL 2738 RETVAL
1811 2739
2740void
2741fade_out (int ms)
2742 CODE:
2743 Mix_FadeOutMusic (ms);
2744
2745void
2746halt ()
2747 CODE:
2748 Mix_HaltMusic ();
2749
1812CFPlus::MixMusic 2750DC::MixMusic
1813new_from_file (SV *class, char *path) 2751new (SV *class, DC::RW rwops)
1814 CODE: 2752 CODE:
1815 RETVAL = Mix_LoadMUS (path); 2753 RETVAL = Mix_LoadMUS_RW (rwops);
1816 OUTPUT: 2754 OUTPUT:
1817 RETVAL 2755 RETVAL
1818 2756
1819void 2757void
1820DESTROY (CFPlus::MixMusic self) 2758DESTROY (DC::MixMusic self)
1821 CODE: 2759 CODE:
1822 Mix_FreeMusic (self); 2760 Mix_FreeMusic (self);
1823 2761
1824int 2762int
1825play (CFPlus::MixMusic self, int loops = -1) 2763play (DC::MixMusic self, int loops = -1)
1826 CODE: 2764 CODE:
1827 RETVAL = Mix_PlayMusic (self, loops); 2765 RETVAL = Mix_PlayMusic (self, loops);
1828 OUTPUT: 2766 OUTPUT:
1829 RETVAL 2767 RETVAL
1830 2768
1831MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2769void
2770fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2771 CODE:
2772 Mix_FadeInMusicPos (self, loops, ms, position);
2773
2774MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2775
2776PROTOTYPES: ENABLE
1832 2777
1833BOOT: 2778BOOT:
1834{ 2779{
1835 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2780 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1836 static const struct { 2781 static const struct {
1837 const char *name; 2782 const char *name;
1838 IV iv; 2783 IV iv;
1839 } *civ, const_iv[] = { 2784 } *civ, const_iv[] = {
1840# define const_iv(name) { # name, (IV)name } 2785# define const_iv(name) { # name, (IV)name }
2786 const_iv (GL_VENDOR),
2787 const_iv (GL_VERSION),
2788 const_iv (GL_EXTENSIONS),
1841 const_iv (GL_COLOR_MATERIAL), 2789 const_iv (GL_COLOR_MATERIAL),
1842 const_iv (GL_SMOOTH), 2790 const_iv (GL_SMOOTH),
1843 const_iv (GL_FLAT), 2791 const_iv (GL_FLAT),
1844 const_iv (GL_DITHER), 2792 const_iv (GL_DITHER),
1845 const_iv (GL_BLEND), 2793 const_iv (GL_BLEND),
… …
1849 const_iv (GL_ALPHA_TEST), 2797 const_iv (GL_ALPHA_TEST),
1850 const_iv (GL_NORMALIZE), 2798 const_iv (GL_NORMALIZE),
1851 const_iv (GL_RESCALE_NORMAL), 2799 const_iv (GL_RESCALE_NORMAL),
1852 const_iv (GL_FRONT), 2800 const_iv (GL_FRONT),
1853 const_iv (GL_BACK), 2801 const_iv (GL_BACK),
2802 const_iv (GL_AUX0),
1854 const_iv (GL_AND), 2803 const_iv (GL_AND),
1855 const_iv (GL_ONE), 2804 const_iv (GL_ONE),
1856 const_iv (GL_ZERO), 2805 const_iv (GL_ZERO),
1857 const_iv (GL_SRC_ALPHA), 2806 const_iv (GL_SRC_ALPHA),
1858 const_iv (GL_DST_ALPHA), 2807 const_iv (GL_DST_ALPHA),
… …
1871 const_iv (GL_INTENSITY), 2820 const_iv (GL_INTENSITY),
1872 const_iv (GL_LUMINANCE), 2821 const_iv (GL_LUMINANCE),
1873 const_iv (GL_LUMINANCE_ALPHA), 2822 const_iv (GL_LUMINANCE_ALPHA),
1874 const_iv (GL_FLOAT), 2823 const_iv (GL_FLOAT),
1875 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2824 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2825 const_iv (GL_COMPRESSED_ALPHA_ARB),
2826 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2827 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2828 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2829 const_iv (GL_COMPRESSED_RGB_ARB),
2830 const_iv (GL_COMPRESSED_RGBA_ARB),
1876 const_iv (GL_COMPILE), 2831 const_iv (GL_COMPILE),
2832 const_iv (GL_PROXY_TEXTURE_1D),
2833 const_iv (GL_PROXY_TEXTURE_2D),
1877 const_iv (GL_TEXTURE_1D), 2834 const_iv (GL_TEXTURE_1D),
1878 const_iv (GL_TEXTURE_2D), 2835 const_iv (GL_TEXTURE_2D),
1879 const_iv (GL_TEXTURE_ENV), 2836 const_iv (GL_TEXTURE_ENV),
1880 const_iv (GL_TEXTURE_MAG_FILTER), 2837 const_iv (GL_TEXTURE_MAG_FILTER),
1881 const_iv (GL_TEXTURE_MIN_FILTER), 2838 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1902 const_iv (GL_COLOR_LOGIC_OP), 2859 const_iv (GL_COLOR_LOGIC_OP),
1903 const_iv (GL_SEPARABLE_2D), 2860 const_iv (GL_SEPARABLE_2D),
1904 const_iv (GL_CONVOLUTION_2D), 2861 const_iv (GL_CONVOLUTION_2D),
1905 const_iv (GL_CONVOLUTION_BORDER_MODE), 2862 const_iv (GL_CONVOLUTION_BORDER_MODE),
1906 const_iv (GL_CONSTANT_BORDER), 2863 const_iv (GL_CONSTANT_BORDER),
2864 const_iv (GL_POINTS),
1907 const_iv (GL_LINES), 2865 const_iv (GL_LINES),
1908 const_iv (GL_LINE_STRIP), 2866 const_iv (GL_LINE_STRIP),
1909 const_iv (GL_LINE_LOOP), 2867 const_iv (GL_LINE_LOOP),
1910 const_iv (GL_QUADS), 2868 const_iv (GL_QUADS),
1911 const_iv (GL_QUAD_STRIP), 2869 const_iv (GL_QUAD_STRIP),
1912 const_iv (GL_TRIANGLES), 2870 const_iv (GL_TRIANGLES),
1913 const_iv (GL_TRIANGLE_STRIP), 2871 const_iv (GL_TRIANGLE_STRIP),
1914 const_iv (GL_TRIANGLE_FAN), 2872 const_iv (GL_TRIANGLE_FAN),
2873 const_iv (GL_POLYGON),
1915 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2874 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2875 const_iv (GL_POINT_SMOOTH_HINT),
2876 const_iv (GL_LINE_SMOOTH_HINT),
2877 const_iv (GL_POLYGON_SMOOTH_HINT),
2878 const_iv (GL_GENERATE_MIPMAP_HINT),
2879 const_iv (GL_TEXTURE_COMPRESSION_HINT),
1916 const_iv (GL_FASTEST), 2880 const_iv (GL_FASTEST),
2881 const_iv (GL_DONT_CARE),
2882 const_iv (GL_NICEST),
1917 const_iv (GL_V2F), 2883 const_iv (GL_V2F),
1918 const_iv (GL_V3F), 2884 const_iv (GL_V3F),
1919 const_iv (GL_T2F_V3F), 2885 const_iv (GL_T2F_V3F),
1920 const_iv (GL_T2F_N3F_V3F), 2886 const_iv (GL_T2F_N3F_V3F),
1921# undef const_iv 2887# undef const_iv
1922 }; 2888 };
1923 2889
1924 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2890 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1925 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2892
2893 texture_av = newAV ();
2894 AvREAL_off (texture_av);
1926} 2895}
2896
2897void
2898disable_GL_EXT_blend_func_separate ()
2899 CODE:
2900 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0;
1927 2902
1928char * 2903char *
1929gl_vendor () 2904gl_vendor ()
1930 CODE: 2905 CODE:
1931 RETVAL = (char *)glGetString (GL_VENDOR); 2906 RETVAL = (char *)glGetString (GL_VENDOR);
… …
1944 CODE: 2919 CODE:
1945 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2920 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1946 OUTPUT: 2921 OUTPUT:
1947 RETVAL 2922 RETVAL
1948 2923
2924const char *glGetString (GLenum pname)
2925
2926GLint glGetInteger (GLenum pname)
2927 CODE:
2928 glGetIntegerv (pname, &RETVAL);
2929 OUTPUT:
2930 RETVAL
2931
2932GLdouble glGetDouble (GLenum pname)
2933 CODE:
2934 glGetDoublev (pname, &RETVAL);
2935 OUTPUT:
2936 RETVAL
2937
1949int glGetError () 2938int glGetError ()
1950 2939
1951void glFinish () 2940void glFinish ()
1952 2941
1953void glClear (int mask) 2942void glClear (int mask)
… …
1990# near_ and far_ are due to microsofts buggy "c" compiler 2979# near_ and far_ are due to microsofts buggy "c" compiler
1991void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2980void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1992 2981
1993# near_ and far_ are due to microsofts buggy "c" compiler 2982# near_ and far_ are due to microsofts buggy "c" compiler
1994void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2983void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2984
2985PROTOTYPES: DISABLE
1995 2986
1996void glViewport (int x, int y, int width, int height) 2987void glViewport (int x, int y, int width, int height)
1997 2988
1998void glScissor (int x, int y, int width, int height) 2989void glScissor (int x, int y, int width, int height)
1999 2990
… …
2007 2998
2008void glRotate (float angle, float x, float y, float z) 2999void glRotate (float angle, float x, float y, float z)
2009 CODE: 3000 CODE:
2010 glRotatef (angle, x, y, z); 3001 glRotatef (angle, x, y, z);
2011 3002
2012void glBegin (int mode)
2013
2014void glEnd ()
2015
2016void glColor (float r, float g, float b, float a = 1.0) 3003void glColor (float r, float g, float b, float a = 1.0)
2017 PROTOTYPE: @
2018 ALIAS: 3004 ALIAS:
2019 glColor_premultiply = 1 3005 glColor_premultiply = 1
2020 CODE: 3006 CODE:
2021 if (ix) 3007 if (ix)
2022 { 3008 {
… …
2025 b *= a; 3011 b *= a;
2026 } 3012 }
2027 // microsoft visual "c" rounds instead of truncating... 3013 // microsoft visual "c" rounds instead of truncating...
2028 glColor4f (r, g, b, a); 3014 glColor4f (r, g, b, a);
2029 3015
2030void glInterleavedArrays (int format, int stride, char *data)
2031
2032void glDrawElements (int mode, int count, int type, char *indices)
2033
2034# 1.2 void glDrawRangeElements (int mode, int start, int end
2035
2036void glRasterPos (float x, float y, float z = 0.) 3016void glRasterPos (float x, float y, float z = 0.)
2037 CODE: 3017 CODE:
2038 glRasterPos3f (0, 0, z); 3018 glRasterPos3f (0, 0, z);
2039 glBitmap (0, 0, 0, 0, x, y, 0); 3019 glBitmap (0, 0, 0, 0, x, y, 0);
2040 3020
… …
2044 3024
2045void glTexCoord (float s, float t) 3025void glTexCoord (float s, float t)
2046 CODE: 3026 CODE:
2047 glTexCoord2f (s, t); 3027 glTexCoord2f (s, t);
2048 3028
3029void glRect (float x1, float y1, float x2, float y2)
3030 CODE:
3031 glRectf (x1, y1, x2, y2);
3032
3033void glRect_lineloop (float x1, float y1, float x2, float y2)
3034 CODE:
3035 glBegin (GL_LINE_LOOP);
3036 glVertex2f (x1, y1);
3037 glVertex2f (x2, y1);
3038 glVertex2f (x2, y2);
3039 glVertex2f (x1, y2);
3040 glEnd ();
3041
3042PROTOTYPES: ENABLE
3043
3044void glBegin (int mode)
3045
3046void glEnd ()
3047
3048void glPointSize (GLfloat size)
3049
3050void glLineWidth (GLfloat width)
3051
3052void glInterleavedArrays (int format, int stride, char *data)
3053
3054void glDrawElements (int mode, int count, int type, char *indices)
3055
3056# 1.2 void glDrawRangeElements (int mode, int start, int end
3057
2049void glTexEnv (int target, int pname, float param) 3058void glTexEnv (int target, int pname, float param)
2050 CODE: 3059 CODE:
2051 glTexEnvf (target, pname, param); 3060 glTexEnvf (target, pname, param);
2052 3061
2053void glTexParameter (int target, int pname, float param) 3062void glTexParameter (int target, int pname, float param)
… …
2069void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3078void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2070 CODE: 3079 CODE:
2071 if (gl.SeparableFilter2D) 3080 if (gl.SeparableFilter2D)
2072 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3081 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2073 3082
2074void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3083void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2075 3084
2076void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3085void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2077 3086
2078void glDrawPixels (int width, int height, int format, int type, char *pixels) 3087void glDrawPixels (int width, int height, int format, int type, char *pixels)
3088
3089void glPixelZoom (float x, float y)
2079 3090
2080void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3091void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2081 3092
2082int glGenTexture () 3093int glGenTexture ()
2083 CODE: 3094 CODE:
2084{ 3095 RETVAL = gen_texture ();
2085 GLuint name;
2086 glGenTextures (1, &name);
2087 RETVAL = name;
2088}
2089 OUTPUT: 3096 OUTPUT:
2090 RETVAL 3097 RETVAL
2091 3098
2092void glDeleteTexture (int name) 3099void glDeleteTexture (int name)
2093 CODE: 3100 CODE:
2094{
2095 GLuint name_ = name;
2096 glDeleteTextures (1, &name_); 3101 del_texture (name);
2097} 3102
2098
2099int glGenList () 3103int glGenList ()
2100 CODE: 3104 CODE:
2101 RETVAL = glGenLists (1); 3105 RETVAL = glGenLists (1);
2102 OUTPUT: 3106 OUTPUT:
2103 RETVAL 3107 RETVAL
… …
2110 3114
2111void glEndList () 3115void glEndList ()
2112 3116
2113void glCallList (int list) 3117void glCallList (int list)
2114 3118
3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120
3121PROTOTYPES: DISABLE
3122
3123void
3124find_widget (SV *self, NV x, NV y)
3125 PPCODE:
3126{
3127 if (within_widget (self, x, y))
3128 XPUSHs (self);
3129}
3130
3131BOOT:
3132{
3133 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3134
3135 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3136 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3137 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3138 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3139}
3140
3141void
3142draw (SV *self)
3143 CODE:
3144{
3145 HV *hv;
3146 SV **svp;
3147 NV x, y, w, h;
3148 SV *draw_x_sv = GvSV (draw_x_gv);
3149 SV *draw_y_sv = GvSV (draw_y_gv);
3150 SV *draw_w_sv = GvSV (draw_w_gv);
3151 SV *draw_h_sv = GvSV (draw_h_gv);
3152 double draw_x, draw_y;
3153
3154 if (!SvROK (self))
3155 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3156
3157 hv = (HV *)SvRV (self);
3158
3159 if (SvTYPE (hv) != SVt_PVHV)
3160 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3161
3162 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3163 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3164
3165 if (!h || !w)
3166 XSRETURN_EMPTY;
3167
3168 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3169 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3170
3171 draw_x = SvNV (draw_x_sv) + x;
3172 draw_y = SvNV (draw_y_sv) + y;
3173
3174 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3175 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3176 XSRETURN_EMPTY;
3177
3178 sv_setnv (draw_x_sv, draw_x);
3179 sv_setnv (draw_y_sv, draw_y);
3180
3181 glPushMatrix ();
3182 glTranslated (x, y, 0);
3183
3184 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3185 {
3186 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3187
3188 if (svp && SvTRUE (*svp))
3189 {
3190 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3191 glEnable (GL_BLEND);
3192 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3193 glBegin (GL_QUADS);
3194 glVertex2f (0, 0);
3195 glVertex2f (w, 0);
3196 glVertex2f (w, h);
3197 glVertex2f (0, h);
3198 glEnd ();
3199 glDisable (GL_BLEND);
3200 }
3201 }
3202#if 0
3203 // draw borders, for debugging
3204 glPushMatrix ();
3205 glColor4f (1., 1., 0., 1.);
3206 glTranslatef (.5, .5, 0.);
3207 glBegin (GL_LINE_LOOP);
3208 glVertex2f (0 , 0);
3209 glVertex2f (w - 1, 0);
3210 glVertex2f (w - 1, h - 1);
3211 glVertex2f (0 , h - 1);
3212 glEnd ();
3213 glPopMatrix ();
3214#endif
3215 PUSHMARK (SP);
3216 XPUSHs (self);
3217 PUTBACK;
3218 call_method ("_draw", G_VOID | G_DISCARD);
3219 SPAGAIN;
3220
3221 glPopMatrix ();
3222
3223 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3224 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3225}
3226

Diff Legend

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