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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines