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.198 by root, Sun Jul 15 21:42:02 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
514SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
515 664
516char * 665char *
517SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
518 667
668int
669SDL_GetAppState ()
670
519void 671void
520SDL_PollEvent () 672poll_events ()
521 PPCODE: 673 PPCODE:
522{ 674{
523 SDL_Event ev; 675 SDL_Event ev;
524 676
525 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
526 { 679 {
527 HV *hv = newHV (); 680 HV *hv = newHV ();
528 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
529 682
530 switch (ev.type) 683 switch (ev.type)
532 case SDL_KEYDOWN: 685 case SDL_KEYDOWN:
533 case SDL_KEYUP: 686 case SDL_KEYUP:
534 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
535 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
536 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
690 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
537 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
538 break; 692 break;
539 693
540 case SDL_ACTIVEEVENT: 694 case SDL_ACTIVEEVENT:
541 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
542 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
543 break; 697 break;
544 698
545 case SDL_MOUSEMOTION: 699 case SDL_MOUSEMOTION:
700 {
701 int state = ev.motion.state;
702 int x = ev.motion.x;
703 int y = ev.motion.y;
704 int xrel = ev.motion.xrel;
705 int yrel = ev.motion.yrel;
706
707 /* do simplistic event compression */
708 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
709 && state == ev.motion.state)
710 {
711 xrel += ev.motion.xrel;
712 yrel += ev.motion.yrel;
713 x = ev.motion.x;
714 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 }
717
546 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
547
548 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
549 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
550 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
551 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
552 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
553 break; 725 break;
554 726
555 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
556 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
557 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
567 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 739 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 740 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569 break; 741 break;
570 } 742 }
571 743
572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 744 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573 } 745 }
574} 746}
575 747
576int 748int
577Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 749Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
586Mix_AllocateChannels (int numchans = -1) 758Mix_AllocateChannels (int numchans = -1)
587 759
588void 760void
589lowdelay (int fd, int val = 1) 761lowdelay (int fd, int val = 1)
590 CODE: 762 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
764
765void
766win32_proxy_info ()
767 PPCODE:
768{
591#ifndef _WIN32 769#ifdef _WIN32
592 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 770 char buffer[2048];
771 DWORD buflen;
772
773 EXTEND (SP, 3);
774
775 buflen = sizeof (buffer);
776 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
777 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
778 {
779 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
780
781 buflen = sizeof (buffer);
782 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
783 {
784 PUSHs (newSVpv (buffer, 0));
785
786 buflen = sizeof (buffer);
787 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
788 PUSHs (newSVpv (buffer, 0));
789 }
790 }
593#endif 791#endif
792}
594 793
595void 794void
596add_font (char *file) 795add_font (char *file)
597 CODE: 796 CODE:
598 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 797 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599#ifdef _WIN32
600 // cairo... sigh... requires win2000
601 AddFontResourceEx (file, FR_PRIVATE, 0);
602#endif
603 798
604void 799void
605load_image_inline (SV *image_) 800load_image_inline (SV *image_)
606 ALIAS: 801 ALIAS:
607 load_image_file = 1 802 load_image_file = 1
649 844
650 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 845 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651 846
652 assert (surface2->pitch == surface2->w * 4); 847 assert (surface2->pitch == surface2->w * 4);
653 848
849 SDL_LockSurface (surface2);
654 EXTEND (SP, 5); 850 EXTEND (SP, 6);
655 PUSHs (sv_2mortal (newSViv (surface2->w))); 851 PUSHs (sv_2mortal (newSViv (surface2->w)));
656 PUSHs (sv_2mortal (newSViv (surface2->h))); 852 PUSHs (sv_2mortal (newSViv (surface2->h)));
657 SDL_LockSurface (surface2);
658 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 853 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))); 854 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
661 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 855 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 856 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
857 SDL_UnlockSurface (surface2);
663 858
664 SDL_FreeSurface (surface); 859 SDL_FreeSurface (surface);
665 SDL_FreeSurface (surface2); 860 SDL_FreeSurface (surface2);
666} 861}
667 862
703 CODE: 898 CODE:
704 fprintf (stderr, "FATAL: %s\n", message); 899 fprintf (stderr, "FATAL: %s\n", message);
705#ifdef _WIN32 900#ifdef _WIN32
706 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707#endif 902#endif
708 exit (1); 903 _exit (1);
709 904
905void
906_exit (int retval = 0)
907 CODE:
908#ifdef WIN32
909 ExitThread (retval); // unclean, please beam me up
910#else
911 _exit (retval);
912#endif
913
914void
915debug ()
916 CODE:
917{
918#if DEBUG
919 VALGRIND_DO_LEAK_CHECK;
920#endif
921}
922
710MODULE = CFClient PACKAGE = CFClient::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
711 924
712CFClient::Font 925CFPlus::Font
713new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
714 CODE: 927 CODE:
715{ 928{
716 int count; 929 int count;
717 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 930 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
720} 933}
721 OUTPUT: 934 OUTPUT:
722 RETVAL 935 RETVAL
723 936
724void 937void
725DESTROY (CFClient::Font self) 938DESTROY (CFPlus::Font self)
726 CODE: 939 CODE:
727 pango_font_description_free (self); 940 pango_font_description_free (self);
728 941
729void 942void
730make_default (CFClient::Font self) 943make_default (CFPlus::Font self)
731 CODE: 944 CODE:
732 default_font = self; 945 default_font = self;
733 946
734MODULE = CFClient PACKAGE = CFClient::Layout 947MODULE = CFPlus PACKAGE = CFPlus::Layout
735 948
736CFClient::Layout 949void
737new (SV *class, int rgba = 0) 950reset_glyph_cache ()
951 CODE:
952 tc_clear ();
953
954CFPlus::Layout
955new (SV *class)
738 CODE: 956 CODE:
739 New (0, RETVAL, 1, struct cf_layout); 957 New (0, RETVAL, 1, struct cf_layout);
740 958
741 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 959 RETVAL->pl = pango_layout_new (opengl_context);
742 RETVAL->rgba = rgba;
743 RETVAL->r = 1.; 960 RETVAL->r = 1.;
744 RETVAL->g = 1.; 961 RETVAL->g = 1.;
745 RETVAL->b = 1.; 962 RETVAL->b = 1.;
746 RETVAL->a = 1.; 963 RETVAL->a = 1.;
747 RETVAL->base_height = MIN_FONT_HEIGHT; 964 RETVAL->base_height = MIN_FONT_HEIGHT;
751 layout_update_font (RETVAL); 968 layout_update_font (RETVAL);
752 OUTPUT: 969 OUTPUT:
753 RETVAL 970 RETVAL
754 971
755void 972void
756DESTROY (CFClient::Layout self) 973DESTROY (CFPlus::Layout self)
757 CODE: 974 CODE:
758 g_object_unref (self->pl); 975 g_object_unref (self->pl);
759 Safefree (self); 976 Safefree (self);
760 977
978void
979set_text (CFPlus::Layout self, SV *text_)
980 CODE:
981{
982 STRLEN textlen;
983 char *text = SvPVutf8 (text_, textlen);
984
985 pango_layout_set_text (self->pl, text, textlen);
986}
987
988void
989set_markup (CFPlus::Layout self, SV *text_)
990 CODE:
991{
992 STRLEN textlen;
993 char *text = SvPVutf8 (text_, textlen);
994
995 pango_layout_set_markup (self->pl, text, textlen);
996}
997
998void
999set_shapes (CFPlus::Layout self, ...)
1000 CODE:
1001{
1002 PangoAttrList *attrs = 0;
1003 const char *text = pango_layout_get_text (self->pl);
1004 const char *pos = text;
1005 int arg = 4;
1006
1007 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1008 {
1009 PangoRectangle inkrect, rect;
1010 PangoAttribute *attr;
1011
1012 int x = SvIV (ST (arg - 3));
1013 int y = SvIV (ST (arg - 2));
1014 int w = SvIV (ST (arg - 1));
1015 int h = SvIV (ST (arg ));
1016
1017 inkrect.x = 0;
1018 inkrect.y = 0;
1019 inkrect.width = 0;
1020 inkrect.height = 0;
1021
1022 rect.x = x * PANGO_SCALE;
1023 rect.y = y * PANGO_SCALE;
1024 rect.width = w * PANGO_SCALE;
1025 rect.height = h * PANGO_SCALE;
1026
1027 if (!attrs)
1028 attrs = pango_layout_get_attributes (self->pl);
1029
1030 attr = pango_attr_shape_new (&inkrect, &rect);
1031 attr->start_index = pos - text;
1032 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1033 pango_attr_list_insert (attrs, attr);
1034
1035 arg += 4;
1036 pos += sizeof (OBJ_STR) - 1;
1037 }
1038
1039 if (attrs)
1040 pango_layout_set_attributes (self->pl, attrs);
1041}
1042
1043void
1044get_shapes (CFPlus::Layout self)
1045 PPCODE:
1046{
1047 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1048
1049 do
1050 {
1051 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1052
1053 if (run && shape_attr_p (run))
1054 {
1055 PangoRectangle extents;
1056 pango_layout_iter_get_run_extents (iter, 0, &extents);
1057
1058 EXTEND (SP, 2);
1059 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1060 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1061 }
1062 }
1063 while (pango_layout_iter_next_run (iter));
1064
1065 pango_layout_iter_free (iter);
1066}
1067
761int 1068int
762is_rgba (CFClient::Layout self) 1069has_wrapped (CFPlus::Layout self)
763 CODE: 1070 CODE:
764 RETVAL = self->rgba; 1071{
1072 int lines = 1;
1073 const char *text = pango_layout_get_text (self->pl);
1074
1075 while (*text)
1076 lines += *text++ == '\n';
1077
1078 RETVAL = lines < pango_layout_get_line_count (self->pl);
1079}
765 OUTPUT: 1080 OUTPUT:
766 RETVAL 1081 RETVAL
767 1082
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 * 1083SV *
789get_text (CFClient::Layout self) 1084get_text (CFPlus::Layout self)
790 CODE: 1085 CODE:
791 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1086 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792 sv_utf8_decode (RETVAL); 1087 sv_utf8_decode (RETVAL);
793 OUTPUT: 1088 OUTPUT:
794 RETVAL 1089 RETVAL
795 1090
796void 1091void
797set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1092set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
798 CODE: 1093 CODE:
799 self->r = r; 1094 self->r = r;
800 self->g = g; 1095 self->g = g;
801 self->b = b; 1096 self->b = b;
802 self->a = a; 1097 self->a = a;
803 1098
804void 1099void
805set_font (CFClient::Layout self, CFClient::Font font = 0) 1100set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806 CODE: 1101 CODE:
807 if (self->font != font) 1102 if (self->font != font)
808 { 1103 {
809 self->font = font; 1104 self->font = font;
810 layout_update_font (self); 1105 layout_update_font (self);
811 } 1106 }
812 1107
813void 1108void
814set_height (CFClient::Layout self, int base_height) 1109set_height (CFPlus::Layout self, int base_height)
815 CODE: 1110 CODE:
816 if (self->base_height != base_height) 1111 if (self->base_height != base_height)
817 { 1112 {
818 self->base_height = base_height; 1113 self->base_height = base_height;
819 layout_update_font (self); 1114 layout_update_font (self);
820 } 1115 }
821 1116
822void 1117void
823set_width (CFClient::Layout self, int max_width = -1) 1118set_width (CFPlus::Layout self, int max_width = -1)
824 CODE: 1119 CODE:
825 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1120 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
826 1121
827void 1122void
828set_indent (CFClient::Layout self, int indent) 1123set_indent (CFPlus::Layout self, int indent)
829 CODE: 1124 CODE:
830 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1125 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831 1126
832void 1127void
833set_spacing (CFClient::Layout self, int spacing) 1128set_spacing (CFPlus::Layout self, int spacing)
834 CODE: 1129 CODE:
835 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1130 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836 1131
837void 1132void
838set_ellipsise (CFClient::Layout self, int ellipsise) 1133set_ellipsise (CFPlus::Layout self, int ellipsise)
839 CODE: 1134 CODE:
840 pango_layout_set_ellipsize (self->pl, 1135 pango_layout_set_ellipsize (self->pl,
841 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1136 ellipsise == 1 ? PANGO_ELLIPSIZE_START
842 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1137 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1138 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
844 : PANGO_ELLIPSIZE_NONE 1139 : PANGO_ELLIPSIZE_NONE
845 ); 1140 );
846 1141
847void 1142void
848set_single_paragraph_mode (CFClient::Layout self, int spm) 1143set_single_paragraph_mode (CFPlus::Layout self, int spm)
849 CODE: 1144 CODE:
850 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1145 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851 1146
852void 1147void
853size (CFClient::Layout self) 1148size (CFPlus::Layout self)
854 PPCODE: 1149 PPCODE:
855{ 1150{
856 int w, h; 1151 int w, h;
857 1152
858 layout_get_pixel_size (self, &w, &h); 1153 layout_get_pixel_size (self, &w, &h);
861 PUSHs (sv_2mortal (newSViv (w))); 1156 PUSHs (sv_2mortal (newSViv (w)));
862 PUSHs (sv_2mortal (newSViv (h))); 1157 PUSHs (sv_2mortal (newSViv (h)));
863} 1158}
864 1159
865int 1160int
1161descent (CFPlus::Layout self)
1162 CODE:
1163{
1164 PangoRectangle rect;
1165 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1166 pango_layout_line_get_pixel_extents (line, 0, &rect);
1167 RETVAL = PANGO_DESCENT (rect);
1168}
1169 OUTPUT:
1170 RETVAL
1171
1172int
866xy_to_index (CFClient::Layout self, int x, int y) 1173xy_to_index (CFPlus::Layout self, int x, int y)
867 CODE: 1174 CODE:
868{ 1175{
869 int index, trailing; 1176 int index, trailing;
870 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1177 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
871 RETVAL = index; 1178 RETVAL = index + trailing;
872} 1179}
873 OUTPUT: 1180 OUTPUT:
874 RETVAL 1181 RETVAL
875 1182
876void 1183void
877cursor_pos (CFClient::Layout self, int index) 1184cursor_pos (CFPlus::Layout self, int index)
878 PPCODE: 1185 PPCODE:
879{ 1186{
880 PangoRectangle strong_pos; 1187 PangoRectangle strong_pos;
881 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1188 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882 1189
885 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887} 1194}
888 1195
889void 1196void
890render (CFClient::Layout self) 1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
891 PPCODE: 1198 PPCODE:
892{ 1199{
893 SV *retval; 1200 int line, x;
894 int w, h;
895 1201
896 layout_get_pixel_size (self, &w, &h); 1202 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1203 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
897 1204
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); 1205 EXTEND (SP, 2);
946 PUSHs (sv_2mortal (newSViv (w))); 1206 PUSHs (sv_2mortal (newSViv (line - 1)));
1207 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1208}
1209
1210void
1211line_x_to_index (CFPlus::Layout self, int line, int x)
1212 PPCODE:
1213{
1214 PangoLayoutLine *lp;
1215 int index, trailing;
1216
1217 if (line < 0)
1218 XSRETURN_EMPTY;
1219
1220 if (!(lp = pango_layout_get_line (self->pl, line)))
1221 XSRETURN_EMPTY; /* do better */
1222
1223 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1224
1225 EXTEND (SP, 2);
1226 if (GIMME_V == G_SCALAR)
947 PUSHs (sv_2mortal (newSViv (h))); 1227 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 1228 else
953 { 1229 {
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))); 1230 PUSHs (sv_2mortal (newSViv (index)));
973 PUSHs (sv_2mortal (newSViv (h))); 1231 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 } 1232 }
978} 1233}
979 1234
1235void
1236render (CFPlus::Layout self, float x, float y, int flags = 0)
1237 PPCODE:
1238 pango_opengl_render_layout_subpixel (
1239 self->pl,
1240 x * PANGO_SCALE, y * PANGO_SCALE,
1241 self->r, self->g, self->b, self->a,
1242 flags
1243 );
1244
980MODULE = CFClient PACKAGE = CFClient::Texture 1245MODULE = CFPlus PACKAGE = CFPlus::Texture
981 1246
982void 1247void
1248pad2pot (SV *data_, SV *w_, SV *h_)
1249 CODE:
1250{
1251 int ow = SvIV (w_);
1252 int oh = SvIV (h_);
1253
1254 if (ow && oh)
1255 {
1256 int nw = minpot (ow);
1257 int nh = minpot (oh);
1258
1259 if (nw != ow || nh != oh)
1260 {
1261 if (SvOK (data_))
1262 {
1263 STRLEN datalen;
1264 char *data = SvPVbyte (data_, datalen);
1265 int bpp = datalen / (ow * oh);
1266 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1267
1268 SvPOK_only (result_);
1269 SvCUR_set (result_, nw * nh * bpp);
1270
1271 memset (SvPVX (result_), 0, nw * nh * bpp);
1272 while (oh--)
1273 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1274
1275 sv_setsv (data_, result_);
1276 }
1277
1278 sv_setiv (w_, nw);
1279 sv_setiv (h_, nh);
1280 }
1281 }
1282}
1283
1284void
983draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984 PROTOTYPE: $$$;$$ 1286 PROTOTYPE: $$$;$$
985 ALIAS: 1287 ALIAS:
986 draw_quad_alpha = 1 1288 draw_quad_alpha = 1
987 draw_quad_alpha_premultiplied = 2 1289 draw_quad_alpha_premultiplied = 2
988 CODE: 1290 CODE:
1026 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1028 } 1330 }
1029} 1331}
1030 1332
1031MODULE = CFClient PACKAGE = CFClient::Map 1333MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1334
1033CFClient::Map 1335CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1336new (SV *class)
1035 CODE: 1337 CODE:
1036 New (0, RETVAL, 1, struct map); 1338 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1339 RETVAL->x = 0;
1038 RETVAL->y = 0; 1340 RETVAL->y = 0;
1039 RETVAL->w = map_width; 1341 RETVAL->w = 0;
1040 RETVAL->h = map_height; 1342 RETVAL->h = 0;
1041 RETVAL->ox = 0; 1343 RETVAL->ox = 0;
1042 RETVAL->oy = 0; 1344 RETVAL->oy = 0;
1043 RETVAL->faces = 8192; 1345 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1044 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1346 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; 1347 RETVAL->rows = 0;
1048 RETVAL->row = 0; 1348 RETVAL->row = 0;
1049 OUTPUT: 1349 OUTPUT:
1050 RETVAL 1350 RETVAL
1051 1351
1052void 1352void
1053DESTROY (CFClient::Map self) 1353DESTROY (CFPlus::Map self)
1054 CODE: 1354 CODE:
1055{ 1355{
1056 map_clear (self); 1356 map_clear (self);
1057 Safefree (self->face); 1357 Safefree (self->face2tile);
1358 Safefree (self->tex);
1058 Safefree (self); 1359 Safefree (self);
1059} 1360}
1060 1361
1061void 1362void
1363resize (CFPlus::Map self, int map_width, int map_height)
1364 CODE:
1365 self->w = map_width;
1366 self->h = map_height;
1367
1368void
1062clear (CFClient::Map self) 1369clear (CFPlus::Map self)
1063 CODE: 1370 CODE:
1064 map_clear (self); 1371 map_clear (self);
1065 1372
1066void 1373void
1067set_face (CFClient::Map self, int face, int texid) 1374set_tileid (CFPlus::Map self, int face, int tile)
1068 CODE: 1375 CODE:
1069{ 1376{
1070 while (self->faces <= face) 1377 need_facenum (self, face); self->face2tile [face] = tile;
1071 { 1378 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} 1379}
1078 1380
1079void 1381void
1382set_smooth (CFPlus::Map self, int face, int smooth, int level)
1383 CODE:
1384{
1385 tileid texid;
1386 maptex *tex;
1387
1388 if (face < 0 || face >= self->faces)
1389 return;
1390
1391 if (smooth < 0 || smooth >= self->faces)
1392 return;
1393
1394 texid = self->face2tile [face];
1395
1396 if (!texid)
1397 return;
1398
1399 tex = self->tex + texid;
1400 tex->smoothtile = self->face2tile [smooth];
1401 tex->smoothlevel = level;
1402}
1403
1404void
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) 1405set_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: 1406 CODE:
1082{ 1407{
1083 while (self->texs <= texid) 1408 need_texid (self, texid);
1084 {
1085 Append (maptex, self->tex, self->texs, self->texs);
1086 self->texs *= 2;
1087 }
1088 1409
1089 { 1410 {
1090 maptex *tex = self->tex + texid; 1411 maptex *tex = self->tex + texid;
1091 1412
1092 tex->name = name; 1413 tex->name = name;
1109 // from transparent color bleeding and ugly wrapping effects. 1430 // from transparent color bleeding and ugly wrapping effects.
1110 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1431 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111} 1432}
1112 1433
1113int 1434int
1114ox (CFClient::Map self) 1435ox (CFPlus::Map self)
1115 ALIAS: 1436 ALIAS:
1116 oy = 1 1437 oy = 1
1117 x = 2 1438 x = 2
1118 y = 3 1439 y = 3
1119 w = 4 1440 w = 4
1130 } 1451 }
1131 OUTPUT: 1452 OUTPUT:
1132 RETVAL 1453 RETVAL
1133 1454
1134void 1455void
1135scroll (CFClient::Map self, int dx, int dy) 1456scroll (CFPlus::Map self, int dx, int dy)
1136 CODE: 1457 CODE:
1137{ 1458{
1138 if (dx > 0) 1459 if (dx > 0)
1139 map_blank (self, self->x, self->y, dx - 1, self->h); 1460 map_blank (self, self->x, self->y, dx, self->h);
1140 else if (dx < 0) 1461 else if (dx < 0)
1141 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1462 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1142 1463
1143 if (dy > 0) 1464 if (dy > 0)
1144 map_blank (self, self->x, self->y, self->w, dy - 1); 1465 map_blank (self, self->x, self->y, self->w, dy);
1145 else if (dy < 0) 1466 else if (dy < 0)
1146 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1467 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1147 1468
1148 self->ox += dx; self->x += dx; 1469 self->ox += dx; self->x += dx;
1149 self->oy += dy; self->y += dy; 1470 self->oy += dy; self->y += dy;
1150 1471
1151 while (self->y < 0) 1472 while (self->y < 0)
1156 self->y += MAP_EXTEND_Y; 1477 self->y += MAP_EXTEND_Y;
1157 } 1478 }
1158} 1479}
1159 1480
1160void 1481void
1161map1a_update (CFClient::Map self, SV *data_) 1482map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162 CODE: 1483 CODE:
1163{ 1484{
1164 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1485 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165 uint8_t *data_end = (uint8_t *)SvEND (data_); 1486 uint8_t *data_end = (uint8_t *)SvEND (data_);
1166 mapcell *cell; 1487 mapcell *cell;
1167 int x, y, flags; 1488 int x, y, flags;
1168 1489
1169 while (data < data_end) 1490 while (data < data_end - 1)
1170 { 1491 {
1171 flags = (data [0] << 8) + data [1]; data += 2; 1492 flags = (data [0] << 8) + data [1]; data += 2;
1172 1493
1173 x = ((flags >> 10) & 63) + self->x; 1494 x = self->x + ((flags >> 10) & 63);
1174 y = ((flags >> 4) & 63) + self->y; 1495 y = self->y + ((flags >> 4) & 63);
1175 1496
1176 cell = map_get_cell (self, x, y); 1497 cell = map_get_cell (self, x, y);
1177 1498
1178 if (flags & 15) 1499 if (flags & 15)
1179 { 1500 {
1180 if (cell->darkness < 0) 1501 if (!cell->darkness)
1181 { 1502 {
1503 memset (cell, 0, sizeof (*cell));
1182 cell->darkness = 0; 1504 cell->darkness = 256;
1183 cell->face [0] = 0;
1184 cell->face [1] = 0;
1185 cell->face [2] = 0;
1186 } 1505 }
1187 1506
1188 cell->darkness = flags & 8 ? *data++ : 255;
1189
1190 //TODO: don't trust server data to be in-range(!) 1507 //TODO: don't trust server data to be in-range(!)
1508
1509 if (flags & 8)
1510 {
1511 if (extmap)
1512 {
1513 uint8_t ext, cmd;
1514
1515 do
1516 {
1517 ext = *data++;
1518 cmd = ext & 0x3f;
1519
1520 if (cmd < 4)
1521 cell->darkness = 255 - ext * 64 + 1;
1522 else if (cmd == 5) // health
1523 {
1524 cell->stat_width = 1;
1525 cell->stat_hp = *data++;
1526 }
1527 else if (cmd == 6) // monster width
1528 cell->stat_width = *data++ + 1;
1529 else if (cmd == 0x47)
1530 {
1531 if (*data == 4)
1532 ; // decode player count
1533
1534 data += *data + 1;
1535 }
1536 else if (cmd == 8) // cell flags
1537 cell->flags = *data++;
1538 else if (ext & 0x40) // unknown, multibyte => skip
1539 data += *data + 1;
1540 else
1541 data++;
1542 }
1543 while (ext & 0x80);
1544 }
1545 else
1546 cell->darkness = *data++ + 1;
1547 }
1191 1548
1192 if (flags & 4) 1549 if (flags & 4)
1193 { 1550 {
1194 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1551 faceid face = (data [0] << 8) + data [1]; data += 2;
1552 need_facenum (self, face);
1553 cell->tile [0] = self->face2tile [face];
1195 } 1554 }
1196 1555
1197 if (flags & 2) 1556 if (flags & 2)
1198 { 1557 {
1199 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1558 faceid face = (data [0] << 8) + data [1]; data += 2;
1559 need_facenum (self, face);
1560 cell->tile [1] = self->face2tile [face];
1200 } 1561 }
1201 1562
1202 if (flags & 1) 1563 if (flags & 1)
1203 { 1564 {
1204 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1565 faceid face = (data [0] << 8) + data [1]; data += 2;
1566 need_facenum (self, face);
1567 cell->tile [2] = self->face2tile [face];
1205 } 1568 }
1206 } 1569 }
1207 else 1570 else
1208 cell->darkness = -1; 1571 cell->darkness = 0;
1209 } 1572 }
1210} 1573}
1211 1574
1212SV * 1575SV *
1213mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1576mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214 CODE: 1577 CODE:
1215{ 1578{
1216 int x1, x; 1579 int x1, x;
1217 int y1, y; 1580 int y1, y;
1218 int z; 1581 int z;
1239 { 1602 {
1240 mapcell *cell = row->col + (x - row->c0); 1603 mapcell *cell = row->col + (x - row->c0);
1241 1604
1242 for (z = 0; z <= 0; z++) 1605 for (z = 0; z <= 0; z++)
1243 { 1606 {
1244 mapface face = cell->face [z];
1245
1246 if (face)
1247 {
1248 maptex tex = self->tex [face]; 1607 maptex tex = self->tex [cell->tile [z]];
1249 int a0 = 255 - tex.a; 1608 int a0 = 255 - tex.a;
1250 int a1 = tex.a; 1609 int a1 = tex.a;
1251 1610
1252 r = (r * a0 + tex.r * a1) / 255; 1611 r = (r * a0 + tex.r * a1) / 255;
1253 g = (g * a0 + tex.g * a1) / 255; 1612 g = (g * a0 + tex.g * a1) / 255;
1254 b = (b * a0 + tex.b * a1) / 255; 1613 b = (b * a0 + tex.b * a1) / 255;
1255 a = (a * a0 + tex.a * a1) / 255; 1614 a = (a * a0 + tex.a * a1) / 255;
1256 }
1257 } 1615 }
1258 } 1616 }
1259 1617
1260 *map++ = (r ) 1618 *map++ = (r )
1261 | (g << 8) 1619 | (g << 8)
1268} 1626}
1269 OUTPUT: 1627 OUTPUT:
1270 RETVAL 1628 RETVAL
1271 1629
1272void 1630void
1273draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1631draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1274 PPCODE: 1632 CODE:
1275{ 1633{
1276 int vx, vy; 1634 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1635 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1636 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1637 smooth_key skey;
1277 int x, y, z; 1638 int x, y, z;
1278 int last_name; 1639 int last_name;
1279 mapface face; 1640
1641 // thats current max. sorry.
1642 if (sw > 255) sw = 255;
1643 if (sh > 255) sh = 255;
1644
1645 // clear key, in case of extra padding
1646 memset (&skey, 0, sizeof (skey));
1647
1648 glColor4ub (255, 255, 255, 255);
1649
1650 glEnable (GL_BLEND);
1651 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1652 glEnable (GL_TEXTURE_2D);
1653 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1654
1655 glBegin (GL_QUADS);
1656
1657 last_name = 0;
1658
1659 mx += self->x;
1660 my += self->y;
1661
1662 // first pass: determine smooth_max
1663 // rather ugly, if you ask me
1664 // could also be stored inside mapcell and updated on change
1665 memset (smooth_max, 0, sizeof (smooth_max));
1666
1667 for (y = 0; y < sh; y++)
1668 if (0 <= y + my && y + my < self->rows)
1669 {
1670 maprow *row = self->row + (y + my);
1671
1672 for (x = 0; x < sw; x++)
1673 if (row->c0 <= x + mx && x + mx < row->c1)
1674 {
1675 mapcell *cell = row->col + (x + mx - row->c0);
1676
1677 smooth_max[x + 1][y + 1] =
1678 MAX (self->tex [cell->tile [0]].smoothlevel,
1679 MAX (self->tex [cell->tile [1]].smoothlevel,
1680 self->tex [cell->tile [2]].smoothlevel));
1681 }
1682 }
1683
1684 for (z = 0; z <= 2; z++)
1685 {
1686 memset (smooth_level, 0, sizeof (smooth_level));
1687
1688 for (y = 0; y < sh; y++)
1689 if (0 <= y + my && y + my < self->rows)
1690 {
1691 maprow *row = self->row + (y + my);
1692
1693 for (x = 0; x < sw; x++)
1694 if (row->c0 <= x + mx && x + mx < row->c1)
1695 {
1696 mapcell *cell = row->col + (x + mx - row->c0);
1697 tileid tile = cell->tile [z];
1698
1699 if (tile)
1700 {
1701 maptex tex = self->tex [tile];
1702 int px = (x + 1) * T - tex.w;
1703 int py = (y + 1) * T - tex.h;
1704
1705 // suppressing texture state switches here
1706 // is only moderately effective, but worth the extra effort
1707 if (last_name != tex.name)
1708 {
1709 if (!tex.name)
1710 tex = self->tex [2]; /* missing, replace by noface */
1711
1712 glEnd ();
1713 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1714 glBegin (GL_QUADS);
1715 }
1716
1717 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1718 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1719 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1720 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1721
1722 if (cell->flags && z == 2)
1723 {
1724 if (cell->flags & 1)
1725 {
1726 maptex tex = self->tex [1];
1727 int px = x * T + T * 2 / 32;
1728 int py = y * T - T * 6 / 32;
1729
1730 glEnd ();
1731 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1732 glBegin (GL_QUADS);
1733
1734 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1735 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1736 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1737 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1738 }
1739 }
1740
1741 // update smooth hash
1742 if (tex.smoothtile)
1743 {
1744 skey.tile = tex.smoothtile;
1745 skey.level = tex.smoothlevel;
1746
1747 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1748
1749 // add bits to current tile and all neighbours. skey.x|y is
1750 // shifted +1|+1 so we always stay positive.
1751
1752 // bits is ___n cccc CCCC bbbb
1753 // n do not draw borders&corners
1754 // c draw these corners, but...
1755 // C ... not these
1756 // b draw these borders
1757
1758 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1759 // ┃· ·· ·┃ ━━
1760
1761 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1762 // ·· ·· ·┏ ┓·
1763
1764 // full tile
1765 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1766
1767 // borders
1768 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1769 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1770 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1771 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1772
1773 // corners
1774 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1775 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1776 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1777 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1778 }
1779 }
1780 }
1781 }
1782
1783 // go through all smoothlevels, lowest to highest, then draw.
1784 // this is basically counting sort
1785 {
1786 int w, b;
1787
1788 for (w = 0; w < 256 / 32; ++w)
1789 {
1790 uint32_t smask = smooth_level [w];
1791 if (smask)
1792 for (b = 0; b < 32; ++b)
1793 if (smask & (((uint32_t)1) << b))
1794 {
1795 int level = (w << 5) | b;
1796 HE *he;
1797
1798 hv_iterinit (smooth);
1799 while ((he = hv_iternext (smooth)))
1800 {
1801 smooth_key *skey = (smooth_key *)HeKEY (he);
1802 IV bits = SvIVX (HeVAL (he));
1803
1804 if (!(bits & 0x1000)
1805 && skey->level == level
1806 && level > smooth_max [skey->x][skey->y])
1807 {
1808 maptex tex = self->tex [skey->tile];
1809 int px = (((int)skey->x) - 1) * T;
1810 int py = (((int)skey->y) - 1) * T;
1811 int border = bits & 15;
1812 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1813 float dx = tex.s * .0625f; // 16 images/row
1814 float dy = tex.t * .5f ; // 2 images/column
1815
1816 // this time naively avoiding texture state changes
1817 // save gobs of state changes.
1818 if (last_name != tex.name)
1819 {
1820 if (!tex.name)
1821 continue; // smoothing not yet available
1822
1823 glEnd ();
1824 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1825 glBegin (GL_QUADS);
1826 }
1827
1828 if (border)
1829 {
1830 float ox = border * dx;
1831
1832 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1833 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1834 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1835 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1836 }
1837
1838 if (corner)
1839 {
1840 float ox = corner * dx;
1841
1842 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1843 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1844 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1846 }
1847 }
1848 }
1849 }
1850 }
1851 }
1852
1853 hv_clear (smooth);
1854 }
1855
1856 glEnd ();
1857
1858 glDisable (GL_TEXTURE_2D);
1859 glDisable (GL_BLEND);
1860
1861 // top layer: overlays such as the health bar
1862 for (y = 0; y < sh; y++)
1863 if (0 <= y + my && y + my < self->rows)
1864 {
1865 maprow *row = self->row + (y + my);
1866
1867 for (x = 0; x < sw; x++)
1868 if (row->c0 <= x + mx && x + mx < row->c1)
1869 {
1870 mapcell *cell = row->col + (x + mx - row->c0);
1871
1872 int px = x * T;
1873 int py = y * T;
1874
1875 if (cell->stat_hp)
1876 {
1877 int width = cell->stat_width * T;
1878 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1879
1880 glColor3ub (0, 0, 0);
1881 glRectf (px + 1, py - thick - 2,
1882 px + width - 1, py);
1883
1884 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1885 glRectf (px + 2,
1886 py - thick - 1,
1887 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1888 }
1889 }
1890 }
1891}
1892
1893void
1894draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1895 CODE:
1896{
1897 static float color[16][3] = {
1898 { 0.00F, 0.00F, 0.00F },
1899 { 1.00F, 1.00F, 1.00F },
1900 { 0.00F, 0.00F, 0.55F },
1901 { 1.00F, 0.00F, 0.00F },
1902
1903 { 1.00F, 0.54F, 0.00F },
1904 { 0.11F, 0.56F, 1.00F },
1905 { 0.93F, 0.46F, 0.00F },
1906 { 0.18F, 0.54F, 0.34F },
1907
1908 { 0.56F, 0.73F, 0.56F },
1909 { 0.80F, 0.80F, 0.80F },
1910 { 0.55F, 0.41F, 0.13F },
1911 { 0.99F, 0.77F, 0.26F },
1912
1913 { 0.74F, 0.65F, 0.41F },
1914
1915 { 0.00F, 1.00F, 1.00F },
1916 { 1.00F, 0.00F, 1.00F },
1917 { 1.00F, 1.00F, 0.00F },
1918 };
1919
1920 int x, y;
1921
1922 glEnable (GL_TEXTURE_2D);
1923 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1924 glEnable (GL_BLEND);
1925 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1926 glBegin (GL_QUADS);
1927
1928 for (y = 0; y < h; y++)
1929 for (x = 0; x < w; x++)
1930 {
1931 unsigned char m = data [x + y * w];
1932
1933 if (m)
1934 {
1935 float *c = color [m & 15];
1936
1937 float tx1 = m & 0x40 ? 0.5 : 0.;
1938 float tx2 = tx1 + 0.5;
1939
1940 glColor4f (c[0], c[1], c[2], 0.75);
1941 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1942 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1943 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1944 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1945 }
1946 }
1947
1948 glEnd ();
1949 glDisable (GL_BLEND);
1950 glDisable (GL_TEXTURE_2D);
1951}
1952
1953void
1954fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1955 PPCODE:
1956{
1957 int x, y;
1280 int sw4 = (sw + 3) & ~3; 1958 int sw4 = (sw + 3) & ~3;
1281 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1959 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1960 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283 1961
1284 memset (darkness, 255, sw4 * sh); 1962 memset (darkness, 255, sw4 * sh);
1285 SvPOK_only (darkness_sv); 1963 SvPOK_only (darkness_sv);
1286 SvCUR_set (darkness_sv, sw4 * sh); 1964 SvCUR_set (darkness_sv, sw4 * sh);
1287 1965
1288 vx = self->x + (self->w - sw) / 2 - shift_x; 1966 mx += self->x;
1289 vy = self->y + (self->h - sh) / 2 - shift_y; 1967 my += self->y;
1290 1968
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++) 1969 for (y = 0; y < sh; y++)
1314 if (0 <= y + vy && y + vy < self->rows) 1970 if (0 <= y + my && y + my < self->rows)
1315 { 1971 {
1316 maprow *row = self->row + (y + vy); 1972 maprow *row = self->row + (y + my);
1317 1973
1318 for (x = 0; x < sw; x++) 1974 for (x = 0; x < sw; x++)
1319 if (row->c0 <= x + vx && x + vx < row->c1) 1975 if (row->c0 <= x + mx && x + mx < row->c1)
1320 { 1976 {
1321 mapcell *cell = row->col + (x + vx - row->c0); 1977 mapcell *cell = row->col + (x + mx - row->c0);
1322 1978
1323 darkness[y * sw4 + x] = cell->darkness < 0 1979 darkness[y * sw4 + x] = cell->darkness
1980 ? 255 - (cell->darkness - 1)
1324 ? 255 - FOW_DARKNESS 1981 : 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 } 1982 }
1350 } 1983 }
1351
1352 glEnd ();
1353
1354 glDisable (GL_TEXTURE_2D);
1355 glDisable (GL_BLEND);
1356 1984
1357 EXTEND (SP, 3); 1985 EXTEND (SP, 3);
1358 PUSHs (sv_2mortal (newSViv (sw4))); 1986 PUSHs (sv_2mortal (newSViv (sw4)));
1359 PUSHs (sv_2mortal (newSViv (sh))); 1987 PUSHs (sv_2mortal (newSViv (sh)));
1360 PUSHs (darkness_sv); 1988 PUSHs (darkness_sv);
1361} 1989}
1362 1990
1363SV * 1991SV *
1364get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1992get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1365 CODE: 1993 CODE:
1366{ 1994{
1367 int x, y, x1, y1; 1995 int x, y, x1, y1;
1368 SV *data_sv = newSV (w * h * 7 + 5); 1996 SV *data_sv = newSV (w * h * 7 + 5);
1369 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1997 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1394 if (row && row->c0 <= x && x < row->c1) 2022 if (row && row->c0 <= x && x < row->c1)
1395 { 2023 {
1396 mapcell *cell = row->col + (x - row->c0); 2024 mapcell *cell = row->col + (x - row->c0);
1397 uint8_t flags = 0; 2025 uint8_t flags = 0;
1398 2026
1399 if (cell->face [0]) flags |= 1; 2027 if (cell->tile [0]) flags |= 1;
1400 if (cell->face [1]) flags |= 2; 2028 if (cell->tile [1]) flags |= 2;
1401 if (cell->face [2]) flags |= 4; 2029 if (cell->tile [2]) flags |= 4;
1402 2030
1403 *data++ = flags; 2031 *data++ = flags;
1404 2032
1405 if (flags & 1) 2033 if (flags & 1)
1406 { 2034 {
2035 tileid tile = cell->tile [0];
1407 *data++ = cell->face [0] >> 8; 2036 *data++ = tile >> 8;
1408 *data++ = cell->face [0]; 2037 *data++ = tile;
1409 } 2038 }
1410 2039
1411 if (flags & 2) 2040 if (flags & 2)
1412 { 2041 {
2042 tileid tile = cell->tile [1];
1413 *data++ = cell->face [1] >> 8; 2043 *data++ = tile >> 8;
1414 *data++ = cell->face [1]; 2044 *data++ = tile;
1415 } 2045 }
1416 2046
1417 if (flags & 4) 2047 if (flags & 4)
1418 { 2048 {
2049 tileid tile = cell->tile [2];
1419 *data++ = cell->face [2] >> 8; 2050 *data++ = tile >> 8;
1420 *data++ = cell->face [2]; 2051 *data++ = tile;
1421 } 2052 }
1422 } 2053 }
1423 else 2054 else
1424 *data++ = 0; 2055 *data++ = 0;
1425 } 2056 }
1431} 2062}
1432 OUTPUT: 2063 OUTPUT:
1433 RETVAL 2064 RETVAL
1434 2065
1435void 2066void
1436set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2067set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437 PPCODE: 2068 PPCODE:
1438{ 2069{
1439 int x, y, z; 2070 int x, y, z;
1440 int w, h; 2071 int w, h;
1441 int x1, y1; 2072 int x1, y1;
1465 { 2096 {
1466 uint8_t flags = *data++; 2097 uint8_t flags = *data++;
1467 2098
1468 if (flags) 2099 if (flags)
1469 { 2100 {
1470 mapface face[3] = { 0, 0, 0 };
1471
1472 mapcell *cell = row_get_cell (row, x); 2101 mapcell *cell = row_get_cell (row, x);
2102 tileid tile[3] = { 0, 0, 0 };
1473 2103
1474 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2104 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1475 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2105 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1476 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2106 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1477 2107
1478 if (cell->darkness <= 0) 2108 if (cell->darkness == 0)
1479 { 2109 {
1480 cell->darkness = -1; 2110 cell->darkness = 0;
1481 2111
1482 for (z = 0; z <= 2; z++) 2112 for (z = 0; z <= 2; z++)
1483 { 2113 {
1484 cell->face[z] = face[z]; 2114 tileid t = tile [z];
1485 2115
1486 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2116 if (t >= self->texs || (t && !self->tex [t].name))
2117 {
1487 XPUSHs (sv_2mortal (newSViv (face[z]))); 2118 XPUSHs (sv_2mortal (newSViv (t)));
2119 need_texid (self, t);
2120 }
2121
2122 cell->tile [z] = t;
1488 } 2123 }
1489 } 2124 }
1490 } 2125 }
1491 } 2126 }
1492 } 2127 }
1493} 2128}
1494 2129
1495MODULE = CFClient PACKAGE = CFClient::MixChunk 2130MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496 2131
1497CFClient::MixChunk 2132CFPlus::MixChunk
1498new_from_file (SV *class, char *path) 2133new_from_file (SV *class, char *path)
1499 CODE: 2134 CODE:
1500 RETVAL = Mix_LoadWAV (path); 2135 RETVAL = Mix_LoadWAV (path);
1501 OUTPUT: 2136 OUTPUT:
1502 RETVAL 2137 RETVAL
1503 2138
1504void 2139void
1505DESTROY (CFClient::MixChunk self) 2140DESTROY (CFPlus::MixChunk self)
1506 CODE: 2141 CODE:
1507 Mix_FreeChunk (self); 2142 Mix_FreeChunk (self);
1508 2143
1509int 2144int
1510volume (CFClient::MixChunk self, int volume = -1) 2145volume (CFPlus::MixChunk self, int volume = -1)
1511 CODE: 2146 CODE:
1512 RETVAL = Mix_VolumeChunk (self, volume); 2147 RETVAL = Mix_VolumeChunk (self, volume);
1513 OUTPUT: 2148 OUTPUT:
1514 RETVAL 2149 RETVAL
1515 2150
1516int 2151int
1517play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2152play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1518 CODE: 2153 CODE:
1519 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2154 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520 OUTPUT: 2155 OUTPUT:
1521 RETVAL 2156 RETVAL
1522 2157
1523MODULE = CFClient PACKAGE = CFClient::MixMusic 2158MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524 2159
1525int 2160int
1526volume (int volume = -1) 2161volume (int volume = -1)
1527 CODE: 2162 CODE:
1528 RETVAL = Mix_VolumeMusic (volume); 2163 RETVAL = Mix_VolumeMusic (volume);
1529 OUTPUT: 2164 OUTPUT:
1530 RETVAL 2165 RETVAL
1531 2166
2167int
2168fade_out (int ms)
2169 CODE:
2170 RETVAL = Mix_FadeOutMusic (ms);
2171 OUTPUT:
2172 RETVAL
2173
1532CFClient::MixMusic 2174CFPlus::MixMusic
1533new_from_file (SV *class, char *path) 2175new_from_file (SV *class, char *path)
1534 CODE: 2176 CODE:
1535 RETVAL = Mix_LoadMUS (path); 2177 RETVAL = Mix_LoadMUS (path);
1536 OUTPUT: 2178 OUTPUT:
1537 RETVAL 2179 RETVAL
1538 2180
1539void 2181void
1540DESTROY (CFClient::MixMusic self) 2182DESTROY (CFPlus::MixMusic self)
1541 CODE: 2183 CODE:
1542 Mix_FreeMusic (self); 2184 Mix_FreeMusic (self);
1543 2185
1544int 2186int
1545play (CFClient::MixMusic self, int loops = -1) 2187play (CFPlus::MixMusic self, int loops = -1)
1546 CODE: 2188 CODE:
1547 RETVAL = Mix_PlayMusic (self, loops); 2189 RETVAL = Mix_PlayMusic (self, loops);
1548 OUTPUT: 2190 OUTPUT:
1549 RETVAL 2191 RETVAL
1550 2192
2193int
2194fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2195 CODE:
2196 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2197 OUTPUT:
2198 RETVAL
2199
1551MODULE = CFClient PACKAGE = CFClient::OpenGL 2200MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552 2201
1553BOOT: 2202BOOT:
1554{ 2203{
1555 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2204 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556 static const struct { 2205 static const struct {
1557 const char *name; 2206 const char *name;
1558 IV iv; 2207 IV iv;
1559 } *civ, const_iv[] = { 2208 } *civ, const_iv[] = {
1560# define const_iv(name) { # name, (IV)name } 2209# define const_iv(name) { # name, (IV)name }
1567 const_iv (GL_SCISSOR_TEST), 2216 const_iv (GL_SCISSOR_TEST),
1568 const_iv (GL_DEPTH_TEST), 2217 const_iv (GL_DEPTH_TEST),
1569 const_iv (GL_ALPHA_TEST), 2218 const_iv (GL_ALPHA_TEST),
1570 const_iv (GL_NORMALIZE), 2219 const_iv (GL_NORMALIZE),
1571 const_iv (GL_RESCALE_NORMAL), 2220 const_iv (GL_RESCALE_NORMAL),
2221 const_iv (GL_FRONT),
2222 const_iv (GL_BACK),
1572 const_iv (GL_AND), 2223 const_iv (GL_AND),
1573 const_iv (GL_ONE), 2224 const_iv (GL_ONE),
1574 const_iv (GL_ZERO), 2225 const_iv (GL_ZERO),
1575 const_iv (GL_SRC_ALPHA), 2226 const_iv (GL_SRC_ALPHA),
1576 const_iv (GL_DST_ALPHA), 2227 const_iv (GL_DST_ALPHA),
1577 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2228 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578 const_iv (GL_ONE_MINUS_DST_ALPHA), 2229 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 2230 const_iv (GL_SRC_ALPHA_SATURATE),
1580 const_iv (GL_RGB), 2231 const_iv (GL_RGB),
1581 const_iv (GL_RGBA), 2232 const_iv (GL_RGBA),
2233 const_iv (GL_RGBA4),
2234 const_iv (GL_RGBA8),
2235 const_iv (GL_RGB5_A1),
1582 const_iv (GL_UNSIGNED_BYTE), 2236 const_iv (GL_UNSIGNED_BYTE),
1583 const_iv (GL_UNSIGNED_SHORT), 2237 const_iv (GL_UNSIGNED_SHORT),
1584 const_iv (GL_UNSIGNED_INT), 2238 const_iv (GL_UNSIGNED_INT),
1585 const_iv (GL_ALPHA), 2239 const_iv (GL_ALPHA),
1586 const_iv (GL_INTENSITY), 2240 const_iv (GL_INTENSITY),
1618 const_iv (GL_SEPARABLE_2D), 2272 const_iv (GL_SEPARABLE_2D),
1619 const_iv (GL_CONVOLUTION_2D), 2273 const_iv (GL_CONVOLUTION_2D),
1620 const_iv (GL_CONVOLUTION_BORDER_MODE), 2274 const_iv (GL_CONVOLUTION_BORDER_MODE),
1621 const_iv (GL_CONSTANT_BORDER), 2275 const_iv (GL_CONSTANT_BORDER),
1622 const_iv (GL_LINES), 2276 const_iv (GL_LINES),
2277 const_iv (GL_LINE_STRIP),
1623 const_iv (GL_LINE_LOOP), 2278 const_iv (GL_LINE_LOOP),
1624 const_iv (GL_QUADS), 2279 const_iv (GL_QUADS),
1625 const_iv (GL_QUAD_STRIP), 2280 const_iv (GL_QUAD_STRIP),
1626 const_iv (GL_TRIANGLES), 2281 const_iv (GL_TRIANGLES),
1627 const_iv (GL_TRIANGLE_STRIP), 2282 const_iv (GL_TRIANGLE_STRIP),
1635# undef const_iv 2290# undef const_iv
1636 }; 2291 };
1637 2292
1638 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2293 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1639 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2294 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2295
2296 texture_av = newAV ();
2297 AvREAL_off (texture_av);
1640} 2298}
1641 2299
1642char * 2300char *
1643gl_vendor () 2301gl_vendor ()
1644 CODE: 2302 CODE:
1660 OUTPUT: 2318 OUTPUT:
1661 RETVAL 2319 RETVAL
1662 2320
1663int glGetError () 2321int glGetError ()
1664 2322
2323void glFinish ()
2324
1665void glClear (int mask) 2325void glClear (int mask)
1666 2326
1667void glClearColor (float r, float g, float b, float a = 1.0) 2327void glClearColor (float r, float g, float b, float a = 1.0)
1668 PROTOTYPE: @ 2328 PROTOTYPE: @
1669 2329
1692void glPushMatrix () 2352void glPushMatrix ()
1693 2353
1694void glPopMatrix () 2354void glPopMatrix ()
1695 2355
1696void glLoadIdentity () 2356void glLoadIdentity ()
2357
2358void glDrawBuffer (int buffer)
2359
2360void glReadBuffer (int buffer)
1697 2361
1698# near_ and far_ are due to microsofts buggy "c" compiler 2362# near_ and far_ are due to microsofts buggy "c" compiler
1699void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2363void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700 2364
1701# near_ and far_ are due to microsofts buggy "c" compiler 2365# near_ and far_ are due to microsofts buggy "c" compiler
1731 r *= a; 2395 r *= a;
1732 g *= a; 2396 g *= a;
1733 b *= a; 2397 b *= a;
1734 } 2398 }
1735 // microsoft visual "c" rounds instead of truncating... 2399 // microsoft visual "c" rounds instead of truncating...
1736 glColor4ub (MIN ((int)(r * 256.f), 255), 2400 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 2401
1741void glInterleavedArrays (int format, int stride, char *data) 2402void glInterleavedArrays (int format, int stride, char *data)
1742 2403
1743void glDrawElements (int mode, int count, int type, char *indices) 2404void glDrawElements (int mode, int count, int type, char *indices)
1744 2405
1790 2451
1791void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2452void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1792 2453
1793int glGenTexture () 2454int glGenTexture ()
1794 CODE: 2455 CODE:
1795{ 2456 RETVAL = gen_texture ();
1796 GLuint name;
1797 glGenTextures (1, &name);
1798 RETVAL = name;
1799}
1800 OUTPUT: 2457 OUTPUT:
1801 RETVAL 2458 RETVAL
1802 2459
1803void glDeleteTexture (int name) 2460void glDeleteTexture (int name)
1804 CODE: 2461 CODE:
1805{
1806 GLuint name_ = name;
1807 glDeleteTextures (1, &name_); 2462 del_texture (name);
1808} 2463
1809
1810int glGenList () 2464int glGenList ()
1811 CODE: 2465 CODE:
1812 RETVAL = glGenLists (1); 2466 RETVAL = glGenLists (1);
1813 OUTPUT: 2467 OUTPUT:
1814 RETVAL 2468 RETVAL
1821 2475
1822void glEndList () 2476void glEndList ()
1823 2477
1824void glCallList (int list) 2478void glCallList (int list)
1825 2479
1826

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines