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.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 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);
… …
285 self->oy = 0; 367 self->oy = 0;
286 self->row = 0; 368 self->row = 0;
287 self->rows = 0; 369 self->rows = 0;
288} 370}
289 371
372#define CELL_CLEAR(cell) \
373 do { \
374 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \
377 (cell)->player = 0; \
378 } while (0)
379
290static void 380static void
291map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 381map_blank (DC__Map self, int x0, int y0, int w, int h)
292{ 382{
293 int x, y; 383 int x, y;
294 maprow *row; 384 maprow *row;
295 mapcell *cell; 385 mapcell *cell;
296 386
… …
308 if (x >= row->c1) 398 if (x >= row->c1)
309 break; 399 break;
310 400
311 cell = row->col + x - row->c0; 401 cell = row->col + x - row->c0;
312 402
313 cell->darkness = 0; 403 CELL_CLEAR (cell);
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
317 } 404 }
318 } 405 }
406}
407
408typedef struct {
409 tileid tile;
410 uint8_t x, y, level;
411} smooth_key;
412
413static void
414smooth_or_bits (HV *hv, smooth_key *key, IV bits)
415{
416 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
417
418 if (SvIOK (*sv))
419 SvIV_set (*sv, SvIVX (*sv) | bits);
420 else
421 sv_setiv (*sv, bits);
319} 422}
320 423
321static void 424static void
322music_finished (void) 425music_finished (void)
323{ 426{
… …
359 n |= n >> 16; 462 n |= n >> 16;
360 463
361 return n + 1; 464 return n + 1;
362} 465}
363 466
467static unsigned int
468popcount (unsigned int n)
469{
470 n -= (n >> 1) & 0x55555555U;
471 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
472 n = ((n >> 4) + n) & 0x0f0f0f0fU;
473 n *= 0x01010101U;
474
475 return n >> 24;
476}
477
364/* SDL should provide this, really. */ 478/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300 479#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314 480#define SDLK_MODIFIER_MAX 314
367 481
368MODULE = CFPlus PACKAGE = CFPlus 482/******************************************************************************/
483
484static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
485static GV *hover_gv;
486
487static int
488within_widget (SV *widget, NV x, NV y)
489{
490 HV *self;
491 SV **svp;
492 NV wx, ww, wy, wh;
493
494 if (!SvROK (widget))
495 return 0;
496
497 self = (HV *)SvRV (widget);
498
499 if (SvTYPE (self) != SVt_PVHV)
500 return 0;
501
502 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
503 if (y < wy)
504 return 0;
505
506 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
507 if (y >= wy + wh)
508 return 0;
509
510 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
511 if (x < wx)
512 return 0;
513
514 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
515 if (x >= wx + ww)
516 return 0;
517
518 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
519 if (!svp || !SvTRUE (*svp))
520 return 0;
521
522 return 1;
523}
524
525MODULE = Deliantra::Client PACKAGE = DC
369 526
370PROTOTYPES: ENABLE 527PROTOTYPES: ENABLE
371 528
372BOOT: 529BOOT:
373{ 530{
374 HV *stash = gv_stashpv ("CFPlus", 1); 531 HV *stash = gv_stashpv ("DC", 1);
375 static const struct { 532 static const struct {
376 const char *name; 533 const char *name;
377 IV iv; 534 IV iv;
378 } *civ, const_iv[] = { 535 } *civ, const_iv[] = {
379# define const_iv(name) { # name, (IV)name } 536# define const_iv(name) { # name, (IV)name }
… …
401 558
402 const_iv (SDL_APPINPUTFOCUS), 559 const_iv (SDL_APPINPUTFOCUS),
403 const_iv (SDL_APPMOUSEFOCUS), 560 const_iv (SDL_APPMOUSEFOCUS),
404 const_iv (SDL_APPACTIVE), 561 const_iv (SDL_APPACTIVE),
405 562
563 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST),
406 const_iv (SDLK_KP0), 565 const_iv (SDLK_KP0),
407 const_iv (SDLK_KP1), 566 const_iv (SDLK_KP1),
408 const_iv (SDLK_KP2), 567 const_iv (SDLK_KP2),
409 const_iv (SDLK_KP3), 568 const_iv (SDLK_KP3),
410 const_iv (SDLK_KP4), 569 const_iv (SDLK_KP4),
… …
482 const_iv (KMOD_LMETA), 641 const_iv (KMOD_LMETA),
483 const_iv (KMOD_RMETA), 642 const_iv (KMOD_RMETA),
484 const_iv (KMOD_NUM), 643 const_iv (KMOD_NUM),
485 const_iv (KMOD_CAPS), 644 const_iv (KMOD_CAPS),
486 const_iv (KMOD_MODE), 645 const_iv (KMOD_MODE),
646
647 const_iv (MIX_DEFAULT_FORMAT),
648
649 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO),
652 const_iv (SDL_INIT_CDROM),
653 const_iv (SDL_INIT_JOYSTICK),
654 const_iv (SDL_INIT_EVERYTHING),
655 const_iv (SDL_INIT_NOPARACHUTE),
656 const_iv (SDL_INIT_EVENTTHREAD),
657
658 const_iv (SDL_GL_RED_SIZE),
659 const_iv (SDL_GL_GREEN_SIZE),
660 const_iv (SDL_GL_BLUE_SIZE),
661 const_iv (SDL_GL_ALPHA_SIZE),
662 const_iv (SDL_GL_DOUBLEBUFFER),
663 const_iv (SDL_GL_BUFFER_SIZE),
664 const_iv (SDL_GL_DEPTH_SIZE),
665 const_iv (SDL_GL_STENCIL_SIZE),
666 const_iv (SDL_GL_ACCUM_RED_SIZE),
667 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
668 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL)
487# undef const_iv 675# undef const_iv
488 }; 676 };
489 677
490 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
492 680
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 681 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 682 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
495} 683}
496 684
685void
686weaken (SV *rv)
687 PROTOTYPE: $
688 CODE:
689 sv_rvweaken (rv);
690
497int 691int
498in_destruct () 692in_destruct ()
499 CODE: 693 CODE:
500 RETVAL = PL_main_cv == Nullcv; 694 RETVAL = PL_main_cv == Nullcv;
501 OUTPUT: 695 OUTPUT:
502 RETVAL 696 RETVAL
503 697
504NV floor (NV x) 698NV floor (NV x)
505 699
506NV ceil (NV x) 700NV ceil (NV x)
701
702IV minpot (UV n)
703
704IV popcount (UV n)
507 705
508void 706void
509pango_init () 707pango_init ()
510 CODE: 708 CODE:
511{ 709{
512 opengl_fontmap = pango_opengl_font_map_new (); 710 opengl_fontmap = pango_opengl_font_map_new ();
513 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 711 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
514 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 712 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
713 /*pango_context_set_font_description (opengl_context, default_font);*/
714#if PANGO_VERSION_CHECK (1, 15, 2)
715 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
716 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
717#endif
515} 718}
516 719
517int 720char *SDL_GetError ()
518SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
519 721
520void 722int SDL_Init (U32 flags)
723
724int SDL_InitSubSystem (U32 flags)
725
726void SDL_QuitSubSystem (U32 flags)
727
521SDL_Quit () 728void SDL_Quit ()
522 729
730int SDL_GL_SetAttribute (int attr, int value)
731
732int SDL_GL_GetAttribute (int attr)
733 CODE:
734 if (SDL_GL_GetAttribute (attr, &RETVAL))
735 XSRETURN_UNDEF;
736 OUTPUT:
737 RETVAL
738
523void 739void
524SDL_ListModes () 740SDL_ListModes (int rgb, int alpha)
525 PPCODE: 741 PPCODE:
526{ 742{
527 SDL_Rect **m; 743 SDL_Rect **m;
528 744
529 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 745 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
530 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 746 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
531 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 747 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
532 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 748 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
533 749
534 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 750 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
535 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
536 752
537 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 753 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
538 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 754 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
539 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 755 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
540 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
541 757
542 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 758 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
543#if SDL_VERSION_ATLEAST(1,2,10)
544 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
545 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 759 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
546#endif
547
548 SDL_EnableUNICODE (1);
549 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
550 760
551 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 761 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
552 762
553 if (m && m != (SDL_Rect **)-1) 763 if (m && m != (SDL_Rect **)-1)
554 while (*m) 764 while (*m)
555 { 765 {
766 if ((*m)->w >= 400 && (*m)->h >= 300)
767 {
556 AV *av = newAV (); 768 AV *av = newAV ();
557 av_push (av, newSViv ((*m)->w)); 769 av_push (av, newSViv ((*m)->w));
558 av_push (av, newSViv ((*m)->h)); 770 av_push (av, newSViv ((*m)->h));
771 av_push (av, newSViv (rgb));
772 av_push (av, newSViv (alpha));
559 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 773 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
774 }
560 775
561 ++m; 776 ++m;
562 } 777 }
563} 778}
564 779
565char *
566SDL_GetError ()
567
568int 780int
569SDL_SetVideoMode (int w, int h, int fullscreen) 781SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
570 CODE: 782 CODE:
783{
784 SDL_EnableUNICODE (1);
785 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
786
787 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
788 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
789 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
790 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
791
571 RETVAL = !!SDL_SetVideoMode ( 792 RETVAL = !!SDL_SetVideoMode (
572 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 793 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
573 ); 794 );
795
574 if (RETVAL) 796 if (RETVAL)
575 { 797 {
576 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 798 av_clear (texture_av);
799
800 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
577# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 801#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
578# include "glfunc.h" 802#include "glfunc.h"
579# undef GL_FUNC 803#undef GL_FUNC
580 } 804 }
805}
581 OUTPUT: 806 OUTPUT:
582 RETVAL 807 RETVAL
583 808
584void 809void
585SDL_GL_SwapBuffers () 810SDL_GL_SwapBuffers ()
586 811
587char * 812char *
588SDL_GetKeyName (int sym) 813SDL_GetKeyName (int sym)
589 814
815int
816SDL_GetAppState ()
817
818int
819SDL_GetModState ()
820
590void 821void
591SDL_PollEvent () 822poll_events ()
592 PPCODE: 823 PPCODE:
593{ 824{
594 SDL_Event ev; 825 SDL_Event ev;
595 826
596 while (SDL_PollEvent (&ev)) 827 SDL_PumpEvents ();
828 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
597 { 829 {
598 HV *hv = newHV (); 830 HV *hv = newHV ();
599 hv_store (hv, "type", 4, newSViv (ev.type), 0); 831 hv_store (hv, "type", 4, newSViv (ev.type), 0);
600 832
601 switch (ev.type) 833 switch (ev.type)
602 { 834 {
603 case SDL_KEYDOWN: 835 case SDL_KEYDOWN:
604 case SDL_KEYUP: 836 case SDL_KEYUP:
605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
607 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 839 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
608 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 840 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
610 break; 842 break;
611 843
612 case SDL_ACTIVEEVENT: 844 case SDL_ACTIVEEVENT:
613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
614 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 846 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
615 break; 847 break;
616 848
617 case SDL_MOUSEMOTION: 849 case SDL_MOUSEMOTION:
850 {
851 int state = ev.motion.state;
852 int x = ev.motion.x;
853 int y = ev.motion.y;
854 int xrel = ev.motion.xrel;
855 int yrel = ev.motion.yrel;
856
857 /* do simplistic event compression */
858 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
859 && state == ev.motion.state)
860 {
861 xrel += ev.motion.xrel;
862 yrel += ev.motion.yrel;
863 x = ev.motion.x;
864 y = ev.motion.y;
865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
866 }
867
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
619
620 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 869 hv_store (hv, "state", 5, newSViv (state), 0);
621 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 870 hv_store (hv, "x", 1, newSViv (x), 0);
622 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 871 hv_store (hv, "y", 1, newSViv (y), 0);
623 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 872 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
624 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 873 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
874 }
625 break; 875 break;
626 876
627 case SDL_MOUSEBUTTONDOWN: 877 case SDL_MOUSEBUTTONDOWN:
628 case SDL_MOUSEBUTTONUP: 878 case SDL_MOUSEBUTTONUP:
629 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 879 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
630 880
631 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 881 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
632 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 882 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
633 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 883 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
634 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 884 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
639 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 889 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
640 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 890 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
641 break; 891 break;
642 } 892 }
643 893
644 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 894 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
645 } 895 }
646} 896}
647 897
648int 898int
649Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 899Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
650 POSTCALL: 900 POSTCALL:
651 Mix_HookMusicFinished (music_finished); 901 Mix_HookMusicFinished (music_finished);
652 Mix_ChannelFinished (channel_finished); 902 Mix_ChannelFinished (channel_finished);
653 903
654void 904void
905Mix_QuerySpec ()
906 PPCODE:
907{
908 int freq, channels;
909 Uint16 format;
910
911 if (Mix_QuerySpec (&freq, &format, &channels))
912 {
913 EXTEND (SP, 3);
914 PUSHs (sv_2mortal (newSViv (freq)));
915 PUSHs (sv_2mortal (newSViv (format)));
916 PUSHs (sv_2mortal (newSViv (channels)));
917 }
918}
919
920void
655Mix_CloseAudio () 921Mix_CloseAudio ()
656 922
657int 923int
658Mix_AllocateChannels (int numchans = -1) 924Mix_AllocateChannels (int numchans = -1)
659 925
926const char *
927Mix_GetError ()
928
660void 929void
661lowdelay (int fd, int val = 1) 930lowdelay (int fd, int val = 1)
662 CODE: 931 CODE:
663#ifndef _WIN32
664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 932 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
665#endif
666 933
667void 934void
668win32_proxy_info () 935win32_proxy_info ()
669 PPCODE: 936 PPCODE:
670{ 937{
… …
691 } 958 }
692 } 959 }
693#endif 960#endif
694} 961}
695 962
696void 963int
697add_font (char *file) 964add_font (char *file)
698 CODE: 965 CODE:
699 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT:
968 RETVAL
700 969
701void 970void
702load_image_inline (SV *image_) 971load_image_inline (SV *image_)
703 ALIAS: 972 ALIAS:
704 load_image_file = 1 973 load_image_file = 1
… …
707 STRLEN image_len; 976 STRLEN image_len;
708 char *image = (char *)SvPVbyte (image_, image_len); 977 char *image = (char *)SvPVbyte (image_, image_len);
709 SDL_Surface *surface, *surface2; 978 SDL_Surface *surface, *surface2;
710 SDL_PixelFormat fmt; 979 SDL_PixelFormat fmt;
711 SDL_RWops *rw = ix 980 SDL_RWops *rw = ix
712 ? SDL_RWFromFile (image, "r") 981 ? SDL_RWFromFile (image, "rb")
713 : SDL_RWFromConstMem (image, image_len); 982 : SDL_RWFromConstMem (image, image_len);
714 983
715 if (!rw) 984 if (!rw)
716 croak ("load_image: %s", SDL_GetError ()); 985 croak ("load_image: %s", SDL_GetError ());
717 986
… …
790void 1059void
791error (char *message) 1060error (char *message)
792 CODE: 1061 CODE:
793 fprintf (stderr, "ERROR: %s\n", message); 1062 fprintf (stderr, "ERROR: %s\n", message);
794#ifdef _WIN32 1063#ifdef _WIN32
795 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
796#endif 1065#endif
797 1066
798void 1067void
799fatal (char *message) 1068fatal (char *message)
800 CODE: 1069 CODE:
801 fprintf (stderr, "FATAL: %s\n", message); 1070 fprintf (stderr, "FATAL: %s\n", message);
802#ifdef _WIN32 1071#ifdef _WIN32
803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1072 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
804#endif 1073#endif
805 _exit (1); 1074 _exit (1);
806 1075
807void 1076void
808_exit (int retval = 0) 1077_exit (int retval = 0)
… …
811 ExitThread (retval); // unclean, please beam me up 1080 ExitThread (retval); // unclean, please beam me up
812#else 1081#else
813 _exit (retval); 1082 _exit (retval);
814#endif 1083#endif
815 1084
816MODULE = CFPlus PACKAGE = CFPlus::Font 1085void
1086debug ()
1087 CODE:
1088{
1089#if DEBUG
1090 VALGRIND_DO_LEAK_CHECK;
1091#endif
1092}
817 1093
818CFPlus::Font 1094MODULE = Deliantra::Client PACKAGE = DC::Font
1095
1096PROTOTYPES: DISABLE
1097
1098DC::Font
819new_from_file (SV *class, char *path, int id = 0) 1099new_from_file (SV *class, char *path, int id = 0)
820 CODE: 1100 CODE:
821{ 1101{
822 int count; 1102 int count;
823 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1103 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
826} 1106}
827 OUTPUT: 1107 OUTPUT:
828 RETVAL 1108 RETVAL
829 1109
830void 1110void
831DESTROY (CFPlus::Font self) 1111DESTROY (DC::Font self)
832 CODE: 1112 CODE:
833 pango_font_description_free (self); 1113 pango_font_description_free (self);
834 1114
835void 1115void
836make_default (CFPlus::Font self) 1116make_default (DC::Font self)
1117 PROTOTYPE: $
837 CODE: 1118 CODE:
838 default_font = self; 1119 default_font = self;
839 1120
840MODULE = CFPlus PACKAGE = CFPlus::Layout 1121MODULE = Deliantra::Client PACKAGE = DC::Layout
841 1122
1123PROTOTYPES: DISABLE
1124
842void 1125void
843reset_glyph_cache () 1126glyph_cache_backup ()
1127 PROTOTYPE:
844 CODE: 1128 CODE:
1129 tc_backup ();
1130
1131void
1132glyph_cache_restore ()
1133 PROTOTYPE:
1134 CODE:
845 tc_clear (); 1135 tc_restore ();
846 1136
847CFPlus::Layout 1137DC::Layout
848new (SV *class) 1138new (SV *class)
849 CODE: 1139 CODE:
850 New (0, RETVAL, 1, struct cf_layout); 1140 New (0, RETVAL, 1, struct cf_layout);
851 1141
852 RETVAL->pl = pango_layout_new (opengl_context); 1142 RETVAL->pl = pango_layout_new (opengl_context);
… …
854 RETVAL->g = 1.; 1144 RETVAL->g = 1.;
855 RETVAL->b = 1.; 1145 RETVAL->b = 1.;
856 RETVAL->a = 1.; 1146 RETVAL->a = 1.;
857 RETVAL->base_height = MIN_FONT_HEIGHT; 1147 RETVAL->base_height = MIN_FONT_HEIGHT;
858 RETVAL->font = 0; 1148 RETVAL->font = 0;
1149 RETVAL->rc = rc_alloc ();
859 1150
860 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1151 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
861 layout_update_font (RETVAL); 1152 layout_update_font (RETVAL);
862 OUTPUT: 1153 OUTPUT:
863 RETVAL 1154 RETVAL
864 1155
865void 1156void
866DESTROY (CFPlus::Layout self) 1157DESTROY (DC::Layout self)
867 CODE: 1158 CODE:
868 g_object_unref (self->pl); 1159 g_object_unref (self->pl);
1160 rc_free (self->rc);
869 Safefree (self); 1161 Safefree (self);
870 1162
871void 1163void
872set_text (CFPlus::Layout self, SV *text_) 1164set_text (DC::Layout self, SV *text_)
873 CODE: 1165 CODE:
874{ 1166{
875 STRLEN textlen; 1167 STRLEN textlen;
876 char *text = SvPVutf8 (text_, textlen); 1168 char *text = SvPVutf8 (text_, textlen);
877 1169
878 pango_layout_set_text (self->pl, text, textlen); 1170 pango_layout_set_text (self->pl, text, textlen);
879} 1171}
880 1172
881void 1173void
882set_markup (CFPlus::Layout self, SV *text_) 1174set_markup (DC::Layout self, SV *text_)
883 CODE: 1175 CODE:
884{ 1176{
885 STRLEN textlen; 1177 STRLEN textlen;
886 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
887 1179
888 pango_layout_set_markup (self->pl, text, textlen); 1180 pango_layout_set_markup (self->pl, text, textlen);
889} 1181}
890 1182
891void 1183void
892set_shapes (CFPlus::Layout self, ...) 1184set_shapes (DC::Layout self, ...)
893 CODE: 1185 CODE:
894{ 1186{
895 PangoAttrList *attrs = 0; 1187 PangoAttrList *attrs = 0;
896 const char *text = pango_layout_get_text (self->pl); 1188 const char *text = pango_layout_get_text (self->pl);
897 const char *pos = text; 1189 const char *pos = text;
… …
932 if (attrs) 1224 if (attrs)
933 pango_layout_set_attributes (self->pl, attrs); 1225 pango_layout_set_attributes (self->pl, attrs);
934} 1226}
935 1227
936void 1228void
937get_shapes (CFPlus::Layout self) 1229get_shapes (DC::Layout self)
938 PPCODE: 1230 PPCODE:
939{ 1231{
940 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1232 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
941 1233
942 do 1234 do
943 { 1235 {
944 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1236 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
945 1237
946 if (run && shape_attr_p (run)) 1238 if (run && shape_attr_p (run))
947 { 1239 {
948 PangoRectangle extents; 1240 PangoRectangle extents;
949 pango_layout_iter_get_run_extents (iter, 0, &extents); 1241 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
957 1249
958 pango_layout_iter_free (iter); 1250 pango_layout_iter_free (iter);
959} 1251}
960 1252
961int 1253int
962has_wrapped (CFPlus::Layout self) 1254has_wrapped (DC::Layout self)
963 CODE: 1255 CODE:
964{ 1256{
965 int lines = 1; 1257 int lines = 1;
966 const char *text = pango_layout_get_text (self->pl); 1258 const char *text = pango_layout_get_text (self->pl);
967 1259
… …
972} 1264}
973 OUTPUT: 1265 OUTPUT:
974 RETVAL 1266 RETVAL
975 1267
976SV * 1268SV *
977get_text (CFPlus::Layout self) 1269get_text (DC::Layout self)
978 CODE: 1270 CODE:
979 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1271 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
980 sv_utf8_decode (RETVAL); 1272 sv_utf8_decode (RETVAL);
981 OUTPUT: 1273 OUTPUT:
982 RETVAL 1274 RETVAL
983 1275
984void 1276void
985set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1277set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
986 CODE: 1278 CODE:
987 self->r = r; 1279 self->r = r;
988 self->g = g; 1280 self->g = g;
989 self->b = b; 1281 self->b = b;
990 self->a = a; 1282 self->a = a;
991 1283
992void 1284void
993set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1285set_font (DC::Layout self, DC::Font font = 0)
994 CODE: 1286 CODE:
995 if (self->font != font) 1287 if (self->font != font)
996 { 1288 {
997 self->font = font; 1289 self->font = font;
998 layout_update_font (self); 1290 layout_update_font (self);
999 } 1291 }
1000 1292
1001void 1293void
1002set_height (CFPlus::Layout self, int base_height) 1294set_height (DC::Layout self, int base_height)
1003 CODE: 1295 CODE:
1004 if (self->base_height != base_height) 1296 if (self->base_height != base_height)
1005 { 1297 {
1006 self->base_height = base_height; 1298 self->base_height = base_height;
1007 layout_update_font (self); 1299 layout_update_font (self);
1008 } 1300 }
1009 1301
1010void 1302void
1011set_width (CFPlus::Layout self, int max_width = -1) 1303set_width (DC::Layout self, int max_width = -1)
1012 CODE: 1304 CODE:
1013 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1305 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1014 1306
1015void 1307void
1016set_indent (CFPlus::Layout self, int indent) 1308set_indent (DC::Layout self, int indent)
1017 CODE: 1309 CODE:
1018 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1310 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1019 1311
1020void 1312void
1021set_spacing (CFPlus::Layout self, int spacing) 1313set_spacing (DC::Layout self, int spacing)
1022 CODE: 1314 CODE:
1023 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1315 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1024 1316
1025void 1317void
1026set_ellipsise (CFPlus::Layout self, int ellipsise) 1318set_ellipsise (DC::Layout self, int ellipsise)
1027 CODE: 1319 CODE:
1028 pango_layout_set_ellipsize (self->pl, 1320 pango_layout_set_ellipsize (self->pl,
1029 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1321 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1030 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1322 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1031 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1323 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1032 : PANGO_ELLIPSIZE_NONE 1324 : PANGO_ELLIPSIZE_NONE
1033 ); 1325 );
1034 1326
1035void 1327void
1036set_single_paragraph_mode (CFPlus::Layout self, int spm) 1328set_single_paragraph_mode (DC::Layout self, int spm)
1037 CODE: 1329 CODE:
1038 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1330 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1039 1331
1040void 1332void
1041size (CFPlus::Layout self) 1333size (DC::Layout self)
1042 PPCODE: 1334 PPCODE:
1043{ 1335{
1044 int w, h; 1336 int w, h;
1045 1337
1046 layout_get_pixel_size (self, &w, &h); 1338 layout_get_pixel_size (self, &w, &h);
… …
1049 PUSHs (sv_2mortal (newSViv (w))); 1341 PUSHs (sv_2mortal (newSViv (w)));
1050 PUSHs (sv_2mortal (newSViv (h))); 1342 PUSHs (sv_2mortal (newSViv (h)));
1051} 1343}
1052 1344
1053int 1345int
1054descent (CFPlus::Layout self) 1346descent (DC::Layout self)
1055 CODE: 1347 CODE:
1056{ 1348{
1057 PangoRectangle rect; 1349 PangoRectangle rect;
1058 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1350 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1059 pango_layout_line_get_pixel_extents (line, 0, &rect); 1351 pango_layout_line_get_pixel_extents (line, 0, &rect);
1060 RETVAL = PANGO_DESCENT (rect); 1352 RETVAL = PANGO_DESCENT (rect);
1061} 1353}
1062 OUTPUT: 1354 OUTPUT:
1063 RETVAL 1355 RETVAL
1064 1356
1065int 1357int
1066xy_to_index (CFPlus::Layout self, int x, int y) 1358xy_to_index (DC::Layout self, int x, int y)
1067 CODE: 1359 CODE:
1068{ 1360{
1069 int index, trailing; 1361 int index, trailing;
1070 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1362 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1071 RETVAL = index + trailing; 1363 RETVAL = index + trailing;
1072} 1364}
1073 OUTPUT: 1365 OUTPUT:
1074 RETVAL 1366 RETVAL
1075 1367
1076void 1368void
1077cursor_pos (CFPlus::Layout self, int index) 1369cursor_pos (DC::Layout self, int index)
1078 PPCODE: 1370 PPCODE:
1079{ 1371{
1080 PangoRectangle strong_pos; 1372 PangoRectangle pos;
1081 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1373 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1082 1374
1083 EXTEND (SP, 3); 1375 EXTEND (SP, 3);
1084 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1376 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1377 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1087} 1379}
1088 1380
1089void 1381void
1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1382index_to_line_x (DC::Layout self, int index, int trailing = 0)
1091 PPCODE: 1383 PPCODE:
1092{ 1384{
1093 int line, x; 1385 int line, x;
1094 1386
1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1387 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1388#if !PANGO_VERSION_CHECK (1, 17, 3)
1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1389 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1097 1390 --line;
1391#endif
1098 EXTEND (SP, 2); 1392 EXTEND (SP, 2);
1099 PUSHs (sv_2mortal (newSViv (line - 1))); 1393 PUSHs (sv_2mortal (newSViv (line)));
1100 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1394 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1101} 1395}
1102 1396
1103void 1397void
1104line_x_to_index (CFPlus::Layout self, int line, int x) 1398line_x_to_index (DC::Layout self, int line, int x)
1105 PPCODE: 1399 PPCODE:
1106{ 1400{
1107 PangoLayoutLine *lp; 1401 PangoLayoutLine *lp;
1108 int index, trailing; 1402 int index, trailing;
1109 1403
1110 if (line < 0) 1404 if (line < 0)
1111 XSRETURN_EMPTY; 1405 XSRETURN_EMPTY;
1112 1406
1113 if (!(lp = pango_layout_get_line (self->pl, line))) 1407 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1114 XSRETURN_EMPTY; /* do better */ 1408 XSRETURN_EMPTY; /* do better */
1115 1409
1116 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1410 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1117 1411
1118 EXTEND (SP, 2); 1412 EXTEND (SP, 2);
… …
1124 PUSHs (sv_2mortal (newSViv (trailing))); 1418 PUSHs (sv_2mortal (newSViv (trailing)));
1125 } 1419 }
1126} 1420}
1127 1421
1128void 1422void
1129render (CFPlus::Layout self, float x, float y, int flags = 0) 1423render (DC::Layout self, float x, float y, int flags = 0)
1130 PPCODE: 1424 CODE:
1425 rc_clear (self->rc);
1131 pango_opengl_render_layout_subpixel ( 1426 pango_opengl_render_layout_subpixel (
1132 self->pl, 1427 self->pl,
1428 self->rc,
1133 x * PANGO_SCALE, y * PANGO_SCALE, 1429 x * PANGO_SCALE, y * PANGO_SCALE,
1134 self->r, self->g, self->b, self->a, 1430 self->r, self->g, self->b, self->a,
1135 flags 1431 flags
1136 ); 1432 );
1433 // we assume that context_change actually clears/frees stuff
1434 // and does not do any recomputation...
1435 pango_layout_context_changed (self->pl);
1137 1436
1138MODULE = CFPlus PACKAGE = CFPlus::Texture
1139
1140void 1437void
1141pad2pot (SV *data_, SV *w_, SV *h_) 1438draw (DC::Layout self)
1142 CODE: 1439 CODE:
1143{ 1440{
1144 int ow = SvIV (w_); 1441 glEnable (GL_TEXTURE_2D);
1145 int oh = SvIV (h_); 1442 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1443 glEnable (GL_BLEND);
1444 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1445 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1446 glEnable (GL_ALPHA_TEST);
1447 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1146 1448
1147 if (ow && oh) 1449 rc_draw (self->rc);
1450
1451 glDisable (GL_ALPHA_TEST);
1452 glDisable (GL_BLEND);
1453 glDisable (GL_TEXTURE_2D);
1454}
1455
1456MODULE = Deliantra::Client PACKAGE = DC::Texture
1457
1458PROTOTYPES: ENABLE
1459
1460void
1461pad (SV *data_, int ow, int oh, int nw, int nh)
1462 CODE:
1463{
1464 if ((nw != ow || nh != oh) && SvOK (data_))
1148 { 1465 {
1149 int nw = minpot (ow);
1150 int nh = minpot (oh);
1151
1152 if (nw != ow || nh != oh)
1153 {
1154 if (SvOK (data_))
1155 {
1156 STRLEN datalen; 1466 STRLEN datalen;
1157 char *data = SvPVbyte (data_, datalen); 1467 char *data = SvPVbyte (data_, datalen);
1158 int bpp = datalen / (ow * oh); 1468 int bpp = datalen / (ow * oh);
1159 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1469 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1160 1470
1161 SvPOK_only (result_); 1471 SvPOK_only (result_);
1162 SvCUR_set (result_, nw * nh * bpp); 1472 SvCUR_set (result_, nw * nh * bpp);
1163 1473
1164 memset (SvPVX (result_), 0, nw * nh * bpp); 1474 memset (SvPVX (result_), 0, nw * nh * bpp);
1165 while (oh--) 1475 while (oh--)
1166 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1476 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1167 1477
1168 sv_setsv (data_, result_); 1478 sv_setsv (data_, result_);
1169 }
1170
1171 sv_setiv (w_, nw);
1172 sv_setiv (h_, nh);
1173 }
1174 } 1479 }
1175} 1480}
1176 1481
1177void 1482void
1178draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1483draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1184{ 1489{
1185 HV *hv = (HV *)SvRV (self); 1490 HV *hv = (HV *)SvRV (self);
1186 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1491 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1187 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1492 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1188 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1493 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1494
1495 if (name <= 0)
1496 XSRETURN_EMPTY;
1189 1497
1190 if (items < 5) 1498 if (items < 5)
1191 { 1499 {
1192 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1500 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1193 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1501 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1221 glDisable (GL_ALPHA_TEST); 1529 glDisable (GL_ALPHA_TEST);
1222 glDisable (GL_BLEND); 1530 glDisable (GL_BLEND);
1223 } 1531 }
1224} 1532}
1225 1533
1226MODULE = CFPlus PACKAGE = CFPlus::Map 1534IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1535 CODE:
1536{
1537 GLint width;
1538 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1539 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1540 RETVAL = width > 0;
1541}
1542 OUTPUT:
1543 RETVAL
1227 1544
1228CFPlus::Map 1545MODULE = Deliantra::Client PACKAGE = DC::Map
1546
1547PROTOTYPES: DISABLE
1548
1549DC::Map
1229new (SV *class) 1550new (SV *class)
1230 CODE: 1551 CODE:
1231 New (0, RETVAL, 1, struct map); 1552 New (0, RETVAL, 1, struct map);
1232 RETVAL->x = 0; 1553 RETVAL->x = 0;
1233 RETVAL->y = 0; 1554 RETVAL->y = 0;
1234 RETVAL->w = 0; 1555 RETVAL->w = 0;
1235 RETVAL->h = 0; 1556 RETVAL->h = 0;
1236 RETVAL->ox = 0; 1557 RETVAL->ox = 0;
1237 RETVAL->oy = 0; 1558 RETVAL->oy = 0;
1238 RETVAL->faces = 8192; 1559 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1239 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1560 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1240 RETVAL->texs = 8192;
1241 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1242 RETVAL->rows = 0; 1561 RETVAL->rows = 0;
1243 RETVAL->row = 0; 1562 RETVAL->row = 0;
1244 OUTPUT: 1563 OUTPUT:
1245 RETVAL 1564 RETVAL
1246 1565
1247void 1566void
1248DESTROY (CFPlus::Map self) 1567DESTROY (DC::Map self)
1249 CODE: 1568 CODE:
1250{ 1569{
1251 map_clear (self); 1570 map_clear (self);
1252 Safefree (self->face); 1571 Safefree (self->face2tile);
1253 Safefree (self->tex); 1572 Safefree (self->tex);
1254 Safefree (self); 1573 Safefree (self);
1255} 1574}
1256 1575
1257void 1576void
1258resize (CFPlus::Map self, int map_width, int map_height) 1577resize (DC::Map self, int map_width, int map_height)
1259 CODE: 1578 CODE:
1260 self->w = map_width; 1579 self->w = map_width;
1261 self->h = map_height; 1580 self->h = map_height;
1262 1581
1263void 1582void
1264clear (CFPlus::Map self) 1583clear (DC::Map self)
1265 CODE: 1584 CODE:
1266 map_clear (self); 1585 map_clear (self);
1267 1586
1268void 1587void
1269set_face (CFPlus::Map self, int face, int texid) 1588set_tileid (DC::Map self, int face, int tile)
1270 CODE: 1589 CODE:
1271{ 1590{
1272 while (self->faces <= face) 1591 need_facenum (self, face); self->face2tile [face] = tile;
1273 { 1592 need_texid (self, tile);
1274 Append (mapface, self->face, self->faces, self->faces);
1275 self->faces *= 2;
1276 }
1277
1278 self->face [face] = texid;
1279} 1593}
1280 1594
1281void 1595void
1596set_smooth (DC::Map self, int face, int smooth, int level)
1597 CODE:
1598{
1599 tileid texid;
1600 maptex *tex;
1601
1602 if (face < 0 || face >= self->faces)
1603 return;
1604
1605 if (smooth < 0 || smooth >= self->faces)
1606 return;
1607
1608 texid = self->face2tile [face];
1609
1610 if (!texid)
1611 return;
1612
1613 tex = self->tex + texid;
1614 tex->smoothtile = self->face2tile [smooth];
1615 tex->smoothlevel = level;
1616}
1617
1618void
1282set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1619set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1283 CODE: 1620 CODE:
1284{ 1621{
1285 while (self->texs <= texid) 1622 need_texid (self, texid);
1286 {
1287 Append (maptex, self->tex, self->texs, self->texs);
1288 self->texs *= 2;
1289 }
1290 1623
1291 { 1624 {
1292 maptex *tex = self->tex + texid; 1625 maptex *tex = self->tex + texid;
1293 1626
1294 tex->name = name; 1627 tex->name = name;
… …
1311 // from transparent color bleeding and ugly wrapping effects. 1644 // from transparent color bleeding and ugly wrapping effects.
1312 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1313} 1646}
1314 1647
1315int 1648int
1316ox (CFPlus::Map self) 1649ox (DC::Map self)
1317 ALIAS: 1650 ALIAS:
1318 oy = 1 1651 oy = 1
1319 x = 2 1652 x = 2
1320 y = 3 1653 y = 3
1321 w = 4 1654 w = 4
… …
1332 } 1665 }
1333 OUTPUT: 1666 OUTPUT:
1334 RETVAL 1667 RETVAL
1335 1668
1336void 1669void
1337scroll (CFPlus::Map self, int dx, int dy) 1670scroll (DC::Map self, int dx, int dy)
1338 CODE: 1671 CODE:
1339{ 1672{
1340 if (dx > 0) 1673 if (dx > 0)
1341 map_blank (self, self->x, self->y, dx, self->h); 1674 map_blank (self, self->x, self->y, dx, self->h);
1342 else if (dx < 0) 1675 else if (dx < 0)
1343 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1676 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1344 1677
1345 if (dy > 0) 1678 if (dy > 0)
1346 map_blank (self, self->x, self->y, self->w, dy); 1679 map_blank (self, self->x, self->y, self->w, dy);
1347 else if (dy < 0) 1680 else if (dy < 0)
1348 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1681 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1349 1682
1350 self->ox += dx; self->x += dx; 1683 self->ox += dx; self->x += dx;
1351 self->oy += dy; self->y += dy; 1684 self->oy += dy; self->y += dy;
1352 1685
1353 while (self->y < 0) 1686 while (self->y < 0)
… …
1357 self->rows += MAP_EXTEND_Y; 1690 self->rows += MAP_EXTEND_Y;
1358 self->y += MAP_EXTEND_Y; 1691 self->y += MAP_EXTEND_Y;
1359 } 1692 }
1360} 1693}
1361 1694
1362void 1695SV *
1363map1a_update (CFPlus::Map self, SV *data_, int extmap) 1696map1a_update (DC::Map self, SV *data_, int extmap)
1364 CODE: 1697 CODE:
1365{ 1698{
1366 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1699 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1367 uint8_t *data_end = (uint8_t *)SvEND (data_); 1700 uint8_t *data_end = (uint8_t *)SvEND (data_);
1368 mapcell *cell; 1701 mapcell *cell;
1369 int x, y, flags; 1702 int x, y, z, flags;
1703 AV *missing = newAV ();
1704 RETVAL = newRV_noinc ((SV *)missing);
1370 1705
1371 while (data < data_end - 1) 1706 while (data < data_end - 1)
1372 { 1707 {
1373 flags = (data [0] << 8) + data [1]; data += 2; 1708 flags = (data [0] << 8) + data [1]; data += 2;
1374 1709
… …
1394 uint8_t ext, cmd; 1729 uint8_t ext, cmd;
1395 1730
1396 do 1731 do
1397 { 1732 {
1398 ext = *data++; 1733 ext = *data++;
1399 cmd = ext & 0x3f; 1734 cmd = ext & 0x7f;
1400 1735
1401 if (cmd < 4) 1736 if (cmd < 4)
1402 cell->darkness = 255 - ext * 64 + 1; 1737 cell->darkness = 255 - ext * 64 + 1;
1403 else if (cmd == 5) // health 1738 else if (cmd == 5) // health
1404 { 1739 {
1405 cell->stat_width = 1; 1740 cell->stat_width = 1;
1406 cell->stat_hp = *data++; 1741 cell->stat_hp = *data++;
1407 } 1742 }
1408 else if (cmd == 6) // monster width 1743 else if (cmd == 6) // monster width
1409 cell->stat_width = *data++ + 1; 1744 cell->stat_width = *data++ + 1;
1410 else if (cmd == 0x47) // monster width 1745 else if (cmd == 0x47)
1411 { 1746 {
1412 if (*data == 4) 1747 if (*data == 1) cell->player = data [1];
1413 ; // decode player tag 1748 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1749 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1750 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1414 1751
1415 data += *data + 1; 1752 data += *data + 1;
1416 } 1753 }
1417 else if (cmd == 8) // cell flags 1754 else if (cmd == 8) // cell flags
1418 cell->flags = *data++; 1755 cell->flags = *data++;
… …
1425 } 1762 }
1426 else 1763 else
1427 cell->darkness = *data++ + 1; 1764 cell->darkness = *data++ + 1;
1428 } 1765 }
1429 1766
1767 for (z = 0; z <= 2; ++z)
1430 if (flags & 4) 1768 if (flags & (4 >> z))
1431 { 1769 {
1432 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1770 faceid face = (data [0] << 8) + data [1]; data += 2;
1771 need_facenum (self, face);
1772 cell->tile [z] = self->face2tile [face];
1773
1774 if (cell->tile [z])
1775 {
1776 maptex *tex = self->tex + cell->tile [z];
1777 if (!tex->name)
1778 av_push (missing, newSViv (cell->tile [z]));
1779
1780 if (tex->smoothtile)
1781 {
1782 maptex *smooth = self->tex + tex->smoothtile;
1783 if (!smooth->name)
1784 av_push (missing, newSViv (tex->smoothtile));
1785 }
1786 }
1433 } 1787 }
1434
1435 if (flags & 2)
1436 {
1437 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
1438 }
1439
1440 if (flags & 1)
1441 {
1442 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1443 }
1444 } 1788 }
1445 else 1789 else
1446 cell->darkness = 0; 1790 CELL_CLEAR (cell);
1447 } 1791 }
1448} 1792}
1793 OUTPUT:
1794 RETVAL
1449 1795
1450SV * 1796SV *
1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1797mapmap (DC::Map self, int x0, int y0, int w, int h)
1452 CODE: 1798 CODE:
1453{ 1799{
1454 int x1, x; 1800 int x1, x;
1455 int y1, y; 1801 int y1, y;
1456 int z; 1802 int z;
… …
1477 { 1823 {
1478 mapcell *cell = row->col + (x - row->c0); 1824 mapcell *cell = row->col + (x - row->c0);
1479 1825
1480 for (z = 0; z <= 0; z++) 1826 for (z = 0; z <= 0; z++)
1481 { 1827 {
1482 mapface face = cell->face [z];
1483
1484 if (face)
1485 {
1486 maptex tex = self->tex [face]; 1828 maptex tex = self->tex [cell->tile [z]];
1487 int a0 = 255 - tex.a; 1829 int a0 = 255 - tex.a;
1488 int a1 = tex.a; 1830 int a1 = tex.a;
1489 1831
1490 r = (r * a0 + tex.r * a1) / 255; 1832 r = (r * a0 + tex.r * a1) / 255;
1491 g = (g * a0 + tex.g * a1) / 255; 1833 g = (g * a0 + tex.g * a1) / 255;
1492 b = (b * a0 + tex.b * a1) / 255; 1834 b = (b * a0 + tex.b * a1) / 255;
1493 a = (a * a0 + tex.a * a1) / 255; 1835 a = (a * a0 + tex.a * a1) / 255;
1494 }
1495 } 1836 }
1496 } 1837 }
1497 1838
1498 *map++ = (r ) 1839 *map++ = (r )
1499 | (g << 8) 1840 | (g << 8)
… …
1506} 1847}
1507 OUTPUT: 1848 OUTPUT:
1508 RETVAL 1849 RETVAL
1509 1850
1510void 1851void
1511draw (CFPlus::Map self, int mx, int my, int sw, int sh) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1512 CODE: 1853 CODE:
1513{ 1854{
1514 int x, y, z; 1855 int x, y, z;
1515 int last_name;
1516 mapface face;
1517 1856
1518 glColor4ub (255, 255, 255, 255); 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1858 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1860 smooth_key skey;
1861 int pl_x, pl_y;
1862 maptex pl_tex;
1863 rc_t *rc = rc_alloc ();
1864 rc_key_t key;
1865 rc_array_t *arr;
1866
1867 pl_tex.name = 0;
1868
1869 // thats current max. sorry.
1870 if (sw > 255) sw = 255;
1871 if (sh > 255) sh = 255;
1872
1873 // clear key, in case of extra padding
1874 memset (&skey, 0, sizeof (skey));
1875
1876 memset (&key, 0, sizeof (key));
1877 key.r = 255;
1878 key.g = 255;
1879 key.b = 255;
1880 key.a = 255;
1881 key.mode = GL_QUADS;
1882 key.format = GL_T2F_V3F;
1883 key.texname = -1;
1884
1885 mx += self->x;
1886 my += self->y;
1887
1888 // first pass: determine smooth_max
1889 // rather ugly, if you ask me
1890 // could also be stored inside mapcell and updated on change
1891 memset (smooth_max, 0, sizeof (smooth_max));
1892
1893 for (y = 0; y < sh; y++)
1894 if (0 <= y + my && y + my < self->rows)
1895 {
1896 maprow *row = self->row + (y + my);
1897
1898 for (x = 0; x < sw; x++)
1899 if (row->c0 <= x + mx && x + mx < row->c1)
1900 {
1901 mapcell *cell = row->col + (x + mx - row->c0);
1902
1903 smooth_max[x + 1][y + 1] =
1904 MAX (self->tex [cell->tile [0]].smoothlevel,
1905 MAX (self->tex [cell->tile [1]].smoothlevel,
1906 self->tex [cell->tile [2]].smoothlevel));
1907 }
1908 }
1519 1909
1520 glEnable (GL_BLEND); 1910 glEnable (GL_BLEND);
1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1522 glEnable (GL_TEXTURE_2D);
1523 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1524 1913
1525 glBegin (GL_QUADS);
1526
1527 last_name = 0;
1528
1529 mx += self->x;
1530 my += self->y;
1531
1532 for (z = 0; z < 3; z++) 1914 for (z = 0; z <= 2; z++)
1915 {
1916 memset (smooth_level, 0, sizeof (smooth_level));
1917
1533 for (y = 0; y < sh; y++) 1918 for (y = 0; y < sh; y++)
1534 if (0 <= y + my && y + my < self->rows) 1919 if (0 <= y + my && y + my < self->rows)
1535 { 1920 {
1536 maprow *row = self->row + (y + my); 1921 maprow *row = self->row + (y + my);
1537 1922
1538 for (x = 0; x < sw; x++) 1923 for (x = 0; x < sw; x++)
1539 if (row->c0 <= x + mx && x + mx < row->c1) 1924 if (row->c0 <= x + mx && x + mx < row->c1)
1540 { 1925 {
1541 mapcell *cell = row->col + (x + mx - row->c0); 1926 mapcell *cell = row->col + (x + mx - row->c0);
1542
1543 face = cell->face [z]; 1927 tileid tile = cell->tile [z];
1928
1929 if (tile)
1930 {
1931 maptex tex = self->tex [tile];
1932 int px = (x + 1) * T - tex.w;
1933 int py = (y + 1) * T - tex.h;
1544 1934
1545 if (face && face < self->texs) 1935 if (key.texname != tex.name)
1936 {
1937 if (!tex.name)
1938 tex = self->tex [2]; /* missing, replace by noface */
1939
1940 key.texname = tex.name;
1941 arr = rc_array (rc, &key);
1942 }
1943
1944 if (expect_false (cell->player == player) && expect_false (z == 2))
1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1951
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1954 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1956
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1960 if (cell->flags & 1)
1961 {
1962 maptex tex = self->tex [1];
1963 int px = x * T + T * 2 / 32;
1964 int py = y * T - T * 6 / 32;
1965
1966 if (tex.name)
1967 {
1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978 }
1979 }
1980 }
1981
1982 // update smooth hash
1983 if (tex.smoothtile)
1984 {
1985 skey.tile = tex.smoothtile;
1986 skey.level = tex.smoothlevel;
1987
1988 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1989
1990 // add bits to current tile and all neighbours. skey.x|y is
1991 // shifted +1|+1 so we always stay positive.
1992
1993 // bits is ___n cccc CCCC bbbb
1994 // n do not draw borders&corners
1995 // c draw these corners, but...
1996 // C ... not these
1997 // b draw these borders
1998
1999 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
2000 // ┃· ·· ·┃ ━━
2001
2002 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2003 // ·· ·· ·┏ ┓·
2004
2005 // full tile
2006 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
2007
2008 // borders
2009 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
2010 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
2011 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
2012 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
2013
2014 // corners
2015 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2016 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2017 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2018 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2019 }
2020 }
2021 }
2022 }
2023
2024 rc_draw (rc);
2025 rc_clear (rc);
2026
2027 // go through all smoothlevels, lowest to highest, then draw.
2028 // this is basically counting sort
2029 {
2030 int w, b;
2031
2032 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS);
2034 for (w = 0; w < 256 / 32; ++w)
2035 {
2036 uint32_t smask = smooth_level [w];
2037 if (smask)
2038 for (b = 0; b < 32; ++b)
2039 if (smask & (((uint32_t)1) << b))
1546 { 2040 {
1547 maptex tex = self->tex [face]; 2041 int level = (w << 5) | b;
1548 int px = (x + 1) * 32 - tex.w; 2042 HE *he;
1549 int py = (y + 1) * 32 - tex.h;
1550 2043
1551 if (last_name != tex.name) 2044 hv_iterinit (smooth);
2045 while ((he = hv_iternext (smooth)))
1552 { 2046 {
1553 glEnd (); 2047 smooth_key *skey = (smooth_key *)HeKEY (he);
1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2048 IV bits = SvIVX (HeVAL (he));
1555 glBegin (GL_QUADS);
1556 }
1557 2049
1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1560 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1562 }
1563
1564 if (cell->flags && z == 2)
1565 {
1566 if (cell->flags & 1) 2050 if (!(bits & 0x1000)
2051 && skey->level == level
2052 && level > smooth_max [skey->x][skey->y])
1567 { 2053 {
1568 maptex tex = self->tex [1]; 2054 maptex tex = self->tex [skey->tile];
1569 int px = (x + 1) * 32 - tex.w + 2; 2055 int px = (((int)skey->x) - 1) * T;
1570 int py = (y + 1) * 32 - tex.h - 6; 2056 int py = (((int)skey->y) - 1) * T;
2057 int border = bits & 15;
2058 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2059 float dx = tex.s * .0625f; // 16 images/row
2060 float dy = tex.t * .5f ; // 2 images/column
1571 2061
2062 if (tex.name)
2063 {
2064 // this time avoiding texture state changes
2065 // save gobs of state changes.
2066 if (key.texname != tex.name)
2067 {
1572 glEnd (); 2068 glEnd ();
1573 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1574 glBegin (GL_QUADS); 2070 glBegin (GL_QUADS);
2071 }
1575 2072
2073 if (border)
2074 {
2075 float ox = border * dx;
2076
2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2081 }
2082
2083 if (corner)
2084 {
2085 float ox = corner * dx;
2086
1576 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2087 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1577 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1578 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1579 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2091 }
2092 }
2093 }
1580 } 2094 }
1581 } 2095 }
1582 }
1583 } 2096 }
1584 2097
1585 glEnd (); 2098 glEnd ();
1586
1587 glDisable (GL_TEXTURE_2D); 2099 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1;
2101 }
2102
2103 hv_clear (smooth);
2104 }
2105
2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
2111
2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
2120 rc_draw (rc);
2121 }
2122
1588 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
2124 rc_free (rc);
1589 2125
1590 // top layer: overlays such as the health bar 2126 // top layer: overlays such as the health bar
1591 for (y = 0; y < sh; y++) 2127 for (y = 0; y < sh; y++)
1592 if (0 <= y + my && y + my < self->rows) 2128 if (0 <= y + my && y + my < self->rows)
1593 { 2129 {
… …
1596 for (x = 0; x < sw; x++) 2132 for (x = 0; x < sw; x++)
1597 if (row->c0 <= x + mx && x + mx < row->c1) 2133 if (row->c0 <= x + mx && x + mx < row->c1)
1598 { 2134 {
1599 mapcell *cell = row->col + (x + mx - row->c0); 2135 mapcell *cell = row->col + (x + mx - row->c0);
1600 2136
1601 int px = x * 32; 2137 int px = x * T;
1602 int py = y * 32; 2138 int py = y * T;
1603 2139
1604 if (cell->stat_hp) 2140 if (cell->stat_hp)
1605 { 2141 {
1606 int width = cell->stat_width * 32; 2142 int width = cell->stat_width * T;
1607 int thick = sh / 28 + 1 + cell->stat_width; 2143 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1608 2144
1609 glColor3ub (0, 0, 0); 2145 glColor3ub (0, 0, 0);
1610 glRectf (px + 1, py - thick - 2, 2146 glRectf (px + 1, py - thick - 2,
1611 px + width - 1, py); 2147 px + width - 1, py);
1612 2148
… …
1618 } 2154 }
1619 } 2155 }
1620} 2156}
1621 2157
1622void 2158void
1623draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1624 CODE: 2160 CODE:
1625{ 2161{
1626 static float color[16][3] = { 2162 static float color[16][3] = {
1627 { 0.00F, 0.00F, 0.00F }, 2163 { 0.00F, 0.00F, 0.00F },
1628 { 1.00F, 1.00F, 1.00F }, 2164 { 1.00F, 1.00F, 1.00F },
… …
1678 glDisable (GL_BLEND); 2214 glDisable (GL_BLEND);
1679 glDisable (GL_TEXTURE_2D); 2215 glDisable (GL_TEXTURE_2D);
1680} 2216}
1681 2217
1682void 2218void
1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2219fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1684 PPCODE: 2220 PPCODE:
1685{ 2221{
1686 int x, y; 2222 int x, y;
2223 int sw1 = sw + 2;
2224 int sh1 = sh + 2;
2225 int sh3 = sh * 3;
1687 int sw4 = (sw + 3) & ~3; 2226 int sw34 = (sw * 3 + 3) & ~3;
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1690 2230
1691 memset (darkness, 255, sw4 * sh);
1692 SvPOK_only (darkness_sv); 2231 SvPOK_only (darkness3_sv);
1693 SvCUR_set (darkness_sv, sw4 * sh); 2232 SvCUR_set (darkness3_sv, sw34 * sh3);
1694 2233
1695 mx += self->x; 2234 mx += self->x - 1;
1696 my += self->y; 2235 my += self->y - 1;
1697 2236
2237 memset (darkness1, 255, sw1 * sh1);
2238
1698 for (y = 0; y < sh; y++) 2239 for (y = 0; y < sh1; y++)
1699 if (0 <= y + my && y + my < self->rows) 2240 if (0 <= y + my && y + my < self->rows)
1700 { 2241 {
1701 maprow *row = self->row + (y + my); 2242 maprow *row = self->row + (y + my);
1702 2243
1703 for (x = 0; x < sw; x++) 2244 for (x = 0; x < sw1; x++)
1704 if (row->c0 <= x + mx && x + mx < row->c1) 2245 if (row->c0 <= x + mx && x + mx < row->c1)
1705 { 2246 {
1706 mapcell *cell = row->col + (x + mx - row->c0); 2247 mapcell *cell = row->col + (x + mx - row->c0);
1707 2248
1708 darkness[y * sw4 + x] = cell->darkness 2249 darkness1 [y * sw1 + x] = cell->darkness
1709 ? 255 - (cell->darkness - 1) 2250 ? 255 - (cell->darkness - 1)
1710 : 255 - FOW_DARKNESS; 2251 : 255 - FOW_DARKNESS;
1711 } 2252 }
1712 } 2253 }
1713 2254
2255 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x)
2257 {
2258 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2259 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2260 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2261 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2262 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2263 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2264 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2265 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2266 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2267
2268 uint8_t r11 = (d11 + d21 + d12) / 3;
2269 uint8_t r21 = d21;
2270 uint8_t r31 = (d21 + d31 + d32) / 3;
2271
2272 uint8_t r12 = d12;
2273 uint8_t r22 = d22;
2274 uint8_t r32 = d32;
2275
2276 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3;
2279
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2284 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2289 }
2290
2291 free (darkness1);
2292
1714 EXTEND (SP, 3); 2293 EXTEND (SP, 3);
1715 PUSHs (sv_2mortal (newSViv (sw4))); 2294 PUSHs (sv_2mortal (newSViv (sw34)));
1716 PUSHs (sv_2mortal (newSViv (sh))); 2295 PUSHs (sv_2mortal (newSViv (sh3)));
1717 PUSHs (darkness_sv); 2296 PUSHs (darkness3_sv);
1718} 2297}
1719 2298
1720SV * 2299SV *
1721get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2300get_rect (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 2301 CODE:
1723{ 2302{
1724 int x, y, x1, y1; 2303 int x, y, x1, y1;
1725 SV *data_sv = newSV (w * h * 7 + 5); 2304 SV *data_sv = newSV (w * h * 7 + 5);
1726 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2305 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1751 if (row && row->c0 <= x && x < row->c1) 2330 if (row && row->c0 <= x && x < row->c1)
1752 { 2331 {
1753 mapcell *cell = row->col + (x - row->c0); 2332 mapcell *cell = row->col + (x - row->c0);
1754 uint8_t flags = 0; 2333 uint8_t flags = 0;
1755 2334
1756 if (cell->face [0]) flags |= 1; 2335 if (cell->tile [0]) flags |= 1;
1757 if (cell->face [1]) flags |= 2; 2336 if (cell->tile [1]) flags |= 2;
1758 if (cell->face [2]) flags |= 4; 2337 if (cell->tile [2]) flags |= 4;
1759 2338
1760 *data++ = flags; 2339 *data++ = flags;
1761 2340
1762 if (flags & 1) 2341 if (flags & 1)
1763 { 2342 {
2343 tileid tile = cell->tile [0];
1764 *data++ = cell->face [0] >> 8; 2344 *data++ = tile >> 8;
1765 *data++ = cell->face [0]; 2345 *data++ = tile;
1766 } 2346 }
1767 2347
1768 if (flags & 2) 2348 if (flags & 2)
1769 { 2349 {
2350 tileid tile = cell->tile [1];
1770 *data++ = cell->face [1] >> 8; 2351 *data++ = tile >> 8;
1771 *data++ = cell->face [1]; 2352 *data++ = tile;
1772 } 2353 }
1773 2354
1774 if (flags & 4) 2355 if (flags & 4)
1775 { 2356 {
2357 tileid tile = cell->tile [2];
1776 *data++ = cell->face [2] >> 8; 2358 *data++ = tile >> 8;
1777 *data++ = cell->face [2]; 2359 *data++ = tile;
1778 } 2360 }
1779 } 2361 }
1780 else 2362 else
1781 *data++ = 0; 2363 *data++ = 0;
1782 } 2364 }
1783 } 2365 }
1784 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
1785 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
1786 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
1787 RETVAL = data_sv; 2374 RETVAL = data_sv;
1788} 2375}
1789 OUTPUT: 2376 OUTPUT:
1790 RETVAL 2377 RETVAL
1791 2378
1792void 2379void
1793set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1794 PPCODE: 2381 PPCODE:
1795{ 2382{
1796 int x, y, z; 2383 int x, y, z;
1797 int w, h; 2384 int w, h;
1798 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
1799 2396
1800 if (*data++ != 0) 2397 if (*data++ != 0)
1801 return; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
1802 2399
1803 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
1804 h = *data++ << 8; h |= *data++; 2401 h = *data++ << 8; h |= *data++;
1805 2402
1806 // we need to do this 'cause we don't keep an absolute coord system for rows 2403 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
1818 { 2415 {
1819 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
1820 2417
1821 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
1822 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
1823 uint8_t flags = *data++; 2425 flags = *data++;
1824 2426
1825 if (flags) 2427 if (flags)
1826 { 2428 {
1827 mapface face[3] = { 0, 0, 0 };
1828
1829 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2430 tileid tile[3] = { 0, 0, 0 };
1830 2431
1831 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2432 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1832 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1833 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1834 2435
1835 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
1836 { 2437 {
1837 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
1838 2440
1839 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
1840 { 2442 {
1841 cell->face[z] = face[z]; 2443 tileid t = tile [z];
1842 2444
1843 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2446 {
1844 XPUSHs (sv_2mortal (newSViv (face[z]))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2448 need_texid (self, t);
2449 }
2450
2451 cell->tile [z] = t;
1845 } 2452 }
1846 } 2453 }
1847 } 2454 }
1848 } 2455 }
1849 } 2456 }
1850} 2457}
1851 2458
1852MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2459MODULE = Deliantra::Client PACKAGE = DC::RW
1853 2460
1854CFPlus::MixChunk 2461DC::RW
1855new_from_file (SV *class, char *path) 2462new (SV *class, SV *data_sv)
1856 CODE: 2463 CODE:
1857 RETVAL = Mix_LoadWAV (path); 2464{
2465 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen);
2467
2468 RETVAL = SDL_RWFromConstMem (data, datalen);
2469}
1858 OUTPUT: 2470 OUTPUT:
1859 RETVAL 2471 RETVAL
1860 2472
2473DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb")
2475 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT:
2478 RETVAL
2479
2480# fails on win32:
2481# dc.xs(2268) : error C2059: syntax error : '('
1861void 2482#void
2483#close (DC::RW self)
2484# CODE:
2485# (self->(close)) (self);
2486
2487MODULE = Deliantra::Client PACKAGE = DC::Channel
2488
2489PROTOTYPES: DISABLE
2490
2491DC::Channel
2492find ()
2493 CODE:
2494{
2495 RETVAL = Mix_GroupAvailable (-1);
2496
2497 if (RETVAL < 0)
2498 {
2499 RETVAL = Mix_GroupOldest (-1);
2500
2501 if (RETVAL < 0)
2502 XSRETURN_UNDEF;
2503
2504 Mix_HaltChannel (RETVAL);
2505 }
2506
2507 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128);
2509}
2510 OUTPUT:
2511 RETVAL
2512
2513void
2514halt (DC::Channel self)
2515 CODE:
2516 Mix_HaltChannel (self);
2517
2518void
2519expire (DC::Channel self, int ticks = -1)
2520 CODE:
2521 Mix_ExpireChannel (self, ticks);
2522
2523void
2524fade_out (DC::Channel self, int ticks = -1)
2525 CODE:
2526 Mix_FadeOutChannel (self, ticks);
2527
2528int
2529volume (DC::Channel self, int volume)
2530 CODE:
2531 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2532 OUTPUT:
2533 RETVAL
2534
2535void
2536unregister_all_effects (DC::Channel self)
2537 CODE:
2538 Mix_UnregisterAllEffects (self);
2539
2540void
2541set_panning (DC::Channel self, int left, int right)
2542 CODE:
2543 left = CLAMP (left , 0, 255);
2544 right = CLAMP (right, 0, 255);
2545 Mix_SetPanning (self, left, right);
2546
2547void
2548set_distance (DC::Channel self, int distance)
2549 CODE:
2550 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2551
2552void
2553set_position (DC::Channel self, int angle, int distance)
2554 CODE:
2555
2556void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE:
2559{
2560 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563}
2564
2565void
2566set_reverse_stereo (DC::Channel self, int flip)
2567 CODE:
2568 Mix_SetReverseStereo (self, flip);
2569
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571
2572PROTOTYPES: DISABLE
2573
2574DC::MixChunk
2575new (SV *class, DC::RW rwops)
2576 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT:
2579 RETVAL
2580
2581void
1862DESTROY (CFPlus::MixChunk self) 2582DESTROY (DC::MixChunk self)
1863 CODE: 2583 CODE:
1864 Mix_FreeChunk (self); 2584 Mix_FreeChunk (self);
1865 2585
1866int 2586int
1867volume (CFPlus::MixChunk self, int volume = -1) 2587volume (DC::MixChunk self, int volume = -1)
1868 CODE: 2588 CODE:
2589 if (items > 1)
2590 volume = CLAMP (volume, 0, 128);
1869 RETVAL = Mix_VolumeChunk (self, volume); 2591 RETVAL = Mix_VolumeChunk (self, volume);
1870 OUTPUT: 2592 OUTPUT:
1871 RETVAL 2593 RETVAL
1872 2594
1873int 2595DC::Channel
1874play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2596play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
1875 CODE: 2597 CODE:
2598{
1876 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2599 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2600
2601 if (RETVAL < 0)
2602 XSRETURN_UNDEF;
2603
2604 if (channel < 0)
2605 {
2606 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128);
2608 }
2609}
1877 OUTPUT: 2610 OUTPUT:
1878 RETVAL 2611 RETVAL
1879 2612
1880MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1881 2614
1882int 2615int
1883volume (int volume = -1) 2616volume (int volume = -1)
2617 PROTOTYPE: ;$
1884 CODE: 2618 CODE:
2619 if (items > 0)
2620 volume = CLAMP (volume, 0, 128);
1885 RETVAL = Mix_VolumeMusic (volume); 2621 RETVAL = Mix_VolumeMusic (volume);
1886 OUTPUT: 2622 OUTPUT:
1887 RETVAL 2623 RETVAL
1888 2624
2625void
2626fade_out (int ms)
2627 CODE:
2628 Mix_FadeOutMusic (ms);
2629
2630void
2631halt ()
2632 CODE:
2633 Mix_HaltMusic ();
2634
1889CFPlus::MixMusic 2635DC::MixMusic
1890new_from_file (SV *class, char *path) 2636new (SV *class, DC::RW rwops)
1891 CODE: 2637 CODE:
1892 RETVAL = Mix_LoadMUS (path); 2638 RETVAL = Mix_LoadMUS_RW (rwops);
1893 OUTPUT: 2639 OUTPUT:
1894 RETVAL 2640 RETVAL
1895 2641
1896void 2642void
1897DESTROY (CFPlus::MixMusic self) 2643DESTROY (DC::MixMusic self)
1898 CODE: 2644 CODE:
1899 Mix_FreeMusic (self); 2645 Mix_FreeMusic (self);
1900 2646
1901int 2647int
1902play (CFPlus::MixMusic self, int loops = -1) 2648play (DC::MixMusic self, int loops = -1)
1903 CODE: 2649 CODE:
1904 RETVAL = Mix_PlayMusic (self, loops); 2650 RETVAL = Mix_PlayMusic (self, loops);
1905 OUTPUT: 2651 OUTPUT:
1906 RETVAL 2652 RETVAL
1907 2653
1908MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2654void
2655fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2656 CODE:
2657 Mix_FadeInMusicPos (self, loops, ms, position);
2658
2659MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2660
2661PROTOTYPES: ENABLE
1909 2662
1910BOOT: 2663BOOT:
1911{ 2664{
1912 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2665 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1913 static const struct { 2666 static const struct {
1914 const char *name; 2667 const char *name;
1915 IV iv; 2668 IV iv;
1916 } *civ, const_iv[] = { 2669 } *civ, const_iv[] = {
1917# define const_iv(name) { # name, (IV)name } 2670# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS),
1918 const_iv (GL_COLOR_MATERIAL), 2674 const_iv (GL_COLOR_MATERIAL),
1919 const_iv (GL_SMOOTH), 2675 const_iv (GL_SMOOTH),
1920 const_iv (GL_FLAT), 2676 const_iv (GL_FLAT),
1921 const_iv (GL_DITHER), 2677 const_iv (GL_DITHER),
1922 const_iv (GL_BLEND), 2678 const_iv (GL_BLEND),
… …
1926 const_iv (GL_ALPHA_TEST), 2682 const_iv (GL_ALPHA_TEST),
1927 const_iv (GL_NORMALIZE), 2683 const_iv (GL_NORMALIZE),
1928 const_iv (GL_RESCALE_NORMAL), 2684 const_iv (GL_RESCALE_NORMAL),
1929 const_iv (GL_FRONT), 2685 const_iv (GL_FRONT),
1930 const_iv (GL_BACK), 2686 const_iv (GL_BACK),
2687 const_iv (GL_AUX0),
1931 const_iv (GL_AND), 2688 const_iv (GL_AND),
1932 const_iv (GL_ONE), 2689 const_iv (GL_ONE),
1933 const_iv (GL_ZERO), 2690 const_iv (GL_ZERO),
1934 const_iv (GL_SRC_ALPHA), 2691 const_iv (GL_SRC_ALPHA),
1935 const_iv (GL_DST_ALPHA), 2692 const_iv (GL_DST_ALPHA),
… …
1948 const_iv (GL_INTENSITY), 2705 const_iv (GL_INTENSITY),
1949 const_iv (GL_LUMINANCE), 2706 const_iv (GL_LUMINANCE),
1950 const_iv (GL_LUMINANCE_ALPHA), 2707 const_iv (GL_LUMINANCE_ALPHA),
1951 const_iv (GL_FLOAT), 2708 const_iv (GL_FLOAT),
1952 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2709 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2710 const_iv (GL_COMPRESSED_ALPHA_ARB),
2711 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2712 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2713 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2714 const_iv (GL_COMPRESSED_RGB_ARB),
2715 const_iv (GL_COMPRESSED_RGBA_ARB),
1953 const_iv (GL_COMPILE), 2716 const_iv (GL_COMPILE),
2717 const_iv (GL_PROXY_TEXTURE_1D),
2718 const_iv (GL_PROXY_TEXTURE_2D),
1954 const_iv (GL_TEXTURE_1D), 2719 const_iv (GL_TEXTURE_1D),
1955 const_iv (GL_TEXTURE_2D), 2720 const_iv (GL_TEXTURE_2D),
1956 const_iv (GL_TEXTURE_ENV), 2721 const_iv (GL_TEXTURE_ENV),
1957 const_iv (GL_TEXTURE_MAG_FILTER), 2722 const_iv (GL_TEXTURE_MAG_FILTER),
1958 const_iv (GL_TEXTURE_MIN_FILTER), 2723 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1979 const_iv (GL_COLOR_LOGIC_OP), 2744 const_iv (GL_COLOR_LOGIC_OP),
1980 const_iv (GL_SEPARABLE_2D), 2745 const_iv (GL_SEPARABLE_2D),
1981 const_iv (GL_CONVOLUTION_2D), 2746 const_iv (GL_CONVOLUTION_2D),
1982 const_iv (GL_CONVOLUTION_BORDER_MODE), 2747 const_iv (GL_CONVOLUTION_BORDER_MODE),
1983 const_iv (GL_CONSTANT_BORDER), 2748 const_iv (GL_CONSTANT_BORDER),
2749 const_iv (GL_POINTS),
1984 const_iv (GL_LINES), 2750 const_iv (GL_LINES),
1985 const_iv (GL_LINE_STRIP), 2751 const_iv (GL_LINE_STRIP),
1986 const_iv (GL_LINE_LOOP), 2752 const_iv (GL_LINE_LOOP),
1987 const_iv (GL_QUADS), 2753 const_iv (GL_QUADS),
1988 const_iv (GL_QUAD_STRIP), 2754 const_iv (GL_QUAD_STRIP),
1989 const_iv (GL_TRIANGLES), 2755 const_iv (GL_TRIANGLES),
1990 const_iv (GL_TRIANGLE_STRIP), 2756 const_iv (GL_TRIANGLE_STRIP),
1991 const_iv (GL_TRIANGLE_FAN), 2757 const_iv (GL_TRIANGLE_FAN),
2758 const_iv (GL_POLYGON),
1992 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2759 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2760 const_iv (GL_POINT_SMOOTH_HINT),
2761 const_iv (GL_LINE_SMOOTH_HINT),
2762 const_iv (GL_POLYGON_SMOOTH_HINT),
2763 const_iv (GL_GENERATE_MIPMAP_HINT),
2764 const_iv (GL_TEXTURE_COMPRESSION_HINT),
1993 const_iv (GL_FASTEST), 2765 const_iv (GL_FASTEST),
2766 const_iv (GL_DONT_CARE),
2767 const_iv (GL_NICEST),
1994 const_iv (GL_V2F), 2768 const_iv (GL_V2F),
1995 const_iv (GL_V3F), 2769 const_iv (GL_V3F),
1996 const_iv (GL_T2F_V3F), 2770 const_iv (GL_T2F_V3F),
1997 const_iv (GL_T2F_N3F_V3F), 2771 const_iv (GL_T2F_N3F_V3F),
1998# undef const_iv 2772# undef const_iv
1999 }; 2773 };
2000 2774
2001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2777
2778 texture_av = newAV ();
2779 AvREAL_off (texture_av);
2003} 2780}
2781
2782void
2783disable_GL_EXT_blend_func_separate ()
2784 CODE:
2785 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0;
2004 2787
2005char * 2788char *
2006gl_vendor () 2789gl_vendor ()
2007 CODE: 2790 CODE:
2008 RETVAL = (char *)glGetString (GL_VENDOR); 2791 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2021 CODE: 2804 CODE:
2022 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2805 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2023 OUTPUT: 2806 OUTPUT:
2024 RETVAL 2807 RETVAL
2025 2808
2809const char *glGetString (GLenum pname)
2810
2811GLint glGetInteger (GLenum pname)
2812 CODE:
2813 glGetIntegerv (pname, &RETVAL);
2814 OUTPUT:
2815 RETVAL
2816
2817GLdouble glGetDouble (GLenum pname)
2818 CODE:
2819 glGetDoublev (pname, &RETVAL);
2820 OUTPUT:
2821 RETVAL
2822
2026int glGetError () 2823int glGetError ()
2027 2824
2028void glFinish () 2825void glFinish ()
2029 2826
2030void glClear (int mask) 2827void glClear (int mask)
… …
2067# near_ and far_ are due to microsofts buggy "c" compiler 2864# near_ and far_ are due to microsofts buggy "c" compiler
2068void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2865void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2069 2866
2070# near_ and far_ are due to microsofts buggy "c" compiler 2867# near_ and far_ are due to microsofts buggy "c" compiler
2071void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2868void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2869
2870PROTOTYPES: DISABLE
2072 2871
2073void glViewport (int x, int y, int width, int height) 2872void glViewport (int x, int y, int width, int height)
2074 2873
2075void glScissor (int x, int y, int width, int height) 2874void glScissor (int x, int y, int width, int height)
2076 2875
… …
2084 2883
2085void glRotate (float angle, float x, float y, float z) 2884void glRotate (float angle, float x, float y, float z)
2086 CODE: 2885 CODE:
2087 glRotatef (angle, x, y, z); 2886 glRotatef (angle, x, y, z);
2088 2887
2089void glBegin (int mode)
2090
2091void glEnd ()
2092
2093void glColor (float r, float g, float b, float a = 1.0) 2888void glColor (float r, float g, float b, float a = 1.0)
2094 PROTOTYPE: @
2095 ALIAS: 2889 ALIAS:
2096 glColor_premultiply = 1 2890 glColor_premultiply = 1
2097 CODE: 2891 CODE:
2098 if (ix) 2892 if (ix)
2099 { 2893 {
… …
2102 b *= a; 2896 b *= a;
2103 } 2897 }
2104 // microsoft visual "c" rounds instead of truncating... 2898 // microsoft visual "c" rounds instead of truncating...
2105 glColor4f (r, g, b, a); 2899 glColor4f (r, g, b, a);
2106 2900
2107void glInterleavedArrays (int format, int stride, char *data)
2108
2109void glDrawElements (int mode, int count, int type, char *indices)
2110
2111# 1.2 void glDrawRangeElements (int mode, int start, int end
2112
2113void glRasterPos (float x, float y, float z = 0.) 2901void glRasterPos (float x, float y, float z = 0.)
2114 CODE: 2902 CODE:
2115 glRasterPos3f (0, 0, z); 2903 glRasterPos3f (0, 0, z);
2116 glBitmap (0, 0, 0, 0, x, y, 0); 2904 glBitmap (0, 0, 0, 0, x, y, 0);
2117 2905
… …
2121 2909
2122void glTexCoord (float s, float t) 2910void glTexCoord (float s, float t)
2123 CODE: 2911 CODE:
2124 glTexCoord2f (s, t); 2912 glTexCoord2f (s, t);
2125 2913
2914void glRect (float x1, float y1, float x2, float y2)
2915 CODE:
2916 glRectf (x1, y1, x2, y2);
2917
2918void glRect_lineloop (float x1, float y1, float x2, float y2)
2919 CODE:
2920 glBegin (GL_LINE_LOOP);
2921 glVertex2f (x1, y1);
2922 glVertex2f (x2, y1);
2923 glVertex2f (x2, y2);
2924 glVertex2f (x1, y2);
2925 glEnd ();
2926
2927PROTOTYPES: ENABLE
2928
2929void glBegin (int mode)
2930
2931void glEnd ()
2932
2933void glPointSize (GLfloat size)
2934
2935void glLineWidth (GLfloat width)
2936
2937void glInterleavedArrays (int format, int stride, char *data)
2938
2939void glDrawElements (int mode, int count, int type, char *indices)
2940
2941# 1.2 void glDrawRangeElements (int mode, int start, int end
2942
2126void glTexEnv (int target, int pname, float param) 2943void glTexEnv (int target, int pname, float param)
2127 CODE: 2944 CODE:
2128 glTexEnvf (target, pname, param); 2945 glTexEnvf (target, pname, param);
2129 2946
2130void glTexParameter (int target, int pname, float param) 2947void glTexParameter (int target, int pname, float param)
… …
2146void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2963void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2147 CODE: 2964 CODE:
2148 if (gl.SeparableFilter2D) 2965 if (gl.SeparableFilter2D)
2149 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2150 2967
2151void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2968void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2152 2969
2153void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2154 2971
2155void glDrawPixels (int width, int height, int format, int type, char *pixels) 2972void glDrawPixels (int width, int height, int format, int type, char *pixels)
2973
2974void glPixelZoom (float x, float y)
2156 2975
2157void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2976void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2158 2977
2159int glGenTexture () 2978int glGenTexture ()
2160 CODE: 2979 CODE:
2161{ 2980 RETVAL = gen_texture ();
2162 GLuint name;
2163 glGenTextures (1, &name);
2164 RETVAL = name;
2165}
2166 OUTPUT: 2981 OUTPUT:
2167 RETVAL 2982 RETVAL
2168 2983
2169void glDeleteTexture (int name) 2984void glDeleteTexture (int name)
2170 CODE: 2985 CODE:
2171{
2172 GLuint name_ = name;
2173 glDeleteTextures (1, &name_); 2986 del_texture (name);
2174} 2987
2175
2176int glGenList () 2988int glGenList ()
2177 CODE: 2989 CODE:
2178 RETVAL = glGenLists (1); 2990 RETVAL = glGenLists (1);
2179 OUTPUT: 2991 OUTPUT:
2180 RETVAL 2992 RETVAL
… …
2187 2999
2188void glEndList () 3000void glEndList ()
2189 3001
2190void glCallList (int list) 3002void glCallList (int list)
2191 3003
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005
3006PROTOTYPES: DISABLE
3007
3008void
3009find_widget (SV *self, NV x, NV y)
3010 PPCODE:
3011{
3012 if (within_widget (self, x, y))
3013 XPUSHs (self);
3014}
3015
3016BOOT:
3017{
3018 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3019
3020 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3021 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3022 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3023 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3024}
3025
3026void
3027draw (SV *self)
3028 CODE:
3029{
3030 HV *hv;
3031 SV **svp;
3032 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv);
3036 SV *draw_h_sv = GvSV (draw_h_gv);
3037 double draw_x, draw_y;
3038
3039 if (!SvROK (self))
3040 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3041
3042 hv = (HV *)SvRV (self);
3043
3044 if (SvTYPE (hv) != SVt_PVHV)
3045 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3046
3047 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3048 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3049
3050 if (!h || !w)
3051 XSRETURN_EMPTY;
3052
3053 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3054 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3055
3056 draw_x = SvNV (draw_x_sv) + x;
3057 draw_y = SvNV (draw_y_sv) + y;
3058
3059 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3060 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3061 XSRETURN_EMPTY;
3062
3063 sv_setnv (draw_x_sv, draw_x);
3064 sv_setnv (draw_y_sv, draw_y);
3065
3066 glPushMatrix ();
3067 glTranslated (x, y, 0);
3068
3069 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3070 {
3071 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3072
3073 if (svp && SvTRUE (*svp))
3074 {
3075 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3076 glEnable (GL_BLEND);
3077 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3078 glBegin (GL_QUADS);
3079 glVertex2f (0, 0);
3080 glVertex2f (w, 0);
3081 glVertex2f (w, h);
3082 glVertex2f (0, h);
3083 glEnd ();
3084 glDisable (GL_BLEND);
3085 }
3086 }
3087#if 0
3088 // draw borders, for debugging
3089 glPushMatrix ();
3090 glColor4f (1., 1., 0., 1.);
3091 glTranslatef (.5, .5, 0.);
3092 glBegin (GL_LINE_LOOP);
3093 glVertex2f (0 , 0);
3094 glVertex2f (w - 1, 0);
3095 glVertex2f (w - 1, h - 1);
3096 glVertex2f (0 , h - 1);
3097 glEnd ();
3098 glPopMatrix ();
3099#endif
3100 PUSHMARK (SP);
3101 XPUSHs (self);
3102 PUTBACK;
3103 call_method ("_draw", G_VOID | G_DISCARD);
3104 SPAGAIN;
3105
3106 glPopMatrix ();
3107
3108 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3109 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3110}
3111

Diff Legend

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