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

Diff Legend

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