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.166 by root, Fri Dec 8 15:07:08 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) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
17#endif 27#endif
18 28
29#include <assert.h>
19#include <math.h> 30#include <math.h>
20#include <string.h> 31#include <string.h>
21#include <stdio.h> 32#include <stdio.h>
22#include <stdlib.h> 33#include <stdlib.h>
23 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
24#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
25#include <SDL_endian.h> 39#include <SDL_endian.h>
26#include <SDL_image.h> 40#include <SDL_image.h>
27#include <SDL_mixer.h> 41#include <SDL_mixer.h>
28#include <SDL_opengl.h> 42#include <SDL_opengl.h>
29 43
… …
31#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
32 46
33#include <glib/gmacros.h> 47#include <glib/gmacros.h>
34 48
35#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
36 61
37#ifndef _WIN32 62#ifndef _WIN32
38# include <sys/types.h> 63# include <sys/types.h>
39# include <sys/socket.h> 64# include <sys/socket.h>
40# include <netinet/in.h> 65# include <netinet/in.h>
41# include <netinet/tcp.h> 66# include <netinet/tcp.h>
42# include <inttypes.h> 67# include <inttypes.h>
43#endif 68#endif
44 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 80
47#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
48 82
49#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
51 85
52#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
53 87
54#if 0 88/* mask out modifiers we are not interested in */
55# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
56#else 90
57# define PARACHUTE 0 91static AV *texture_av;
58#endif
59 92
60static struct 93static struct
61{ 94{
62#define GL_FUNC(ptr,name) ptr name; 95#define GL_FUNC(ptr,name) ptr name;
63#include "glfunc.h" 96#include "glfunc.h"
64#undef GL_FUNC 97#undef GL_FUNC
65} gl; 98} gl;
66 99
100static void
67static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 101gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68{ 102{
69 if (gl.BlendFuncSeparate) 103 if (gl.BlendFuncSeparate)
70 gl.BlendFuncSeparate (sa, da, saa, daa); 104 gl.BlendFuncSeparate (sa, da, saa, daa);
71 else if (gl.BlendFuncSeparateEXT) 105 else if (gl.BlendFuncSeparateEXT)
72 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 106 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73 else 107 else
74 glBlendFunc (sa, da); 108 glBlendFunc (sa, da);
75} 109}
76 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
77#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
78 137
79#include "pango-font.c" 138#include "pango-font.c"
80#include "pango-fontmap.c" 139#include "pango-fontmap.c"
81#include "pango-render.c" 140#include "pango-render.c"
82 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
83typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
84typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
85 146
86typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
87 148
88static int 149static int
89shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
90{ 151{
91 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
… …
105 166
106typedef struct cf_layout { 167typedef struct cf_layout {
107 PangoLayout *pl; 168 PangoLayout *pl;
108 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
109 int base_height; 170 int base_height;
110 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
111} *CFPlus__Layout; 173} *DC__Layout;
112 174
113static CFPlus__Font default_font; 175static DC__Font default_font;
114static PangoContext *opengl_context; 176static PangoContext *opengl_context;
115static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
116 178
117static void 179static void
118substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
… …
123#endif 185#endif
124 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
125} 187}
126 188
127static void 189static void
128layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
129{ 191{
130 /* 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
131 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
132 */ 194 */
133 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
134 196
135 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
136 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
137 199
138 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
139} 201}
140 202
141static void 203static void
142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
143{ 205{
144 PangoRectangle rect; 206 PangoRectangle rect;
145 207
146 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
147 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
… …
154 216
155 *w = rect.width; 217 *w = rect.width;
156 *h = rect.height; 218 *h = rect.height;
157} 219}
158 220
221typedef uint16_t tileid;
159typedef uint16_t mapface; 222typedef uint16_t faceid;
160 223
161typedef struct { 224typedef struct {
162 GLint name; 225 GLuint name;
163 int w, h; 226 int w, h;
164 float s, t; 227 float s, t;
165 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
229 tileid smoothtile;
230 uint8_t smoothlevel;
166} maptex; 231} maptex;
167 232
168typedef struct { 233typedef struct {
169 uint32_t player; 234 uint32_t player;
170 mapface face[3]; 235 tileid tile[3];
171 uint16_t darkness; 236 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags; 237 uint8_t stat_width, stat_hp, flags, smoothmax;
173} mapcell; 238} mapcell;
174 239
175typedef struct { 240typedef struct {
176 int32_t c0, c1; 241 int32_t c0, c1;
177 mapcell *col; 242 mapcell *col;
178} maprow; 243} maprow;
179 244
180typedef struct map { 245typedef struct map {
181 int x, y, w, h; 246 int x, y, w, h;
182 int ox, oy; /* offset to virtual global coordinate system */ 247 int ox, oy; /* offset to virtual global coordinate system */
183 int faces; 248 int faces; tileid *face2tile; // [faceid]
184 mapface *face; 249 int texs; maptex *tex; // [tileid]
185
186 int texs;
187 maptex *tex;
188 250
189 int32_t rows; 251 int32_t rows;
190 maprow *row; 252 maprow *row;
191} *CFPlus__Map; 253} *DC__Map;
192 254
193static char * 255static char *
194prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
195{ 257{
196 char *p; 258 char *p;
… …
213} 275}
214 276
215#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))
216#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))
217 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
218static maprow * 300static maprow *
219map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
220{ 302{
221 if (0 > y) 303 if (0 > y)
222 { 304 {
223 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
224 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
… …
262 344
263 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
264} 346}
265 347
266static mapcell * 348static mapcell *
267map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
268{ 350{
269 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
270} 352}
271 353
272static void 354static void
273map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
274{ 356{
275 int r; 357 int r;
276 358
277 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
278 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
… …
286 self->row = 0; 368 self->row = 0;
287 self->rows = 0; 369 self->rows = 0;
288} 370}
289 371
290static void 372static void
291map_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)
292{ 374{
293 int x, y; 375 int x, y;
294 maprow *row; 376 maprow *row;
295 mapcell *cell; 377 mapcell *cell;
296 378
… …
316 cell->player = 0; 398 cell->player = 0;
317 } 399 }
318 } 400 }
319} 401}
320 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
321static void 419static void
322music_finished (void) 420music_finished (void)
323{ 421{
324 SDL_UserEvent ev; 422 SDL_UserEvent ev;
325 423
… …
359 n |= n >> 16; 457 n |= n >> 16;
360 458
361 return n + 1; 459 return n + 1;
362} 460}
363 461
364MODULE = 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
365 521
366PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
367 523
368BOOT: 524BOOT:
369{ 525{
370 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
371 static const struct { 527 static const struct {
372 const char *name; 528 const char *name;
373 IV iv; 529 IV iv;
374 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
375# 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
376 const_iv (SDL_ACTIVEEVENT), 535 const_iv (SDL_ACTIVEEVENT),
377 const_iv (SDL_KEYDOWN), 536 const_iv (SDL_KEYDOWN),
378 const_iv (SDL_KEYUP), 537 const_iv (SDL_KEYUP),
379 const_iv (SDL_MOUSEMOTION), 538 const_iv (SDL_MOUSEMOTION),
380 const_iv (SDL_MOUSEBUTTONDOWN), 539 const_iv (SDL_MOUSEBUTTONDOWN),
… …
389 const_iv (SDL_EVENT_RESERVEDA), 548 const_iv (SDL_EVENT_RESERVEDA),
390 const_iv (SDL_EVENT_RESERVEDB), 549 const_iv (SDL_EVENT_RESERVEDB),
391 const_iv (SDL_VIDEORESIZE), 550 const_iv (SDL_VIDEORESIZE),
392 const_iv (SDL_VIDEOEXPOSE), 551 const_iv (SDL_VIDEOEXPOSE),
393 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),
394 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
395 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
396 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
397 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
398 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
… …
453 const_iv (SDLK_BREAK), 619 const_iv (SDLK_BREAK),
454 const_iv (SDLK_MENU), 620 const_iv (SDLK_MENU),
455 const_iv (SDLK_POWER), 621 const_iv (SDLK_POWER),
456 const_iv (SDLK_EURO), 622 const_iv (SDLK_EURO),
457 const_iv (SDLK_UNDO), 623 const_iv (SDLK_UNDO),
624
458 const_iv (KMOD_NONE), 625 const_iv (KMOD_NONE),
626 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_LSHIFT), 627 const_iv (KMOD_LSHIFT),
460 const_iv (KMOD_RSHIFT), 628 const_iv (KMOD_RSHIFT),
629 const_iv (KMOD_CTRL),
461 const_iv (KMOD_LCTRL), 630 const_iv (KMOD_LCTRL),
462 const_iv (KMOD_RCTRL), 631 const_iv (KMOD_RCTRL),
632 const_iv (KMOD_ALT),
463 const_iv (KMOD_LALT), 633 const_iv (KMOD_LALT),
464 const_iv (KMOD_RALT), 634 const_iv (KMOD_RALT),
635 const_iv (KMOD_META),
465 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
466 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
467 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
468 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
469 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
470 const_iv (KMOD_CTRL), 641
471 const_iv (KMOD_SHIFT), 642 const_iv (MIX_DEFAULT_FORMAT),
472 const_iv (KMOD_ALT), 643
473 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),
474# undef const_iv 652# undef const_iv
475 }; 653 };
476 654
477 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; )
478 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);
479} 660}
661
662void
663weaken (SV *rv)
664 PROTOTYPE: $
665 CODE:
666 sv_rvweaken (rv);
480 667
481int 668int
482in_destruct () 669in_destruct ()
483 CODE: 670 CODE:
484 RETVAL = PL_main_cv == Nullcv; 671 RETVAL = PL_main_cv == Nullcv;
… …
486 RETVAL 673 RETVAL
487 674
488NV floor (NV x) 675NV floor (NV x)
489 676
490NV ceil (NV x) 677NV ceil (NV x)
678
679IV minpot (UV n)
680
681IV popcount (UV n)
491 682
492void 683void
493pango_init () 684pango_init ()
494 CODE: 685 CODE:
495{ 686{
496 opengl_fontmap = pango_opengl_font_map_new (); 687 opengl_fontmap = pango_opengl_font_map_new ();
497 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);
498 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
499} 695}
500 696
501int 697char *SDL_GetError ()
502SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
503 698
504void 699int SDL_Init (U32 flags)
700
701int SDL_InitSubSystem (U32 flags)
702
703void SDL_QuitSubSystem (U32 flags)
704
505SDL_Quit () 705void SDL_Quit ()
506 706
507void 707void
508SDL_ListModes () 708SDL_ListModes (int rgb, int alpha)
509 PPCODE: 709 PPCODE:
510{ 710{
511 SDL_Rect **m; 711 SDL_Rect **m;
512 712
513 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 713 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
514 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 714 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
515 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 715 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
516 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 716 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
517 717
518 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 718 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
519 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 719 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
520 720
521 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 721 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 722 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 723 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 724 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
525 725
526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 726 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10) 727#if SDL_VERSION_ATLEAST(1,2,10)
528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 728 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 729 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif 730#endif
531
532 SDL_EnableUNICODE (1);
533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
534 731
535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
536 733
537 if (m && m != (SDL_Rect **)-1) 734 if (m && m != (SDL_Rect **)-1)
538 while (*m) 735 while (*m)
539 { 736 {
540 AV *av = newAV (); 737 AV *av = newAV ();
541 av_push (av, newSViv ((*m)->w)); 738 av_push (av, newSViv ((*m)->w));
542 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));
543 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
544 743
545 ++m; 744 ++m;
546 } 745 }
547} 746}
548 747
549char *
550SDL_GetError ()
551
552int 748int
553SDL_SetVideoMode (int w, int h, int fullscreen) 749SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
554 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
555 RETVAL = !!SDL_SetVideoMode ( 760 RETVAL = !!SDL_SetVideoMode (
556 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 761 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
557 ); 762 );
763
558 if (RETVAL) 764 if (RETVAL)
559 { 765 {
560 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 766 av_clear (texture_av);
767
768 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
561# 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);
562# include "glfunc.h" 770#include "glfunc.h"
563# undef GL_FUNC 771#undef GL_FUNC
564 } 772 }
773}
565 OUTPUT: 774 OUTPUT:
566 RETVAL 775 RETVAL
567 776
568void 777void
569SDL_GL_SwapBuffers () 778SDL_GL_SwapBuffers ()
570 779
571char * 780char *
572SDL_GetKeyName (int sym) 781SDL_GetKeyName (int sym)
573 782
783int
784SDL_GetAppState ()
785
786int
787SDL_GetModState ()
788
574void 789void
575SDL_PollEvent () 790poll_events ()
576 PPCODE: 791 PPCODE:
577{ 792{
578 SDL_Event ev; 793 SDL_Event ev;
579 794
580 while (SDL_PollEvent (&ev)) 795 SDL_PumpEvents ();
796 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
581 { 797 {
582 HV *hv = newHV (); 798 HV *hv = newHV ();
583 hv_store (hv, "type", 4, newSViv (ev.type), 0); 799 hv_store (hv, "type", 4, newSViv (ev.type), 0);
584 800
585 switch (ev.type) 801 switch (ev.type)
586 { 802 {
587 case SDL_KEYDOWN: 803 case SDL_KEYDOWN:
588 case SDL_KEYUP: 804 case SDL_KEYUP:
589 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591 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 */
592 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593 break; 810 break;
594 811
595 case SDL_ACTIVEEVENT: 812 case SDL_ACTIVEEVENT:
596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
597 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 814 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
598 break; 815 break;
599 816
600 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
601 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
602
603 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 837 hv_store (hv, "state", 5, newSViv (state), 0);
604 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 838 hv_store (hv, "x", 1, newSViv (x), 0);
605 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 839 hv_store (hv, "y", 1, newSViv (y), 0);
606 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 840 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
607 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 841 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
842 }
608 break; 843 break;
609 844
610 case SDL_MOUSEBUTTONDOWN: 845 case SDL_MOUSEBUTTONDOWN:
611 case SDL_MOUSEBUTTONUP: 846 case SDL_MOUSEBUTTONUP:
612 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 847 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
613 848
614 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 849 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
615 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 850 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
616 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 851 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
617 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 852 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 857 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 858 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
624 break; 859 break;
625 } 860 }
626 861
627 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))));
628 } 863 }
629} 864}
630 865
631int 866int
632Mix_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)
633 POSTCALL: 868 POSTCALL:
634 Mix_HookMusicFinished (music_finished); 869 Mix_HookMusicFinished (music_finished);
635 Mix_ChannelFinished (channel_finished); 870 Mix_ChannelFinished (channel_finished);
636 871
637void 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
638Mix_CloseAudio () 889Mix_CloseAudio ()
639 890
640int 891int
641Mix_AllocateChannels (int numchans = -1) 892Mix_AllocateChannels (int numchans = -1)
642 893
894const char *
895Mix_GetError ()
896
643void 897void
644lowdelay (int fd, int val = 1) 898lowdelay (int fd, int val = 1)
645 CODE: 899 CODE:
646#ifndef _WIN32
647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 900 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648#endif
649 901
650void 902void
651win32_proxy_info () 903win32_proxy_info ()
652 PPCODE: 904 PPCODE:
653{ 905{
… …
674 } 926 }
675 } 927 }
676#endif 928#endif
677} 929}
678 930
679void 931int
680add_font (char *file) 932add_font (char *file)
681 CODE: 933 CODE:
682 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT:
936 RETVAL
683 937
684void 938void
685load_image_inline (SV *image_) 939load_image_inline (SV *image_)
686 ALIAS: 940 ALIAS:
687 load_image_file = 1 941 load_image_file = 1
… …
690 STRLEN image_len; 944 STRLEN image_len;
691 char *image = (char *)SvPVbyte (image_, image_len); 945 char *image = (char *)SvPVbyte (image_, image_len);
692 SDL_Surface *surface, *surface2; 946 SDL_Surface *surface, *surface2;
693 SDL_PixelFormat fmt; 947 SDL_PixelFormat fmt;
694 SDL_RWops *rw = ix 948 SDL_RWops *rw = ix
695 ? SDL_RWFromFile (image, "r") 949 ? SDL_RWFromFile (image, "rb")
696 : SDL_RWFromConstMem (image, image_len); 950 : SDL_RWFromConstMem (image, image_len);
697 951
698 if (!rw) 952 if (!rw)
699 croak ("load_image: %s", SDL_GetError ()); 953 croak ("load_image: %s", SDL_GetError ());
700 954
… …
773void 1027void
774error (char *message) 1028error (char *message)
775 CODE: 1029 CODE:
776 fprintf (stderr, "ERROR: %s\n", message); 1030 fprintf (stderr, "ERROR: %s\n", message);
777#ifdef _WIN32 1031#ifdef _WIN32
778 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1032 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
779#endif 1033#endif
780 1034
781void 1035void
782fatal (char *message) 1036fatal (char *message)
783 CODE: 1037 CODE:
784 fprintf (stderr, "FATAL: %s\n", message); 1038 fprintf (stderr, "FATAL: %s\n", message);
785#ifdef _WIN32 1039#ifdef _WIN32
786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1040 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
787#endif 1041#endif
788 _exit (1); 1042 _exit (1);
789 1043
790void 1044void
791_exit (int retval = 0) 1045_exit (int retval = 0)
… …
794 ExitThread (retval); // unclean, please beam me up 1048 ExitThread (retval); // unclean, please beam me up
795#else 1049#else
796 _exit (retval); 1050 _exit (retval);
797#endif 1051#endif
798 1052
799MODULE = CFPlus PACKAGE = CFPlus::Font 1053void
1054debug ()
1055 CODE:
1056{
1057#if DEBUG
1058 VALGRIND_DO_LEAK_CHECK;
1059#endif
1060}
800 1061
801CFPlus::Font 1062MODULE = Deliantra::Client PACKAGE = DC::Font
1063
1064PROTOTYPES: DISABLE
1065
1066DC::Font
802new_from_file (SV *class, char *path, int id = 0) 1067new_from_file (SV *class, char *path, int id = 0)
803 CODE: 1068 CODE:
804{ 1069{
805 int count; 1070 int count;
806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1071 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
809} 1074}
810 OUTPUT: 1075 OUTPUT:
811 RETVAL 1076 RETVAL
812 1077
813void 1078void
814DESTROY (CFPlus::Font self) 1079DESTROY (DC::Font self)
815 CODE: 1080 CODE:
816 pango_font_description_free (self); 1081 pango_font_description_free (self);
817 1082
818void 1083void
819make_default (CFPlus::Font self) 1084make_default (DC::Font self)
1085 PROTOTYPE: $
820 CODE: 1086 CODE:
821 default_font = self; 1087 default_font = self;
822 1088
823MODULE = CFPlus PACKAGE = CFPlus::Layout 1089MODULE = Deliantra::Client PACKAGE = DC::Layout
824 1090
1091PROTOTYPES: DISABLE
1092
825void 1093void
826reset_glyph_cache () 1094glyph_cache_backup ()
1095 PROTOTYPE:
827 CODE: 1096 CODE:
1097 tc_backup ();
1098
1099void
1100glyph_cache_restore ()
1101 PROTOTYPE:
1102 CODE:
828 tc_clear (); 1103 tc_restore ();
829 1104
830CFPlus::Layout 1105DC::Layout
831new (SV *class) 1106new (SV *class)
832 CODE: 1107 CODE:
833 New (0, RETVAL, 1, struct cf_layout); 1108 New (0, RETVAL, 1, struct cf_layout);
834 1109
835 RETVAL->pl = pango_layout_new (opengl_context); 1110 RETVAL->pl = pango_layout_new (opengl_context);
… …
837 RETVAL->g = 1.; 1112 RETVAL->g = 1.;
838 RETVAL->b = 1.; 1113 RETVAL->b = 1.;
839 RETVAL->a = 1.; 1114 RETVAL->a = 1.;
840 RETVAL->base_height = MIN_FONT_HEIGHT; 1115 RETVAL->base_height = MIN_FONT_HEIGHT;
841 RETVAL->font = 0; 1116 RETVAL->font = 0;
1117 RETVAL->rc = rc_alloc ();
842 1118
843 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1119 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
844 layout_update_font (RETVAL); 1120 layout_update_font (RETVAL);
845 OUTPUT: 1121 OUTPUT:
846 RETVAL 1122 RETVAL
847 1123
848void 1124void
849DESTROY (CFPlus::Layout self) 1125DESTROY (DC::Layout self)
850 CODE: 1126 CODE:
851 g_object_unref (self->pl); 1127 g_object_unref (self->pl);
1128 rc_free (self->rc);
852 Safefree (self); 1129 Safefree (self);
853 1130
854void 1131void
855set_text (CFPlus::Layout self, SV *text_) 1132set_text (DC::Layout self, SV *text_)
856 CODE: 1133 CODE:
857{ 1134{
858 STRLEN textlen; 1135 STRLEN textlen;
859 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
860 1137
861 pango_layout_set_text (self->pl, text, textlen); 1138 pango_layout_set_text (self->pl, text, textlen);
862} 1139}
863 1140
864void 1141void
865set_markup (CFPlus::Layout self, SV *text_) 1142set_markup (DC::Layout self, SV *text_)
866 CODE: 1143 CODE:
867{ 1144{
868 STRLEN textlen; 1145 STRLEN textlen;
869 char *text = SvPVutf8 (text_, textlen); 1146 char *text = SvPVutf8 (text_, textlen);
870 1147
871 pango_layout_set_markup (self->pl, text, textlen); 1148 pango_layout_set_markup (self->pl, text, textlen);
872} 1149}
873 1150
874void 1151void
875set_shapes (CFPlus::Layout self, ...) 1152set_shapes (DC::Layout self, ...)
876 CODE: 1153 CODE:
877{ 1154{
878 PangoAttrList *attrs = 0; 1155 PangoAttrList *attrs = 0;
879 const char *text = pango_layout_get_text (self->pl); 1156 const char *text = pango_layout_get_text (self->pl);
880 const char *pos = text; 1157 const char *pos = text;
… …
915 if (attrs) 1192 if (attrs)
916 pango_layout_set_attributes (self->pl, attrs); 1193 pango_layout_set_attributes (self->pl, attrs);
917} 1194}
918 1195
919void 1196void
920get_shapes (CFPlus::Layout self) 1197get_shapes (DC::Layout self)
921 PPCODE: 1198 PPCODE:
922{ 1199{
923 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1200 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
924 1201
925 do 1202 do
926 { 1203 {
927 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1204 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
928 1205
929 if (run && shape_attr_p (run)) 1206 if (run && shape_attr_p (run))
930 { 1207 {
931 PangoRectangle extents; 1208 PangoRectangle extents;
932 pango_layout_iter_get_run_extents (iter, 0, &extents); 1209 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
940 1217
941 pango_layout_iter_free (iter); 1218 pango_layout_iter_free (iter);
942} 1219}
943 1220
944int 1221int
945has_wrapped (CFPlus::Layout self) 1222has_wrapped (DC::Layout self)
946 CODE: 1223 CODE:
947{ 1224{
948 int lines = 1; 1225 int lines = 1;
949 const char *text = pango_layout_get_text (self->pl); 1226 const char *text = pango_layout_get_text (self->pl);
950 1227
… …
955} 1232}
956 OUTPUT: 1233 OUTPUT:
957 RETVAL 1234 RETVAL
958 1235
959SV * 1236SV *
960get_text (CFPlus::Layout self) 1237get_text (DC::Layout self)
961 CODE: 1238 CODE:
962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1239 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
963 sv_utf8_decode (RETVAL); 1240 sv_utf8_decode (RETVAL);
964 OUTPUT: 1241 OUTPUT:
965 RETVAL 1242 RETVAL
966 1243
967void 1244void
968set_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.)
969 CODE: 1246 CODE:
970 self->r = r; 1247 self->r = r;
971 self->g = g; 1248 self->g = g;
972 self->b = b; 1249 self->b = b;
973 self->a = a; 1250 self->a = a;
974 1251
975void 1252void
976set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1253set_font (DC::Layout self, DC::Font font = 0)
977 CODE: 1254 CODE:
978 if (self->font != font) 1255 if (self->font != font)
979 { 1256 {
980 self->font = font; 1257 self->font = font;
981 layout_update_font (self); 1258 layout_update_font (self);
982 } 1259 }
983 1260
984void 1261void
985set_height (CFPlus::Layout self, int base_height) 1262set_height (DC::Layout self, int base_height)
986 CODE: 1263 CODE:
987 if (self->base_height != base_height) 1264 if (self->base_height != base_height)
988 { 1265 {
989 self->base_height = base_height; 1266 self->base_height = base_height;
990 layout_update_font (self); 1267 layout_update_font (self);
991 } 1268 }
992 1269
993void 1270void
994set_width (CFPlus::Layout self, int max_width = -1) 1271set_width (DC::Layout self, int max_width = -1)
995 CODE: 1272 CODE:
996 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);
997 1274
998void 1275void
999set_indent (CFPlus::Layout self, int indent) 1276set_indent (DC::Layout self, int indent)
1000 CODE: 1277 CODE:
1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1278 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1002 1279
1003void 1280void
1004set_spacing (CFPlus::Layout self, int spacing) 1281set_spacing (DC::Layout self, int spacing)
1005 CODE: 1282 CODE:
1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1283 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1007 1284
1008void 1285void
1009set_ellipsise (CFPlus::Layout self, int ellipsise) 1286set_ellipsise (DC::Layout self, int ellipsise)
1010 CODE: 1287 CODE:
1011 pango_layout_set_ellipsize (self->pl, 1288 pango_layout_set_ellipsize (self->pl,
1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1289 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1290 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1291 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1015 : PANGO_ELLIPSIZE_NONE 1292 : PANGO_ELLIPSIZE_NONE
1016 ); 1293 );
1017 1294
1018void 1295void
1019set_single_paragraph_mode (CFPlus::Layout self, int spm) 1296set_single_paragraph_mode (DC::Layout self, int spm)
1020 CODE: 1297 CODE:
1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1298 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1022 1299
1023void 1300void
1024size (CFPlus::Layout self) 1301size (DC::Layout self)
1025 PPCODE: 1302 PPCODE:
1026{ 1303{
1027 int w, h; 1304 int w, h;
1028 1305
1029 layout_get_pixel_size (self, &w, &h); 1306 layout_get_pixel_size (self, &w, &h);
… …
1032 PUSHs (sv_2mortal (newSViv (w))); 1309 PUSHs (sv_2mortal (newSViv (w)));
1033 PUSHs (sv_2mortal (newSViv (h))); 1310 PUSHs (sv_2mortal (newSViv (h)));
1034} 1311}
1035 1312
1036int 1313int
1037descent (CFPlus::Layout self) 1314descent (DC::Layout self)
1038 CODE: 1315 CODE:
1039{ 1316{
1040 PangoRectangle rect; 1317 PangoRectangle rect;
1041 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1318 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1042 pango_layout_line_get_pixel_extents (line, 0, &rect); 1319 pango_layout_line_get_pixel_extents (line, 0, &rect);
1043 RETVAL = PANGO_DESCENT (rect); 1320 RETVAL = PANGO_DESCENT (rect);
1044} 1321}
1045 OUTPUT: 1322 OUTPUT:
1046 RETVAL 1323 RETVAL
1047 1324
1048int 1325int
1049xy_to_index (CFPlus::Layout self, int x, int y) 1326xy_to_index (DC::Layout self, int x, int y)
1050 CODE: 1327 CODE:
1051{ 1328{
1052 int index, trailing; 1329 int index, trailing;
1053 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);
1054 RETVAL = index + trailing; 1331 RETVAL = index + trailing;
1055} 1332}
1056 OUTPUT: 1333 OUTPUT:
1057 RETVAL 1334 RETVAL
1058 1335
1059void 1336void
1060cursor_pos (CFPlus::Layout self, int index) 1337cursor_pos (DC::Layout self, int index)
1061 PPCODE: 1338 PPCODE:
1062{ 1339{
1063 PangoRectangle strong_pos; 1340 PangoRectangle pos;
1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1341 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1065 1342
1066 EXTEND (SP, 3); 1343 EXTEND (SP, 3);
1067 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1070} 1347}
1071 1348
1072void 1349void
1073index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1350index_to_line_x (DC::Layout self, int index, int trailing = 0)
1074 PPCODE: 1351 PPCODE:
1075{ 1352{
1076 int line, x; 1353 int line, x;
1077 1354
1078 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1355 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1356#if !PANGO_VERSION_CHECK (1, 17, 3)
1079 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1357 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1080 1358 --line;
1359#endif
1081 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1082 PUSHs (sv_2mortal (newSViv (line - 1))); 1361 PUSHs (sv_2mortal (newSViv (line)));
1083 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1362 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1084} 1363}
1085 1364
1086void 1365void
1087line_x_to_index (CFPlus::Layout self, int line, int x) 1366line_x_to_index (DC::Layout self, int line, int x)
1088 PPCODE: 1367 PPCODE:
1089{ 1368{
1090 PangoLayoutLine *lp; 1369 PangoLayoutLine *lp;
1091 int index, trailing; 1370 int index, trailing;
1092 1371
1093 if (line < 0) 1372 if (line < 0)
1094 XSRETURN_EMPTY; 1373 XSRETURN_EMPTY;
1095 1374
1096 if (!(lp = pango_layout_get_line (self->pl, line))) 1375 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1097 XSRETURN_EMPTY; /* do better */ 1376 XSRETURN_EMPTY; /* do better */
1098 1377
1099 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1378 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1100 1379
1101 EXTEND (SP, 2); 1380 EXTEND (SP, 2);
… …
1107 PUSHs (sv_2mortal (newSViv (trailing))); 1386 PUSHs (sv_2mortal (newSViv (trailing)));
1108 } 1387 }
1109} 1388}
1110 1389
1111void 1390void
1112render (CFPlus::Layout self, float x, float y, int flags = 0) 1391render (DC::Layout self, float x, float y, int flags = 0)
1113 PPCODE: 1392 CODE:
1393 rc_clear (self->rc);
1114 pango_opengl_render_layout_subpixel ( 1394 pango_opengl_render_layout_subpixel (
1115 self->pl, 1395 self->pl,
1396 self->rc,
1116 x * PANGO_SCALE, y * PANGO_SCALE, 1397 x * PANGO_SCALE, y * PANGO_SCALE,
1117 self->r, self->g, self->b, self->a, 1398 self->r, self->g, self->b, self->a,
1118 flags 1399 flags
1119 ); 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);
1120 1404
1121MODULE = CFPlus PACKAGE = CFPlus::Texture
1122
1123void 1405void
1124pad2pot (SV *data_, SV *w_, SV *h_) 1406draw (DC::Layout self)
1125 CODE: 1407 CODE:
1126{ 1408{
1127 int ow = SvIV (w_); 1409 glEnable (GL_TEXTURE_2D);
1128 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);
1129 1416
1130 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_))
1131 { 1433 {
1132 int nw = minpot (ow);
1133 int nh = minpot (oh);
1134
1135 if (nw != ow || nh != oh)
1136 {
1137 if (SvOK (data_))
1138 {
1139 STRLEN datalen; 1434 STRLEN datalen;
1140 char *data = SvPVbyte (data_, datalen); 1435 char *data = SvPVbyte (data_, datalen);
1141 int bpp = datalen / (ow * oh); 1436 int bpp = datalen / (ow * oh);
1142 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1437 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1143 1438
1144 SvPOK_only (result_); 1439 SvPOK_only (result_);
1145 SvCUR_set (result_, nw * nh * bpp); 1440 SvCUR_set (result_, nw * nh * bpp);
1146 1441
1147 memset (SvPVX (result_), 0, nw * nh * bpp); 1442 memset (SvPVX (result_), 0, nw * nh * bpp);
1148 while (oh--) 1443 while (oh--)
1149 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);
1150 1445
1151 sv_setsv (data_, result_); 1446 sv_setsv (data_, result_);
1152 }
1153
1154 sv_setiv (w_, nw);
1155 sv_setiv (h_, nh);
1156 }
1157 } 1447 }
1158} 1448}
1159 1449
1160void 1450void
1161draw_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.)
… …
1167{ 1457{
1168 HV *hv = (HV *)SvRV (self); 1458 HV *hv = (HV *)SvRV (self);
1169 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1459 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1170 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1460 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1171 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;
1172 1465
1173 if (items < 5) 1466 if (items < 5)
1174 { 1467 {
1175 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1468 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1176 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1469 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1204 glDisable (GL_ALPHA_TEST); 1497 glDisable (GL_ALPHA_TEST);
1205 glDisable (GL_BLEND); 1498 glDisable (GL_BLEND);
1206 } 1499 }
1207} 1500}
1208 1501
1209MODULE = 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
1210 1512
1211CFPlus::Map 1513MODULE = Deliantra::Client PACKAGE = DC::Map
1514
1515PROTOTYPES: DISABLE
1516
1517DC::Map
1212new (SV *class) 1518new (SV *class)
1213 CODE: 1519 CODE:
1214 New (0, RETVAL, 1, struct map); 1520 New (0, RETVAL, 1, struct map);
1215 RETVAL->x = 0; 1521 RETVAL->x = 0;
1216 RETVAL->y = 0; 1522 RETVAL->y = 0;
1217 RETVAL->w = 0; 1523 RETVAL->w = 0;
1218 RETVAL->h = 0; 1524 RETVAL->h = 0;
1219 RETVAL->ox = 0; 1525 RETVAL->ox = 0;
1220 RETVAL->oy = 0; 1526 RETVAL->oy = 0;
1221 RETVAL->faces = 8192; 1527 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1222 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1528 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1223 RETVAL->texs = 8192;
1224 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1225 RETVAL->rows = 0; 1529 RETVAL->rows = 0;
1226 RETVAL->row = 0; 1530 RETVAL->row = 0;
1227 OUTPUT: 1531 OUTPUT:
1228 RETVAL 1532 RETVAL
1229 1533
1230void 1534void
1231DESTROY (CFPlus::Map self) 1535DESTROY (DC::Map self)
1232 CODE: 1536 CODE:
1233{ 1537{
1234 map_clear (self); 1538 map_clear (self);
1235 Safefree (self->face); 1539 Safefree (self->face2tile);
1236 Safefree (self->tex); 1540 Safefree (self->tex);
1237 Safefree (self); 1541 Safefree (self);
1238} 1542}
1239 1543
1240void 1544void
1241resize (CFPlus::Map self, int map_width, int map_height) 1545resize (DC::Map self, int map_width, int map_height)
1242 CODE: 1546 CODE:
1243 self->w = map_width; 1547 self->w = map_width;
1244 self->h = map_height; 1548 self->h = map_height;
1245 1549
1246void 1550void
1247clear (CFPlus::Map self) 1551clear (DC::Map self)
1248 CODE: 1552 CODE:
1249 map_clear (self); 1553 map_clear (self);
1250 1554
1251void 1555void
1252set_face (CFPlus::Map self, int face, int texid) 1556set_tileid (DC::Map self, int face, int tile)
1253 CODE: 1557 CODE:
1254{ 1558{
1255 while (self->faces <= face) 1559 need_facenum (self, face); self->face2tile [face] = tile;
1256 { 1560 need_texid (self, tile);
1257 Append (mapface, self->face, self->faces, self->faces);
1258 self->faces *= 2;
1259 }
1260
1261 self->face [face] = texid;
1262} 1561}
1263 1562
1264void 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
1265set_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)
1266 CODE: 1588 CODE:
1267{ 1589{
1268 while (self->texs <= texid) 1590 need_texid (self, texid);
1269 {
1270 Append (maptex, self->tex, self->texs, self->texs);
1271 self->texs *= 2;
1272 }
1273 1591
1274 { 1592 {
1275 maptex *tex = self->tex + texid; 1593 maptex *tex = self->tex + texid;
1276 1594
1277 tex->name = name; 1595 tex->name = name;
… …
1294 // from transparent color bleeding and ugly wrapping effects. 1612 // from transparent color bleeding and ugly wrapping effects.
1295 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1296} 1614}
1297 1615
1298int 1616int
1299ox (CFPlus::Map self) 1617ox (DC::Map self)
1300 ALIAS: 1618 ALIAS:
1301 oy = 1 1619 oy = 1
1302 x = 2 1620 x = 2
1303 y = 3 1621 y = 3
1304 w = 4 1622 w = 4
… …
1315 } 1633 }
1316 OUTPUT: 1634 OUTPUT:
1317 RETVAL 1635 RETVAL
1318 1636
1319void 1637void
1320scroll (CFPlus::Map self, int dx, int dy) 1638scroll (DC::Map self, int dx, int dy)
1321 CODE: 1639 CODE:
1322{ 1640{
1323 if (dx > 0) 1641 if (dx > 0)
1324 map_blank (self, self->x, self->y, dx, self->h); 1642 map_blank (self, self->x, self->y, dx, self->h);
1325 else if (dx < 0) 1643 else if (dx < 0)
1326 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);
1327 1645
1328 if (dy > 0) 1646 if (dy > 0)
1329 map_blank (self, self->x, self->y, self->w, dy); 1647 map_blank (self, self->x, self->y, self->w, dy);
1330 else if (dy < 0) 1648 else if (dy < 0)
1331 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);
1332 1650
1333 self->ox += dx; self->x += dx; 1651 self->ox += dx; self->x += dx;
1334 self->oy += dy; self->y += dy; 1652 self->oy += dy; self->y += dy;
1335 1653
1336 while (self->y < 0) 1654 while (self->y < 0)
… …
1340 self->rows += MAP_EXTEND_Y; 1658 self->rows += MAP_EXTEND_Y;
1341 self->y += MAP_EXTEND_Y; 1659 self->y += MAP_EXTEND_Y;
1342 } 1660 }
1343} 1661}
1344 1662
1345void 1663SV *
1346map1a_update (CFPlus::Map self, SV *data_, int extmap) 1664map1a_update (DC::Map self, SV *data_, int extmap)
1347 CODE: 1665 CODE:
1348{ 1666{
1349 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1667 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1350 uint8_t *data_end = (uint8_t *)SvEND (data_); 1668 uint8_t *data_end = (uint8_t *)SvEND (data_);
1351 mapcell *cell; 1669 mapcell *cell;
1352 int x, y, flags; 1670 int x, y, z, flags;
1671 AV *missing = newAV ();
1672 RETVAL = newRV_noinc ((SV *)missing);
1353 1673
1354 while (data < data_end - 1) 1674 while (data < data_end - 1)
1355 { 1675 {
1356 flags = (data [0] << 8) + data [1]; data += 2; 1676 flags = (data [0] << 8) + data [1]; data += 2;
1357 1677
… …
1377 uint8_t ext, cmd; 1697 uint8_t ext, cmd;
1378 1698
1379 do 1699 do
1380 { 1700 {
1381 ext = *data++; 1701 ext = *data++;
1382 cmd = ext & 0x3f; 1702 cmd = ext & 0x7f;
1383 1703
1384 if (cmd < 4) 1704 if (cmd < 4)
1385 cell->darkness = 255 - ext * 64 + 1; 1705 cell->darkness = 255 - ext * 64 + 1;
1386 else if (cmd == 5) // health 1706 else if (cmd == 5) // health
1387 { 1707 {
1388 cell->stat_width = 1; 1708 cell->stat_width = 1;
1389 cell->stat_hp = *data++; 1709 cell->stat_hp = *data++;
1390 } 1710 }
1391 else if (cmd == 6) // monster width 1711 else if (cmd == 6) // monster width
1392 cell->stat_width = *data++ + 1; 1712 cell->stat_width = *data++ + 1;
1393 else if (cmd == 0x47) // monster width 1713 else if (cmd == 0x47)
1394 { 1714 {
1395 if (*data == 4) 1715 if (*data == 1) cell->player = data [1];
1396 ; // 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);
1397 1719
1398 data += *data + 1; 1720 data += *data + 1;
1399 } 1721 }
1400 else if (cmd == 8) // cell flags 1722 else if (cmd == 8) // cell flags
1401 cell->flags = *data++; 1723 cell->flags = *data++;
… …
1408 } 1730 }
1409 else 1731 else
1410 cell->darkness = *data++ + 1; 1732 cell->darkness = *data++ + 1;
1411 } 1733 }
1412 1734
1735 for (z = 0; z <= 2; ++z)
1413 if (flags & 4) 1736 if (flags & (4 >> z))
1414 { 1737 {
1415 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 }
1416 } 1755 }
1417
1418 if (flags & 2)
1419 {
1420 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
1421 }
1422
1423 if (flags & 1)
1424 {
1425 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1426 }
1427 } 1756 }
1428 else 1757 else
1429 cell->darkness = 0; 1758 cell->darkness = 0;
1430 } 1759 }
1431} 1760}
1761 OUTPUT:
1762 RETVAL
1432 1763
1433SV * 1764SV *
1434mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1765mapmap (DC::Map self, int x0, int y0, int w, int h)
1435 CODE: 1766 CODE:
1436{ 1767{
1437 int x1, x; 1768 int x1, x;
1438 int y1, y; 1769 int y1, y;
1439 int z; 1770 int z;
… …
1460 { 1791 {
1461 mapcell *cell = row->col + (x - row->c0); 1792 mapcell *cell = row->col + (x - row->c0);
1462 1793
1463 for (z = 0; z <= 0; z++) 1794 for (z = 0; z <= 0; z++)
1464 { 1795 {
1465 mapface face = cell->face [z];
1466
1467 if (face)
1468 {
1469 maptex tex = self->tex [face]; 1796 maptex tex = self->tex [cell->tile [z]];
1470 int a0 = 255 - tex.a; 1797 int a0 = 255 - tex.a;
1471 int a1 = tex.a; 1798 int a1 = tex.a;
1472 1799
1473 r = (r * a0 + tex.r * a1) / 255; 1800 r = (r * a0 + tex.r * a1) / 255;
1474 g = (g * a0 + tex.g * a1) / 255; 1801 g = (g * a0 + tex.g * a1) / 255;
1475 b = (b * a0 + tex.b * a1) / 255; 1802 b = (b * a0 + tex.b * a1) / 255;
1476 a = (a * a0 + tex.a * a1) / 255; 1803 a = (a * a0 + tex.a * a1) / 255;
1477 }
1478 } 1804 }
1479 } 1805 }
1480 1806
1481 *map++ = (r ) 1807 *map++ = (r )
1482 | (g << 8) 1808 | (g << 8)
… …
1489} 1815}
1490 OUTPUT: 1816 OUTPUT:
1491 RETVAL 1817 RETVAL
1492 1818
1493void 1819void
1494draw (CFPlus::Map self, int mx, int my, 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)
1495 CODE: 1821 CODE:
1496{ 1822{
1497 int x, y, z; 1823 int x, y, z;
1498 int last_name;
1499 mapface face;
1500 1824
1501 glColor4ub (255, 255, 255, 255); 1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
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;
1834
1835 pl_tex.name = 0;
1836
1837 // thats current max. sorry.
1838 if (sw > 255) sw = 255;
1839 if (sh > 255) sh = 255;
1840
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 }
1502 1877
1503 glEnable (GL_BLEND); 1878 glEnable (GL_BLEND);
1504 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1879 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1505 glEnable (GL_TEXTURE_2D);
1506 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1880 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1507 1881
1508 glBegin (GL_QUADS);
1509
1510 last_name = 0;
1511
1512 mx += self->x;
1513 my += self->y;
1514
1515 for (z = 0; z < 3; z++) 1882 for (z = 0; z <= 2; z++)
1883 {
1884 memset (smooth_level, 0, sizeof (smooth_level));
1885
1516 for (y = 0; y < sh; y++) 1886 for (y = 0; y < sh; y++)
1517 if (0 <= y + my && y + my < self->rows) 1887 if (0 <= y + my && y + my < self->rows)
1518 { 1888 {
1519 maprow *row = self->row + (y + my); 1889 maprow *row = self->row + (y + my);
1520 1890
1521 for (x = 0; x < sw; x++) 1891 for (x = 0; x < sw; x++)
1522 if (row->c0 <= x + mx && x + mx < row->c1) 1892 if (row->c0 <= x + mx && x + mx < row->c1)
1523 { 1893 {
1524 mapcell *cell = row->col + (x + mx - row->c0); 1894 mapcell *cell = row->col + (x + mx - row->c0);
1525
1526 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;
1527 1902
1528 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))
1529 { 2008 {
1530 maptex tex = self->tex [face]; 2009 int level = (w << 5) | b;
1531 int px = (x + 1) * 32 - tex.w; 2010 HE *he;
1532 int py = (y + 1) * 32 - tex.h;
1533 2011
1534 if (last_name != tex.name) 2012 hv_iterinit (smooth);
2013 while ((he = hv_iternext (smooth)))
1535 { 2014 {
1536 glEnd (); 2015 smooth_key *skey = (smooth_key *)HeKEY (he);
1537 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2016 IV bits = SvIVX (HeVAL (he));
1538 glBegin (GL_QUADS);
1539 }
1540 2017
1541 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1542 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1543 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1544 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1545 }
1546
1547 if (cell->flags && z == 2)
1548 {
1549 if (cell->flags & 1) 2018 if (!(bits & 0x1000)
2019 && skey->level == level
2020 && level > smooth_max [skey->x][skey->y])
1550 { 2021 {
1551 maptex tex = self->tex [1]; 2022 maptex tex = self->tex [skey->tile];
1552 int px = (x + 1) * 32 - tex.w + 2; 2023 int px = (((int)skey->x) - 1) * T;
1553 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
1554 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 {
1555 glEnd (); 2036 glEnd ();
1556 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1557 glBegin (GL_QUADS); 2038 glBegin (GL_QUADS);
2039 }
1558 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
1559 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2055 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1560 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2056 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1561 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 2057 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1562 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 2058 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2059 }
2060 }
2061 }
1563 } 2062 }
1564 } 2063 }
1565 }
1566 } 2064 }
1567 2065
1568 glEnd (); 2066 glEnd ();
1569
1570 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
1571 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2092 rc_free (rc);
1572 2093
1573 // top layer: overlays such as the health bar 2094 // top layer: overlays such as the health bar
1574 for (y = 0; y < sh; y++) 2095 for (y = 0; y < sh; y++)
1575 if (0 <= y + my && y + my < self->rows) 2096 if (0 <= y + my && y + my < self->rows)
1576 { 2097 {
… …
1579 for (x = 0; x < sw; x++) 2100 for (x = 0; x < sw; x++)
1580 if (row->c0 <= x + mx && x + mx < row->c1) 2101 if (row->c0 <= x + mx && x + mx < row->c1)
1581 { 2102 {
1582 mapcell *cell = row->col + (x + mx - row->c0); 2103 mapcell *cell = row->col + (x + mx - row->c0);
1583 2104
1584 int px = x * 32; 2105 int px = x * T;
1585 int py = y * 32; 2106 int py = y * T;
1586 2107
1587 if (cell->stat_hp) 2108 if (cell->stat_hp)
1588 { 2109 {
1589 int width = cell->stat_width * 32; 2110 int width = cell->stat_width * T;
1590 int thick = sh / 28 + 1 + cell->stat_width; 2111 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1591 2112
1592 glColor3ub (0, 0, 0); 2113 glColor3ub (0, 0, 0);
1593 glRectf (px + 1, py - thick - 2, 2114 glRectf (px + 1, py - thick - 2,
1594 px + width - 1, py); 2115 px + width - 1, py);
1595 2116
… …
1601 } 2122 }
1602 } 2123 }
1603} 2124}
1604 2125
1605void 2126void
1606draw_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)
1607 CODE: 2128 CODE:
1608{ 2129{
1609 static float color[16][3] = { 2130 static float color[16][3] = {
1610 { 0.00F, 0.00F, 0.00F }, 2131 { 0.00F, 0.00F, 0.00F },
1611 { 1.00F, 1.00F, 1.00F }, 2132 { 1.00F, 1.00F, 1.00F },
… …
1661 glDisable (GL_BLEND); 2182 glDisable (GL_BLEND);
1662 glDisable (GL_TEXTURE_2D); 2183 glDisable (GL_TEXTURE_2D);
1663} 2184}
1664 2185
1665void 2186void
1666fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2187fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1667 PPCODE: 2188 PPCODE:
1668{ 2189{
1669 int x, y; 2190 int x, y;
2191 int sw1 = sw + 2;
2192 int sh1 = sh + 2;
2193 int sh3 = sh * 3;
1670 int sw4 = (sw + 3) & ~3; 2194 int sw34 = (sw * 3 + 3) & ~3;
2195 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1671 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2196 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1672 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2197 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1673 2198
1674 memset (darkness, 255, sw4 * sh);
1675 SvPOK_only (darkness_sv); 2199 SvPOK_only (darkness3_sv);
1676 SvCUR_set (darkness_sv, sw4 * sh); 2200 SvCUR_set (darkness3_sv, sw34 * sh3);
1677 2201
1678 mx += self->x; 2202 mx += self->x - 1;
1679 my += self->y; 2203 my += self->y - 1;
1680 2204
2205 memset (darkness1, 255, sw1 * sh1);
2206
1681 for (y = 0; y < sh; y++) 2207 for (y = 0; y < sh1; y++)
1682 if (0 <= y + my && y + my < self->rows) 2208 if (0 <= y + my && y + my < self->rows)
1683 { 2209 {
1684 maprow *row = self->row + (y + my); 2210 maprow *row = self->row + (y + my);
1685 2211
1686 for (x = 0; x < sw; x++) 2212 for (x = 0; x < sw1; x++)
1687 if (row->c0 <= x + mx && x + mx < row->c1) 2213 if (row->c0 <= x + mx && x + mx < row->c1)
1688 { 2214 {
1689 mapcell *cell = row->col + (x + mx - row->c0); 2215 mapcell *cell = row->col + (x + mx - row->c0);
1690 2216
1691 darkness[y * sw4 + x] = cell->darkness 2217 darkness1 [y * sw1 + x] = cell->darkness
1692 ? 255 - (cell->darkness - 1) 2218 ? 255 - (cell->darkness - 1)
1693 : 255 - FOW_DARKNESS; 2219 : 255 - FOW_DARKNESS;
1694 } 2220 }
1695 } 2221 }
1696 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
1697 EXTEND (SP, 3); 2261 EXTEND (SP, 3);
1698 PUSHs (sv_2mortal (newSViv (sw4))); 2262 PUSHs (sv_2mortal (newSViv (sw34)));
1699 PUSHs (sv_2mortal (newSViv (sh))); 2263 PUSHs (sv_2mortal (newSViv (sh3)));
1700 PUSHs (darkness_sv); 2264 PUSHs (darkness3_sv);
1701} 2265}
1702 2266
1703SV * 2267SV *
1704get_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)
1705 CODE: 2269 CODE:
1706{ 2270{
1707 int x, y, x1, y1; 2271 int x, y, x1, y1;
1708 SV *data_sv = newSV (w * h * 7 + 5); 2272 SV *data_sv = newSV (w * h * 7 + 5);
1709 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2273 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1734 if (row && row->c0 <= x && x < row->c1) 2298 if (row && row->c0 <= x && x < row->c1)
1735 { 2299 {
1736 mapcell *cell = row->col + (x - row->c0); 2300 mapcell *cell = row->col + (x - row->c0);
1737 uint8_t flags = 0; 2301 uint8_t flags = 0;
1738 2302
1739 if (cell->face [0]) flags |= 1; 2303 if (cell->tile [0]) flags |= 1;
1740 if (cell->face [1]) flags |= 2; 2304 if (cell->tile [1]) flags |= 2;
1741 if (cell->face [2]) flags |= 4; 2305 if (cell->tile [2]) flags |= 4;
1742 2306
1743 *data++ = flags; 2307 *data++ = flags;
1744 2308
1745 if (flags & 1) 2309 if (flags & 1)
1746 { 2310 {
2311 tileid tile = cell->tile [0];
1747 *data++ = cell->face [0] >> 8; 2312 *data++ = tile >> 8;
1748 *data++ = cell->face [0]; 2313 *data++ = tile;
1749 } 2314 }
1750 2315
1751 if (flags & 2) 2316 if (flags & 2)
1752 { 2317 {
2318 tileid tile = cell->tile [1];
1753 *data++ = cell->face [1] >> 8; 2319 *data++ = tile >> 8;
1754 *data++ = cell->face [1]; 2320 *data++ = tile;
1755 } 2321 }
1756 2322
1757 if (flags & 4) 2323 if (flags & 4)
1758 { 2324 {
2325 tileid tile = cell->tile [2];
1759 *data++ = cell->face [2] >> 8; 2326 *data++ = tile >> 8;
1760 *data++ = cell->face [2]; 2327 *data++ = tile;
1761 } 2328 }
1762 } 2329 }
1763 else 2330 else
1764 *data++ = 0; 2331 *data++ = 0;
1765 } 2332 }
1766 } 2333 }
1767 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 {
1768 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
1769 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
1770 RETVAL = data_sv; 2342 RETVAL = data_sv;
1771} 2343}
1772 OUTPUT: 2344 OUTPUT:
1773 RETVAL 2345 RETVAL
1774 2346
1775void 2347void
1776set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1777 PPCODE: 2349 PPCODE:
1778{ 2350{
1779 int x, y, z; 2351 int x, y, z;
1780 int w, h; 2352 int w, h;
1781 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;
1782 2364
1783 if (*data++ != 0) 2365 if (*data++ != 0)
1784 return; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
1785 2367
1786 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
1787 h = *data++ << 8; h |= *data++; 2369 h = *data++ << 8; h |= *data++;
1788 2370
1789 // 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
… …
1801 { 2383 {
1802 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
1803 2385
1804 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
1805 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
1806 uint8_t flags = *data++; 2393 flags = *data++;
1807 2394
1808 if (flags) 2395 if (flags)
1809 { 2396 {
1810 mapface face[3] = { 0, 0, 0 };
1811
1812 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2398 tileid tile[3] = { 0, 0, 0 };
1813 2399
1814 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2400 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1815 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1816 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1817 2403
1818 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
1819 { 2405 {
1820 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
1821 2408
1822 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
1823 { 2410 {
1824 cell->face[z] = face[z]; 2411 tileid t = tile [z];
1825 2412
1826 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2414 {
1827 XPUSHs (sv_2mortal (newSViv (face[z]))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2416 need_texid (self, t);
2417 }
2418
2419 cell->tile [z] = t;
1828 } 2420 }
1829 } 2421 }
1830 } 2422 }
1831 } 2423 }
1832 } 2424 }
1833} 2425}
1834 2426
1835MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2427MODULE = Deliantra::Client PACKAGE = DC::RW
1836 2428
1837CFPlus::MixChunk 2429DC::RW
1838new_from_file (SV *class, char *path) 2430new (SV *class, SV *data_sv)
1839 CODE: 2431 CODE:
1840 RETVAL = Mix_LoadWAV (path); 2432{
2433 STRLEN datalen;
2434 char *data = SvPVbyte (data_sv, datalen);
2435
2436 RETVAL = SDL_RWFromConstMem (data, datalen);
2437}
1841 OUTPUT: 2438 OUTPUT:
1842 RETVAL 2439 RETVAL
1843 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 : '('
1844void 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
1845DESTROY (CFPlus::MixChunk self) 2550DESTROY (DC::MixChunk self)
1846 CODE: 2551 CODE:
1847 Mix_FreeChunk (self); 2552 Mix_FreeChunk (self);
1848 2553
1849int 2554int
1850volume (CFPlus::MixChunk self, int volume = -1) 2555volume (DC::MixChunk self, int volume = -1)
1851 CODE: 2556 CODE:
2557 if (items > 1)
2558 volume = CLAMP (volume, 0, 128);
1852 RETVAL = Mix_VolumeChunk (self, volume); 2559 RETVAL = Mix_VolumeChunk (self, volume);
1853 OUTPUT: 2560 OUTPUT:
1854 RETVAL 2561 RETVAL
1855 2562
1856int 2563DC::Channel
1857play (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)
1858 CODE: 2565 CODE:
2566{
1859 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}
1860 OUTPUT: 2578 OUTPUT:
1861 RETVAL 2579 RETVAL
1862 2580
1863MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1864 2582
1865int 2583int
1866volume (int volume = -1) 2584volume (int volume = -1)
2585 PROTOTYPE: ;$
1867 CODE: 2586 CODE:
2587 if (items > 0)
2588 volume = CLAMP (volume, 0, 128);
1868 RETVAL = Mix_VolumeMusic (volume); 2589 RETVAL = Mix_VolumeMusic (volume);
1869 OUTPUT: 2590 OUTPUT:
1870 RETVAL 2591 RETVAL
1871 2592
2593void
2594fade_out (int ms)
2595 CODE:
2596 Mix_FadeOutMusic (ms);
2597
2598void
2599halt ()
2600 CODE:
2601 Mix_HaltMusic ();
2602
1872CFPlus::MixMusic 2603DC::MixMusic
1873new_from_file (SV *class, char *path) 2604new (SV *class, DC::RW rwops)
1874 CODE: 2605 CODE:
1875 RETVAL = Mix_LoadMUS (path); 2606 RETVAL = Mix_LoadMUS_RW (rwops);
1876 OUTPUT: 2607 OUTPUT:
1877 RETVAL 2608 RETVAL
1878 2609
1879void 2610void
1880DESTROY (CFPlus::MixMusic self) 2611DESTROY (DC::MixMusic self)
1881 CODE: 2612 CODE:
1882 Mix_FreeMusic (self); 2613 Mix_FreeMusic (self);
1883 2614
1884int 2615int
1885play (CFPlus::MixMusic self, int loops = -1) 2616play (DC::MixMusic self, int loops = -1)
1886 CODE: 2617 CODE:
1887 RETVAL = Mix_PlayMusic (self, loops); 2618 RETVAL = Mix_PlayMusic (self, loops);
1888 OUTPUT: 2619 OUTPUT:
1889 RETVAL 2620 RETVAL
1890 2621
1891MODULE = 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
1892 2630
1893BOOT: 2631BOOT:
1894{ 2632{
1895 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2633 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1896 static const struct { 2634 static const struct {
1897 const char *name; 2635 const char *name;
1898 IV iv; 2636 IV iv;
1899 } *civ, const_iv[] = { 2637 } *civ, const_iv[] = {
1900# 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),
1901 const_iv (GL_COLOR_MATERIAL), 2642 const_iv (GL_COLOR_MATERIAL),
1902 const_iv (GL_SMOOTH), 2643 const_iv (GL_SMOOTH),
1903 const_iv (GL_FLAT), 2644 const_iv (GL_FLAT),
1904 const_iv (GL_DITHER), 2645 const_iv (GL_DITHER),
1905 const_iv (GL_BLEND), 2646 const_iv (GL_BLEND),
… …
1909 const_iv (GL_ALPHA_TEST), 2650 const_iv (GL_ALPHA_TEST),
1910 const_iv (GL_NORMALIZE), 2651 const_iv (GL_NORMALIZE),
1911 const_iv (GL_RESCALE_NORMAL), 2652 const_iv (GL_RESCALE_NORMAL),
1912 const_iv (GL_FRONT), 2653 const_iv (GL_FRONT),
1913 const_iv (GL_BACK), 2654 const_iv (GL_BACK),
2655 const_iv (GL_AUX0),
1914 const_iv (GL_AND), 2656 const_iv (GL_AND),
1915 const_iv (GL_ONE), 2657 const_iv (GL_ONE),
1916 const_iv (GL_ZERO), 2658 const_iv (GL_ZERO),
1917 const_iv (GL_SRC_ALPHA), 2659 const_iv (GL_SRC_ALPHA),
1918 const_iv (GL_DST_ALPHA), 2660 const_iv (GL_DST_ALPHA),
… …
1931 const_iv (GL_INTENSITY), 2673 const_iv (GL_INTENSITY),
1932 const_iv (GL_LUMINANCE), 2674 const_iv (GL_LUMINANCE),
1933 const_iv (GL_LUMINANCE_ALPHA), 2675 const_iv (GL_LUMINANCE_ALPHA),
1934 const_iv (GL_FLOAT), 2676 const_iv (GL_FLOAT),
1935 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),
1936 const_iv (GL_COMPILE), 2684 const_iv (GL_COMPILE),
2685 const_iv (GL_PROXY_TEXTURE_1D),
2686 const_iv (GL_PROXY_TEXTURE_2D),
1937 const_iv (GL_TEXTURE_1D), 2687 const_iv (GL_TEXTURE_1D),
1938 const_iv (GL_TEXTURE_2D), 2688 const_iv (GL_TEXTURE_2D),
1939 const_iv (GL_TEXTURE_ENV), 2689 const_iv (GL_TEXTURE_ENV),
1940 const_iv (GL_TEXTURE_MAG_FILTER), 2690 const_iv (GL_TEXTURE_MAG_FILTER),
1941 const_iv (GL_TEXTURE_MIN_FILTER), 2691 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1962 const_iv (GL_COLOR_LOGIC_OP), 2712 const_iv (GL_COLOR_LOGIC_OP),
1963 const_iv (GL_SEPARABLE_2D), 2713 const_iv (GL_SEPARABLE_2D),
1964 const_iv (GL_CONVOLUTION_2D), 2714 const_iv (GL_CONVOLUTION_2D),
1965 const_iv (GL_CONVOLUTION_BORDER_MODE), 2715 const_iv (GL_CONVOLUTION_BORDER_MODE),
1966 const_iv (GL_CONSTANT_BORDER), 2716 const_iv (GL_CONSTANT_BORDER),
2717 const_iv (GL_POINTS),
1967 const_iv (GL_LINES), 2718 const_iv (GL_LINES),
1968 const_iv (GL_LINE_STRIP), 2719 const_iv (GL_LINE_STRIP),
1969 const_iv (GL_LINE_LOOP), 2720 const_iv (GL_LINE_LOOP),
1970 const_iv (GL_QUADS), 2721 const_iv (GL_QUADS),
1971 const_iv (GL_QUAD_STRIP), 2722 const_iv (GL_QUAD_STRIP),
1972 const_iv (GL_TRIANGLES), 2723 const_iv (GL_TRIANGLES),
1973 const_iv (GL_TRIANGLE_STRIP), 2724 const_iv (GL_TRIANGLE_STRIP),
1974 const_iv (GL_TRIANGLE_FAN), 2725 const_iv (GL_TRIANGLE_FAN),
2726 const_iv (GL_POLYGON),
1975 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),
1976 const_iv (GL_FASTEST), 2733 const_iv (GL_FASTEST),
2734 const_iv (GL_DONT_CARE),
2735 const_iv (GL_NICEST),
1977 const_iv (GL_V2F), 2736 const_iv (GL_V2F),
1978 const_iv (GL_V3F), 2737 const_iv (GL_V3F),
1979 const_iv (GL_T2F_V3F), 2738 const_iv (GL_T2F_V3F),
1980 const_iv (GL_T2F_N3F_V3F), 2739 const_iv (GL_T2F_N3F_V3F),
1981# undef const_iv 2740# undef const_iv
1982 }; 2741 };
1983 2742
1984 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; )
1985 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);
1986} 2748}
2749
2750void
2751disable_GL_EXT_blend_func_separate ()
2752 CODE:
2753 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0;
1987 2755
1988char * 2756char *
1989gl_vendor () 2757gl_vendor ()
1990 CODE: 2758 CODE:
1991 RETVAL = (char *)glGetString (GL_VENDOR); 2759 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2004 CODE: 2772 CODE:
2005 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2773 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2006 OUTPUT: 2774 OUTPUT:
2007 RETVAL 2775 RETVAL
2008 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
2009int glGetError () 2791int glGetError ()
2010 2792
2011void glFinish () 2793void glFinish ()
2012 2794
2013void glClear (int mask) 2795void glClear (int mask)
… …
2050# near_ and far_ are due to microsofts buggy "c" compiler 2832# near_ and far_ are due to microsofts buggy "c" compiler
2051void 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_)
2052 2834
2053# near_ and far_ are due to microsofts buggy "c" compiler 2835# near_ and far_ are due to microsofts buggy "c" compiler
2054void 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
2055 2839
2056void glViewport (int x, int y, int width, int height) 2840void glViewport (int x, int y, int width, int height)
2057 2841
2058void glScissor (int x, int y, int width, int height) 2842void glScissor (int x, int y, int width, int height)
2059 2843
… …
2067 2851
2068void glRotate (float angle, float x, float y, float z) 2852void glRotate (float angle, float x, float y, float z)
2069 CODE: 2853 CODE:
2070 glRotatef (angle, x, y, z); 2854 glRotatef (angle, x, y, z);
2071 2855
2072void glBegin (int mode)
2073
2074void glEnd ()
2075
2076void glColor (float r, float g, float b, float a = 1.0) 2856void glColor (float r, float g, float b, float a = 1.0)
2077 PROTOTYPE: @
2078 ALIAS: 2857 ALIAS:
2079 glColor_premultiply = 1 2858 glColor_premultiply = 1
2080 CODE: 2859 CODE:
2081 if (ix) 2860 if (ix)
2082 { 2861 {
… …
2085 b *= a; 2864 b *= a;
2086 } 2865 }
2087 // microsoft visual "c" rounds instead of truncating... 2866 // microsoft visual "c" rounds instead of truncating...
2088 glColor4f (r, g, b, a); 2867 glColor4f (r, g, b, a);
2089 2868
2090void glInterleavedArrays (int format, int stride, char *data)
2091
2092void glDrawElements (int mode, int count, int type, char *indices)
2093
2094# 1.2 void glDrawRangeElements (int mode, int start, int end
2095
2096void glRasterPos (float x, float y, float z = 0.) 2869void glRasterPos (float x, float y, float z = 0.)
2097 CODE: 2870 CODE:
2098 glRasterPos3f (0, 0, z); 2871 glRasterPos3f (0, 0, z);
2099 glBitmap (0, 0, 0, 0, x, y, 0); 2872 glBitmap (0, 0, 0, 0, x, y, 0);
2100 2873
… …
2104 2877
2105void glTexCoord (float s, float t) 2878void glTexCoord (float s, float t)
2106 CODE: 2879 CODE:
2107 glTexCoord2f (s, t); 2880 glTexCoord2f (s, t);
2108 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
2109void glTexEnv (int target, int pname, float param) 2911void glTexEnv (int target, int pname, float param)
2110 CODE: 2912 CODE:
2111 glTexEnvf (target, pname, param); 2913 glTexEnvf (target, pname, param);
2112 2914
2113void glTexParameter (int target, int pname, float param) 2915void glTexParameter (int target, int pname, float param)
… …
2129void 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)
2130 CODE: 2932 CODE:
2131 if (gl.SeparableFilter2D) 2933 if (gl.SeparableFilter2D)
2132 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2934 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2133 2935
2134void 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)
2135 2937
2136void 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)
2137 2939
2138void 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)
2139 2943
2140void 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)
2141 2945
2142int glGenTexture () 2946int glGenTexture ()
2143 CODE: 2947 CODE:
2144{ 2948 RETVAL = gen_texture ();
2145 GLuint name;
2146 glGenTextures (1, &name);
2147 RETVAL = name;
2148}
2149 OUTPUT: 2949 OUTPUT:
2150 RETVAL 2950 RETVAL
2151 2951
2152void glDeleteTexture (int name) 2952void glDeleteTexture (int name)
2153 CODE: 2953 CODE:
2154{
2155 GLuint name_ = name;
2156 glDeleteTextures (1, &name_); 2954 del_texture (name);
2157} 2955
2158
2159int glGenList () 2956int glGenList ()
2160 CODE: 2957 CODE:
2161 RETVAL = glGenLists (1); 2958 RETVAL = glGenLists (1);
2162 OUTPUT: 2959 OUTPUT:
2163 RETVAL 2960 RETVAL
… …
2170 2967
2171void glEndList () 2968void glEndList ()
2172 2969
2173void glCallList (int list) 2970void glCallList (int list)
2174 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