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.105 by root, Mon Jun 5 03:33:09 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);
154#ifdef FC_HINT_STYLE
91 //FcPatternAddBool (pattern, FC_AUTOHINT, 1); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
156#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93} 158}
94 159
95static void 160static void
96layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
97{ 162{
98 /* 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
99 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
100 */ 165 */
101 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
105 170
106 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
107} 172}
108 173
109static void 174static void
110layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
111{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
112 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
113 181
114 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
115 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
116 184
117 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
118} 186 if (!rect.height) rect.height = 1;
119 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
120typedef uint16_t mapface; 193typedef uint16_t faceid;
121 194
122typedef struct { 195typedef struct {
123 GLint name; 196 int name;
124 int w, h; 197 int w, h;
125 float s, t; 198 float s, t;
126 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
127} maptex; 202} maptex;
128 203
129typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
130 int16_t darkness; 207 uint16_t darkness;
131 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
132} mapcell; 209} mapcell;
133 210
134typedef struct { 211typedef struct {
135 int32_t c0, c1; 212 int32_t c0, c1;
136 mapcell *col; 213 mapcell *col;
137} maprow; 214} maprow;
138 215
139typedef struct map { 216typedef struct map {
140 int x, y, w, h; 217 int x, y, w, h;
141 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
142 int faces; 219 int faces; tileid *face2tile; // [faceid]
143 mapface *face; 220 int texs; maptex *tex; // [tileid]
144
145 int texs;
146 maptex *tex;
147 221
148 int32_t rows; 222 int32_t rows;
149 maprow *row; 223 maprow *row;
150} *CFClient__Map; 224} *CFPlus__Map;
151 225
152static char * 226static char *
153prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
154{ 228{
155 char *p; 229 char *p;
172} 246}
173 247
174#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))
175#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))
176 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
177static maprow * 271static maprow *
178map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
179{ 273{
180 if (0 > y) 274 if (0 > y)
181 { 275 {
182 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
183 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
221 315
222 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
223} 317}
224 318
225static mapcell * 319static mapcell *
226map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
227{ 321{
228 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
229} 323}
230 324
231static void 325static void
232map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
233{ 327{
234 int r; 328 int r;
235 329
236 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
237 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
245 self->row = 0; 339 self->row = 0;
246 self->rows = 0; 340 self->rows = 0;
247} 341}
248 342
249static void 343static void
250map_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)
251{ 345{
252 int x, y; 346 int x, y;
253 maprow *row; 347 maprow *row;
348 mapcell *cell;
254 349
255 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
256 if (y >= 0) 351 if (y >= 0)
257 { 352 {
258 if (y >= self->rows) 353 if (y >= self->rows)
264 if (x >= row->c0) 359 if (x >= row->c0)
265 { 360 {
266 if (x >= row->c1) 361 if (x >= row->c1)
267 break; 362 break;
268 363
269 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;
270 } 370 }
271 } 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);
272} 388}
273 389
274static void 390static void
275music_finished (void) 391music_finished (void)
276{ 392{
295 ev.data2 = 0; 411 ev.data2 = 0;
296 412
297 SDL_PushEvent ((SDL_Event *)&ev); 413 SDL_PushEvent ((SDL_Event *)&ev);
298} 414}
299 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
300MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
301 438
302PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
303 440
304BOOT: 441BOOT:
305{ 442{
306 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
307 static const struct { 444 static const struct {
308 const char *name; 445 const char *name;
309 IV iv; 446 IV iv;
310 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
311# 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
312 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
313 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
314 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
315 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
316 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
325 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
326 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
327 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
328 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
329 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
330 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
331 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
332 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
333 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
334 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
389 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
390 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
391 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
392 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
393 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
394 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
395 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
396 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
397 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
398 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
399 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
400 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
401 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
402 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
403 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
404 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
405 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
406 const_iv (KMOD_CTRL),
407 const_iv (KMOD_SHIFT),
408 const_iv (KMOD_ALT),
409 const_iv (KMOD_META)
410# undef const_iv 556# undef const_iv
411 }; 557 };
412 558
413 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; )
414 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);
415} 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)
416 582
417void 583void
418pango_init () 584pango_init ()
419 CODE: 585 CODE:
420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{ 586{
422 {
423 ft2_fontmap = pango_ft2_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
424 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);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426 }
427
428 {
429 cairo_font_options_t *fopt = cairo_font_options_create ();
430 cairo_fontmap = pango_cairo_font_map_get_default ();
431 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435 pango_cairo_context_set_font_options (cairo_context, fopt);
436 cairo_font_options_destroy (fopt);
437 }
438} 590}
439 591
440int 592int
441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
442 594
443void 595void
444SDL_Quit () 596SDL_Quit ()
445 597
446void 598void
453 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456 608
457 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459 611
460 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464 616
465 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
466 622
467 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
468 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469 625
470 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
490 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
491 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
492 ); 648 );
493 if (RETVAL) 649 if (RETVAL)
494 { 650 {
651 av_clear (texture_av);
652
495 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
496# 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);
497# include "glfunc.h" 655# include "glfunc.h"
498# undef GL_FUNC 656# undef GL_FUNC
657
499 } 658 }
500 OUTPUT: 659 OUTPUT:
501 RETVAL 660 RETVAL
502 661
503void 662void
505 664
506char * 665char *
507SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
508 667
509void 668void
510SDL_PollEvent () 669poll_events ()
511 PPCODE: 670 PPCODE:
512{ 671{
513 SDL_Event ev; 672 SDL_Event ev;
514 673
515 while (SDL_PollEvent (&ev)) 674 SDL_PumpEvents ();
675 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
516 { 676 {
517 HV *hv = newHV (); 677 HV *hv = newHV ();
518 hv_store (hv, "type", 4, newSViv (ev.type), 0); 678 hv_store (hv, "type", 4, newSViv (ev.type), 0);
519 679
520 switch (ev.type) 680 switch (ev.type)
522 case SDL_KEYDOWN: 682 case SDL_KEYDOWN:
523 case SDL_KEYUP: 683 case SDL_KEYUP:
524 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 684 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
525 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 685 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
526 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 */
527 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 688 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
528 break; 689 break;
529 690
530 case SDL_ACTIVEEVENT: 691 case SDL_ACTIVEEVENT:
531 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 692 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
532 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 693 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
533 break; 694 break;
534 695
535 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
536 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 715 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
537
538 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 716 hv_store (hv, "state", 5, newSViv (state), 0);
539 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 717 hv_store (hv, "x", 1, newSViv (x), 0);
540 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 718 hv_store (hv, "y", 1, newSViv (y), 0);
541 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 719 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
542 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 720 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
721 }
543 break; 722 break;
544 723
545 case SDL_MOUSEBUTTONDOWN: 724 case SDL_MOUSEBUTTONDOWN:
546 case SDL_MOUSEBUTTONUP: 725 case SDL_MOUSEBUTTONUP:
547 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 726 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
557 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 736 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 737 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559 break; 738 break;
560 } 739 }
561 740
562 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 741 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563 } 742 }
564} 743}
565 744
566int 745int
567Mix_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)
576Mix_AllocateChannels (int numchans = -1) 755Mix_AllocateChannels (int numchans = -1)
577 756
578void 757void
579lowdelay (int fd, int val = 1) 758lowdelay (int fd, int val = 1)
580 CODE: 759 CODE:
760 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
761
762void
763win32_proxy_info ()
764 PPCODE:
765{
581#ifndef _WIN32 766#ifdef _WIN32
582 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 }
583#endif 788#endif
789}
584 790
585void 791void
586add_font (char *file) 792add_font (char *file)
587 CODE: 793 CODE:
588 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 794 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589#ifdef _WIN32
590 // cairo... sigh... requires win2000
591 AddFontResourceEx (file, FR_PRIVATE, 0);
592#endif
593 795
594void 796void
595load_image_inline (SV *image_) 797load_image_inline (SV *image_)
596 ALIAS: 798 ALIAS:
597 load_image_file = 1 799 load_image_file = 1
639 841
640 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 842 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641 843
642 assert (surface2->pitch == surface2->w * 4); 844 assert (surface2->pitch == surface2->w * 4);
643 845
846 SDL_LockSurface (surface2);
644 EXTEND (SP, 5); 847 EXTEND (SP, 6);
645 PUSHs (sv_2mortal (newSViv (surface2->w))); 848 PUSHs (sv_2mortal (newSViv (surface2->w)));
646 PUSHs (sv_2mortal (newSViv (surface2->h))); 849 PUSHs (sv_2mortal (newSViv (surface2->h)));
647 SDL_LockSurface (surface2);
648 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 850 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
649 SDL_UnlockSurface (surface2);
650 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)));
651 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 852 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 853 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
854 SDL_UnlockSurface (surface2);
653 855
654 SDL_FreeSurface (surface); 856 SDL_FreeSurface (surface);
655 SDL_FreeSurface (surface2); 857 SDL_FreeSurface (surface2);
656} 858}
657 859
693 CODE: 895 CODE:
694 fprintf (stderr, "FATAL: %s\n", message); 896 fprintf (stderr, "FATAL: %s\n", message);
695#ifdef _WIN32 897#ifdef _WIN32
696 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 898 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697#endif 899#endif
698 exit (1); 900 _exit (1);
699 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
700MODULE = CFClient PACKAGE = CFClient::Font 920MODULE = CFPlus PACKAGE = CFPlus::Font
701 921
702CFClient::Font 922CFPlus::Font
703new_from_file (SV *class, char *path, int id = 0) 923new_from_file (SV *class, char *path, int id = 0)
704 CODE: 924 CODE:
705{ 925{
706 int count; 926 int count;
707 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 927 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
710} 930}
711 OUTPUT: 931 OUTPUT:
712 RETVAL 932 RETVAL
713 933
714void 934void
715DESTROY (CFClient::Font self) 935DESTROY (CFPlus::Font self)
716 CODE: 936 CODE:
717 pango_font_description_free (self); 937 pango_font_description_free (self);
718 938
719void 939void
720make_default (CFClient::Font self) 940make_default (CFPlus::Font self)
721 CODE: 941 CODE:
722 default_font = self; 942 default_font = self;
723 943
724MODULE = CFClient PACKAGE = CFClient::Layout 944MODULE = CFPlus PACKAGE = CFPlus::Layout
725 945
726CFClient::Layout 946void
727new (SV *class, int rgba = 0) 947reset_glyph_cache ()
728 CODE: 948 CODE:
729#if _WIN32 949 tc_clear ();
730 //rgba = 0;//D makes text nicer, breaks TextView 950
731#endif 951CFPlus::Layout
732 rgba=1;//D 952new (SV *class)
953 CODE:
733 New (0, RETVAL, 1, struct cf_layout); 954 New (0, RETVAL, 1, struct cf_layout);
734 955
735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 956 RETVAL->pl = pango_layout_new (opengl_context);
736 RETVAL->rgba = rgba;
737 RETVAL->r = 1.; 957 RETVAL->r = 1.;
738 RETVAL->g = 1.; 958 RETVAL->g = 1.;
739 RETVAL->b = 1.; 959 RETVAL->b = 1.;
740 RETVAL->a = 1.; 960 RETVAL->a = 1.;
741 RETVAL->base_height = MIN_FONT_HEIGHT; 961 RETVAL->base_height = MIN_FONT_HEIGHT;
745 layout_update_font (RETVAL); 965 layout_update_font (RETVAL);
746 OUTPUT: 966 OUTPUT:
747 RETVAL 967 RETVAL
748 968
749void 969void
750DESTROY (CFClient::Layout self) 970DESTROY (CFPlus::Layout self)
751 CODE: 971 CODE:
752 g_object_unref (self->pl); 972 g_object_unref (self->pl);
753 Safefree (self); 973 Safefree (self);
754 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
755int 1065int
756is_rgba (CFClient::Layout self) 1066has_wrapped (CFPlus::Layout self)
757 CODE: 1067 CODE:
758 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}
759 OUTPUT: 1077 OUTPUT:
760 RETVAL 1078 RETVAL
761 1079
762void
763set_text (CFClient::Layout self, SV *text_)
764 CODE:
765{
766 STRLEN textlen;
767 char *text = SvPVutf8 (text_, textlen);
768
769 pango_layout_set_text (self->pl, text, textlen);
770}
771
772void
773set_markup (CFClient::Layout self, SV *text_)
774 CODE:
775{
776 STRLEN textlen;
777 char *text = SvPVutf8 (text_, textlen);
778
779 pango_layout_set_markup (self->pl, text, textlen);
780}
781
782SV * 1080SV *
783get_text (CFClient::Layout self) 1081get_text (CFPlus::Layout self)
784 CODE: 1082 CODE:
785 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1083 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786 SvUTF8_on (RETVAL); 1084 sv_utf8_decode (RETVAL);
787 OUTPUT: 1085 OUTPUT:
788 RETVAL 1086 RETVAL
789 1087
790void 1088void
791set_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.)
792 CODE: 1090 CODE:
793 self->r = r; 1091 self->r = r;
794 self->g = g; 1092 self->g = g;
795 self->b = b; 1093 self->b = b;
796 self->a = a; 1094 self->a = a;
797 1095
798void 1096void
799set_font (CFClient::Layout self, CFClient::Font font = 0) 1097set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800 CODE: 1098 CODE:
801 if (self->font != font) 1099 if (self->font != font)
802 { 1100 {
803 self->font = font; 1101 self->font = font;
804 layout_update_font (self); 1102 layout_update_font (self);
805 } 1103 }
806 1104
807void 1105void
808set_height (CFClient::Layout self, int base_height) 1106set_height (CFPlus::Layout self, int base_height)
809 CODE: 1107 CODE:
810 if (self->base_height != base_height) 1108 if (self->base_height != base_height)
811 { 1109 {
812 self->base_height = base_height; 1110 self->base_height = base_height;
813 layout_update_font (self); 1111 layout_update_font (self);
814 } 1112 }
815 1113
816void 1114void
817set_width (CFClient::Layout self, int max_width = -1) 1115set_width (CFPlus::Layout self, int max_width = -1)
818 CODE: 1116 CODE:
819 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);
820 1118
821void 1119void
822set_indent (CFClient::Layout self, int indent) 1120set_indent (CFPlus::Layout self, int indent)
823 CODE: 1121 CODE:
824 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1122 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825 1123
826void 1124void
827set_spacing (CFClient::Layout self, int spacing) 1125set_spacing (CFPlus::Layout self, int spacing)
828 CODE: 1126 CODE:
829 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1127 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830 1128
831void 1129void
832set_ellipsise (CFClient::Layout self, int ellipsise) 1130set_ellipsise (CFPlus::Layout self, int ellipsise)
833 CODE: 1131 CODE:
834 pango_layout_set_ellipsize (self->pl, 1132 pango_layout_set_ellipsize (self->pl,
835 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1133 ellipsise == 1 ? PANGO_ELLIPSIZE_START
836 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1134 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1135 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
838 : PANGO_ELLIPSIZE_NONE 1136 : PANGO_ELLIPSIZE_NONE
839 ); 1137 );
840 1138
841void 1139void
842set_single_paragraph_mode (CFClient::Layout self, int spm) 1140set_single_paragraph_mode (CFPlus::Layout self, int spm)
843 CODE: 1141 CODE:
844 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1142 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845 1143
846void 1144void
847size (CFClient::Layout self) 1145size (CFPlus::Layout self)
848 PPCODE: 1146 PPCODE:
849{ 1147{
850 int w, h; 1148 int w, h;
851 1149
852 layout_get_pixel_size (self, &w, &h); 1150 layout_get_pixel_size (self, &w, &h);
855 PUSHs (sv_2mortal (newSViv (w))); 1153 PUSHs (sv_2mortal (newSViv (w)));
856 PUSHs (sv_2mortal (newSViv (h))); 1154 PUSHs (sv_2mortal (newSViv (h)));
857} 1155}
858 1156
859int 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
860xy_to_index (CFClient::Layout self, int x, int y) 1170xy_to_index (CFPlus::Layout self, int x, int y)
861 CODE: 1171 CODE:
862{ 1172{
863 int index, trailing; 1173 int index, trailing;
864 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);
865 RETVAL = index; 1175 RETVAL = index + trailing;
866} 1176}
867 OUTPUT: 1177 OUTPUT:
868 RETVAL 1178 RETVAL
869 1179
870void 1180void
871cursor_pos (CFClient::Layout self, int index) 1181cursor_pos (CFPlus::Layout self, int index)
872 PPCODE: 1182 PPCODE:
873{ 1183{
874 PangoRectangle strong_pos; 1184 PangoRectangle strong_pos;
875 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1185 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876 1186
879 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1189 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1190 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881} 1191}
882 1192
883void 1193void
884render (CFClient::Layout self) 1194index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
885 PPCODE: 1195 PPCODE:
886{ 1196{
887 SV *retval; 1197 int line, x;
888 int w, h;
889 1198
890 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 */
891 1201
892 if (self->rgba)
893 {
894 cairo_surface_t *surface;
895 cairo_t *cairo;
896
897 retval = newSV (w * h * 4);
898 SvPOK_only (retval);
899 SvCUR_set (retval, w * h * 4);
900
901 memset (SvPVX (retval), 0, w * h * 4);
902
903 surface = cairo_image_surface_create_for_data (
904 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
905 cairo = cairo_create (surface);
906 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
907
908 pango_cairo_show_layout (cairo, self->pl);
909
910 cairo_destroy (cairo);
911 cairo_surface_destroy (surface);
912
913 // what a mess, and its premultiplied, too :(
914 {
915 uint32_t *p = (uint32_t *)SvPVX (retval);
916 uint32_t *e = p + w * h;
917
918 while (p < e)
919 {
920 uint32_t rgba = *p;
921 rgba = (rgba >> 24) | (rgba << 8);
922#if 0
923#ifdef _WIN32
924 {//D
925 uint8_t r = rgba >> 24;
926 uint8_t g = rgba >> 16;
927 uint8_t b = rgba >> 8;
928 uint8_t a = rgba >> 0;
929
930 rgba = (rgba & 0xffffff00) | a;
931 }
932#endif
933#endif
934 rgba = SDL_SwapBE32 (rgba);
935 *p++ = rgba;
936 }
937 }
938
939 EXTEND (SP, 5); 1202 EXTEND (SP, 2);
940 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)
941 PUSHs (sv_2mortal (newSViv (h))); 1224 PUSHs (sv_2mortal (newSViv (index + trailing)));
942 PUSHs (sv_2mortal (retval));
943 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945 }
946 else 1225 else
947 { 1226 {
948 FT_Bitmap bitmap;
949
950 retval = newSV (w * h);
951 SvPOK_only (retval);
952 SvCUR_set (retval, w * h);
953
954 bitmap.rows = h;
955 bitmap.width = w;
956 bitmap.pitch = w;
957 bitmap.buffer = (unsigned char*)SvPVX (retval);
958 bitmap.num_grays = 256;
959 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
960
961 memset (bitmap.buffer, 0, w * h);
962
963 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
964
965 EXTEND (SP, 5);
966 PUSHs (sv_2mortal (newSViv (w))); 1227 PUSHs (sv_2mortal (newSViv (index)));
967 PUSHs (sv_2mortal (newSViv (h))); 1228 PUSHs (sv_2mortal (newSViv (trailing)));
968 PUSHs (sv_2mortal (retval));
969 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971 } 1229 }
972} 1230}
973 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
974MODULE = CFClient PACKAGE = CFClient::Texture 1242MODULE = CFPlus PACKAGE = CFPlus::Texture
975 1243
976void 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
977draw_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.)
978 PROTOTYPE: $$$;$$ 1283 PROTOTYPE: $$$;$$
979 ALIAS: 1284 ALIAS:
980 draw_quad_alpha = 1 1285 draw_quad_alpha = 1
981 draw_quad_alpha_premultiplied = 2 1286 draw_quad_alpha_premultiplied = 2
982 CODE: 1287 CODE:
1020 glDisable (GL_ALPHA_TEST); 1325 glDisable (GL_ALPHA_TEST);
1021 glDisable (GL_BLEND); 1326 glDisable (GL_BLEND);
1022 } 1327 }
1023} 1328}
1024 1329
1025MODULE = CFClient PACKAGE = CFClient::Map 1330MODULE = CFPlus PACKAGE = CFPlus::Map
1026 1331
1027CFClient::Map 1332CFPlus::Map
1028new (SV *class, int map_width, int map_height) 1333new (SV *class)
1029 CODE: 1334 CODE:
1030 New (0, RETVAL, 1, struct map); 1335 New (0, RETVAL, 1, struct map);
1031 RETVAL->x = 0; 1336 RETVAL->x = 0;
1032 RETVAL->y = 0; 1337 RETVAL->y = 0;
1033 RETVAL->w = map_width; 1338 RETVAL->w = 0;
1034 RETVAL->h = map_height; 1339 RETVAL->h = 0;
1035 RETVAL->ox = 0; 1340 RETVAL->ox = 0;
1036 RETVAL->oy = 0; 1341 RETVAL->oy = 0;
1037 RETVAL->faces = 8192; 1342 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1038 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1343 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1039 RETVAL->texs = 8192;
1040 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1041 RETVAL->rows = 0; 1344 RETVAL->rows = 0;
1042 RETVAL->row = 0; 1345 RETVAL->row = 0;
1043 OUTPUT: 1346 OUTPUT:
1044 RETVAL 1347 RETVAL
1045 1348
1046void 1349void
1047DESTROY (CFClient::Map self) 1350DESTROY (CFPlus::Map self)
1048 CODE: 1351 CODE:
1049{ 1352{
1050 map_clear (self); 1353 map_clear (self);
1051 Safefree (self->face); 1354 Safefree (self->face2tile);
1355 Safefree (self->tex);
1052 Safefree (self); 1356 Safefree (self);
1053} 1357}
1054 1358
1055void 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
1056clear (CFClient::Map self) 1366clear (CFPlus::Map self)
1057 CODE: 1367 CODE:
1058 map_clear (self); 1368 map_clear (self);
1059 1369
1060void 1370void
1061set_face (CFClient::Map self, int face, int texid) 1371set_tileid (CFPlus::Map self, int face, int tile)
1062 CODE: 1372 CODE:
1063{ 1373{
1064 while (self->faces <= face) 1374 need_facenum (self, face); self->face2tile [face] = tile;
1065 { 1375 need_texid (self, tile);
1066 Append (mapface, self->face, self->faces, self->faces);
1067 self->faces *= 2;
1068 }
1069
1070 self->face [face] = texid;
1071} 1376}
1072 1377
1073void 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
1074set_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)
1075 CODE: 1403 CODE:
1076{ 1404{
1077 while (self->texs <= texid) 1405 need_texid (self, texid);
1078 {
1079 Append (maptex, self->tex, self->texs, self->texs);
1080 self->texs *= 2;
1081 }
1082 1406
1083 { 1407 {
1084 maptex *tex = self->tex + texid; 1408 maptex *tex = self->tex + texid;
1085 1409
1086 tex->name = name; 1410 tex->name = name;
1103 // from transparent color bleeding and ugly wrapping effects. 1427 // from transparent color bleeding and ugly wrapping effects.
1104 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1428 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105} 1429}
1106 1430
1107int 1431int
1108ox (CFClient::Map self) 1432ox (CFPlus::Map self)
1109 ALIAS: 1433 ALIAS:
1110 oy = 1 1434 oy = 1
1111 x = 2 1435 x = 2
1112 y = 3 1436 y = 3
1113 w = 4 1437 w = 4
1124 } 1448 }
1125 OUTPUT: 1449 OUTPUT:
1126 RETVAL 1450 RETVAL
1127 1451
1128void 1452void
1129scroll (CFClient::Map self, int dx, int dy) 1453scroll (CFPlus::Map self, int dx, int dy)
1130 CODE: 1454 CODE:
1131{ 1455{
1132 if (dx > 0) 1456 if (dx > 0)
1133 map_blank (self, self->x, self->y, dx - 1, self->h); 1457 map_blank (self, self->x, self->y, dx, self->h);
1134 else if (dx < 0) 1458 else if (dx < 0)
1135 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);
1136 1460
1137 if (dy > 0) 1461 if (dy > 0)
1138 map_blank (self, self->x, self->y, self->w, dy - 1); 1462 map_blank (self, self->x, self->y, self->w, dy);
1139 else if (dy < 0) 1463 else if (dy < 0)
1140 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);
1141 1465
1142 self->ox += dx; self->x += dx; 1466 self->ox += dx; self->x += dx;
1143 self->oy += dy; self->y += dy; 1467 self->oy += dy; self->y += dy;
1144 1468
1145 while (self->y < 0) 1469 while (self->y < 0)
1150 self->y += MAP_EXTEND_Y; 1474 self->y += MAP_EXTEND_Y;
1151 } 1475 }
1152} 1476}
1153 1477
1154void 1478void
1155map1a_update (CFClient::Map self, SV *data_) 1479map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156 CODE: 1480 CODE:
1157{ 1481{
1158 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1482 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1159 uint8_t *data_end = (uint8_t *)SvEND (data_); 1483 uint8_t *data_end = (uint8_t *)SvEND (data_);
1160 mapcell *cell; 1484 mapcell *cell;
1161 int x, y, flags; 1485 int x, y, flags;
1162 1486
1163 while (data < data_end) 1487 while (data < data_end - 1)
1164 { 1488 {
1165 flags = (data [0] << 8) + data [1]; data += 2; 1489 flags = (data [0] << 8) + data [1]; data += 2;
1166 1490
1167 x = ((flags >> 10) & 63) + self->x; 1491 x = self->x + ((flags >> 10) & 63);
1168 y = ((flags >> 4) & 63) + self->y; 1492 y = self->y + ((flags >> 4) & 63);
1169 1493
1170 cell = map_get_cell (self, x, y); 1494 cell = map_get_cell (self, x, y);
1171 1495
1172 if (flags & 15) 1496 if (flags & 15)
1173 { 1497 {
1174 if (cell->darkness < 0) 1498 if (!cell->darkness)
1175 { 1499 {
1500 memset (cell, 0, sizeof (*cell));
1176 cell->darkness = 0; 1501 cell->darkness = 256;
1177 cell->face [0] = 0;
1178 cell->face [1] = 0;
1179 cell->face [2] = 0;
1180 } 1502 }
1181 1503
1182 cell->darkness = flags & 8 ? *data++ : 255;
1183
1184 //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 }
1185 1545
1186 if (flags & 4) 1546 if (flags & 4)
1187 { 1547 {
1188 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];
1189 } 1551 }
1190 1552
1191 if (flags & 2) 1553 if (flags & 2)
1192 { 1554 {
1193 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];
1194 } 1558 }
1195 1559
1196 if (flags & 1) 1560 if (flags & 1)
1197 { 1561 {
1198 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];
1199 } 1565 }
1200 } 1566 }
1201 else 1567 else
1202 cell->darkness = -1; 1568 cell->darkness = 0;
1203 } 1569 }
1204} 1570}
1205 1571
1206SV * 1572SV *
1207mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1573mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1208 CODE: 1574 CODE:
1209{ 1575{
1210 int x1, x; 1576 int x1, x;
1211 int y1, y; 1577 int y1, y;
1212 int z; 1578 int z;
1233 { 1599 {
1234 mapcell *cell = row->col + (x - row->c0); 1600 mapcell *cell = row->col + (x - row->c0);
1235 1601
1236 for (z = 0; z <= 0; z++) 1602 for (z = 0; z <= 0; z++)
1237 { 1603 {
1238 mapface face = cell->face [z];
1239
1240 if (face)
1241 {
1242 maptex tex = self->tex [face]; 1604 maptex tex = self->tex [cell->tile [z]];
1243 int a0 = 255 - tex.a; 1605 int a0 = 255 - tex.a;
1244 int a1 = tex.a; 1606 int a1 = tex.a;
1245 1607
1246 r = (r * a0 + tex.r * a1) / 255; 1608 r = (r * a0 + tex.r * a1) / 255;
1247 g = (g * a0 + tex.g * a1) / 255; 1609 g = (g * a0 + tex.g * a1) / 255;
1248 b = (b * a0 + tex.b * a1) / 255; 1610 b = (b * a0 + tex.b * a1) / 255;
1249 a = (a * a0 + tex.a * a1) / 255; 1611 a = (a * a0 + tex.a * a1) / 255;
1250 }
1251 } 1612 }
1252 } 1613 }
1253 1614
1254 *map++ = (r ) 1615 *map++ = (r )
1255 | (g << 8) 1616 | (g << 8)
1262} 1623}
1263 OUTPUT: 1624 OUTPUT:
1264 RETVAL 1625 RETVAL
1265 1626
1266void 1627void
1267draw (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)
1268 PPCODE: 1629 CODE:
1269{ 1630{
1270 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;
1271 int x, y, z; 1635 int x, y, z;
1272 int last_name; 1636 int last_name;
1273 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;
1274 int sw4 = (sw + 3) & ~3; 1955 int sw4 = (sw + 3) & ~3;
1275 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1956 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1276 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1957 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1277 1958
1278 memset (darkness, 255, sw4 * sh); 1959 memset (darkness, 255, sw4 * sh);
1279 SvPOK_only (darkness_sv); 1960 SvPOK_only (darkness_sv);
1280 SvCUR_set (darkness_sv, sw4 * sh); 1961 SvCUR_set (darkness_sv, sw4 * sh);
1281 1962
1282 vx = self->x + (self->w - sw) / 2 - shift_x; 1963 mx += self->x;
1283 vy = self->y + (self->h - sh) / 2 - shift_y; 1964 my += self->y;
1284 1965
1285 /*
1286 int vx = self->vx = self->w >= sw
1287 ? self->x + (self->w - sw) / 2
1288 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1289
1290 int vy = self->vy = self->h >= sh
1291 ? self->y + (self->h - sh) / 2
1292 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1293 */
1294
1295 glColor4ub (255, 255, 255, 255);
1296
1297 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298 glEnable (GL_BLEND);
1299 glEnable (GL_TEXTURE_2D);
1300 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301
1302 glBegin (GL_QUADS);
1303
1304 last_name = 0;
1305
1306 for (z = 0; z < 3; z++)
1307 for (y = 0; y < sh; y++) 1966 for (y = 0; y < sh; y++)
1308 if (0 <= y + vy && y + vy < self->rows) 1967 if (0 <= y + my && y + my < self->rows)
1309 { 1968 {
1310 maprow *row = self->row + (y + vy); 1969 maprow *row = self->row + (y + my);
1311 1970
1312 for (x = 0; x < sw; x++) 1971 for (x = 0; x < sw; x++)
1313 if (row->c0 <= x + vx && x + vx < row->c1) 1972 if (row->c0 <= x + mx && x + mx < row->c1)
1314 { 1973 {
1315 mapcell *cell = row->col + (x + vx - row->c0); 1974 mapcell *cell = row->col + (x + mx - row->c0);
1316 1975
1317 darkness[y * sw4 + x] = cell->darkness < 0 1976 darkness[y * sw4 + x] = cell->darkness
1977 ? 255 - (cell->darkness - 1)
1318 ? 255 - FOW_DARKNESS 1978 : 255 - FOW_DARKNESS;
1319 : 255 - cell->darkness;
1320
1321 face = cell->face [z];
1322
1323 if (face)
1324 {
1325 maptex tex = self->tex [face];
1326
1327 int px = (x + 1) * 32 - tex.w;
1328 int py = (y + 1) * 32 - tex.h;
1329
1330 if (last_name != tex.name)
1331 {
1332 glEnd ();
1333 last_name = tex.name;
1334 glBindTexture (GL_TEXTURE_2D, last_name);
1335 glBegin (GL_QUADS);
1336 }
1337
1338 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1341 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1342 }
1343 } 1979 }
1344 } 1980 }
1345
1346 glEnd ();
1347
1348 glDisable (GL_TEXTURE_2D);
1349 glDisable (GL_BLEND);
1350 1981
1351 EXTEND (SP, 3); 1982 EXTEND (SP, 3);
1352 PUSHs (sv_2mortal (newSViv (sw4))); 1983 PUSHs (sv_2mortal (newSViv (sw4)));
1353 PUSHs (sv_2mortal (newSViv (sh))); 1984 PUSHs (sv_2mortal (newSViv (sh)));
1354 PUSHs (darkness_sv); 1985 PUSHs (darkness_sv);
1355} 1986}
1356 1987
1357SV * 1988SV *
1358get_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)
1359 CODE: 1990 CODE:
1360{ 1991{
1361 int x, y, x1, y1; 1992 int x, y, x1, y1;
1362 SV *data_sv = newSV (w * h * 7 + 5); 1993 SV *data_sv = newSV (w * h * 7 + 5);
1363 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1994 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1388 if (row && row->c0 <= x && x < row->c1) 2019 if (row && row->c0 <= x && x < row->c1)
1389 { 2020 {
1390 mapcell *cell = row->col + (x - row->c0); 2021 mapcell *cell = row->col + (x - row->c0);
1391 uint8_t flags = 0; 2022 uint8_t flags = 0;
1392 2023
1393 if (cell->face [0]) flags |= 1; 2024 if (cell->tile [0]) flags |= 1;
1394 if (cell->face [1]) flags |= 2; 2025 if (cell->tile [1]) flags |= 2;
1395 if (cell->face [2]) flags |= 4; 2026 if (cell->tile [2]) flags |= 4;
1396 2027
1397 *data++ = flags; 2028 *data++ = flags;
1398 2029
1399 if (flags & 1) 2030 if (flags & 1)
1400 { 2031 {
2032 tileid tile = cell->tile [0];
1401 *data++ = cell->face [0] >> 8; 2033 *data++ = tile >> 8;
1402 *data++ = cell->face [0]; 2034 *data++ = tile;
1403 } 2035 }
1404 2036
1405 if (flags & 2) 2037 if (flags & 2)
1406 { 2038 {
2039 tileid tile = cell->tile [1];
1407 *data++ = cell->face [1] >> 8; 2040 *data++ = tile >> 8;
1408 *data++ = cell->face [1]; 2041 *data++ = tile;
1409 } 2042 }
1410 2043
1411 if (flags & 4) 2044 if (flags & 4)
1412 { 2045 {
2046 tileid tile = cell->tile [2];
1413 *data++ = cell->face [2] >> 8; 2047 *data++ = tile >> 8;
1414 *data++ = cell->face [2]; 2048 *data++ = tile;
1415 } 2049 }
1416 } 2050 }
1417 else 2051 else
1418 *data++ = 0; 2052 *data++ = 0;
1419 } 2053 }
1425} 2059}
1426 OUTPUT: 2060 OUTPUT:
1427 RETVAL 2061 RETVAL
1428 2062
1429void 2063void
1430set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2064set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1431 PPCODE: 2065 PPCODE:
1432{ 2066{
1433 int x, y, z; 2067 int x, y, z;
1434 int w, h; 2068 int w, h;
1435 int x1, y1; 2069 int x1, y1;
1459 { 2093 {
1460 uint8_t flags = *data++; 2094 uint8_t flags = *data++;
1461 2095
1462 if (flags) 2096 if (flags)
1463 { 2097 {
1464 mapface face[3] = { 0, 0, 0 };
1465
1466 mapcell *cell = row_get_cell (row, x); 2098 mapcell *cell = row_get_cell (row, x);
2099 tileid tile[3] = { 0, 0, 0 };
1467 2100
1468 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2101 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1469 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2102 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1470 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2103 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1471 2104
1472 if (cell->darkness <= 0) 2105 if (cell->darkness == 0)
1473 { 2106 {
1474 cell->darkness = -1; 2107 cell->darkness = 0;
1475 2108
1476 for (z = 0; z <= 2; z++) 2109 for (z = 0; z <= 2; z++)
1477 { 2110 {
1478 cell->face[z] = face[z]; 2111 tileid t = tile [z];
1479 2112
1480 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2113 if (t >= self->texs || (t && !self->tex [t].name))
2114 {
1481 XPUSHs (sv_2mortal (newSViv (face[z]))); 2115 XPUSHs (sv_2mortal (newSViv (t)));
2116 need_texid (self, t);
2117 }
2118
2119 cell->tile [z] = t;
1482 } 2120 }
1483 } 2121 }
1484 } 2122 }
1485 } 2123 }
1486 } 2124 }
1487} 2125}
1488 2126
1489MODULE = CFClient PACKAGE = CFClient::MixChunk 2127MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490 2128
1491CFClient::MixChunk 2129CFPlus::MixChunk
1492new_from_file (SV *class, char *path) 2130new_from_file (SV *class, char *path)
1493 CODE: 2131 CODE:
1494 RETVAL = Mix_LoadWAV (path); 2132 RETVAL = Mix_LoadWAV (path);
1495 OUTPUT: 2133 OUTPUT:
1496 RETVAL 2134 RETVAL
1497 2135
1498void 2136void
1499DESTROY (CFClient::MixChunk self) 2137DESTROY (CFPlus::MixChunk self)
1500 CODE: 2138 CODE:
1501 Mix_FreeChunk (self); 2139 Mix_FreeChunk (self);
1502 2140
1503int 2141int
1504volume (CFClient::MixChunk self, int volume = -1) 2142volume (CFPlus::MixChunk self, int volume = -1)
1505 CODE: 2143 CODE:
1506 RETVAL = Mix_VolumeChunk (self, volume); 2144 RETVAL = Mix_VolumeChunk (self, volume);
1507 OUTPUT: 2145 OUTPUT:
1508 RETVAL 2146 RETVAL
1509 2147
1510int 2148int
1511play (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)
1512 CODE: 2150 CODE:
1513 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2151 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514 OUTPUT: 2152 OUTPUT:
1515 RETVAL 2153 RETVAL
1516 2154
1517MODULE = CFClient PACKAGE = CFClient::MixMusic 2155MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518 2156
1519int 2157int
1520volume (int volume = -1) 2158volume (int volume = -1)
1521 CODE: 2159 CODE:
1522 RETVAL = Mix_VolumeMusic (volume); 2160 RETVAL = Mix_VolumeMusic (volume);
1523 OUTPUT: 2161 OUTPUT:
1524 RETVAL 2162 RETVAL
1525 2163
2164int
2165fade_out (int ms)
2166 CODE:
2167 RETVAL = Mix_FadeOutMusic (ms);
2168 OUTPUT:
2169 RETVAL
2170
1526CFClient::MixMusic 2171CFPlus::MixMusic
1527new_from_file (SV *class, char *path) 2172new_from_file (SV *class, char *path)
1528 CODE: 2173 CODE:
1529 RETVAL = Mix_LoadMUS (path); 2174 RETVAL = Mix_LoadMUS (path);
1530 OUTPUT: 2175 OUTPUT:
1531 RETVAL 2176 RETVAL
1532 2177
1533void 2178void
1534DESTROY (CFClient::MixMusic self) 2179DESTROY (CFPlus::MixMusic self)
1535 CODE: 2180 CODE:
1536 Mix_FreeMusic (self); 2181 Mix_FreeMusic (self);
1537 2182
1538int 2183int
1539play (CFClient::MixMusic self, int loops = -1) 2184play (CFPlus::MixMusic self, int loops = -1)
1540 CODE: 2185 CODE:
1541 RETVAL = Mix_PlayMusic (self, loops); 2186 RETVAL = Mix_PlayMusic (self, loops);
1542 OUTPUT: 2187 OUTPUT:
1543 RETVAL 2188 RETVAL
1544 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
1545MODULE = CFClient PACKAGE = CFClient::OpenGL 2197MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546 2198
1547BOOT: 2199BOOT:
1548{ 2200{
1549 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2201 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550 static const struct { 2202 static const struct {
1551 const char *name; 2203 const char *name;
1552 IV iv; 2204 IV iv;
1553 } *civ, const_iv[] = { 2205 } *civ, const_iv[] = {
1554# define const_iv(name) { # name, (IV)name } 2206# define const_iv(name) { # name, (IV)name }
1561 const_iv (GL_SCISSOR_TEST), 2213 const_iv (GL_SCISSOR_TEST),
1562 const_iv (GL_DEPTH_TEST), 2214 const_iv (GL_DEPTH_TEST),
1563 const_iv (GL_ALPHA_TEST), 2215 const_iv (GL_ALPHA_TEST),
1564 const_iv (GL_NORMALIZE), 2216 const_iv (GL_NORMALIZE),
1565 const_iv (GL_RESCALE_NORMAL), 2217 const_iv (GL_RESCALE_NORMAL),
2218 const_iv (GL_FRONT),
2219 const_iv (GL_BACK),
1566 const_iv (GL_AND), 2220 const_iv (GL_AND),
1567 const_iv (GL_ONE), 2221 const_iv (GL_ONE),
1568 const_iv (GL_ZERO), 2222 const_iv (GL_ZERO),
1569 const_iv (GL_SRC_ALPHA), 2223 const_iv (GL_SRC_ALPHA),
1570 const_iv (GL_DST_ALPHA), 2224 const_iv (GL_DST_ALPHA),
1571 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2225 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572 const_iv (GL_ONE_MINUS_DST_ALPHA), 2226 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE), 2227 const_iv (GL_SRC_ALPHA_SATURATE),
1574 const_iv (GL_RGB), 2228 const_iv (GL_RGB),
1575 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),
1576 const_iv (GL_UNSIGNED_BYTE), 2233 const_iv (GL_UNSIGNED_BYTE),
1577 const_iv (GL_UNSIGNED_SHORT), 2234 const_iv (GL_UNSIGNED_SHORT),
1578 const_iv (GL_UNSIGNED_INT), 2235 const_iv (GL_UNSIGNED_INT),
1579 const_iv (GL_ALPHA), 2236 const_iv (GL_ALPHA),
1580 const_iv (GL_INTENSITY), 2237 const_iv (GL_INTENSITY),
1612 const_iv (GL_SEPARABLE_2D), 2269 const_iv (GL_SEPARABLE_2D),
1613 const_iv (GL_CONVOLUTION_2D), 2270 const_iv (GL_CONVOLUTION_2D),
1614 const_iv (GL_CONVOLUTION_BORDER_MODE), 2271 const_iv (GL_CONVOLUTION_BORDER_MODE),
1615 const_iv (GL_CONSTANT_BORDER), 2272 const_iv (GL_CONSTANT_BORDER),
1616 const_iv (GL_LINES), 2273 const_iv (GL_LINES),
2274 const_iv (GL_LINE_STRIP),
1617 const_iv (GL_LINE_LOOP), 2275 const_iv (GL_LINE_LOOP),
1618 const_iv (GL_QUADS), 2276 const_iv (GL_QUADS),
1619 const_iv (GL_QUAD_STRIP), 2277 const_iv (GL_QUAD_STRIP),
1620 const_iv (GL_TRIANGLES), 2278 const_iv (GL_TRIANGLES),
1621 const_iv (GL_TRIANGLE_STRIP), 2279 const_iv (GL_TRIANGLE_STRIP),
1629# undef const_iv 2287# undef const_iv
1630 }; 2288 };
1631 2289
1632 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; )
1633 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);
1634} 2295}
1635 2296
1636char * 2297char *
1637gl_vendor () 2298gl_vendor ()
1638 CODE: 2299 CODE:
1654 OUTPUT: 2315 OUTPUT:
1655 RETVAL 2316 RETVAL
1656 2317
1657int glGetError () 2318int glGetError ()
1658 2319
2320void glFinish ()
2321
1659void glClear (int mask) 2322void glClear (int mask)
1660 2323
1661void glClearColor (float r, float g, float b, float a = 1.0) 2324void glClearColor (float r, float g, float b, float a = 1.0)
1662 PROTOTYPE: @ 2325 PROTOTYPE: @
1663 2326
1686void glPushMatrix () 2349void glPushMatrix ()
1687 2350
1688void glPopMatrix () 2351void glPopMatrix ()
1689 2352
1690void glLoadIdentity () 2353void glLoadIdentity ()
2354
2355void glDrawBuffer (int buffer)
2356
2357void glReadBuffer (int buffer)
1691 2358
1692# near_ and far_ are due to microsofts buggy "c" compiler 2359# near_ and far_ are due to microsofts buggy "c" compiler
1693void 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_)
1694 2361
1695# near_ and far_ are due to microsofts buggy "c" compiler 2362# near_ and far_ are due to microsofts buggy "c" compiler
1725 r *= a; 2392 r *= a;
1726 g *= a; 2393 g *= a;
1727 b *= a; 2394 b *= a;
1728 } 2395 }
1729 // microsoft visual "c" rounds instead of truncating... 2396 // microsoft visual "c" rounds instead of truncating...
1730 glColor4ub (MIN ((int)(r * 256.f), 255), 2397 glColor4f (r, g, b, a);
1731 MIN ((int)(g * 256.f), 255),
1732 MIN ((int)(b * 256.f), 255),
1733 MIN ((int)(a * 256.f), 255));
1734 2398
1735void glInterleavedArrays (int format, int stride, char *data) 2399void glInterleavedArrays (int format, int stride, char *data)
1736 2400
1737void glDrawElements (int mode, int count, int type, char *indices) 2401void glDrawElements (int mode, int count, int type, char *indices)
1738 2402
1784 2448
1785void 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)
1786 2450
1787int glGenTexture () 2451int glGenTexture ()
1788 CODE: 2452 CODE:
1789{ 2453 RETVAL = gen_texture ();
1790 GLuint name;
1791 glGenTextures (1, &name);
1792 RETVAL = name;
1793}
1794 OUTPUT: 2454 OUTPUT:
1795 RETVAL 2455 RETVAL
1796 2456
1797void glDeleteTexture (int name) 2457void glDeleteTexture (int name)
1798 CODE: 2458 CODE:
1799{
1800 GLuint name_ = name;
1801 glDeleteTextures (1, &name_); 2459 del_texture (name);
1802} 2460
1803
1804int glGenList () 2461int glGenList ()
1805 CODE: 2462 CODE:
1806 RETVAL = glGenLists (1); 2463 RETVAL = glGenLists (1);
1807 OUTPUT: 2464 OUTPUT:
1808 RETVAL 2465 RETVAL
1815 2472
1816void glEndList () 2473void glEndList ()
1817 2474
1818void glCallList (int list) 2475void glCallList (int list)
1819 2476
1820

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines