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.165 by root, Fri Dec 8 14:59:54 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# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# 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
17#endif 27#endif
18 28
29#include <assert.h>
19#include <math.h> 30#include <math.h>
20#include <string.h> 31#include <string.h>
21#include <stdio.h> 32#include <stdio.h>
22#include <stdlib.h> 33#include <stdlib.h>
23 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
24#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
25#include <SDL_endian.h> 39#include <SDL_endian.h>
26#include <SDL_image.h> 40#include <SDL_image.h>
27#include <SDL_mixer.h> 41#include <SDL_mixer.h>
28#include <SDL_opengl.h> 42#include <SDL_opengl.h>
29 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
30#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
32 51
33#include <glib/gmacros.h> 52#include <glib/gmacros.h>
34 53
35#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
36 66
37#ifndef _WIN32 67#ifndef _WIN32
38# include <sys/types.h> 68# include <sys/types.h>
39# include <sys/socket.h> 69# include <sys/socket.h>
40# include <netinet/in.h> 70# include <netinet/in.h>
41# include <netinet/tcp.h> 71# include <netinet/tcp.h>
42# include <inttypes.h> 72# include <inttypes.h>
43#endif 73#endif
44 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 85
47#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
48 87
49#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
51 90
52#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
53 92
54#if 0 93/* mask out modifiers we are not interested in */
55# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
56#else 95
57# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
58#endif 97
98static AV *texture_av;
59 99
60static struct 100static struct
61{ 101{
62#define GL_FUNC(ptr,name) ptr name; 102#define GL_FUNC(ptr,name) ptr name;
63#include "glfunc.h" 103#include "glfunc.h"
64#undef GL_FUNC 104#undef GL_FUNC
65} gl; 105} gl;
66 106
107static void
67static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 108gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68{ 109{
69 if (gl.BlendFuncSeparate) 110 if (gl.BlendFuncSeparate)
70 gl.BlendFuncSeparate (sa, da, saa, daa); 111 gl.BlendFuncSeparate (sa, da, saa, daa);
71 else if (gl.BlendFuncSeparateEXT) 112 else if (gl.BlendFuncSeparateEXT)
72 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 113 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73 else 114 else
74 glBlendFunc (sa, da); 115 glBlendFunc (sa, da);
75} 116}
76 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
77#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
78 144
79#include "pango-font.c" 145#include "pango-font.c"
80#include "pango-fontmap.c" 146#include "pango-fontmap.c"
81#include "pango-render.c" 147#include "pango-render.c"
82 148
149typedef IV DC__Channel;
150typedef SDL_RWops *DC__RW;
83typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
84typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
85 153
86typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
87 155
88static int 156static int
89shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
90{ 158{
91 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
… …
105 173
106typedef struct cf_layout { 174typedef struct cf_layout {
107 PangoLayout *pl; 175 PangoLayout *pl;
108 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
109 int base_height; 177 int base_height;
110 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
111} *CFPlus__Layout; 180} *DC__Layout;
112 181
113static CFPlus__Font default_font; 182static DC__Font default_font;
114static PangoContext *opengl_context; 183static PangoContext *opengl_context;
115static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
116 185
117static void 186static void
118substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
… …
123#endif 192#endif
124 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
125} 194}
126 195
127static void 196static void
128layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
129{ 198{
130 /* 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
131 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
132 */ 201 */
133 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
134 203
135 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
136 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
137 206
138 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
139} 208}
140 209
141static void 210static void
142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
143{ 212{
144 PangoRectangle rect; 213 PangoRectangle rect;
145 214
146 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
147 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
… …
154 223
155 *w = rect.width; 224 *w = rect.width;
156 *h = rect.height; 225 *h = rect.height;
157} 226}
158 227
228typedef uint16_t tileid;
159typedef uint16_t mapface; 229typedef uint16_t faceid;
160 230
161typedef struct { 231typedef struct {
162 GLint name; 232 GLuint name;
163 int w, h; 233 int w, h;
164 float s, t; 234 float s, t;
165 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
236 tileid smoothtile;
237 uint8_t smoothlevel;
166} maptex; 238} maptex;
167 239
168typedef struct { 240typedef struct {
169 uint32_t player; 241 uint32_t player;
170 mapface face[3]; 242 tileid tile[3];
171 uint16_t darkness; 243 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags; 244 uint8_t stat_width, stat_hp, flags, smoothmax;
173} mapcell; 245} mapcell;
174 246
175typedef struct { 247typedef struct {
176 int32_t c0, c1; 248 int32_t c0, c1;
177 mapcell *col; 249 mapcell *col;
178} maprow; 250} maprow;
179 251
180typedef struct map { 252typedef struct map {
181 int x, y, w, h; 253 int x, y, w, h;
182 int ox, oy; /* offset to virtual global coordinate system */ 254 int ox, oy; /* offset to virtual global coordinate system */
183 int faces; 255 int faces; tileid *face2tile; // [faceid]
184 mapface *face; 256 int texs; maptex *tex; // [tileid]
185
186 int texs;
187 maptex *tex;
188 257
189 int32_t rows; 258 int32_t rows;
190 maprow *row; 259 maprow *row;
191} *CFPlus__Map; 260} *DC__Map;
192 261
193static char * 262static char *
194prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
195{ 264{
196 char *p; 265 char *p;
… …
213} 282}
214 283
215#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))
216#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))
217 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
218static maprow * 307static maprow *
219map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
220{ 309{
221 if (0 > y) 310 if (0 > y)
222 { 311 {
223 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
224 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
… …
262 351
263 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
264} 353}
265 354
266static mapcell * 355static mapcell *
267map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
268{ 357{
269 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
270} 359}
271 360
272static void 361static void
273map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
274{ 363{
275 int r; 364 int r;
276 365
277 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
278 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
… …
285 self->oy = 0; 374 self->oy = 0;
286 self->row = 0; 375 self->row = 0;
287 self->rows = 0; 376 self->rows = 0;
288} 377}
289 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
290static void 389static void
291map_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)
292{ 391{
293 int x, y; 392 int x, y;
294 maprow *row; 393 maprow *row;
295 mapcell *cell; 394 mapcell *cell;
296 395
… …
308 if (x >= row->c1) 407 if (x >= row->c1)
309 break; 408 break;
310 409
311 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
312 411
313 cell->darkness = 0; 412 CELL_CLEAR (cell);
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
317 } 413 }
318 } 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);
319} 431}
320 432
321static void 433static void
322music_finished (void) 434music_finished (void)
323{ 435{
… …
359 n |= n >> 16; 471 n |= n >> 16;
360 472
361 return n + 1; 473 return n + 1;
362} 474}
363 475
364MODULE = 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
365 585
366PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
367 587
368BOOT: 588BOOT:
369{ 589{
370 HV *stash = gv_stashpv ("CFPlus", 1); 590 HV *stash = gv_stashpv ("DC", 1);
371 static const struct { 591 static const struct {
372 const char *name; 592 const char *name;
373 IV iv; 593 IV iv;
374 } *civ, const_iv[] = { 594 } *civ, const_iv[] = {
375# 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
376 const_iv (SDL_ACTIVEEVENT), 599 const_iv (SDL_ACTIVEEVENT),
377 const_iv (SDL_KEYDOWN), 600 const_iv (SDL_KEYDOWN),
378 const_iv (SDL_KEYUP), 601 const_iv (SDL_KEYUP),
379 const_iv (SDL_MOUSEMOTION), 602 const_iv (SDL_MOUSEMOTION),
380 const_iv (SDL_MOUSEBUTTONDOWN), 603 const_iv (SDL_MOUSEBUTTONDOWN),
… …
389 const_iv (SDL_EVENT_RESERVEDA), 612 const_iv (SDL_EVENT_RESERVEDA),
390 const_iv (SDL_EVENT_RESERVEDB), 613 const_iv (SDL_EVENT_RESERVEDB),
391 const_iv (SDL_VIDEORESIZE), 614 const_iv (SDL_VIDEORESIZE),
392 const_iv (SDL_VIDEOEXPOSE), 615 const_iv (SDL_VIDEOEXPOSE),
393 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),
394 const_iv (SDLK_KP0), 674 const_iv (SDLK_KP0),
395 const_iv (SDLK_KP1), 675 const_iv (SDLK_KP1),
396 const_iv (SDLK_KP2), 676 const_iv (SDLK_KP2),
397 const_iv (SDLK_KP3), 677 const_iv (SDLK_KP3),
398 const_iv (SDLK_KP4), 678 const_iv (SDLK_KP4),
… …
453 const_iv (SDLK_BREAK), 733 const_iv (SDLK_BREAK),
454 const_iv (SDLK_MENU), 734 const_iv (SDLK_MENU),
455 const_iv (SDLK_POWER), 735 const_iv (SDLK_POWER),
456 const_iv (SDLK_EURO), 736 const_iv (SDLK_EURO),
457 const_iv (SDLK_UNDO), 737 const_iv (SDLK_UNDO),
738
458 const_iv (KMOD_NONE), 739 const_iv (KMOD_NONE),
740 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_LSHIFT), 741 const_iv (KMOD_LSHIFT),
460 const_iv (KMOD_RSHIFT), 742 const_iv (KMOD_RSHIFT),
743 const_iv (KMOD_CTRL),
461 const_iv (KMOD_LCTRL), 744 const_iv (KMOD_LCTRL),
462 const_iv (KMOD_RCTRL), 745 const_iv (KMOD_RCTRL),
746 const_iv (KMOD_ALT),
463 const_iv (KMOD_LALT), 747 const_iv (KMOD_LALT),
464 const_iv (KMOD_RALT), 748 const_iv (KMOD_RALT),
749 const_iv (KMOD_META),
465 const_iv (KMOD_LMETA), 750 const_iv (KMOD_LMETA),
466 const_iv (KMOD_RMETA), 751 const_iv (KMOD_RMETA),
467 const_iv (KMOD_NUM), 752 const_iv (KMOD_NUM),
468 const_iv (KMOD_CAPS), 753 const_iv (KMOD_CAPS),
469 const_iv (KMOD_MODE), 754 const_iv (KMOD_MODE),
470 const_iv (KMOD_CTRL), 755
471 const_iv (KMOD_SHIFT), 756 const_iv (KMOD_LRAM),
472 const_iv (KMOD_ALT), 757
473 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)
474# undef const_iv 788# undef const_iv
475 }; 789 };
476 790
477 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; )
478 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);
479} 796}
797
798void
799weaken (SV *rv)
800 PROTOTYPE: $
801 CODE:
802 sv_rvweaken (rv);
480 803
481int 804int
482in_destruct () 805in_destruct ()
483 CODE: 806 CODE:
484 RETVAL = PL_main_cv == Nullcv; 807 RETVAL = PL_main_cv == Nullcv;
… …
487 810
488NV floor (NV x) 811NV floor (NV x)
489 812
490NV ceil (NV x) 813NV ceil (NV x)
491 814
815IV minpot (UV n)
816
817IV popcount (UV n)
818
492void 819void
493pango_init () 820pango_init ()
494 CODE: 821 CODE:
495{ 822{
496 opengl_fontmap = pango_opengl_font_map_new (); 823 opengl_fontmap = pango_opengl_font_map_new ();
497 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);
498 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
499} 831}
500 832
501int 833char *SDL_GetError ()
502SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
503 834
504void 835void SDL_braino ()
836
837int SDL_Init (U32 flags)
838
839int SDL_InitSubSystem (U32 flags)
840
841void SDL_QuitSubSystem (U32 flags)
842
505SDL_Quit () 843void SDL_Quit ()
506 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
507void 854void
508SDL_ListModes () 855SDL_ListModes (int rgb, int alpha)
509 PPCODE: 856 PPCODE:
510{ 857{
511 SDL_Rect **m; 858 SDL_Rect **m;
512 859
513 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 860 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
514 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 861 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
515 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 862 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
516 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 863 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
517 864
518 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 865 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
519 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 866 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
520 867
521 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 868 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
525 872
526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 873 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10)
528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 874 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif
531
532 SDL_EnableUNICODE (1);
533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
534 875
535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 876 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
536 877
537 if (m && m != (SDL_Rect **)-1) 878 if (m && m != (SDL_Rect **)-1)
538 while (*m) 879 while (*m)
539 { 880 {
881 if ((*m)->w >= 400 && (*m)->h >= 300)
882 {
540 AV *av = newAV (); 883 AV *av = newAV ();
541 av_push (av, newSViv ((*m)->w)); 884 av_push (av, newSViv ((*m)->w));
542 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));
543 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 888 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
889 }
544 890
545 ++m; 891 ++m;
546 } 892 }
547} 893}
548 894
549char *
550SDL_GetError ()
551
552int 895int
553SDL_SetVideoMode (int w, int h, int fullscreen) 896SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
554 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
555 RETVAL = !!SDL_SetVideoMode ( 907 RETVAL = !!SDL_SetVideoMode (
556 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 908 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
557 ); 909 );
910
558 if (RETVAL) 911 if (RETVAL)
559 { 912 {
560 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 913 av_clear (texture_av);
914
915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
561# 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);
562# include "glfunc.h" 917#include "glfunc.h"
563# undef GL_FUNC 918#undef GL_FUNC
564 } 919 }
920}
565 OUTPUT: 921 OUTPUT:
566 RETVAL 922 RETVAL
567 923
568void 924void
569SDL_GL_SwapBuffers () 925SDL_GL_SwapBuffers ()
570 926
571char * 927char *
572SDL_GetKeyName (int sym) 928SDL_GetKeyName (int sym)
573 929
930int
931SDL_GetAppState ()
932
933int
934SDL_GetModState ()
935
574void 936void
575SDL_PollEvent () 937poll_events ()
576 PPCODE: 938 PPCODE:
577{ 939{
578 SDL_Event ev; 940 SDL_Event ev;
579 941
580 while (SDL_PollEvent (&ev)) 942 SDL_PumpEvents ();
943 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
581 { 944 {
582 HV *hv = newHV (); 945 HV *hv = newHV ();
583 hv_store (hv, "type", 4, newSViv (ev.type), 0); 946 hv_store (hv, "type", 4, newSViv (ev.type), 0);
584 947
585 switch (ev.type) 948 switch (ev.type)
586 { 949 {
587 case SDL_KEYDOWN: 950 case SDL_KEYDOWN:
588 case SDL_KEYUP: 951 case SDL_KEYUP:
589 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 952 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 953 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591 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 */
592 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 956 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593 break; 957 break;
594 958
595 case SDL_ACTIVEEVENT: 959 case SDL_ACTIVEEVENT:
596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 960 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
597 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 961 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
598 break; 962 break;
599 963
600 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
601 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 983 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
602
603 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 984 hv_store (hv, "state", 5, newSViv (state), 0);
604 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 985 hv_store (hv, "x", 1, newSViv (x), 0);
605 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 986 hv_store (hv, "y", 1, newSViv (y), 0);
606 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 987 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
607 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 988 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
989 }
608 break; 990 break;
609 991
610 case SDL_MOUSEBUTTONDOWN: 992 case SDL_MOUSEBUTTONDOWN:
611 case SDL_MOUSEBUTTONUP: 993 case SDL_MOUSEBUTTONUP:
612 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 994 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
613 995
614 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 996 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
615 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 997 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
616 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 998 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
617 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 999 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1004 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1005 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
624 break; 1006 break;
625 } 1007 }
626 1008
627 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))));
628 } 1010 }
629} 1011}
630 1012
631int 1013int
632Mix_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)
633 POSTCALL: 1015 POSTCALL:
634 Mix_HookMusicFinished (music_finished); 1016 Mix_HookMusicFinished (music_finished);
635 Mix_ChannelFinished (channel_finished); 1017 Mix_ChannelFinished (channel_finished);
636 1018
637void 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
638Mix_CloseAudio () 1036Mix_CloseAudio ()
639 1037
640int 1038int
641Mix_AllocateChannels (int numchans = -1) 1039Mix_AllocateChannels (int numchans = -1)
642 1040
1041const char *
1042Mix_GetError ()
1043
643void 1044void
644lowdelay (int fd, int val = 1) 1045lowdelay (int fd, int val = 1)
645 CODE: 1046 CODE:
646#ifndef _WIN32
647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 1047 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648#endif
649 1048
650void 1049void
651win32_proxy_info () 1050win32_proxy_info ()
652 PPCODE: 1051 PPCODE:
653{ 1052{
… …
674 } 1073 }
675 } 1074 }
676#endif 1075#endif
677} 1076}
678 1077
679void 1078int
680add_font (char *file) 1079add_font (char *file)
681 CODE: 1080 CODE:
682 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT:
1083 RETVAL
683 1084
684void 1085void
685load_image_inline (SV *image_) 1086load_image_inline (SV *image_)
686 ALIAS: 1087 ALIAS:
687 load_image_file = 1 1088 load_image_file = 1
… …
690 STRLEN image_len; 1091 STRLEN image_len;
691 char *image = (char *)SvPVbyte (image_, image_len); 1092 char *image = (char *)SvPVbyte (image_, image_len);
692 SDL_Surface *surface, *surface2; 1093 SDL_Surface *surface, *surface2;
693 SDL_PixelFormat fmt; 1094 SDL_PixelFormat fmt;
694 SDL_RWops *rw = ix 1095 SDL_RWops *rw = ix
695 ? SDL_RWFromFile (image, "r") 1096 ? SDL_RWFromFile (image, "rb")
696 : SDL_RWFromConstMem (image, image_len); 1097 : SDL_RWFromConstMem (image, image_len);
697 1098
698 if (!rw) 1099 if (!rw)
699 croak ("load_image: %s", SDL_GetError ()); 1100 croak ("load_image: %s", SDL_GetError ());
700 1101
… …
773void 1174void
774error (char *message) 1175error (char *message)
775 CODE: 1176 CODE:
776 fprintf (stderr, "ERROR: %s\n", message); 1177 fprintf (stderr, "ERROR: %s\n", message);
777#ifdef _WIN32 1178#ifdef _WIN32
778 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1179 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
779#endif 1180#endif
780 1181
781void 1182void
782fatal (char *message) 1183fatal (char *message)
783 CODE: 1184 CODE:
784 fprintf (stderr, "FATAL: %s\n", message); 1185 fprintf (stderr, "FATAL: %s\n", message);
785#ifdef _WIN32 1186#ifdef _WIN32
786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
787#endif 1188#endif
788 _exit (1); 1189 _exit (1);
789 1190
790void 1191void
791_exit (int retval = 0) 1192_exit (int retval = 0)
… …
794 ExitThread (retval); // unclean, please beam me up 1195 ExitThread (retval); // unclean, please beam me up
795#else 1196#else
796 _exit (retval); 1197 _exit (retval);
797#endif 1198#endif
798 1199
799MODULE = CFPlus PACKAGE = CFPlus::Font 1200void
1201debug ()
1202 CODE:
1203{
1204#if DEBUG
1205 VALGRIND_DO_LEAK_CHECK;
1206#endif
1207}
800 1208
801CFPlus::Font 1209MODULE = Deliantra::Client PACKAGE = DC::Font
1210
1211PROTOTYPES: DISABLE
1212
1213DC::Font
802new_from_file (SV *class, char *path, int id = 0) 1214new_from_file (SV *class, char *path, int id = 0)
803 CODE: 1215 CODE:
804{ 1216{
805 int count; 1217 int count;
806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
809} 1221}
810 OUTPUT: 1222 OUTPUT:
811 RETVAL 1223 RETVAL
812 1224
813void 1225void
814DESTROY (CFPlus::Font self) 1226DESTROY (DC::Font self)
815 CODE: 1227 CODE:
816 pango_font_description_free (self); 1228 pango_font_description_free (self);
817 1229
818void 1230void
819make_default (CFPlus::Font self) 1231make_default (DC::Font self)
1232 PROTOTYPE: $
820 CODE: 1233 CODE:
821 default_font = self; 1234 default_font = self;
822 1235
823MODULE = CFPlus PACKAGE = CFPlus::Layout 1236MODULE = Deliantra::Client PACKAGE = DC::Layout
824 1237
1238PROTOTYPES: DISABLE
1239
825void 1240void
826reset_glyph_cache () 1241glyph_cache_backup ()
1242 PROTOTYPE:
827 CODE: 1243 CODE:
1244 tc_backup ();
1245
1246void
1247glyph_cache_restore ()
1248 PROTOTYPE:
1249 CODE:
828 tc_clear (); 1250 tc_restore ();
829 1251
830CFPlus::Layout 1252DC::Layout
831new (SV *class) 1253new (SV *class)
832 CODE: 1254 CODE:
833 New (0, RETVAL, 1, struct cf_layout); 1255 New (0, RETVAL, 1, struct cf_layout);
834 1256
835 RETVAL->pl = pango_layout_new (opengl_context); 1257 RETVAL->pl = pango_layout_new (opengl_context);
… …
837 RETVAL->g = 1.; 1259 RETVAL->g = 1.;
838 RETVAL->b = 1.; 1260 RETVAL->b = 1.;
839 RETVAL->a = 1.; 1261 RETVAL->a = 1.;
840 RETVAL->base_height = MIN_FONT_HEIGHT; 1262 RETVAL->base_height = MIN_FONT_HEIGHT;
841 RETVAL->font = 0; 1263 RETVAL->font = 0;
1264 RETVAL->rc = rc_alloc ();
842 1265
843 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1266 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
844 layout_update_font (RETVAL); 1267 layout_update_font (RETVAL);
845 OUTPUT: 1268 OUTPUT:
846 RETVAL 1269 RETVAL
847 1270
848void 1271void
849DESTROY (CFPlus::Layout self) 1272DESTROY (DC::Layout self)
850 CODE: 1273 CODE:
851 g_object_unref (self->pl); 1274 g_object_unref (self->pl);
1275 rc_free (self->rc);
852 Safefree (self); 1276 Safefree (self);
853 1277
854void 1278void
855set_text (CFPlus::Layout self, SV *text_) 1279set_text (DC::Layout self, SV *text_)
856 CODE: 1280 CODE:
857{ 1281{
858 STRLEN textlen; 1282 STRLEN textlen;
859 char *text = SvPVutf8 (text_, textlen); 1283 char *text = SvPVutf8 (text_, textlen);
860 1284
861 pango_layout_set_text (self->pl, text, textlen); 1285 pango_layout_set_text (self->pl, text, textlen);
862} 1286}
863 1287
864void 1288void
865set_markup (CFPlus::Layout self, SV *text_) 1289set_markup (DC::Layout self, SV *text_)
866 CODE: 1290 CODE:
867{ 1291{
868 STRLEN textlen; 1292 STRLEN textlen;
869 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
870 1294
871 pango_layout_set_markup (self->pl, text, textlen); 1295 pango_layout_set_markup (self->pl, text, textlen);
872} 1296}
873 1297
874void 1298void
875set_shapes (CFPlus::Layout self, ...) 1299set_shapes (DC::Layout self, ...)
876 CODE: 1300 CODE:
877{ 1301{
878 PangoAttrList *attrs = 0; 1302 PangoAttrList *attrs = 0;
879 const char *text = pango_layout_get_text (self->pl); 1303 const char *text = pango_layout_get_text (self->pl);
880 const char *pos = text; 1304 const char *pos = text;
… …
915 if (attrs) 1339 if (attrs)
916 pango_layout_set_attributes (self->pl, attrs); 1340 pango_layout_set_attributes (self->pl, attrs);
917} 1341}
918 1342
919void 1343void
920get_shapes (CFPlus::Layout self) 1344get_shapes (DC::Layout self)
921 PPCODE: 1345 PPCODE:
922{ 1346{
923 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1347 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
924 1348
925 do 1349 do
926 { 1350 {
927 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1351 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
928 1352
929 if (run && shape_attr_p (run)) 1353 if (run && shape_attr_p (run))
930 { 1354 {
931 PangoRectangle extents; 1355 PangoRectangle extents;
932 pango_layout_iter_get_run_extents (iter, 0, &extents); 1356 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
940 1364
941 pango_layout_iter_free (iter); 1365 pango_layout_iter_free (iter);
942} 1366}
943 1367
944int 1368int
945has_wrapped (CFPlus::Layout self) 1369has_wrapped (DC::Layout self)
946 CODE: 1370 CODE:
947{ 1371{
948 int lines = 1; 1372 int lines = 1;
949 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
950 1374
… …
955} 1379}
956 OUTPUT: 1380 OUTPUT:
957 RETVAL 1381 RETVAL
958 1382
959SV * 1383SV *
960get_text (CFPlus::Layout self) 1384get_text (DC::Layout self)
961 CODE: 1385 CODE:
962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1386 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
963 sv_utf8_decode (RETVAL); 1387 sv_utf8_decode (RETVAL);
964 OUTPUT: 1388 OUTPUT:
965 RETVAL 1389 RETVAL
966 1390
967void 1391void
968set_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.)
969 CODE: 1393 CODE:
970 self->r = r; 1394 self->r = r;
971 self->g = g; 1395 self->g = g;
972 self->b = b; 1396 self->b = b;
973 self->a = a; 1397 self->a = a;
974 1398
975void 1399void
976set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1400set_font (DC::Layout self, DC::Font font = 0)
977 CODE: 1401 CODE:
978 if (self->font != font) 1402 if (self->font != font)
979 { 1403 {
980 self->font = font; 1404 self->font = font;
981 layout_update_font (self); 1405 layout_update_font (self);
982 } 1406 }
983 1407
984void 1408void
985set_height (CFPlus::Layout self, int base_height) 1409set_height (DC::Layout self, int base_height)
986 CODE: 1410 CODE:
987 if (self->base_height != base_height) 1411 if (self->base_height != base_height)
988 { 1412 {
989 self->base_height = base_height; 1413 self->base_height = base_height;
990 layout_update_font (self); 1414 layout_update_font (self);
991 } 1415 }
992 1416
993void 1417void
994set_width (CFPlus::Layout self, int max_width = -1) 1418set_width (DC::Layout self, int max_width = -1)
995 CODE: 1419 CODE:
996 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);
997 1421
998void 1422void
999set_indent (CFPlus::Layout self, int indent) 1423set_indent (DC::Layout self, int indent)
1000 CODE: 1424 CODE:
1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1425 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1002 1426
1003void 1427void
1004set_spacing (CFPlus::Layout self, int spacing) 1428set_spacing (DC::Layout self, int spacing)
1005 CODE: 1429 CODE:
1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1430 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1007 1431
1008void 1432void
1009set_ellipsise (CFPlus::Layout self, int ellipsise) 1433set_ellipsise (DC::Layout self, int ellipsise)
1010 CODE: 1434 CODE:
1011 pango_layout_set_ellipsize (self->pl, 1435 pango_layout_set_ellipsize (self->pl,
1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1436 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1437 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1438 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1015 : PANGO_ELLIPSIZE_NONE 1439 : PANGO_ELLIPSIZE_NONE
1016 ); 1440 );
1017 1441
1018void 1442void
1019set_single_paragraph_mode (CFPlus::Layout self, int spm) 1443set_single_paragraph_mode (DC::Layout self, int spm)
1020 CODE: 1444 CODE:
1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1445 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1022 1446
1023void 1447void
1024size (CFPlus::Layout self) 1448size (DC::Layout self)
1025 PPCODE: 1449 PPCODE:
1026{ 1450{
1027 int w, h; 1451 int w, h;
1028 1452
1029 layout_get_pixel_size (self, &w, &h); 1453 layout_get_pixel_size (self, &w, &h);
… …
1032 PUSHs (sv_2mortal (newSViv (w))); 1456 PUSHs (sv_2mortal (newSViv (w)));
1033 PUSHs (sv_2mortal (newSViv (h))); 1457 PUSHs (sv_2mortal (newSViv (h)));
1034} 1458}
1035 1459
1036int 1460int
1037descent (CFPlus::Layout self) 1461descent (DC::Layout self)
1038 CODE: 1462 CODE:
1039{ 1463{
1040 PangoRectangle rect; 1464 PangoRectangle rect;
1041 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1465 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1042 pango_layout_line_get_pixel_extents (line, 0, &rect); 1466 pango_layout_line_get_pixel_extents (line, 0, &rect);
1043 RETVAL = PANGO_DESCENT (rect); 1467 RETVAL = PANGO_DESCENT (rect);
1044} 1468}
1045 OUTPUT: 1469 OUTPUT:
1046 RETVAL 1470 RETVAL
1047 1471
1048int 1472int
1049xy_to_index (CFPlus::Layout self, int x, int y) 1473xy_to_index (DC::Layout self, int x, int y)
1050 CODE: 1474 CODE:
1051{ 1475{
1052 int index, trailing; 1476 int index, trailing;
1053 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);
1054 RETVAL = index + trailing; 1478 RETVAL = index + trailing;
1055} 1479}
1056 OUTPUT: 1480 OUTPUT:
1057 RETVAL 1481 RETVAL
1058 1482
1059void 1483void
1060cursor_pos (CFPlus::Layout self, int index) 1484cursor_pos (DC::Layout self, int index)
1061 PPCODE: 1485 PPCODE:
1062{ 1486{
1063 PangoRectangle strong_pos; 1487 PangoRectangle pos;
1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1488 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1065 1489
1066 EXTEND (SP, 3); 1490 EXTEND (SP, 3);
1067 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1491 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1492 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1070} 1494}
1071 1495
1072void 1496void
1073index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1497index_to_line_x (DC::Layout self, int index, int trailing = 0)
1074 PPCODE: 1498 PPCODE:
1075{ 1499{
1076 int line, x; 1500 int line, x;
1077 1501
1078 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1502 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1503#if !PANGO_VERSION_CHECK (1, 17, 3)
1079 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1504 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1080 1505 --line;
1506#endif
1081 EXTEND (SP, 2); 1507 EXTEND (SP, 2);
1082 PUSHs (sv_2mortal (newSViv (line - 1))); 1508 PUSHs (sv_2mortal (newSViv (line)));
1083 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1509 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1084} 1510}
1085 1511
1086void 1512void
1087line_x_to_index (CFPlus::Layout self, int line, int x) 1513line_x_to_index (DC::Layout self, int line, int x)
1088 PPCODE: 1514 PPCODE:
1089{ 1515{
1090 PangoLayoutLine *lp; 1516 PangoLayoutLine *lp;
1091 int index, trailing; 1517 int index, trailing;
1092 1518
1093 if (line < 0) 1519 if (line < 0)
1094 XSRETURN_EMPTY; 1520 XSRETURN_EMPTY;
1095 1521
1096 if (!(lp = pango_layout_get_line (self->pl, line))) 1522 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1097 XSRETURN_EMPTY; /* do better */ 1523 XSRETURN_EMPTY; /* do better */
1098 1524
1099 if (!pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing)) 1525 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1100 XSRETURN_EMPTY; /* do better */
1101 1526
1102 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1103 if (GIMME_V == G_SCALAR) 1528 if (GIMME_V == G_SCALAR)
1104 PUSHs (sv_2mortal (newSViv (index + trailing))); 1529 PUSHs (sv_2mortal (newSViv (index + trailing)));
1105 else 1530 else
… …
1108 PUSHs (sv_2mortal (newSViv (trailing))); 1533 PUSHs (sv_2mortal (newSViv (trailing)));
1109 } 1534 }
1110} 1535}
1111 1536
1112void 1537void
1113render (CFPlus::Layout self, float x, float y, int flags = 0) 1538render (DC::Layout self, float x, float y, int flags = 0)
1114 PPCODE: 1539 CODE:
1540 rc_clear (self->rc);
1115 pango_opengl_render_layout_subpixel ( 1541 pango_opengl_render_layout_subpixel (
1116 self->pl, 1542 self->pl,
1543 self->rc,
1117 x * PANGO_SCALE, y * PANGO_SCALE, 1544 x * PANGO_SCALE, y * PANGO_SCALE,
1118 self->r, self->g, self->b, self->a, 1545 self->r, self->g, self->b, self->a,
1119 flags 1546 flags
1120 ); 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);
1121 1551
1122MODULE = CFPlus PACKAGE = CFPlus::Texture
1123
1124void 1552void
1125pad2pot (SV *data_, SV *w_, SV *h_) 1553draw (DC::Layout self)
1126 CODE: 1554 CODE:
1127{ 1555{
1128 int ow = SvIV (w_); 1556 glEnable (GL_TEXTURE_2D);
1129 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);
1130 1563
1131 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_))
1132 { 1580 {
1133 int nw = minpot (ow);
1134 int nh = minpot (oh);
1135
1136 if (nw != ow || nh != oh)
1137 {
1138 if (SvOK (data_))
1139 {
1140 STRLEN datalen; 1581 STRLEN datalen;
1141 char *data = SvPVbyte (data_, datalen); 1582 char *data = SvPVbyte (data_, datalen);
1142 int bpp = datalen / (ow * oh); 1583 int bpp = datalen / (ow * oh);
1143 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1584 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1144 1585
1145 SvPOK_only (result_); 1586 SvPOK_only (result_);
1146 SvCUR_set (result_, nw * nh * bpp); 1587 SvCUR_set (result_, nw * nh * bpp);
1147 1588
1148 memset (SvPVX (result_), 0, nw * nh * bpp); 1589 memset (SvPVX (result_), 0, nw * nh * bpp);
1149 while (oh--) 1590 while (oh--)
1150 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);
1151 1592
1152 sv_setsv (data_, result_); 1593 sv_setsv (data_, result_);
1153 }
1154
1155 sv_setiv (w_, nw);
1156 sv_setiv (h_, nh);
1157 }
1158 } 1594 }
1159} 1595}
1160 1596
1161void 1597void
1162draw_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.)
… …
1168{ 1604{
1169 HV *hv = (HV *)SvRV (self); 1605 HV *hv = (HV *)SvRV (self);
1170 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1606 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1171 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1607 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1172 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;
1173 1612
1174 if (items < 5) 1613 if (items < 5)
1175 { 1614 {
1176 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1615 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1177 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1616 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1205 glDisable (GL_ALPHA_TEST); 1644 glDisable (GL_ALPHA_TEST);
1206 glDisable (GL_BLEND); 1645 glDisable (GL_BLEND);
1207 } 1646 }
1208} 1647}
1209 1648
1210MODULE = 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
1211 1659
1212CFPlus::Map 1660MODULE = Deliantra::Client PACKAGE = DC::Map
1661
1662PROTOTYPES: DISABLE
1663
1664DC::Map
1213new (SV *class) 1665new (SV *class)
1214 CODE: 1666 CODE:
1215 New (0, RETVAL, 1, struct map); 1667 New (0, RETVAL, 1, struct map);
1216 RETVAL->x = 0; 1668 RETVAL->x = 0;
1217 RETVAL->y = 0; 1669 RETVAL->y = 0;
1218 RETVAL->w = 0; 1670 RETVAL->w = 0;
1219 RETVAL->h = 0; 1671 RETVAL->h = 0;
1220 RETVAL->ox = 0; 1672 RETVAL->ox = 0;
1221 RETVAL->oy = 0; 1673 RETVAL->oy = 0;
1222 RETVAL->faces = 8192; 1674 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1223 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1675 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1224 RETVAL->texs = 8192;
1225 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1226 RETVAL->rows = 0; 1676 RETVAL->rows = 0;
1227 RETVAL->row = 0; 1677 RETVAL->row = 0;
1228 OUTPUT: 1678 OUTPUT:
1229 RETVAL 1679 RETVAL
1230 1680
1231void 1681void
1232DESTROY (CFPlus::Map self) 1682DESTROY (DC::Map self)
1233 CODE: 1683 CODE:
1234{ 1684{
1235 map_clear (self); 1685 map_clear (self);
1236 Safefree (self->face); 1686 Safefree (self->face2tile);
1237 Safefree (self->tex); 1687 Safefree (self->tex);
1238 Safefree (self); 1688 Safefree (self);
1239} 1689}
1240 1690
1241void 1691void
1242resize (CFPlus::Map self, int map_width, int map_height) 1692resize (DC::Map self, int map_width, int map_height)
1243 CODE: 1693 CODE:
1244 self->w = map_width; 1694 self->w = map_width;
1245 self->h = map_height; 1695 self->h = map_height;
1246 1696
1247void 1697void
1248clear (CFPlus::Map self) 1698clear (DC::Map self)
1249 CODE: 1699 CODE:
1250 map_clear (self); 1700 map_clear (self);
1251 1701
1252void 1702void
1253set_face (CFPlus::Map self, int face, int texid) 1703set_tileid (DC::Map self, int face, int tile)
1254 CODE: 1704 CODE:
1255{ 1705{
1256 while (self->faces <= face) 1706 need_facenum (self, face); self->face2tile [face] = tile;
1257 { 1707 need_texid (self, tile);
1258 Append (mapface, self->face, self->faces, self->faces);
1259 self->faces *= 2;
1260 }
1261
1262 self->face [face] = texid;
1263} 1708}
1264 1709
1265void 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
1266set_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)
1267 CODE: 1735 CODE:
1268{ 1736{
1269 while (self->texs <= texid) 1737 need_texid (self, texid);
1270 {
1271 Append (maptex, self->tex, self->texs, self->texs);
1272 self->texs *= 2;
1273 }
1274 1738
1275 { 1739 {
1276 maptex *tex = self->tex + texid; 1740 maptex *tex = self->tex + texid;
1277 1741
1278 tex->name = name; 1742 tex->name = name;
… …
1295 // from transparent color bleeding and ugly wrapping effects. 1759 // from transparent color bleeding and ugly wrapping effects.
1296 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1297} 1761}
1298 1762
1299int 1763int
1300ox (CFPlus::Map self) 1764ox (DC::Map self)
1301 ALIAS: 1765 ALIAS:
1302 oy = 1 1766 oy = 1
1303 x = 2 1767 x = 2
1304 y = 3 1768 y = 3
1305 w = 4 1769 w = 4
… …
1316 } 1780 }
1317 OUTPUT: 1781 OUTPUT:
1318 RETVAL 1782 RETVAL
1319 1783
1320void 1784void
1321scroll (CFPlus::Map self, int dx, int dy) 1785scroll (DC::Map self, int dx, int dy)
1322 CODE: 1786 CODE:
1323{ 1787{
1324 if (dx > 0) 1788 if (dx > 0)
1325 map_blank (self, self->x, self->y, dx, self->h); 1789 map_blank (self, self->x, self->y, dx, self->h);
1326 else if (dx < 0) 1790 else if (dx < 0)
1327 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);
1328 1792
1329 if (dy > 0) 1793 if (dy > 0)
1330 map_blank (self, self->x, self->y, self->w, dy); 1794 map_blank (self, self->x, self->y, self->w, dy);
1331 else if (dy < 0) 1795 else if (dy < 0)
1332 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);
1333 1797
1334 self->ox += dx; self->x += dx; 1798 self->ox += dx; self->x += dx;
1335 self->oy += dy; self->y += dy; 1799 self->oy += dy; self->y += dy;
1336 1800
1337 while (self->y < 0) 1801 while (self->y < 0)
… …
1341 self->rows += MAP_EXTEND_Y; 1805 self->rows += MAP_EXTEND_Y;
1342 self->y += MAP_EXTEND_Y; 1806 self->y += MAP_EXTEND_Y;
1343 } 1807 }
1344} 1808}
1345 1809
1346void 1810SV *
1347map1a_update (CFPlus::Map self, SV *data_, int extmap) 1811map1a_update (DC::Map self, SV *data_, int extmap)
1348 CODE: 1812 CODE:
1349{ 1813{
1350 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1351 uint8_t *data_end = (uint8_t *)SvEND (data_); 1815 uint8_t *data_end = (uint8_t *)SvEND (data_);
1352 mapcell *cell; 1816 mapcell *cell;
1353 int x, y, flags; 1817 int x, y, z, flags;
1818 AV *missing = newAV ();
1819 RETVAL = newRV_noinc ((SV *)missing);
1354 1820
1355 while (data < data_end - 1) 1821 while (data < data_end - 1)
1356 { 1822 {
1357 flags = (data [0] << 8) + data [1]; data += 2; 1823 flags = (data [0] << 8) + data [1]; data += 2;
1358 1824
… …
1378 uint8_t ext, cmd; 1844 uint8_t ext, cmd;
1379 1845
1380 do 1846 do
1381 { 1847 {
1382 ext = *data++; 1848 ext = *data++;
1383 cmd = ext & 0x3f; 1849 cmd = ext & 0x7f;
1384 1850
1385 if (cmd < 4) 1851 if (cmd < 4)
1386 cell->darkness = 255 - ext * 64 + 1; 1852 cell->darkness = 255 - ext * 64 + 1;
1387 else if (cmd == 5) // health 1853 else if (cmd == 5) // health
1388 { 1854 {
1389 cell->stat_width = 1; 1855 cell->stat_width = 1;
1390 cell->stat_hp = *data++; 1856 cell->stat_hp = *data++;
1391 } 1857 }
1392 else if (cmd == 6) // monster width 1858 else if (cmd == 6) // monster width
1393 cell->stat_width = *data++ + 1; 1859 cell->stat_width = *data++ + 1;
1394 else if (cmd == 0x47) // monster width 1860 else if (cmd == 0x47)
1395 { 1861 {
1396 if (*data == 4) 1862 if (*data == 1) cell->player = data [1];
1397 ; // 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);
1398 1866
1399 data += *data + 1; 1867 data += *data + 1;
1400 } 1868 }
1401 else if (cmd == 8) // cell flags 1869 else if (cmd == 8) // cell flags
1402 cell->flags = *data++; 1870 cell->flags = *data++;
… …
1409 } 1877 }
1410 else 1878 else
1411 cell->darkness = *data++ + 1; 1879 cell->darkness = *data++ + 1;
1412 } 1880 }
1413 1881
1882 for (z = 0; z <= 2; ++z)
1414 if (flags & 4) 1883 if (flags & (4 >> z))
1415 { 1884 {
1416 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 }
1417 } 1902 }
1418
1419 if (flags & 2)
1420 {
1421 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
1422 }
1423
1424 if (flags & 1)
1425 {
1426 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1427 }
1428 } 1903 }
1429 else 1904 else
1430 cell->darkness = 0; 1905 CELL_CLEAR (cell);
1431 } 1906 }
1432} 1907}
1908 OUTPUT:
1909 RETVAL
1433 1910
1434SV * 1911SV *
1435mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1912mapmap (DC::Map self, int x0, int y0, int w, int h)
1436 CODE: 1913 CODE:
1437{ 1914{
1438 int x1, x; 1915 int x1, x;
1439 int y1, y; 1916 int y1, y;
1440 int z; 1917 int z;
… …
1461 { 1938 {
1462 mapcell *cell = row->col + (x - row->c0); 1939 mapcell *cell = row->col + (x - row->c0);
1463 1940
1464 for (z = 0; z <= 0; z++) 1941 for (z = 0; z <= 0; z++)
1465 { 1942 {
1466 mapface face = cell->face [z];
1467
1468 if (face)
1469 {
1470 maptex tex = self->tex [face]; 1943 maptex tex = self->tex [cell->tile [z]];
1471 int a0 = 255 - tex.a; 1944 int a0 = 255 - tex.a;
1472 int a1 = tex.a; 1945 int a1 = tex.a;
1473 1946
1474 r = (r * a0 + tex.r * a1) / 255; 1947 r = (r * a0 + tex.r * a1) / 255;
1475 g = (g * a0 + tex.g * a1) / 255; 1948 g = (g * a0 + tex.g * a1) / 255;
1476 b = (b * a0 + tex.b * a1) / 255; 1949 b = (b * a0 + tex.b * a1) / 255;
1477 a = (a * a0 + tex.a * a1) / 255; 1950 a = (a * a0 + tex.a * a1) / 255;
1478 }
1479 } 1951 }
1480 } 1952 }
1481 1953
1482 *map++ = (r ) 1954 *map++ = (r )
1483 | (g << 8) 1955 | (g << 8)
… …
1490} 1962}
1491 OUTPUT: 1963 OUTPUT:
1492 RETVAL 1964 RETVAL
1493 1965
1494void 1966void
1495draw (CFPlus::Map self, int mx, int my, 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)
1496 CODE: 1968 CODE:
1497{ 1969{
1498 int x, y, z; 1970 int x, y, z;
1499 int last_name;
1500 mapface face;
1501 1971
1502 glColor4ub (255, 255, 255, 255); 1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
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;
1981
1982 pl_tex.name = 0;
1983
1984 // thats current max. sorry.
1985 if (sw > 255) sw = 255;
1986 if (sh > 255) sh = 255;
1987
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 }
1503 2024
1504 glEnable (GL_BLEND); 2025 glEnable (GL_BLEND);
1505 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1506 glEnable (GL_TEXTURE_2D);
1507 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1508 2028
1509 glBegin (GL_QUADS);
1510
1511 last_name = 0;
1512
1513 mx += self->x;
1514 my += self->y;
1515
1516 for (z = 0; z < 3; z++) 2029 for (z = 0; z <= 2; z++)
2030 {
2031 memset (smooth_level, 0, sizeof (smooth_level));
2032
1517 for (y = 0; y < sh; y++) 2033 for (y = 0; y < sh; y++)
1518 if (0 <= y + my && y + my < self->rows) 2034 if (0 <= y + my && y + my < self->rows)
1519 { 2035 {
1520 maprow *row = self->row + (y + my); 2036 maprow *row = self->row + (y + my);
1521 2037
1522 for (x = 0; x < sw; x++) 2038 for (x = 0; x < sw; x++)
1523 if (row->c0 <= x + mx && x + mx < row->c1) 2039 if (row->c0 <= x + mx && x + mx < row->c1)
1524 { 2040 {
1525 mapcell *cell = row->col + (x + mx - row->c0); 2041 mapcell *cell = row->col + (x + mx - row->c0);
1526
1527 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;
1528 2049
1529 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))
1530 { 2155 {
1531 maptex tex = self->tex [face]; 2156 int level = (w << 5) | b;
1532 int px = (x + 1) * 32 - tex.w; 2157 HE *he;
1533 int py = (y + 1) * 32 - tex.h;
1534 2158
1535 if (last_name != tex.name) 2159 hv_iterinit (smooth);
2160 while ((he = hv_iternext (smooth)))
1536 { 2161 {
1537 glEnd (); 2162 smooth_key *skey = (smooth_key *)HeKEY (he);
1538 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2163 IV bits = SvIVX (HeVAL (he));
1539 glBegin (GL_QUADS);
1540 }
1541 2164
1542 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1543 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1544 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1545 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1546 }
1547
1548 if (cell->flags && z == 2)
1549 {
1550 if (cell->flags & 1) 2165 if (!(bits & 0x1000)
2166 && skey->level == level
2167 && level > smooth_max [skey->x][skey->y])
1551 { 2168 {
1552 maptex tex = self->tex [1]; 2169 maptex tex = self->tex [skey->tile];
1553 int px = (x + 1) * 32 - tex.w + 2; 2170 int px = (((int)skey->x) - 1) * T;
1554 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
1555 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 {
1556 glEnd (); 2183 glEnd ();
1557 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1558 glBegin (GL_QUADS); 2185 glBegin (GL_QUADS);
2186 }
1559 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
1560 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2202 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1561 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1562 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1563 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2206 }
2207 }
2208 }
1564 } 2209 }
1565 } 2210 }
1566 }
1567 } 2211 }
1568 2212
1569 glEnd (); 2213 glEnd ();
1570
1571 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
1572 glDisable (GL_BLEND); 2238 glDisable (GL_BLEND);
2239 rc_free (rc);
1573 2240
1574 // top layer: overlays such as the health bar 2241 // top layer: overlays such as the health bar
1575 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1576 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1577 { 2244 {
… …
1580 for (x = 0; x < sw; x++) 2247 for (x = 0; x < sw; x++)
1581 if (row->c0 <= x + mx && x + mx < row->c1) 2248 if (row->c0 <= x + mx && x + mx < row->c1)
1582 { 2249 {
1583 mapcell *cell = row->col + (x + mx - row->c0); 2250 mapcell *cell = row->col + (x + mx - row->c0);
1584 2251
1585 int px = x * 32; 2252 int px = x * T;
1586 int py = y * 32; 2253 int py = y * T;
1587 2254
1588 if (cell->stat_hp) 2255 if (cell->stat_hp)
1589 { 2256 {
1590 int width = cell->stat_width * 32; 2257 int width = cell->stat_width * T;
1591 int thick = sh / 28 + 1 + cell->stat_width; 2258 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1592 2259
1593 glColor3ub (0, 0, 0); 2260 glColor3ub (0, 0, 0);
1594 glRectf (px + 1, py - thick - 2, 2261 glRectf (px + 1, py - thick - 2,
1595 px + width - 1, py); 2262 px + width - 1, py);
1596 2263
… …
1602 } 2269 }
1603 } 2270 }
1604} 2271}
1605 2272
1606void 2273void
1607draw_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)
1608 CODE: 2275 CODE:
1609{ 2276{
1610 static float color[16][3] = { 2277 static float color[16][3] = {
1611 { 0.00F, 0.00F, 0.00F }, 2278 { 0.00F, 0.00F, 0.00F },
1612 { 1.00F, 1.00F, 1.00F }, 2279 { 1.00F, 1.00F, 1.00F },
… …
1662 glDisable (GL_BLEND); 2329 glDisable (GL_BLEND);
1663 glDisable (GL_TEXTURE_2D); 2330 glDisable (GL_TEXTURE_2D);
1664} 2331}
1665 2332
1666void 2333void
1667fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2334fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1668 PPCODE: 2335 PPCODE:
1669{ 2336{
1670 int x, y; 2337 int x, y;
2338 int sw1 = sw + 2;
2339 int sh1 = sh + 2;
2340 int sh3 = sh * 3;
1671 int sw4 = (sw + 3) & ~3; 2341 int sw34 = (sw * 3 + 3) & ~3;
2342 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1672 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2343 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1673 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2344 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1674 2345
1675 memset (darkness, 255, sw4 * sh);
1676 SvPOK_only (darkness_sv); 2346 SvPOK_only (darkness3_sv);
1677 SvCUR_set (darkness_sv, sw4 * sh); 2347 SvCUR_set (darkness3_sv, sw34 * sh3);
1678 2348
1679 mx += self->x; 2349 mx += self->x - 1;
1680 my += self->y; 2350 my += self->y - 1;
1681 2351
2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353
1682 for (y = 0; y < sh; y++) 2354 for (y = 0; y < sh1; y++)
1683 if (0 <= y + my && y + my < self->rows) 2355 if (0 <= y + my && y + my < self->rows)
1684 { 2356 {
1685 maprow *row = self->row + (y + my); 2357 maprow *row = self->row + (y + my);
1686 2358
1687 for (x = 0; x < sw; x++) 2359 for (x = 0; x < sw1; x++)
1688 if (row->c0 <= x + mx && x + mx < row->c1) 2360 if (row->c0 <= x + mx && x + mx < row->c1)
1689 { 2361 {
1690 mapcell *cell = row->col + (x + mx - row->c0); 2362 mapcell *cell = row->col + (x + mx - row->c0);
1691 2363
1692 darkness[y * sw4 + x] = cell->darkness 2364 darkness1 [y * sw1 + x] = cell->darkness
1693 ? 255 - (cell->darkness - 1) 2365 ? 255 - (cell->darkness - 1)
1694 : 255 - FOW_DARKNESS; 2366 : 255 - FOW_DARKNESS;
1695 } 2367 }
1696 } 2368 }
1697 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
1698 EXTEND (SP, 3); 2408 EXTEND (SP, 3);
1699 PUSHs (sv_2mortal (newSViv (sw4))); 2409 PUSHs (sv_2mortal (newSViv (sw34)));
1700 PUSHs (sv_2mortal (newSViv (sh))); 2410 PUSHs (sv_2mortal (newSViv (sh3)));
1701 PUSHs (darkness_sv); 2411 PUSHs (darkness3_sv);
1702} 2412}
1703 2413
1704SV * 2414SV *
1705get_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)
1706 CODE: 2416 CODE:
1707{ 2417{
1708 int x, y, x1, y1; 2418 int x, y, x1, y1;
1709 SV *data_sv = newSV (w * h * 7 + 5); 2419 SV *data_sv = newSV (w * h * 7 + 5);
1710 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2420 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1735 if (row && row->c0 <= x && x < row->c1) 2445 if (row && row->c0 <= x && x < row->c1)
1736 { 2446 {
1737 mapcell *cell = row->col + (x - row->c0); 2447 mapcell *cell = row->col + (x - row->c0);
1738 uint8_t flags = 0; 2448 uint8_t flags = 0;
1739 2449
1740 if (cell->face [0]) flags |= 1; 2450 if (cell->tile [0]) flags |= 1;
1741 if (cell->face [1]) flags |= 2; 2451 if (cell->tile [1]) flags |= 2;
1742 if (cell->face [2]) flags |= 4; 2452 if (cell->tile [2]) flags |= 4;
1743 2453
1744 *data++ = flags; 2454 *data++ = flags;
1745 2455
1746 if (flags & 1) 2456 if (flags & 1)
1747 { 2457 {
2458 tileid tile = cell->tile [0];
1748 *data++ = cell->face [0] >> 8; 2459 *data++ = tile >> 8;
1749 *data++ = cell->face [0]; 2460 *data++ = tile;
1750 } 2461 }
1751 2462
1752 if (flags & 2) 2463 if (flags & 2)
1753 { 2464 {
2465 tileid tile = cell->tile [1];
1754 *data++ = cell->face [1] >> 8; 2466 *data++ = tile >> 8;
1755 *data++ = cell->face [1]; 2467 *data++ = tile;
1756 } 2468 }
1757 2469
1758 if (flags & 4) 2470 if (flags & 4)
1759 { 2471 {
2472 tileid tile = cell->tile [2];
1760 *data++ = cell->face [2] >> 8; 2473 *data++ = tile >> 8;
1761 *data++ = cell->face [2]; 2474 *data++ = tile;
1762 } 2475 }
1763 } 2476 }
1764 else 2477 else
1765 *data++ = 0; 2478 *data++ = 0;
1766 } 2479 }
1767 } 2480 }
1768 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 {
1769 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
1770 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 }
2488
1771 RETVAL = data_sv; 2489 RETVAL = data_sv;
1772} 2490}
1773 OUTPUT: 2491 OUTPUT:
1774 RETVAL 2492 RETVAL
1775 2493
1776void 2494void
1777set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2495set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1778 PPCODE: 2496 PPCODE:
1779{ 2497{
1780 int x, y, z; 2498 int x, y, z;
1781 int w, h; 2499 int w, h;
1782 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;
1783 2511
1784 if (*data++ != 0) 2512 if (*data++ != 0)
1785 return; /* version mismatch */ 2513 XSRETURN_EMPTY; /* version mismatch */
1786 2514
1787 w = *data++ << 8; w |= *data++; 2515 w = *data++ << 8; w |= *data++;
1788 h = *data++ << 8; h |= *data++; 2516 h = *data++ << 8; h |= *data++;
1789 2517
1790 // 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
… …
1802 { 2530 {
1803 maprow *row = map_get_row (self, y); 2531 maprow *row = map_get_row (self, y);
1804 2532
1805 for (x = x0; x < x1; x++) 2533 for (x = x0; x < x1; x++)
1806 { 2534 {
2535 uint8_t flags;
2536
2537 if (data + 7 >= end)
2538 XSRETURN_EMPTY;
2539
1807 uint8_t flags = *data++; 2540 flags = *data++;
1808 2541
1809 if (flags) 2542 if (flags)
1810 { 2543 {
1811 mapface face[3] = { 0, 0, 0 };
1812
1813 mapcell *cell = row_get_cell (row, x); 2544 mapcell *cell = row_get_cell (row, x);
2545 tileid tile[3] = { 0, 0, 0 };
1814 2546
1815 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2547 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1816 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2548 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1817 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2549 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1818 2550
1819 if (cell->darkness == 0) 2551 if (cell->darkness == 0)
1820 { 2552 {
1821 cell->darkness = 0; 2553 /*cell->darkness = 0;*/
2554 EXTEND (SP, 3);
1822 2555
1823 for (z = 0; z <= 2; z++) 2556 for (z = 0; z <= 2; z++)
1824 { 2557 {
1825 cell->face[z] = face[z]; 2558 tileid t = tile [z];
1826 2559
1827 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2560 if (t >= self->texs || (t && !self->tex [t].name))
2561 {
1828 XPUSHs (sv_2mortal (newSViv (face[z]))); 2562 PUSHs (sv_2mortal (newSViv (t)));
2563 need_texid (self, t);
2564 }
2565
2566 cell->tile [z] = t;
1829 } 2567 }
1830 } 2568 }
1831 } 2569 }
1832 } 2570 }
1833 } 2571 }
1834} 2572}
1835 2573
1836MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2574MODULE = Deliantra::Client PACKAGE = DC::RW
1837 2575
1838CFPlus::MixChunk 2576DC::RW
1839new_from_file (SV *class, char *path) 2577new (SV *class, SV *data_sv)
1840 CODE: 2578 CODE:
1841 RETVAL = Mix_LoadWAV (path); 2579{
2580 STRLEN datalen;
2581 char *data = SvPVbyte (data_sv, datalen);
2582
2583 RETVAL = SDL_RWFromConstMem (data, datalen);
2584}
1842 OUTPUT: 2585 OUTPUT:
1843 RETVAL 2586 RETVAL
1844 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 : '('
1845void 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
1846DESTROY (CFPlus::MixChunk self) 2697DESTROY (DC::MixChunk self)
1847 CODE: 2698 CODE:
1848 Mix_FreeChunk (self); 2699 Mix_FreeChunk (self);
1849 2700
1850int 2701int
1851volume (CFPlus::MixChunk self, int volume = -1) 2702volume (DC::MixChunk self, int volume = -1)
1852 CODE: 2703 CODE:
2704 if (items > 1)
2705 volume = CLAMP (volume, 0, 128);
1853 RETVAL = Mix_VolumeChunk (self, volume); 2706 RETVAL = Mix_VolumeChunk (self, volume);
1854 OUTPUT: 2707 OUTPUT:
1855 RETVAL 2708 RETVAL
1856 2709
1857int 2710DC::Channel
1858play (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)
1859 CODE: 2712 CODE:
2713{
1860 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}
1861 OUTPUT: 2725 OUTPUT:
1862 RETVAL 2726 RETVAL
1863 2727
1864MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1865 2729
1866int 2730int
1867volume (int volume = -1) 2731volume (int volume = -1)
2732 PROTOTYPE: ;$
1868 CODE: 2733 CODE:
2734 if (items > 0)
2735 volume = CLAMP (volume, 0, 128);
1869 RETVAL = Mix_VolumeMusic (volume); 2736 RETVAL = Mix_VolumeMusic (volume);
1870 OUTPUT: 2737 OUTPUT:
1871 RETVAL 2738 RETVAL
1872 2739
2740void
2741fade_out (int ms)
2742 CODE:
2743 Mix_FadeOutMusic (ms);
2744
2745void
2746halt ()
2747 CODE:
2748 Mix_HaltMusic ();
2749
1873CFPlus::MixMusic 2750DC::MixMusic
1874new_from_file (SV *class, char *path) 2751new (SV *class, DC::RW rwops)
1875 CODE: 2752 CODE:
1876 RETVAL = Mix_LoadMUS (path); 2753 RETVAL = Mix_LoadMUS_RW (rwops);
1877 OUTPUT: 2754 OUTPUT:
1878 RETVAL 2755 RETVAL
1879 2756
1880void 2757void
1881DESTROY (CFPlus::MixMusic self) 2758DESTROY (DC::MixMusic self)
1882 CODE: 2759 CODE:
1883 Mix_FreeMusic (self); 2760 Mix_FreeMusic (self);
1884 2761
1885int 2762int
1886play (CFPlus::MixMusic self, int loops = -1) 2763play (DC::MixMusic self, int loops = -1)
1887 CODE: 2764 CODE:
1888 RETVAL = Mix_PlayMusic (self, loops); 2765 RETVAL = Mix_PlayMusic (self, loops);
1889 OUTPUT: 2766 OUTPUT:
1890 RETVAL 2767 RETVAL
1891 2768
1892MODULE = 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
1893 2777
1894BOOT: 2778BOOT:
1895{ 2779{
1896 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2780 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1897 static const struct { 2781 static const struct {
1898 const char *name; 2782 const char *name;
1899 IV iv; 2783 IV iv;
1900 } *civ, const_iv[] = { 2784 } *civ, const_iv[] = {
1901# 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),
1902 const_iv (GL_COLOR_MATERIAL), 2789 const_iv (GL_COLOR_MATERIAL),
1903 const_iv (GL_SMOOTH), 2790 const_iv (GL_SMOOTH),
1904 const_iv (GL_FLAT), 2791 const_iv (GL_FLAT),
1905 const_iv (GL_DITHER), 2792 const_iv (GL_DITHER),
1906 const_iv (GL_BLEND), 2793 const_iv (GL_BLEND),
… …
1910 const_iv (GL_ALPHA_TEST), 2797 const_iv (GL_ALPHA_TEST),
1911 const_iv (GL_NORMALIZE), 2798 const_iv (GL_NORMALIZE),
1912 const_iv (GL_RESCALE_NORMAL), 2799 const_iv (GL_RESCALE_NORMAL),
1913 const_iv (GL_FRONT), 2800 const_iv (GL_FRONT),
1914 const_iv (GL_BACK), 2801 const_iv (GL_BACK),
2802 const_iv (GL_AUX0),
1915 const_iv (GL_AND), 2803 const_iv (GL_AND),
1916 const_iv (GL_ONE), 2804 const_iv (GL_ONE),
1917 const_iv (GL_ZERO), 2805 const_iv (GL_ZERO),
1918 const_iv (GL_SRC_ALPHA), 2806 const_iv (GL_SRC_ALPHA),
1919 const_iv (GL_DST_ALPHA), 2807 const_iv (GL_DST_ALPHA),
… …
1932 const_iv (GL_INTENSITY), 2820 const_iv (GL_INTENSITY),
1933 const_iv (GL_LUMINANCE), 2821 const_iv (GL_LUMINANCE),
1934 const_iv (GL_LUMINANCE_ALPHA), 2822 const_iv (GL_LUMINANCE_ALPHA),
1935 const_iv (GL_FLOAT), 2823 const_iv (GL_FLOAT),
1936 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),
1937 const_iv (GL_COMPILE), 2831 const_iv (GL_COMPILE),
2832 const_iv (GL_PROXY_TEXTURE_1D),
2833 const_iv (GL_PROXY_TEXTURE_2D),
1938 const_iv (GL_TEXTURE_1D), 2834 const_iv (GL_TEXTURE_1D),
1939 const_iv (GL_TEXTURE_2D), 2835 const_iv (GL_TEXTURE_2D),
1940 const_iv (GL_TEXTURE_ENV), 2836 const_iv (GL_TEXTURE_ENV),
1941 const_iv (GL_TEXTURE_MAG_FILTER), 2837 const_iv (GL_TEXTURE_MAG_FILTER),
1942 const_iv (GL_TEXTURE_MIN_FILTER), 2838 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1963 const_iv (GL_COLOR_LOGIC_OP), 2859 const_iv (GL_COLOR_LOGIC_OP),
1964 const_iv (GL_SEPARABLE_2D), 2860 const_iv (GL_SEPARABLE_2D),
1965 const_iv (GL_CONVOLUTION_2D), 2861 const_iv (GL_CONVOLUTION_2D),
1966 const_iv (GL_CONVOLUTION_BORDER_MODE), 2862 const_iv (GL_CONVOLUTION_BORDER_MODE),
1967 const_iv (GL_CONSTANT_BORDER), 2863 const_iv (GL_CONSTANT_BORDER),
2864 const_iv (GL_POINTS),
1968 const_iv (GL_LINES), 2865 const_iv (GL_LINES),
1969 const_iv (GL_LINE_STRIP), 2866 const_iv (GL_LINE_STRIP),
1970 const_iv (GL_LINE_LOOP), 2867 const_iv (GL_LINE_LOOP),
1971 const_iv (GL_QUADS), 2868 const_iv (GL_QUADS),
1972 const_iv (GL_QUAD_STRIP), 2869 const_iv (GL_QUAD_STRIP),
1973 const_iv (GL_TRIANGLES), 2870 const_iv (GL_TRIANGLES),
1974 const_iv (GL_TRIANGLE_STRIP), 2871 const_iv (GL_TRIANGLE_STRIP),
1975 const_iv (GL_TRIANGLE_FAN), 2872 const_iv (GL_TRIANGLE_FAN),
2873 const_iv (GL_POLYGON),
1976 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),
1977 const_iv (GL_FASTEST), 2880 const_iv (GL_FASTEST),
2881 const_iv (GL_DONT_CARE),
2882 const_iv (GL_NICEST),
1978 const_iv (GL_V2F), 2883 const_iv (GL_V2F),
1979 const_iv (GL_V3F), 2884 const_iv (GL_V3F),
1980 const_iv (GL_T2F_V3F), 2885 const_iv (GL_T2F_V3F),
1981 const_iv (GL_T2F_N3F_V3F), 2886 const_iv (GL_T2F_N3F_V3F),
1982# undef const_iv 2887# undef const_iv
1983 }; 2888 };
1984 2889
1985 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; )
1986 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);
1987} 2895}
2896
2897void
2898disable_GL_EXT_blend_func_separate ()
2899 CODE:
2900 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0;
1988 2902
1989char * 2903char *
1990gl_vendor () 2904gl_vendor ()
1991 CODE: 2905 CODE:
1992 RETVAL = (char *)glGetString (GL_VENDOR); 2906 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2005 CODE: 2919 CODE:
2006 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2920 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2007 OUTPUT: 2921 OUTPUT:
2008 RETVAL 2922 RETVAL
2009 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
2010int glGetError () 2938int glGetError ()
2011 2939
2012void glFinish () 2940void glFinish ()
2013 2941
2014void glClear (int mask) 2942void glClear (int mask)
… …
2051# near_ and far_ are due to microsofts buggy "c" compiler 2979# near_ and far_ are due to microsofts buggy "c" compiler
2052void 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_)
2053 2981
2054# near_ and far_ are due to microsofts buggy "c" compiler 2982# near_ and far_ are due to microsofts buggy "c" compiler
2055void 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
2056 2986
2057void glViewport (int x, int y, int width, int height) 2987void glViewport (int x, int y, int width, int height)
2058 2988
2059void glScissor (int x, int y, int width, int height) 2989void glScissor (int x, int y, int width, int height)
2060 2990
… …
2068 2998
2069void glRotate (float angle, float x, float y, float z) 2999void glRotate (float angle, float x, float y, float z)
2070 CODE: 3000 CODE:
2071 glRotatef (angle, x, y, z); 3001 glRotatef (angle, x, y, z);
2072 3002
2073void glBegin (int mode)
2074
2075void glEnd ()
2076
2077void glColor (float r, float g, float b, float a = 1.0) 3003void glColor (float r, float g, float b, float a = 1.0)
2078 PROTOTYPE: @
2079 ALIAS: 3004 ALIAS:
2080 glColor_premultiply = 1 3005 glColor_premultiply = 1
2081 CODE: 3006 CODE:
2082 if (ix) 3007 if (ix)
2083 { 3008 {
… …
2086 b *= a; 3011 b *= a;
2087 } 3012 }
2088 // microsoft visual "c" rounds instead of truncating... 3013 // microsoft visual "c" rounds instead of truncating...
2089 glColor4f (r, g, b, a); 3014 glColor4f (r, g, b, a);
2090 3015
2091void glInterleavedArrays (int format, int stride, char *data)
2092
2093void glDrawElements (int mode, int count, int type, char *indices)
2094
2095# 1.2 void glDrawRangeElements (int mode, int start, int end
2096
2097void glRasterPos (float x, float y, float z = 0.) 3016void glRasterPos (float x, float y, float z = 0.)
2098 CODE: 3017 CODE:
2099 glRasterPos3f (0, 0, z); 3018 glRasterPos3f (0, 0, z);
2100 glBitmap (0, 0, 0, 0, x, y, 0); 3019 glBitmap (0, 0, 0, 0, x, y, 0);
2101 3020
… …
2105 3024
2106void glTexCoord (float s, float t) 3025void glTexCoord (float s, float t)
2107 CODE: 3026 CODE:
2108 glTexCoord2f (s, t); 3027 glTexCoord2f (s, t);
2109 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
2110void glTexEnv (int target, int pname, float param) 3058void glTexEnv (int target, int pname, float param)
2111 CODE: 3059 CODE:
2112 glTexEnvf (target, pname, param); 3060 glTexEnvf (target, pname, param);
2113 3061
2114void glTexParameter (int target, int pname, float param) 3062void glTexParameter (int target, int pname, float param)
… …
2130void 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)
2131 CODE: 3079 CODE:
2132 if (gl.SeparableFilter2D) 3080 if (gl.SeparableFilter2D)
2133 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3081 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2134 3082
2135void 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)
2136 3084
2137void 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)
2138 3086
2139void 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)
2140 3090
2141void 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)
2142 3092
2143int glGenTexture () 3093int glGenTexture ()
2144 CODE: 3094 CODE:
2145{ 3095 RETVAL = gen_texture ();
2146 GLuint name;
2147 glGenTextures (1, &name);
2148 RETVAL = name;
2149}
2150 OUTPUT: 3096 OUTPUT:
2151 RETVAL 3097 RETVAL
2152 3098
2153void glDeleteTexture (int name) 3099void glDeleteTexture (int name)
2154 CODE: 3100 CODE:
2155{
2156 GLuint name_ = name;
2157 glDeleteTextures (1, &name_); 3101 del_texture (name);
2158} 3102
2159
2160int glGenList () 3103int glGenList ()
2161 CODE: 3104 CODE:
2162 RETVAL = glGenLists (1); 3105 RETVAL = glGenLists (1);
2163 OUTPUT: 3106 OUTPUT:
2164 RETVAL 3107 RETVAL
… …
2171 3114
2172void glEndList () 3115void glEndList ()
2173 3116
2174void glCallList (int list) 3117void glCallList (int list)
2175 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