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.157 by root, Sun Oct 1 14:48:50 2006 UTC vs.
Revision 1.279 by root, Thu Oct 2 15:59:40 2008 UTC

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

Diff Legend

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