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.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.197 by root, Sun Jul 15 21:08:40 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# 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>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
21# undef pipe
22#endif
23
24#include <assert.h>
12#include <math.h> 25#include <math.h>
13#include <string.h> 26#include <string.h>
14#include <stdio.h> 27#include <stdio.h>
28#include <stdlib.h>
15 29
16#include <SDL.h> 30#include <SDL.h>
17#include <SDL_endian.h> 31#include <SDL_endian.h>
18#include <SDL_image.h> 32#include <SDL_image.h>
19#include <SDL_mixer.h> 33#include <SDL_mixer.h>
20#include <SDL_opengl.h> 34#include <SDL_opengl.h>
21 35
36#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS
38
22#include <glib/gmacros.h> 39#include <glib/gmacros.h>
23 40
24#include <pango/pango.h> 41#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 42
29#ifndef _WIN32 43#ifndef _WIN32
30# include <sys/types.h> 44# include <sys/types.h>
31# include <sys/socket.h> 45# include <sys/socket.h>
32# include <netinet/in.h> 46# include <netinet/in.h>
33# include <netinet/tcp.h> 47# include <netinet/tcp.h>
34# include <inttypes.h> 48# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 49#endif
43 50
44#include "glext.h" 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 52
46#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
47 54
48#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
50 57
51#define MIN_FONT_HEIGHT 10 58#define MIN_FONT_HEIGHT 10
59
60#if 0
61# define PARACHUTE SDL_INIT_NOPARACHUTE
62#else
63# define PARACHUTE 0
64#endif
65
66static AV *texture_av;
52 67
53static struct 68static struct
54{ 69{
55#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 71#include "glfunc.h"
57#undef GL_FUNC 72#undef GL_FUNC
58} gl; 73} gl;
59 74
75static void
60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61{ 77{
62 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
63 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
64 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 82 else
67 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
68} 84}
69 85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
108}
109
110#include "texcache.c"
111
112#include "pango-font.c"
113#include "pango-fontmap.c"
114#include "pango-render.c"
115
70typedef Mix_Chunk *CFClient__MixChunk; 116typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 117typedef Mix_Music *CFPlus__MixMusic;
72 118
73typedef PangoFontDescription *CFClient__Font; 119typedef PangoFontDescription *CFPlus__Font;
120
121static int
122shape_attr_p (PangoLayoutRun *run)
123{
124 GSList *attrs = run->item->analysis.extra_attrs;
125
126 while (attrs)
127 {
128 PangoAttribute *attr = attrs->data;
129
130 if (attr->klass->type == PANGO_ATTR_SHAPE)
131 return 1;
132
133 attrs = attrs->next;
134 }
135
136 return 0;
137}
74 138
75typedef struct cf_layout { 139typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 140 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 141 float r, g, b, a; // default color for rgba mode
79 int base_height; 142 int base_height;
80 CFClient__Font font; 143 CFPlus__Font font;
81} *CFClient__Layout; 144} *CFPlus__Layout;
82 145
83static CFClient__Font default_font; 146static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 147static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 148static PangoFontMap *opengl_fontmap;
86 149
87static void 150static void
88substitute_func (FcPattern *pattern, gpointer data) 151substitute_func (FcPattern *pattern, gpointer data)
89{ 152{
90 FcPatternAddBool (pattern, FC_HINTING, 1); 153 FcPatternAddBool (pattern, FC_HINTING, 1);
91#ifdef FC_HINT_STYLE 154#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#endif 156#endif
94#ifdef _WIN32
95 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96#else
97 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98#endif
99} 158}
100 159
101static void 160static void
102layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
103{ 162{
104 /* use a random scale factor to account for unknown descenders, 0.8 works 163 /* use a random scale factor to account for unknown descenders, 0.8 works
105 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
106 */ 165 */
107 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
111 170
112 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
113} 172}
114 173
115static void 174static void
116layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
118 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
119 181
120 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122 184
123 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
124} 186 if (!rect.height) rect.height = 1;
125 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
126typedef uint16_t mapface; 193typedef uint16_t faceid;
127 194
128typedef struct { 195typedef struct {
129 GLint name; 196 int name;
130 int w, h; 197 int w, h;
131 float s, t; 198 float s, t;
132 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
133} maptex; 202} maptex;
134 203
135typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
136 int16_t darkness; 207 uint16_t darkness;
137 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
138} mapcell; 209} mapcell;
139 210
140typedef struct { 211typedef struct {
141 int32_t c0, c1; 212 int32_t c0, c1;
142 mapcell *col; 213 mapcell *col;
143} maprow; 214} maprow;
144 215
145typedef struct map { 216typedef struct map {
146 int x, y, w, h; 217 int x, y, w, h;
147 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
148 int faces; 219 int faces; tileid *face2tile; // [faceid]
149 mapface *face; 220 int texs; maptex *tex; // [tileid]
150
151 int texs;
152 maptex *tex;
153 221
154 int32_t rows; 222 int32_t rows;
155 maprow *row; 223 maprow *row;
156} *CFClient__Map; 224} *CFPlus__Map;
157 225
158static char * 226static char *
159prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
160{ 228{
161 char *p; 229 char *p;
178} 246}
179 247
180#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
181#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182 250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
270
183static maprow * 271static maprow *
184map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
185{ 273{
186 if (0 > y) 274 if (0 > y)
187 { 275 {
188 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
189 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
227 315
228 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
229} 317}
230 318
231static mapcell * 319static mapcell *
232map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
233{ 321{
234 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
235} 323}
236 324
237static void 325static void
238map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
239{ 327{
240 int r; 328 int r;
241 329
242 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
243 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
251 self->row = 0; 339 self->row = 0;
252 self->rows = 0; 340 self->rows = 0;
253} 341}
254 342
255static void 343static void
256map_blank (CFClient__Map self, int x0, int y0, int w, int h) 344map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
257{ 345{
258 int x, y; 346 int x, y;
259 maprow *row; 347 maprow *row;
348 mapcell *cell;
260 349
261 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
262 if (y >= 0) 351 if (y >= 0)
263 { 352 {
264 if (y >= self->rows) 353 if (y >= self->rows)
270 if (x >= row->c0) 359 if (x >= row->c0)
271 { 360 {
272 if (x >= row->c1) 361 if (x >= row->c1)
273 break; 362 break;
274 363
275 row->col[x - row->c0].darkness = -1; 364 cell = row->col + x - row->c0;
365
366 cell->darkness = 0;
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
276 } 370 }
277 } 371 }
372}
373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
278} 388}
279 389
280static void 390static void
281music_finished (void) 391music_finished (void)
282{ 392{
301 ev.data2 = 0; 411 ev.data2 = 0;
302 412
303 SDL_PushEvent ((SDL_Event *)&ev); 413 SDL_PushEvent ((SDL_Event *)&ev);
304} 414}
305 415
416static unsigned int
417minpot (unsigned int n)
418{
419 if (!n)
420 return 0;
421
422 --n;
423
424 n |= n >> 1;
425 n |= n >> 2;
426 n |= n >> 4;
427 n |= n >> 8;
428 n |= n >> 16;
429
430 return n + 1;
431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
436
306MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
307 438
308PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
309 440
310BOOT: 441BOOT:
311{ 442{
312 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
313 static const struct { 444 static const struct {
314 const char *name; 445 const char *name;
315 IV iv; 446 IV iv;
316 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
317# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
318 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
319 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
320 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
321 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
322 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
331 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
332 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
333 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
334 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
335 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
336 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
337 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
338 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
339 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
340 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
395 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
396 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
397 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
398 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
399 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
400 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
401 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
402 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
403 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
404 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
405 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
406 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
407 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
408 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
409 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
410 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
411 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
412 const_iv (KMOD_CTRL),
413 const_iv (KMOD_SHIFT),
414 const_iv (KMOD_ALT),
415 const_iv (KMOD_META)
416# undef const_iv 556# undef const_iv
417 }; 557 };
418 558
419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
421} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
571
572int
573in_destruct ()
574 CODE:
575 RETVAL = PL_main_cv == Nullcv;
576 OUTPUT:
577 RETVAL
578
579NV floor (NV x)
580
581NV ceil (NV x)
422 582
423void 583void
424pango_init () 584pango_init ()
425 CODE: 585 CODE:
426 // delayed, so it can pick up new fonts added by AddFontResourceEx
427{ 586{
428 {
429 ft2_fontmap = pango_ft2_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
430 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
431 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
432 }
433 {
434 cairo_font_options_t *fopt = cairo_font_options_create ();
435 cairo_fontmap = pango_cairo_font_map_get_default ();
436 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
437#ifdef _WIN32
438 // cairo looks like shit eaten twice on windows
439 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
440#else
441 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
442#endif
443 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
444 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
445 pango_cairo_context_set_font_options (cairo_context, fopt);
446 cairo_font_options_destroy (fopt);
447 }
448} 590}
449 591
450int 592int
451SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452 594
453void 595void
454SDL_Quit () 596SDL_Quit ()
455 597
456void 598void
463 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466 608
467 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469 611
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474 616
475 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
476 622
477 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
478 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479 625
480 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
500 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
501 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
502 ); 648 );
503 if (RETVAL) 649 if (RETVAL)
504 { 650 {
651 av_clear (texture_av);
652
505 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
506# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
507# include "glfunc.h" 655# include "glfunc.h"
508# undef GL_FUNC 656# undef GL_FUNC
657
509 } 658 }
510 OUTPUT: 659 OUTPUT:
511 RETVAL 660 RETVAL
512 661
513void 662void
515 664
516char * 665char *
517SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
518 667
519void 668void
520SDL_PollEvent () 669poll_events ()
521 PPCODE: 670 PPCODE:
522{ 671{
523 SDL_Event ev; 672 SDL_Event ev;
524 673
525 while (SDL_PollEvent (&ev)) 674 SDL_PumpEvents ();
675 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
526 { 676 {
527 HV *hv = newHV (); 677 HV *hv = newHV ();
528 hv_store (hv, "type", 4, newSViv (ev.type), 0); 678 hv_store (hv, "type", 4, newSViv (ev.type), 0);
529 679
530 switch (ev.type) 680 switch (ev.type)
532 case SDL_KEYDOWN: 682 case SDL_KEYDOWN:
533 case SDL_KEYUP: 683 case SDL_KEYUP:
534 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 684 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
535 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 685 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
536 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 686 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
687 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
537 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 688 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
538 break; 689 break;
539 690
540 case SDL_ACTIVEEVENT: 691 case SDL_ACTIVEEVENT:
541 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 692 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
542 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 693 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
543 break; 694 break;
544 695
545 case SDL_MOUSEMOTION: 696 case SDL_MOUSEMOTION:
697 {
698 int state = ev.motion.state;
699 int x = ev.motion.x;
700 int y = ev.motion.y;
701 int xrel = ev.motion.xrel;
702 int yrel = ev.motion.yrel;
703
704 /* do simplistic event compression */
705 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
706 && state == ev.motion.state)
707 {
708 xrel += ev.motion.xrel;
709 yrel += ev.motion.yrel;
710 x = ev.motion.x;
711 y = ev.motion.y;
712 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
713 }
714
546 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 715 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
547
548 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 716 hv_store (hv, "state", 5, newSViv (state), 0);
549 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 717 hv_store (hv, "x", 1, newSViv (x), 0);
550 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 718 hv_store (hv, "y", 1, newSViv (y), 0);
551 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 719 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
552 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 720 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
721 }
553 break; 722 break;
554 723
555 case SDL_MOUSEBUTTONDOWN: 724 case SDL_MOUSEBUTTONDOWN:
556 case SDL_MOUSEBUTTONUP: 725 case SDL_MOUSEBUTTONUP:
557 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 726 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
567 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 736 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 737 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569 break; 738 break;
570 } 739 }
571 740
572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 741 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573 } 742 }
574} 743}
575 744
576int 745int
577Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 746Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
586Mix_AllocateChannels (int numchans = -1) 755Mix_AllocateChannels (int numchans = -1)
587 756
588void 757void
589lowdelay (int fd, int val = 1) 758lowdelay (int fd, int val = 1)
590 CODE: 759 CODE:
760 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
761
762void
763win32_proxy_info ()
764 PPCODE:
765{
591#ifndef _WIN32 766#ifdef _WIN32
592 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 767 char buffer[2048];
768 DWORD buflen;
769
770 EXTEND (SP, 3);
771
772 buflen = sizeof (buffer);
773 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
774 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
775 {
776 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
777
778 buflen = sizeof (buffer);
779 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
780 {
781 PUSHs (newSVpv (buffer, 0));
782
783 buflen = sizeof (buffer);
784 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
785 PUSHs (newSVpv (buffer, 0));
786 }
787 }
593#endif 788#endif
789}
594 790
595void 791void
596add_font (char *file) 792add_font (char *file)
597 CODE: 793 CODE:
598 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 794 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599#ifdef _WIN32
600 // cairo... sigh... requires win2000
601 AddFontResourceEx (file, FR_PRIVATE, 0);
602#endif
603 795
604void 796void
605load_image_inline (SV *image_) 797load_image_inline (SV *image_)
606 ALIAS: 798 ALIAS:
607 load_image_file = 1 799 load_image_file = 1
649 841
650 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 842 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651 843
652 assert (surface2->pitch == surface2->w * 4); 844 assert (surface2->pitch == surface2->w * 4);
653 845
846 SDL_LockSurface (surface2);
654 EXTEND (SP, 5); 847 EXTEND (SP, 6);
655 PUSHs (sv_2mortal (newSViv (surface2->w))); 848 PUSHs (sv_2mortal (newSViv (surface2->w)));
656 PUSHs (sv_2mortal (newSViv (surface2->h))); 849 PUSHs (sv_2mortal (newSViv (surface2->h)));
657 SDL_LockSurface (surface2);
658 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 850 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
659 SDL_UnlockSurface (surface2);
660 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 851 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
661 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 852 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 853 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
854 SDL_UnlockSurface (surface2);
663 855
664 SDL_FreeSurface (surface); 856 SDL_FreeSurface (surface);
665 SDL_FreeSurface (surface2); 857 SDL_FreeSurface (surface2);
666} 858}
667 859
703 CODE: 895 CODE:
704 fprintf (stderr, "FATAL: %s\n", message); 896 fprintf (stderr, "FATAL: %s\n", message);
705#ifdef _WIN32 897#ifdef _WIN32
706 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 898 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707#endif 899#endif
708 exit (1); 900 _exit (1);
709 901
902void
903_exit (int retval = 0)
904 CODE:
905#ifdef WIN32
906 ExitThread (retval); // unclean, please beam me up
907#else
908 _exit (retval);
909#endif
910
911void
912debug ()
913 CODE:
914{
915#if DEBUG
916 VALGRIND_DO_LEAK_CHECK;
917#endif
918}
919
710MODULE = CFClient PACKAGE = CFClient::Font 920MODULE = CFPlus PACKAGE = CFPlus::Font
711 921
712CFClient::Font 922CFPlus::Font
713new_from_file (SV *class, char *path, int id = 0) 923new_from_file (SV *class, char *path, int id = 0)
714 CODE: 924 CODE:
715{ 925{
716 int count; 926 int count;
717 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 927 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
720} 930}
721 OUTPUT: 931 OUTPUT:
722 RETVAL 932 RETVAL
723 933
724void 934void
725DESTROY (CFClient::Font self) 935DESTROY (CFPlus::Font self)
726 CODE: 936 CODE:
727 pango_font_description_free (self); 937 pango_font_description_free (self);
728 938
729void 939void
730make_default (CFClient::Font self) 940make_default (CFPlus::Font self)
731 CODE: 941 CODE:
732 default_font = self; 942 default_font = self;
733 943
734MODULE = CFClient PACKAGE = CFClient::Layout 944MODULE = CFPlus PACKAGE = CFPlus::Layout
735 945
736CFClient::Layout 946void
737new (SV *class, int rgba = 0) 947reset_glyph_cache ()
948 CODE:
949 tc_clear ();
950
951CFPlus::Layout
952new (SV *class)
738 CODE: 953 CODE:
739 New (0, RETVAL, 1, struct cf_layout); 954 New (0, RETVAL, 1, struct cf_layout);
740 955
741 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 956 RETVAL->pl = pango_layout_new (opengl_context);
742 RETVAL->rgba = rgba;
743 RETVAL->r = 1.; 957 RETVAL->r = 1.;
744 RETVAL->g = 1.; 958 RETVAL->g = 1.;
745 RETVAL->b = 1.; 959 RETVAL->b = 1.;
746 RETVAL->a = 1.; 960 RETVAL->a = 1.;
747 RETVAL->base_height = MIN_FONT_HEIGHT; 961 RETVAL->base_height = MIN_FONT_HEIGHT;
751 layout_update_font (RETVAL); 965 layout_update_font (RETVAL);
752 OUTPUT: 966 OUTPUT:
753 RETVAL 967 RETVAL
754 968
755void 969void
756DESTROY (CFClient::Layout self) 970DESTROY (CFPlus::Layout self)
757 CODE: 971 CODE:
758 g_object_unref (self->pl); 972 g_object_unref (self->pl);
759 Safefree (self); 973 Safefree (self);
760 974
975void
976set_text (CFPlus::Layout self, SV *text_)
977 CODE:
978{
979 STRLEN textlen;
980 char *text = SvPVutf8 (text_, textlen);
981
982 pango_layout_set_text (self->pl, text, textlen);
983}
984
985void
986set_markup (CFPlus::Layout self, SV *text_)
987 CODE:
988{
989 STRLEN textlen;
990 char *text = SvPVutf8 (text_, textlen);
991
992 pango_layout_set_markup (self->pl, text, textlen);
993}
994
995void
996set_shapes (CFPlus::Layout self, ...)
997 CODE:
998{
999 PangoAttrList *attrs = 0;
1000 const char *text = pango_layout_get_text (self->pl);
1001 const char *pos = text;
1002 int arg = 4;
1003
1004 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1005 {
1006 PangoRectangle inkrect, rect;
1007 PangoAttribute *attr;
1008
1009 int x = SvIV (ST (arg - 3));
1010 int y = SvIV (ST (arg - 2));
1011 int w = SvIV (ST (arg - 1));
1012 int h = SvIV (ST (arg ));
1013
1014 inkrect.x = 0;
1015 inkrect.y = 0;
1016 inkrect.width = 0;
1017 inkrect.height = 0;
1018
1019 rect.x = x * PANGO_SCALE;
1020 rect.y = y * PANGO_SCALE;
1021 rect.width = w * PANGO_SCALE;
1022 rect.height = h * PANGO_SCALE;
1023
1024 if (!attrs)
1025 attrs = pango_layout_get_attributes (self->pl);
1026
1027 attr = pango_attr_shape_new (&inkrect, &rect);
1028 attr->start_index = pos - text;
1029 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1030 pango_attr_list_insert (attrs, attr);
1031
1032 arg += 4;
1033 pos += sizeof (OBJ_STR) - 1;
1034 }
1035
1036 if (attrs)
1037 pango_layout_set_attributes (self->pl, attrs);
1038}
1039
1040void
1041get_shapes (CFPlus::Layout self)
1042 PPCODE:
1043{
1044 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1045
1046 do
1047 {
1048 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1049
1050 if (run && shape_attr_p (run))
1051 {
1052 PangoRectangle extents;
1053 pango_layout_iter_get_run_extents (iter, 0, &extents);
1054
1055 EXTEND (SP, 2);
1056 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1057 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1058 }
1059 }
1060 while (pango_layout_iter_next_run (iter));
1061
1062 pango_layout_iter_free (iter);
1063}
1064
761int 1065int
762is_rgba (CFClient::Layout self) 1066has_wrapped (CFPlus::Layout self)
763 CODE: 1067 CODE:
764 RETVAL = self->rgba; 1068{
1069 int lines = 1;
1070 const char *text = pango_layout_get_text (self->pl);
1071
1072 while (*text)
1073 lines += *text++ == '\n';
1074
1075 RETVAL = lines < pango_layout_get_line_count (self->pl);
1076}
765 OUTPUT: 1077 OUTPUT:
766 RETVAL 1078 RETVAL
767 1079
768void
769set_text (CFClient::Layout self, SV *text_)
770 CODE:
771{
772 STRLEN textlen;
773 char *text = SvPVutf8 (text_, textlen);
774
775 pango_layout_set_text (self->pl, text, textlen);
776}
777
778void
779set_markup (CFClient::Layout self, SV *text_)
780 CODE:
781{
782 STRLEN textlen;
783 char *text = SvPVutf8 (text_, textlen);
784
785 pango_layout_set_markup (self->pl, text, textlen);
786}
787
788SV * 1080SV *
789get_text (CFClient::Layout self) 1081get_text (CFPlus::Layout self)
790 CODE: 1082 CODE:
791 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1083 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792 sv_utf8_decode (RETVAL); 1084 sv_utf8_decode (RETVAL);
793 OUTPUT: 1085 OUTPUT:
794 RETVAL 1086 RETVAL
795 1087
796void 1088void
797set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1089set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
798 CODE: 1090 CODE:
799 self->r = r; 1091 self->r = r;
800 self->g = g; 1092 self->g = g;
801 self->b = b; 1093 self->b = b;
802 self->a = a; 1094 self->a = a;
803 1095
804void 1096void
805set_font (CFClient::Layout self, CFClient::Font font = 0) 1097set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806 CODE: 1098 CODE:
807 if (self->font != font) 1099 if (self->font != font)
808 { 1100 {
809 self->font = font; 1101 self->font = font;
810 layout_update_font (self); 1102 layout_update_font (self);
811 } 1103 }
812 1104
813void 1105void
814set_height (CFClient::Layout self, int base_height) 1106set_height (CFPlus::Layout self, int base_height)
815 CODE: 1107 CODE:
816 if (self->base_height != base_height) 1108 if (self->base_height != base_height)
817 { 1109 {
818 self->base_height = base_height; 1110 self->base_height = base_height;
819 layout_update_font (self); 1111 layout_update_font (self);
820 } 1112 }
821 1113
822void 1114void
823set_width (CFClient::Layout self, int max_width = -1) 1115set_width (CFPlus::Layout self, int max_width = -1)
824 CODE: 1116 CODE:
825 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1117 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
826 1118
827void 1119void
828set_indent (CFClient::Layout self, int indent) 1120set_indent (CFPlus::Layout self, int indent)
829 CODE: 1121 CODE:
830 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1122 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831 1123
832void 1124void
833set_spacing (CFClient::Layout self, int spacing) 1125set_spacing (CFPlus::Layout self, int spacing)
834 CODE: 1126 CODE:
835 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1127 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836 1128
837void 1129void
838set_ellipsise (CFClient::Layout self, int ellipsise) 1130set_ellipsise (CFPlus::Layout self, int ellipsise)
839 CODE: 1131 CODE:
840 pango_layout_set_ellipsize (self->pl, 1132 pango_layout_set_ellipsize (self->pl,
841 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1133 ellipsise == 1 ? PANGO_ELLIPSIZE_START
842 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1134 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1135 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
844 : PANGO_ELLIPSIZE_NONE 1136 : PANGO_ELLIPSIZE_NONE
845 ); 1137 );
846 1138
847void 1139void
848set_single_paragraph_mode (CFClient::Layout self, int spm) 1140set_single_paragraph_mode (CFPlus::Layout self, int spm)
849 CODE: 1141 CODE:
850 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1142 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851 1143
852void 1144void
853size (CFClient::Layout self) 1145size (CFPlus::Layout self)
854 PPCODE: 1146 PPCODE:
855{ 1147{
856 int w, h; 1148 int w, h;
857 1149
858 layout_get_pixel_size (self, &w, &h); 1150 layout_get_pixel_size (self, &w, &h);
861 PUSHs (sv_2mortal (newSViv (w))); 1153 PUSHs (sv_2mortal (newSViv (w)));
862 PUSHs (sv_2mortal (newSViv (h))); 1154 PUSHs (sv_2mortal (newSViv (h)));
863} 1155}
864 1156
865int 1157int
1158descent (CFPlus::Layout self)
1159 CODE:
1160{
1161 PangoRectangle rect;
1162 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1163 pango_layout_line_get_pixel_extents (line, 0, &rect);
1164 RETVAL = PANGO_DESCENT (rect);
1165}
1166 OUTPUT:
1167 RETVAL
1168
1169int
866xy_to_index (CFClient::Layout self, int x, int y) 1170xy_to_index (CFPlus::Layout self, int x, int y)
867 CODE: 1171 CODE:
868{ 1172{
869 int index, trailing; 1173 int index, trailing;
870 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1174 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
871 RETVAL = index; 1175 RETVAL = index + trailing;
872} 1176}
873 OUTPUT: 1177 OUTPUT:
874 RETVAL 1178 RETVAL
875 1179
876void 1180void
877cursor_pos (CFClient::Layout self, int index) 1181cursor_pos (CFPlus::Layout self, int index)
878 PPCODE: 1182 PPCODE:
879{ 1183{
880 PangoRectangle strong_pos; 1184 PangoRectangle strong_pos;
881 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1185 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882 1186
885 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1189 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1190 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887} 1191}
888 1192
889void 1193void
890render (CFClient::Layout self) 1194index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
891 PPCODE: 1195 PPCODE:
892{ 1196{
893 SV *retval; 1197 int line, x;
894 int w, h;
895 1198
896 layout_get_pixel_size (self, &w, &h); 1199 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1200 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
897 1201
898 if (self->rgba)
899 {
900 cairo_surface_t *surface;
901 cairo_t *cairo;
902
903 retval = newSV (w * h * 4);
904 SvPOK_only (retval);
905 SvCUR_set (retval, w * h * 4);
906
907 memset (SvPVX (retval), 0, w * h * 4);
908
909 surface = cairo_image_surface_create_for_data (
910 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
911 cairo = cairo_create (surface);
912 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
913
914 pango_cairo_show_layout (cairo, self->pl);
915
916 cairo_destroy (cairo);
917 cairo_surface_destroy (surface);
918
919 // what a mess, and its premultiplied, too :(
920 {
921 uint32_t *p = (uint32_t *)SvPVX (retval);
922 uint32_t *e = p + w * h;
923
924 while (p < e)
925 {
926 uint32_t rgba = *p;
927 rgba = (rgba >> 24) | (rgba << 8);
928#if 0
929#ifdef _WIN32
930 {//D
931 uint8_t r = rgba >> 24;
932 uint8_t g = rgba >> 16;
933 uint8_t b = rgba >> 8;
934 uint8_t a = rgba >> 0;
935
936 rgba = (rgba & 0xffffff00) | a;
937 }
938#endif
939#endif
940 rgba = SDL_SwapBE32 (rgba);
941 *p++ = rgba;
942 }
943 }
944
945 EXTEND (SP, 5); 1202 EXTEND (SP, 2);
946 PUSHs (sv_2mortal (newSViv (w))); 1203 PUSHs (sv_2mortal (newSViv (line - 1)));
1204 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1205}
1206
1207void
1208line_x_to_index (CFPlus::Layout self, int line, int x)
1209 PPCODE:
1210{
1211 PangoLayoutLine *lp;
1212 int index, trailing;
1213
1214 if (line < 0)
1215 XSRETURN_EMPTY;
1216
1217 if (!(lp = pango_layout_get_line (self->pl, line)))
1218 XSRETURN_EMPTY; /* do better */
1219
1220 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1221
1222 EXTEND (SP, 2);
1223 if (GIMME_V == G_SCALAR)
947 PUSHs (sv_2mortal (newSViv (h))); 1224 PUSHs (sv_2mortal (newSViv (index + trailing)));
948 PUSHs (sv_2mortal (retval));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951 }
952 else 1225 else
953 { 1226 {
954 FT_Bitmap bitmap;
955
956 retval = newSV (w * h);
957 SvPOK_only (retval);
958 SvCUR_set (retval, w * h);
959
960 bitmap.rows = h;
961 bitmap.width = w;
962 bitmap.pitch = w;
963 bitmap.buffer = (unsigned char*)SvPVX (retval);
964 bitmap.num_grays = 256;
965 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
966
967 memset (bitmap.buffer, 0, w * h);
968
969 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
970
971 EXTEND (SP, 5);
972 PUSHs (sv_2mortal (newSViv (w))); 1227 PUSHs (sv_2mortal (newSViv (index)));
973 PUSHs (sv_2mortal (newSViv (h))); 1228 PUSHs (sv_2mortal (newSViv (trailing)));
974 PUSHs (sv_2mortal (retval));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977 } 1229 }
978} 1230}
979 1231
1232void
1233render (CFPlus::Layout self, float x, float y, int flags = 0)
1234 PPCODE:
1235 pango_opengl_render_layout_subpixel (
1236 self->pl,
1237 x * PANGO_SCALE, y * PANGO_SCALE,
1238 self->r, self->g, self->b, self->a,
1239 flags
1240 );
1241
980MODULE = CFClient PACKAGE = CFClient::Texture 1242MODULE = CFPlus PACKAGE = CFPlus::Texture
981 1243
982void 1244void
1245pad2pot (SV *data_, SV *w_, SV *h_)
1246 CODE:
1247{
1248 int ow = SvIV (w_);
1249 int oh = SvIV (h_);
1250
1251 if (ow && oh)
1252 {
1253 int nw = minpot (ow);
1254 int nh = minpot (oh);
1255
1256 if (nw != ow || nh != oh)
1257 {
1258 if (SvOK (data_))
1259 {
1260 STRLEN datalen;
1261 char *data = SvPVbyte (data_, datalen);
1262 int bpp = datalen / (ow * oh);
1263 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1264
1265 SvPOK_only (result_);
1266 SvCUR_set (result_, nw * nh * bpp);
1267
1268 memset (SvPVX (result_), 0, nw * nh * bpp);
1269 while (oh--)
1270 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1271
1272 sv_setsv (data_, result_);
1273 }
1274
1275 sv_setiv (w_, nw);
1276 sv_setiv (h_, nh);
1277 }
1278 }
1279}
1280
1281void
983draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1282draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984 PROTOTYPE: $$$;$$ 1283 PROTOTYPE: $$$;$$
985 ALIAS: 1284 ALIAS:
986 draw_quad_alpha = 1 1285 draw_quad_alpha = 1
987 draw_quad_alpha_premultiplied = 2 1286 draw_quad_alpha_premultiplied = 2
988 CODE: 1287 CODE:
1026 glDisable (GL_ALPHA_TEST); 1325 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1326 glDisable (GL_BLEND);
1028 } 1327 }
1029} 1328}
1030 1329
1031MODULE = CFClient PACKAGE = CFClient::Map 1330MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1331
1033CFClient::Map 1332CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1333new (SV *class)
1035 CODE: 1334 CODE:
1036 New (0, RETVAL, 1, struct map); 1335 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1336 RETVAL->x = 0;
1038 RETVAL->y = 0; 1337 RETVAL->y = 0;
1039 RETVAL->w = map_width; 1338 RETVAL->w = 0;
1040 RETVAL->h = map_height; 1339 RETVAL->h = 0;
1041 RETVAL->ox = 0; 1340 RETVAL->ox = 0;
1042 RETVAL->oy = 0; 1341 RETVAL->oy = 0;
1043 RETVAL->faces = 8192; 1342 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1044 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1343 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1045 RETVAL->texs = 8192;
1046 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1047 RETVAL->rows = 0; 1344 RETVAL->rows = 0;
1048 RETVAL->row = 0; 1345 RETVAL->row = 0;
1049 OUTPUT: 1346 OUTPUT:
1050 RETVAL 1347 RETVAL
1051 1348
1052void 1349void
1053DESTROY (CFClient::Map self) 1350DESTROY (CFPlus::Map self)
1054 CODE: 1351 CODE:
1055{ 1352{
1056 map_clear (self); 1353 map_clear (self);
1057 Safefree (self->face); 1354 Safefree (self->face2tile);
1355 Safefree (self->tex);
1058 Safefree (self); 1356 Safefree (self);
1059} 1357}
1060 1358
1061void 1359void
1360resize (CFPlus::Map self, int map_width, int map_height)
1361 CODE:
1362 self->w = map_width;
1363 self->h = map_height;
1364
1365void
1062clear (CFClient::Map self) 1366clear (CFPlus::Map self)
1063 CODE: 1367 CODE:
1064 map_clear (self); 1368 map_clear (self);
1065 1369
1066void 1370void
1067set_face (CFClient::Map self, int face, int texid) 1371set_tileid (CFPlus::Map self, int face, int tile)
1068 CODE: 1372 CODE:
1069{ 1373{
1070 while (self->faces <= face) 1374 need_facenum (self, face); self->face2tile [face] = tile;
1071 { 1375 need_texid (self, tile);
1072 Append (mapface, self->face, self->faces, self->faces);
1073 self->faces *= 2;
1074 }
1075
1076 self->face [face] = texid;
1077} 1376}
1078 1377
1079void 1378void
1379set_smooth (CFPlus::Map self, int face, int smooth, int level)
1380 CODE:
1381{
1382 tileid texid;
1383 maptex *tex;
1384
1385 if (face < 0 || face >= self->faces)
1386 return;
1387
1388 if (smooth < 0 || smooth >= self->faces)
1389 return;
1390
1391 texid = self->face2tile [face];
1392
1393 if (!texid)
1394 return;
1395
1396 tex = self->tex + texid;
1397 tex->smoothtile = self->face2tile [smooth];
1398 tex->smoothlevel = level;
1399}
1400
1401void
1080set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1402set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1081 CODE: 1403 CODE:
1082{ 1404{
1083 while (self->texs <= texid) 1405 need_texid (self, texid);
1084 {
1085 Append (maptex, self->tex, self->texs, self->texs);
1086 self->texs *= 2;
1087 }
1088 1406
1089 { 1407 {
1090 maptex *tex = self->tex + texid; 1408 maptex *tex = self->tex + texid;
1091 1409
1092 tex->name = name; 1410 tex->name = name;
1109 // from transparent color bleeding and ugly wrapping effects. 1427 // from transparent color bleeding and ugly wrapping effects.
1110 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1428 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111} 1429}
1112 1430
1113int 1431int
1114ox (CFClient::Map self) 1432ox (CFPlus::Map self)
1115 ALIAS: 1433 ALIAS:
1116 oy = 1 1434 oy = 1
1117 x = 2 1435 x = 2
1118 y = 3 1436 y = 3
1119 w = 4 1437 w = 4
1130 } 1448 }
1131 OUTPUT: 1449 OUTPUT:
1132 RETVAL 1450 RETVAL
1133 1451
1134void 1452void
1135scroll (CFClient::Map self, int dx, int dy) 1453scroll (CFPlus::Map self, int dx, int dy)
1136 CODE: 1454 CODE:
1137{ 1455{
1138 if (dx > 0) 1456 if (dx > 0)
1139 map_blank (self, self->x, self->y, dx - 1, self->h); 1457 map_blank (self, self->x, self->y, dx, self->h);
1140 else if (dx < 0) 1458 else if (dx < 0)
1141 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1459 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1142 1460
1143 if (dy > 0) 1461 if (dy > 0)
1144 map_blank (self, self->x, self->y, self->w, dy - 1); 1462 map_blank (self, self->x, self->y, self->w, dy);
1145 else if (dy < 0) 1463 else if (dy < 0)
1146 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1464 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1147 1465
1148 self->ox += dx; self->x += dx; 1466 self->ox += dx; self->x += dx;
1149 self->oy += dy; self->y += dy; 1467 self->oy += dy; self->y += dy;
1150 1468
1151 while (self->y < 0) 1469 while (self->y < 0)
1156 self->y += MAP_EXTEND_Y; 1474 self->y += MAP_EXTEND_Y;
1157 } 1475 }
1158} 1476}
1159 1477
1160void 1478void
1161map1a_update (CFClient::Map self, SV *data_) 1479map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162 CODE: 1480 CODE:
1163{ 1481{
1164 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1482 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165 uint8_t *data_end = (uint8_t *)SvEND (data_); 1483 uint8_t *data_end = (uint8_t *)SvEND (data_);
1166 mapcell *cell; 1484 mapcell *cell;
1167 int x, y, flags; 1485 int x, y, flags;
1168 1486
1169 while (data < data_end) 1487 while (data < data_end - 1)
1170 { 1488 {
1171 flags = (data [0] << 8) + data [1]; data += 2; 1489 flags = (data [0] << 8) + data [1]; data += 2;
1172 1490
1173 x = ((flags >> 10) & 63) + self->x; 1491 x = self->x + ((flags >> 10) & 63);
1174 y = ((flags >> 4) & 63) + self->y; 1492 y = self->y + ((flags >> 4) & 63);
1175 1493
1176 cell = map_get_cell (self, x, y); 1494 cell = map_get_cell (self, x, y);
1177 1495
1178 if (flags & 15) 1496 if (flags & 15)
1179 { 1497 {
1180 if (cell->darkness < 0) 1498 if (!cell->darkness)
1181 { 1499 {
1500 memset (cell, 0, sizeof (*cell));
1182 cell->darkness = 0; 1501 cell->darkness = 256;
1183 cell->face [0] = 0;
1184 cell->face [1] = 0;
1185 cell->face [2] = 0;
1186 } 1502 }
1187 1503
1188 cell->darkness = flags & 8 ? *data++ : 255;
1189
1190 //TODO: don't trust server data to be in-range(!) 1504 //TODO: don't trust server data to be in-range(!)
1505
1506 if (flags & 8)
1507 {
1508 if (extmap)
1509 {
1510 uint8_t ext, cmd;
1511
1512 do
1513 {
1514 ext = *data++;
1515 cmd = ext & 0x3f;
1516
1517 if (cmd < 4)
1518 cell->darkness = 255 - ext * 64 + 1;
1519 else if (cmd == 5) // health
1520 {
1521 cell->stat_width = 1;
1522 cell->stat_hp = *data++;
1523 }
1524 else if (cmd == 6) // monster width
1525 cell->stat_width = *data++ + 1;
1526 else if (cmd == 0x47)
1527 {
1528 if (*data == 4)
1529 ; // decode player count
1530
1531 data += *data + 1;
1532 }
1533 else if (cmd == 8) // cell flags
1534 cell->flags = *data++;
1535 else if (ext & 0x40) // unknown, multibyte => skip
1536 data += *data + 1;
1537 else
1538 data++;
1539 }
1540 while (ext & 0x80);
1541 }
1542 else
1543 cell->darkness = *data++ + 1;
1544 }
1191 1545
1192 if (flags & 4) 1546 if (flags & 4)
1193 { 1547 {
1194 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1548 faceid face = (data [0] << 8) + data [1]; data += 2;
1549 need_facenum (self, face);
1550 cell->tile [0] = self->face2tile [face];
1195 } 1551 }
1196 1552
1197 if (flags & 2) 1553 if (flags & 2)
1198 { 1554 {
1199 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1555 faceid face = (data [0] << 8) + data [1]; data += 2;
1556 need_facenum (self, face);
1557 cell->tile [1] = self->face2tile [face];
1200 } 1558 }
1201 1559
1202 if (flags & 1) 1560 if (flags & 1)
1203 { 1561 {
1204 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1562 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face);
1564 cell->tile [2] = self->face2tile [face];
1205 } 1565 }
1206 } 1566 }
1207 else 1567 else
1208 cell->darkness = -1; 1568 cell->darkness = 0;
1209 } 1569 }
1210} 1570}
1211 1571
1212SV * 1572SV *
1213mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1573mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214 CODE: 1574 CODE:
1215{ 1575{
1216 int x1, x; 1576 int x1, x;
1217 int y1, y; 1577 int y1, y;
1218 int z; 1578 int z;
1239 { 1599 {
1240 mapcell *cell = row->col + (x - row->c0); 1600 mapcell *cell = row->col + (x - row->c0);
1241 1601
1242 for (z = 0; z <= 0; z++) 1602 for (z = 0; z <= 0; z++)
1243 { 1603 {
1244 mapface face = cell->face [z];
1245
1246 if (face)
1247 {
1248 maptex tex = self->tex [face]; 1604 maptex tex = self->tex [cell->tile [z]];
1249 int a0 = 255 - tex.a; 1605 int a0 = 255 - tex.a;
1250 int a1 = tex.a; 1606 int a1 = tex.a;
1251 1607
1252 r = (r * a0 + tex.r * a1) / 255; 1608 r = (r * a0 + tex.r * a1) / 255;
1253 g = (g * a0 + tex.g * a1) / 255; 1609 g = (g * a0 + tex.g * a1) / 255;
1254 b = (b * a0 + tex.b * a1) / 255; 1610 b = (b * a0 + tex.b * a1) / 255;
1255 a = (a * a0 + tex.a * a1) / 255; 1611 a = (a * a0 + tex.a * a1) / 255;
1256 }
1257 } 1612 }
1258 } 1613 }
1259 1614
1260 *map++ = (r ) 1615 *map++ = (r )
1261 | (g << 8) 1616 | (g << 8)
1268} 1623}
1269 OUTPUT: 1624 OUTPUT:
1270 RETVAL 1625 RETVAL
1271 1626
1272void 1627void
1273draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1628draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1274 PPCODE: 1629 CODE:
1275{ 1630{
1276 int vx, vy; 1631 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1632 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1633 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1634 smooth_key skey;
1277 int x, y, z; 1635 int x, y, z;
1278 int last_name; 1636 int last_name;
1279 mapface face; 1637
1638 // thats current max. sorry.
1639 if (sw > 255) sw = 255;
1640 if (sh > 255) sh = 255;
1641
1642 // clear key, in case of extra padding
1643 memset (&skey, 0, sizeof (skey));
1644
1645 glColor4ub (255, 255, 255, 255);
1646
1647 glEnable (GL_BLEND);
1648 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1649 glEnable (GL_TEXTURE_2D);
1650 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1651
1652 glBegin (GL_QUADS);
1653
1654 last_name = 0;
1655
1656 mx += self->x;
1657 my += self->y;
1658
1659 // first pass: determine smooth_max
1660 // rather ugly, if you ask me
1661 // could also be stored inside mapcell and updated on change
1662 memset (smooth_max, 0, sizeof (smooth_max));
1663
1664 for (y = 0; y < sh; y++)
1665 if (0 <= y + my && y + my < self->rows)
1666 {
1667 maprow *row = self->row + (y + my);
1668
1669 for (x = 0; x < sw; x++)
1670 if (row->c0 <= x + mx && x + mx < row->c1)
1671 {
1672 mapcell *cell = row->col + (x + mx - row->c0);
1673
1674 smooth_max[x + 1][y + 1] =
1675 MAX (self->tex [cell->tile [0]].smoothlevel,
1676 MAX (self->tex [cell->tile [1]].smoothlevel,
1677 self->tex [cell->tile [2]].smoothlevel));
1678 }
1679 }
1680
1681 for (z = 0; z <= 2; z++)
1682 {
1683 memset (smooth_level, 0, sizeof (smooth_level));
1684
1685 for (y = 0; y < sh; y++)
1686 if (0 <= y + my && y + my < self->rows)
1687 {
1688 maprow *row = self->row + (y + my);
1689
1690 for (x = 0; x < sw; x++)
1691 if (row->c0 <= x + mx && x + mx < row->c1)
1692 {
1693 mapcell *cell = row->col + (x + mx - row->c0);
1694 tileid tile = cell->tile [z];
1695
1696 if (tile)
1697 {
1698 maptex tex = self->tex [tile];
1699 int px = (x + 1) * T - tex.w;
1700 int py = (y + 1) * T - tex.h;
1701
1702 // suppressing texture state switches here
1703 // is only moderately effective, but worth the extra effort
1704 if (last_name != tex.name)
1705 {
1706 if (!tex.name)
1707 tex = self->tex [2]; /* missing, replace by noface */
1708
1709 glEnd ();
1710 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1711 glBegin (GL_QUADS);
1712 }
1713
1714 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1715 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1716 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1717 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1718
1719 if (cell->flags && z == 2)
1720 {
1721 if (cell->flags & 1)
1722 {
1723 maptex tex = self->tex [1];
1724 int px = x * T + T * 2 / 32;
1725 int py = y * T - T * 6 / 32;
1726
1727 glEnd ();
1728 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1729 glBegin (GL_QUADS);
1730
1731 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1732 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1733 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1734 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1735 }
1736 }
1737
1738 // update smooth hash
1739 if (tex.smoothtile)
1740 {
1741 skey.tile = tex.smoothtile;
1742 skey.level = tex.smoothlevel;
1743
1744 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1745
1746 // add bits to current tile and all neighbours. skey.x|y is
1747 // shifted +1|+1 so we always stay positive.
1748
1749 // bits is ___n cccc CCCC bbbb
1750 // n do not draw borders&corners
1751 // c draw these corners, but...
1752 // C ... not these
1753 // b draw these borders
1754
1755 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1756 // ┃· ·· ·┃ ━━
1757
1758 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1759 // ·· ·· ·┏ ┓·
1760
1761 // full tile
1762 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1763
1764 // borders
1765 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1766 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1767 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1768 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1769
1770 // corners
1771 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1772 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1773 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1774 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1775 }
1776 }
1777 }
1778 }
1779
1780 // go through all smoothlevels, lowest to highest, then draw.
1781 // this is basically counting sort
1782 {
1783 int w, b;
1784
1785 for (w = 0; w < 256 / 32; ++w)
1786 {
1787 uint32_t smask = smooth_level [w];
1788 if (smask)
1789 for (b = 0; b < 32; ++b)
1790 if (smask & (((uint32_t)1) << b))
1791 {
1792 int level = (w << 5) | b;
1793 HE *he;
1794
1795 hv_iterinit (smooth);
1796 while ((he = hv_iternext (smooth)))
1797 {
1798 smooth_key *skey = (smooth_key *)HeKEY (he);
1799 IV bits = SvIVX (HeVAL (he));
1800
1801 if (!(bits & 0x1000)
1802 && skey->level == level
1803 && level > smooth_max [skey->x][skey->y])
1804 {
1805 maptex tex = self->tex [skey->tile];
1806 int px = (((int)skey->x) - 1) * T;
1807 int py = (((int)skey->y) - 1) * T;
1808 int border = bits & 15;
1809 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1810 float dx = tex.s * .0625f; // 16 images/row
1811 float dy = tex.t * .5f ; // 2 images/column
1812
1813 // this time naively avoiding texture state changes
1814 // save gobs of state changes.
1815 if (last_name != tex.name)
1816 {
1817 if (!tex.name)
1818 continue; // smoothing not yet available
1819
1820 glEnd ();
1821 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1822 glBegin (GL_QUADS);
1823 }
1824
1825 if (border)
1826 {
1827 float ox = border * dx;
1828
1829 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1830 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1831 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1832 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1833 }
1834
1835 if (corner)
1836 {
1837 float ox = corner * dx;
1838
1839 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1840 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1841 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1842 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1843 }
1844 }
1845 }
1846 }
1847 }
1848 }
1849
1850 hv_clear (smooth);
1851 }
1852
1853 glEnd ();
1854
1855 glDisable (GL_TEXTURE_2D);
1856 glDisable (GL_BLEND);
1857
1858 // top layer: overlays such as the health bar
1859 for (y = 0; y < sh; y++)
1860 if (0 <= y + my && y + my < self->rows)
1861 {
1862 maprow *row = self->row + (y + my);
1863
1864 for (x = 0; x < sw; x++)
1865 if (row->c0 <= x + mx && x + mx < row->c1)
1866 {
1867 mapcell *cell = row->col + (x + mx - row->c0);
1868
1869 int px = x * T;
1870 int py = y * T;
1871
1872 if (cell->stat_hp)
1873 {
1874 int width = cell->stat_width * T;
1875 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1876
1877 glColor3ub (0, 0, 0);
1878 glRectf (px + 1, py - thick - 2,
1879 px + width - 1, py);
1880
1881 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1882 glRectf (px + 2,
1883 py - thick - 1,
1884 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1885 }
1886 }
1887 }
1888}
1889
1890void
1891draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1892 CODE:
1893{
1894 static float color[16][3] = {
1895 { 0.00F, 0.00F, 0.00F },
1896 { 1.00F, 1.00F, 1.00F },
1897 { 0.00F, 0.00F, 0.55F },
1898 { 1.00F, 0.00F, 0.00F },
1899
1900 { 1.00F, 0.54F, 0.00F },
1901 { 0.11F, 0.56F, 1.00F },
1902 { 0.93F, 0.46F, 0.00F },
1903 { 0.18F, 0.54F, 0.34F },
1904
1905 { 0.56F, 0.73F, 0.56F },
1906 { 0.80F, 0.80F, 0.80F },
1907 { 0.55F, 0.41F, 0.13F },
1908 { 0.99F, 0.77F, 0.26F },
1909
1910 { 0.74F, 0.65F, 0.41F },
1911
1912 { 0.00F, 1.00F, 1.00F },
1913 { 1.00F, 0.00F, 1.00F },
1914 { 1.00F, 1.00F, 0.00F },
1915 };
1916
1917 int x, y;
1918
1919 glEnable (GL_TEXTURE_2D);
1920 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1921 glEnable (GL_BLEND);
1922 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1923 glBegin (GL_QUADS);
1924
1925 for (y = 0; y < h; y++)
1926 for (x = 0; x < w; x++)
1927 {
1928 unsigned char m = data [x + y * w];
1929
1930 if (m)
1931 {
1932 float *c = color [m & 15];
1933
1934 float tx1 = m & 0x40 ? 0.5 : 0.;
1935 float tx2 = tx1 + 0.5;
1936
1937 glColor4f (c[0], c[1], c[2], 0.75);
1938 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1939 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1940 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1941 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1942 }
1943 }
1944
1945 glEnd ();
1946 glDisable (GL_BLEND);
1947 glDisable (GL_TEXTURE_2D);
1948}
1949
1950void
1951fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1952 PPCODE:
1953{
1954 int x, y;
1280 int sw4 = (sw + 3) & ~3; 1955 int sw4 = (sw + 3) & ~3;
1281 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1956 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1957 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283 1958
1284 memset (darkness, 255, sw4 * sh); 1959 memset (darkness, 255, sw4 * sh);
1285 SvPOK_only (darkness_sv); 1960 SvPOK_only (darkness_sv);
1286 SvCUR_set (darkness_sv, sw4 * sh); 1961 SvCUR_set (darkness_sv, sw4 * sh);
1287 1962
1288 vx = self->x + (self->w - sw) / 2 - shift_x; 1963 mx += self->x;
1289 vy = self->y + (self->h - sh) / 2 - shift_y; 1964 my += self->y;
1290 1965
1291 /*
1292 int vx = self->vx = self->w >= sw
1293 ? self->x + (self->w - sw) / 2
1294 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1295
1296 int vy = self->vy = self->h >= sh
1297 ? self->y + (self->h - sh) / 2
1298 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299 */
1300
1301 glColor4ub (255, 255, 255, 255);
1302
1303 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304 glEnable (GL_BLEND);
1305 glEnable (GL_TEXTURE_2D);
1306 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307
1308 glBegin (GL_QUADS);
1309
1310 last_name = 0;
1311
1312 for (z = 0; z < 3; z++)
1313 for (y = 0; y < sh; y++) 1966 for (y = 0; y < sh; y++)
1314 if (0 <= y + vy && y + vy < self->rows) 1967 if (0 <= y + my && y + my < self->rows)
1315 { 1968 {
1316 maprow *row = self->row + (y + vy); 1969 maprow *row = self->row + (y + my);
1317 1970
1318 for (x = 0; x < sw; x++) 1971 for (x = 0; x < sw; x++)
1319 if (row->c0 <= x + vx && x + vx < row->c1) 1972 if (row->c0 <= x + mx && x + mx < row->c1)
1320 { 1973 {
1321 mapcell *cell = row->col + (x + vx - row->c0); 1974 mapcell *cell = row->col + (x + mx - row->c0);
1322 1975
1323 darkness[y * sw4 + x] = cell->darkness < 0 1976 darkness[y * sw4 + x] = cell->darkness
1977 ? 255 - (cell->darkness - 1)
1324 ? 255 - FOW_DARKNESS 1978 : 255 - FOW_DARKNESS;
1325 : 255 - cell->darkness;
1326
1327 face = cell->face [z];
1328
1329 if (face)
1330 {
1331 maptex tex = self->tex [face];
1332
1333 int px = (x + 1) * 32 - tex.w;
1334 int py = (y + 1) * 32 - tex.h;
1335
1336 if (last_name != tex.name)
1337 {
1338 glEnd ();
1339 last_name = tex.name;
1340 glBindTexture (GL_TEXTURE_2D, last_name);
1341 glBegin (GL_QUADS);
1342 }
1343
1344 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1345 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1346 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1347 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1348 }
1349 } 1979 }
1350 } 1980 }
1351
1352 glEnd ();
1353
1354 glDisable (GL_TEXTURE_2D);
1355 glDisable (GL_BLEND);
1356 1981
1357 EXTEND (SP, 3); 1982 EXTEND (SP, 3);
1358 PUSHs (sv_2mortal (newSViv (sw4))); 1983 PUSHs (sv_2mortal (newSViv (sw4)));
1359 PUSHs (sv_2mortal (newSViv (sh))); 1984 PUSHs (sv_2mortal (newSViv (sh)));
1360 PUSHs (darkness_sv); 1985 PUSHs (darkness_sv);
1361} 1986}
1362 1987
1363SV * 1988SV *
1364get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1989get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1365 CODE: 1990 CODE:
1366{ 1991{
1367 int x, y, x1, y1; 1992 int x, y, x1, y1;
1368 SV *data_sv = newSV (w * h * 7 + 5); 1993 SV *data_sv = newSV (w * h * 7 + 5);
1369 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1994 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1394 if (row && row->c0 <= x && x < row->c1) 2019 if (row && row->c0 <= x && x < row->c1)
1395 { 2020 {
1396 mapcell *cell = row->col + (x - row->c0); 2021 mapcell *cell = row->col + (x - row->c0);
1397 uint8_t flags = 0; 2022 uint8_t flags = 0;
1398 2023
1399 if (cell->face [0]) flags |= 1; 2024 if (cell->tile [0]) flags |= 1;
1400 if (cell->face [1]) flags |= 2; 2025 if (cell->tile [1]) flags |= 2;
1401 if (cell->face [2]) flags |= 4; 2026 if (cell->tile [2]) flags |= 4;
1402 2027
1403 *data++ = flags; 2028 *data++ = flags;
1404 2029
1405 if (flags & 1) 2030 if (flags & 1)
1406 { 2031 {
2032 tileid tile = cell->tile [0];
1407 *data++ = cell->face [0] >> 8; 2033 *data++ = tile >> 8;
1408 *data++ = cell->face [0]; 2034 *data++ = tile;
1409 } 2035 }
1410 2036
1411 if (flags & 2) 2037 if (flags & 2)
1412 { 2038 {
2039 tileid tile = cell->tile [1];
1413 *data++ = cell->face [1] >> 8; 2040 *data++ = tile >> 8;
1414 *data++ = cell->face [1]; 2041 *data++ = tile;
1415 } 2042 }
1416 2043
1417 if (flags & 4) 2044 if (flags & 4)
1418 { 2045 {
2046 tileid tile = cell->tile [2];
1419 *data++ = cell->face [2] >> 8; 2047 *data++ = tile >> 8;
1420 *data++ = cell->face [2]; 2048 *data++ = tile;
1421 } 2049 }
1422 } 2050 }
1423 else 2051 else
1424 *data++ = 0; 2052 *data++ = 0;
1425 } 2053 }
1431} 2059}
1432 OUTPUT: 2060 OUTPUT:
1433 RETVAL 2061 RETVAL
1434 2062
1435void 2063void
1436set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2064set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437 PPCODE: 2065 PPCODE:
1438{ 2066{
1439 int x, y, z; 2067 int x, y, z;
1440 int w, h; 2068 int w, h;
1441 int x1, y1; 2069 int x1, y1;
1465 { 2093 {
1466 uint8_t flags = *data++; 2094 uint8_t flags = *data++;
1467 2095
1468 if (flags) 2096 if (flags)
1469 { 2097 {
1470 mapface face[3] = { 0, 0, 0 };
1471
1472 mapcell *cell = row_get_cell (row, x); 2098 mapcell *cell = row_get_cell (row, x);
2099 tileid tile[3] = { 0, 0, 0 };
1473 2100
1474 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2101 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1475 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2102 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1476 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2103 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1477 2104
1478 if (cell->darkness <= 0) 2105 if (cell->darkness == 0)
1479 { 2106 {
1480 cell->darkness = -1; 2107 cell->darkness = 0;
1481 2108
1482 for (z = 0; z <= 2; z++) 2109 for (z = 0; z <= 2; z++)
1483 { 2110 {
1484 cell->face[z] = face[z]; 2111 tileid t = tile [z];
1485 2112
1486 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2113 if (t >= self->texs || (t && !self->tex [t].name))
2114 {
1487 XPUSHs (sv_2mortal (newSViv (face[z]))); 2115 XPUSHs (sv_2mortal (newSViv (t)));
2116 need_texid (self, t);
2117 }
2118
2119 cell->tile [z] = t;
1488 } 2120 }
1489 } 2121 }
1490 } 2122 }
1491 } 2123 }
1492 } 2124 }
1493} 2125}
1494 2126
1495MODULE = CFClient PACKAGE = CFClient::MixChunk 2127MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496 2128
1497CFClient::MixChunk 2129CFPlus::MixChunk
1498new_from_file (SV *class, char *path) 2130new_from_file (SV *class, char *path)
1499 CODE: 2131 CODE:
1500 RETVAL = Mix_LoadWAV (path); 2132 RETVAL = Mix_LoadWAV (path);
1501 OUTPUT: 2133 OUTPUT:
1502 RETVAL 2134 RETVAL
1503 2135
1504void 2136void
1505DESTROY (CFClient::MixChunk self) 2137DESTROY (CFPlus::MixChunk self)
1506 CODE: 2138 CODE:
1507 Mix_FreeChunk (self); 2139 Mix_FreeChunk (self);
1508 2140
1509int 2141int
1510volume (CFClient::MixChunk self, int volume = -1) 2142volume (CFPlus::MixChunk self, int volume = -1)
1511 CODE: 2143 CODE:
1512 RETVAL = Mix_VolumeChunk (self, volume); 2144 RETVAL = Mix_VolumeChunk (self, volume);
1513 OUTPUT: 2145 OUTPUT:
1514 RETVAL 2146 RETVAL
1515 2147
1516int 2148int
1517play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2149play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1518 CODE: 2150 CODE:
1519 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2151 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520 OUTPUT: 2152 OUTPUT:
1521 RETVAL 2153 RETVAL
1522 2154
1523MODULE = CFClient PACKAGE = CFClient::MixMusic 2155MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524 2156
1525int 2157int
1526volume (int volume = -1) 2158volume (int volume = -1)
1527 CODE: 2159 CODE:
1528 RETVAL = Mix_VolumeMusic (volume); 2160 RETVAL = Mix_VolumeMusic (volume);
1529 OUTPUT: 2161 OUTPUT:
1530 RETVAL 2162 RETVAL
1531 2163
2164int
2165fade_out (int ms)
2166 CODE:
2167 RETVAL = Mix_FadeOutMusic (ms);
2168 OUTPUT:
2169 RETVAL
2170
1532CFClient::MixMusic 2171CFPlus::MixMusic
1533new_from_file (SV *class, char *path) 2172new_from_file (SV *class, char *path)
1534 CODE: 2173 CODE:
1535 RETVAL = Mix_LoadMUS (path); 2174 RETVAL = Mix_LoadMUS (path);
1536 OUTPUT: 2175 OUTPUT:
1537 RETVAL 2176 RETVAL
1538 2177
1539void 2178void
1540DESTROY (CFClient::MixMusic self) 2179DESTROY (CFPlus::MixMusic self)
1541 CODE: 2180 CODE:
1542 Mix_FreeMusic (self); 2181 Mix_FreeMusic (self);
1543 2182
1544int 2183int
1545play (CFClient::MixMusic self, int loops = -1) 2184play (CFPlus::MixMusic self, int loops = -1)
1546 CODE: 2185 CODE:
1547 RETVAL = Mix_PlayMusic (self, loops); 2186 RETVAL = Mix_PlayMusic (self, loops);
1548 OUTPUT: 2187 OUTPUT:
1549 RETVAL 2188 RETVAL
1550 2189
2190int
2191fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2192 CODE:
2193 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2194 OUTPUT:
2195 RETVAL
2196
1551MODULE = CFClient PACKAGE = CFClient::OpenGL 2197MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552 2198
1553BOOT: 2199BOOT:
1554{ 2200{
1555 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2201 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556 static const struct { 2202 static const struct {
1557 const char *name; 2203 const char *name;
1558 IV iv; 2204 IV iv;
1559 } *civ, const_iv[] = { 2205 } *civ, const_iv[] = {
1560# define const_iv(name) { # name, (IV)name } 2206# define const_iv(name) { # name, (IV)name }
1567 const_iv (GL_SCISSOR_TEST), 2213 const_iv (GL_SCISSOR_TEST),
1568 const_iv (GL_DEPTH_TEST), 2214 const_iv (GL_DEPTH_TEST),
1569 const_iv (GL_ALPHA_TEST), 2215 const_iv (GL_ALPHA_TEST),
1570 const_iv (GL_NORMALIZE), 2216 const_iv (GL_NORMALIZE),
1571 const_iv (GL_RESCALE_NORMAL), 2217 const_iv (GL_RESCALE_NORMAL),
2218 const_iv (GL_FRONT),
2219 const_iv (GL_BACK),
1572 const_iv (GL_AND), 2220 const_iv (GL_AND),
1573 const_iv (GL_ONE), 2221 const_iv (GL_ONE),
1574 const_iv (GL_ZERO), 2222 const_iv (GL_ZERO),
1575 const_iv (GL_SRC_ALPHA), 2223 const_iv (GL_SRC_ALPHA),
1576 const_iv (GL_DST_ALPHA), 2224 const_iv (GL_DST_ALPHA),
1577 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2225 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578 const_iv (GL_ONE_MINUS_DST_ALPHA), 2226 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 2227 const_iv (GL_SRC_ALPHA_SATURATE),
1580 const_iv (GL_RGB), 2228 const_iv (GL_RGB),
1581 const_iv (GL_RGBA), 2229 const_iv (GL_RGBA),
2230 const_iv (GL_RGBA4),
2231 const_iv (GL_RGBA8),
2232 const_iv (GL_RGB5_A1),
1582 const_iv (GL_UNSIGNED_BYTE), 2233 const_iv (GL_UNSIGNED_BYTE),
1583 const_iv (GL_UNSIGNED_SHORT), 2234 const_iv (GL_UNSIGNED_SHORT),
1584 const_iv (GL_UNSIGNED_INT), 2235 const_iv (GL_UNSIGNED_INT),
1585 const_iv (GL_ALPHA), 2236 const_iv (GL_ALPHA),
1586 const_iv (GL_INTENSITY), 2237 const_iv (GL_INTENSITY),
1618 const_iv (GL_SEPARABLE_2D), 2269 const_iv (GL_SEPARABLE_2D),
1619 const_iv (GL_CONVOLUTION_2D), 2270 const_iv (GL_CONVOLUTION_2D),
1620 const_iv (GL_CONVOLUTION_BORDER_MODE), 2271 const_iv (GL_CONVOLUTION_BORDER_MODE),
1621 const_iv (GL_CONSTANT_BORDER), 2272 const_iv (GL_CONSTANT_BORDER),
1622 const_iv (GL_LINES), 2273 const_iv (GL_LINES),
2274 const_iv (GL_LINE_STRIP),
1623 const_iv (GL_LINE_LOOP), 2275 const_iv (GL_LINE_LOOP),
1624 const_iv (GL_QUADS), 2276 const_iv (GL_QUADS),
1625 const_iv (GL_QUAD_STRIP), 2277 const_iv (GL_QUAD_STRIP),
1626 const_iv (GL_TRIANGLES), 2278 const_iv (GL_TRIANGLES),
1627 const_iv (GL_TRIANGLE_STRIP), 2279 const_iv (GL_TRIANGLE_STRIP),
1635# undef const_iv 2287# undef const_iv
1636 }; 2288 };
1637 2289
1638 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2290 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1639 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2291 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2292
2293 texture_av = newAV ();
2294 AvREAL_off (texture_av);
1640} 2295}
1641 2296
1642char * 2297char *
1643gl_vendor () 2298gl_vendor ()
1644 CODE: 2299 CODE:
1660 OUTPUT: 2315 OUTPUT:
1661 RETVAL 2316 RETVAL
1662 2317
1663int glGetError () 2318int glGetError ()
1664 2319
2320void glFinish ()
2321
1665void glClear (int mask) 2322void glClear (int mask)
1666 2323
1667void glClearColor (float r, float g, float b, float a = 1.0) 2324void glClearColor (float r, float g, float b, float a = 1.0)
1668 PROTOTYPE: @ 2325 PROTOTYPE: @
1669 2326
1692void glPushMatrix () 2349void glPushMatrix ()
1693 2350
1694void glPopMatrix () 2351void glPopMatrix ()
1695 2352
1696void glLoadIdentity () 2353void glLoadIdentity ()
2354
2355void glDrawBuffer (int buffer)
2356
2357void glReadBuffer (int buffer)
1697 2358
1698# near_ and far_ are due to microsofts buggy "c" compiler 2359# near_ and far_ are due to microsofts buggy "c" compiler
1699void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2360void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700 2361
1701# near_ and far_ are due to microsofts buggy "c" compiler 2362# near_ and far_ are due to microsofts buggy "c" compiler
1731 r *= a; 2392 r *= a;
1732 g *= a; 2393 g *= a;
1733 b *= a; 2394 b *= a;
1734 } 2395 }
1735 // microsoft visual "c" rounds instead of truncating... 2396 // microsoft visual "c" rounds instead of truncating...
1736 glColor4ub (MIN ((int)(r * 256.f), 255), 2397 glColor4f (r, g, b, a);
1737 MIN ((int)(g * 256.f), 255),
1738 MIN ((int)(b * 256.f), 255),
1739 MIN ((int)(a * 256.f), 255));
1740 2398
1741void glInterleavedArrays (int format, int stride, char *data) 2399void glInterleavedArrays (int format, int stride, char *data)
1742 2400
1743void glDrawElements (int mode, int count, int type, char *indices) 2401void glDrawElements (int mode, int count, int type, char *indices)
1744 2402
1790 2448
1791void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2449void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1792 2450
1793int glGenTexture () 2451int glGenTexture ()
1794 CODE: 2452 CODE:
1795{ 2453 RETVAL = gen_texture ();
1796 GLuint name;
1797 glGenTextures (1, &name);
1798 RETVAL = name;
1799}
1800 OUTPUT: 2454 OUTPUT:
1801 RETVAL 2455 RETVAL
1802 2456
1803void glDeleteTexture (int name) 2457void glDeleteTexture (int name)
1804 CODE: 2458 CODE:
1805{
1806 GLuint name_ = name;
1807 glDeleteTextures (1, &name_); 2459 del_texture (name);
1808} 2460
1809
1810int glGenList () 2461int glGenList ()
1811 CODE: 2462 CODE:
1812 RETVAL = glGenLists (1); 2463 RETVAL = glGenLists (1);
1813 OUTPUT: 2464 OUTPUT:
1814 RETVAL 2465 RETVAL
1821 2472
1822void glEndList () 2473void glEndList ()
1823 2474
1824void glCallList (int list) 2475void glCallList (int list)
1825 2476
1826

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines