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.104 by root, Mon Jun 5 00:17:47 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>
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 _WIN32 154#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#else 156#endif
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
96} 158}
97 159
98static void 160static void
99layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
100{ 162{
101 /* 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
102 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
103 */ 165 */
104 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
108 170
109 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
110} 172}
111 173
112static void 174static void
113layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
114{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
115 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
116 181
117 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119 184
120 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
121} 186 if (!rect.height) rect.height = 1;
122 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
123typedef uint16_t mapface; 193typedef uint16_t faceid;
124 194
125typedef struct { 195typedef struct {
126 GLint name; 196 int name;
127 int w, h; 197 int w, h;
128 float s, t; 198 float s, t;
129 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
130} maptex; 202} maptex;
131 203
132typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
133 int16_t darkness; 207 uint16_t darkness;
134 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
135} mapcell; 209} mapcell;
136 210
137typedef struct { 211typedef struct {
138 int32_t c0, c1; 212 int32_t c0, c1;
139 mapcell *col; 213 mapcell *col;
140} maprow; 214} maprow;
141 215
142typedef struct map { 216typedef struct map {
143 int x, y, w, h; 217 int x, y, w, h;
144 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
145 int faces; 219 int faces; tileid *face2tile; // [faceid]
146 mapface *face; 220 int texs; maptex *tex; // [tileid]
147
148 int texs;
149 maptex *tex;
150 221
151 int32_t rows; 222 int32_t rows;
152 maprow *row; 223 maprow *row;
153} *CFClient__Map; 224} *CFPlus__Map;
154 225
155static char * 226static char *
156prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
157{ 228{
158 char *p; 229 char *p;
175} 246}
176 247
177#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))
178#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))
179 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
180static maprow * 271static maprow *
181map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
182{ 273{
183 if (0 > y) 274 if (0 > y)
184 { 275 {
185 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
186 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
224 315
225 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
226} 317}
227 318
228static mapcell * 319static mapcell *
229map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
230{ 321{
231 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
232} 323}
233 324
234static void 325static void
235map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
236{ 327{
237 int r; 328 int r;
238 329
239 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
240 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
248 self->row = 0; 339 self->row = 0;
249 self->rows = 0; 340 self->rows = 0;
250} 341}
251 342
252static void 343static void
253map_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)
254{ 345{
255 int x, y; 346 int x, y;
256 maprow *row; 347 maprow *row;
348 mapcell *cell;
257 349
258 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
259 if (y >= 0) 351 if (y >= 0)
260 { 352 {
261 if (y >= self->rows) 353 if (y >= self->rows)
267 if (x >= row->c0) 359 if (x >= row->c0)
268 { 360 {
269 if (x >= row->c1) 361 if (x >= row->c1)
270 break; 362 break;
271 363
272 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;
273 } 370 }
274 } 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);
275} 388}
276 389
277static void 390static void
278music_finished (void) 391music_finished (void)
279{ 392{
298 ev.data2 = 0; 411 ev.data2 = 0;
299 412
300 SDL_PushEvent ((SDL_Event *)&ev); 413 SDL_PushEvent ((SDL_Event *)&ev);
301} 414}
302 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
303MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
304 438
305PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
306 440
307BOOT: 441BOOT:
308{ 442{
309 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
310 static const struct { 444 static const struct {
311 const char *name; 445 const char *name;
312 IV iv; 446 IV iv;
313 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
314# 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
315 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
316 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
317 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
318 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
319 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
328 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
329 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
330 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
331 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
332 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
333 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
334 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
335 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
336 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
337 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
392 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
393 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
394 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
395 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
396 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
397 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
398 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
399 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
400 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
401 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
402 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
403 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
404 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
405 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
406 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
407 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
408 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
409 const_iv (KMOD_CTRL),
410 const_iv (KMOD_SHIFT),
411 const_iv (KMOD_ALT),
412 const_iv (KMOD_META)
413# undef const_iv 556# undef const_iv
414 }; 557 };
415 558
416 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; )
417 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);
418} 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)
419 582
420void 583void
421pango_init () 584pango_init ()
422 CODE: 585 CODE:
423{ 586{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425 ft2_fontmap = pango_ft2_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
426 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);
427 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429 cairo_fontmap = pango_cairo_font_map_get_default ();
430 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431} 590}
432 591
433int 592int
434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
435 594
436void 595void
437SDL_Quit () 596SDL_Quit ()
438 597
439void 598void
446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449 608
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452 611
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457 616
458 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
459 622
460 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462 625
463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
483 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
484 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
485 ); 648 );
486 if (RETVAL) 649 if (RETVAL)
487 { 650 {
651 av_clear (texture_av);
652
488 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
489# 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);
490# include "glfunc.h" 655# include "glfunc.h"
491# undef GL_FUNC 656# undef GL_FUNC
657
492 } 658 }
493 OUTPUT: 659 OUTPUT:
494 RETVAL 660 RETVAL
495 661
496void 662void
497SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
498 664
499char * 665char *
500SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
501 667
668int
669SDL_GetAppState ()
670
502void 671void
503SDL_PollEvent () 672poll_events ()
504 PPCODE: 673 PPCODE:
505{ 674{
506 SDL_Event ev; 675 SDL_Event ev;
507 676
508 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
509 { 679 {
510 HV *hv = newHV (); 680 HV *hv = newHV ();
511 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
512 682
513 switch (ev.type) 683 switch (ev.type)
515 case SDL_KEYDOWN: 685 case SDL_KEYDOWN:
516 case SDL_KEYUP: 686 case SDL_KEYUP:
517 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
518 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
519 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 */
520 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
521 break; 692 break;
522 693
523 case SDL_ACTIVEEVENT: 694 case SDL_ACTIVEEVENT:
524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
525 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
526 break; 697 break;
527 698
528 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
529 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
530
531 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
532 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
533 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
534 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
535 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
536 break; 725 break;
537 726
538 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
539 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
540 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
550 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 739 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 740 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552 break; 741 break;
553 } 742 }
554 743
555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 744 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556 } 745 }
557} 746}
558 747
559int 748int
560Mix_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)
569Mix_AllocateChannels (int numchans = -1) 758Mix_AllocateChannels (int numchans = -1)
570 759
571void 760void
572lowdelay (int fd, int val = 1) 761lowdelay (int fd, int val = 1)
573 CODE: 762 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
764
765void
766win32_proxy_info ()
767 PPCODE:
768{
574#ifndef _WIN32 769#ifdef _WIN32
575 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 }
576#endif 791#endif
792}
577 793
578void 794void
579add_font (char *file) 795add_font (char *file)
580 CODE: 796 CODE:
581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 797 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582#ifdef _WIN32
583 // cairo... sigh... requires win2000
584 AddFontResourceEx (file, FR_PRIVATE, 0);
585#endif
586 798
587void 799void
588load_image_inline (SV *image_) 800load_image_inline (SV *image_)
589 ALIAS: 801 ALIAS:
590 load_image_file = 1 802 load_image_file = 1
632 844
633 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 845 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634 846
635 assert (surface2->pitch == surface2->w * 4); 847 assert (surface2->pitch == surface2->w * 4);
636 848
849 SDL_LockSurface (surface2);
637 EXTEND (SP, 5); 850 EXTEND (SP, 6);
638 PUSHs (sv_2mortal (newSViv (surface2->w))); 851 PUSHs (sv_2mortal (newSViv (surface2->w)));
639 PUSHs (sv_2mortal (newSViv (surface2->h))); 852 PUSHs (sv_2mortal (newSViv (surface2->h)));
640 SDL_LockSurface (surface2);
641 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 853 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642 SDL_UnlockSurface (surface2);
643 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)));
644 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 855 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 856 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
857 SDL_UnlockSurface (surface2);
646 858
647 SDL_FreeSurface (surface); 859 SDL_FreeSurface (surface);
648 SDL_FreeSurface (surface2); 860 SDL_FreeSurface (surface2);
649} 861}
650 862
686 CODE: 898 CODE:
687 fprintf (stderr, "FATAL: %s\n", message); 899 fprintf (stderr, "FATAL: %s\n", message);
688#ifdef _WIN32 900#ifdef _WIN32
689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690#endif 902#endif
691 exit (1); 903 _exit (1);
692 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
693MODULE = CFClient PACKAGE = CFClient::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
694 924
695CFClient::Font 925CFPlus::Font
696new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
697 CODE: 927 CODE:
698{ 928{
699 int count; 929 int count;
700 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 930 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
703} 933}
704 OUTPUT: 934 OUTPUT:
705 RETVAL 935 RETVAL
706 936
707void 937void
708DESTROY (CFClient::Font self) 938DESTROY (CFPlus::Font self)
709 CODE: 939 CODE:
710 pango_font_description_free (self); 940 pango_font_description_free (self);
711 941
712void 942void
713make_default (CFClient::Font self) 943make_default (CFPlus::Font self)
714 CODE: 944 CODE:
715 default_font = self; 945 default_font = self;
716 946
717MODULE = CFClient PACKAGE = CFClient::Layout 947MODULE = CFPlus PACKAGE = CFPlus::Layout
718 948
719CFClient::Layout 949void
720new (SV *class, int rgba = 0) 950reset_glyph_cache ()
721 CODE: 951 CODE:
722#if _WIN32 952 tc_clear ();
723 //rgba = 0;//D makes text nicer, breaks TextView 953
724#endif 954CFPlus::Layout
725 rgba=1;//D 955new (SV *class)
956 CODE:
726 New (0, RETVAL, 1, struct cf_layout); 957 New (0, RETVAL, 1, struct cf_layout);
727 958
728 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 959 RETVAL->pl = pango_layout_new (opengl_context);
729 RETVAL->rgba = rgba;
730 RETVAL->r = 1.; 960 RETVAL->r = 1.;
731 RETVAL->g = 1.; 961 RETVAL->g = 1.;
732 RETVAL->b = 1.; 962 RETVAL->b = 1.;
733 RETVAL->a = 1.; 963 RETVAL->a = 1.;
734 RETVAL->base_height = MIN_FONT_HEIGHT; 964 RETVAL->base_height = MIN_FONT_HEIGHT;
738 layout_update_font (RETVAL); 968 layout_update_font (RETVAL);
739 OUTPUT: 969 OUTPUT:
740 RETVAL 970 RETVAL
741 971
742void 972void
743DESTROY (CFClient::Layout self) 973DESTROY (CFPlus::Layout self)
744 CODE: 974 CODE:
745 g_object_unref (self->pl); 975 g_object_unref (self->pl);
746 Safefree (self); 976 Safefree (self);
747 977
748int
749is_rgba (CFClient::Layout self)
750 CODE:
751 RETVAL = self->rgba;
752 OUTPUT:
753 RETVAL
754
755void 978void
756set_text (CFClient::Layout self, SV *text_) 979set_text (CFPlus::Layout self, SV *text_)
757 CODE: 980 CODE:
758{ 981{
759 STRLEN textlen; 982 STRLEN textlen;
760 char *text = SvPVutf8 (text_, textlen); 983 char *text = SvPVutf8 (text_, textlen);
761 984
762 pango_layout_set_text (self->pl, text, textlen); 985 pango_layout_set_text (self->pl, text, textlen);
763} 986}
764 987
765void 988void
766set_markup (CFClient::Layout self, SV *text_) 989set_markup (CFPlus::Layout self, SV *text_)
767 CODE: 990 CODE:
768{ 991{
769 STRLEN textlen; 992 STRLEN textlen;
770 char *text = SvPVutf8 (text_, textlen); 993 char *text = SvPVutf8 (text_, textlen);
771 994
772 pango_layout_set_markup (self->pl, text, textlen); 995 pango_layout_set_markup (self->pl, text, textlen);
773} 996}
774 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
775SV * 1083SV *
776get_text (CFClient::Layout self) 1084get_text (CFPlus::Layout self)
777 CODE: 1085 CODE:
778 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1086 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779 SvUTF8_on (RETVAL); 1087 sv_utf8_decode (RETVAL);
780 OUTPUT: 1088 OUTPUT:
781 RETVAL 1089 RETVAL
782 1090
783void 1091void
784set_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.)
785 CODE: 1093 CODE:
786 self->r = r; 1094 self->r = r;
787 self->g = g; 1095 self->g = g;
788 self->b = b; 1096 self->b = b;
789 self->a = a; 1097 self->a = a;
790 1098
791void 1099void
792set_font (CFClient::Layout self, CFClient::Font font = 0) 1100set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793 CODE: 1101 CODE:
794 if (self->font != font) 1102 if (self->font != font)
795 { 1103 {
796 self->font = font; 1104 self->font = font;
797 layout_update_font (self); 1105 layout_update_font (self);
798 } 1106 }
799 1107
800void 1108void
801set_height (CFClient::Layout self, int base_height) 1109set_height (CFPlus::Layout self, int base_height)
802 CODE: 1110 CODE:
803 if (self->base_height != base_height) 1111 if (self->base_height != base_height)
804 { 1112 {
805 self->base_height = base_height; 1113 self->base_height = base_height;
806 layout_update_font (self); 1114 layout_update_font (self);
807 } 1115 }
808 1116
809void 1117void
810set_width (CFClient::Layout self, int max_width = -1) 1118set_width (CFPlus::Layout self, int max_width = -1)
811 CODE: 1119 CODE:
812 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);
813 1121
814void 1122void
815set_indent (CFClient::Layout self, int indent) 1123set_indent (CFPlus::Layout self, int indent)
816 CODE: 1124 CODE:
817 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1125 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818 1126
819void 1127void
820set_spacing (CFClient::Layout self, int spacing) 1128set_spacing (CFPlus::Layout self, int spacing)
821 CODE: 1129 CODE:
822 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1130 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823 1131
824void 1132void
825set_ellipsise (CFClient::Layout self, int ellipsise) 1133set_ellipsise (CFPlus::Layout self, int ellipsise)
826 CODE: 1134 CODE:
827 pango_layout_set_ellipsize (self->pl, 1135 pango_layout_set_ellipsize (self->pl,
828 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1136 ellipsise == 1 ? PANGO_ELLIPSIZE_START
829 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1137 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1138 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
831 : PANGO_ELLIPSIZE_NONE 1139 : PANGO_ELLIPSIZE_NONE
832 ); 1140 );
833 1141
834void 1142void
835set_single_paragraph_mode (CFClient::Layout self, int spm) 1143set_single_paragraph_mode (CFPlus::Layout self, int spm)
836 CODE: 1144 CODE:
837 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1145 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838 1146
839void 1147void
840size (CFClient::Layout self) 1148size (CFPlus::Layout self)
841 PPCODE: 1149 PPCODE:
842{ 1150{
843 int w, h; 1151 int w, h;
844 1152
845 layout_get_pixel_size (self, &w, &h); 1153 layout_get_pixel_size (self, &w, &h);
848 PUSHs (sv_2mortal (newSViv (w))); 1156 PUSHs (sv_2mortal (newSViv (w)));
849 PUSHs (sv_2mortal (newSViv (h))); 1157 PUSHs (sv_2mortal (newSViv (h)));
850} 1158}
851 1159
852int 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
853xy_to_index (CFClient::Layout self, int x, int y) 1173xy_to_index (CFPlus::Layout self, int x, int y)
854 CODE: 1174 CODE:
855{ 1175{
856 int index, trailing; 1176 int index, trailing;
857 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);
858 RETVAL = index; 1178 RETVAL = index + trailing;
859} 1179}
860 OUTPUT: 1180 OUTPUT:
861 RETVAL 1181 RETVAL
862 1182
863void 1183void
864cursor_pos (CFClient::Layout self, int index) 1184cursor_pos (CFPlus::Layout self, int index)
865 PPCODE: 1185 PPCODE:
866{ 1186{
867 PangoRectangle strong_pos; 1187 PangoRectangle strong_pos;
868 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1188 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869 1189
872 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874} 1194}
875 1195
876void 1196void
877render (CFClient::Layout self) 1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
878 PPCODE: 1198 PPCODE:
879{ 1199{
880 SV *retval; 1200 int line, x;
881 int w, h;
882 1201
883 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 */
884 1204
885 if (self->rgba)
886 {
887 cairo_surface_t *surface;
888 cairo_t *cairo;
889
890 retval = newSV (w * h * 4);
891 SvPOK_only (retval);
892 SvCUR_set (retval, w * h * 4);
893
894 memset (SvPVX (retval), 0, w * h * 4);
895
896 surface = cairo_image_surface_create_for_data (
897 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
898 cairo = cairo_create (surface);
899 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901 pango_cairo_show_layout (cairo, self->pl);
902
903 cairo_destroy (cairo);
904 cairo_surface_destroy (surface);
905
906 // what a mess, and its premultiplied, too :(
907 {
908 uint32_t *p = (uint32_t *)SvPVX (retval);
909 uint32_t *e = p + w * h;
910
911 while (p < e)
912 {
913 uint32_t rgba = *p;
914 rgba = (rgba >> 24) | (rgba << 8);
915#if 0
916#ifdef _WIN32
917 {//D
918 uint8_t r = rgba >> 24;
919 uint8_t g = rgba >> 16;
920 uint8_t b = rgba >> 8;
921 uint8_t a = rgba >> 0;
922
923 rgba = (rgba & 0xffffff00) | a;
924 }
925#endif
926#endif
927 rgba = SDL_SwapBE32 (rgba);
928 *p++ = rgba;
929 }
930 }
931
932 EXTEND (SP, 5); 1205 EXTEND (SP, 2);
933 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)
934 PUSHs (sv_2mortal (newSViv (h))); 1227 PUSHs (sv_2mortal (newSViv (index + trailing)));
935 PUSHs (sv_2mortal (retval));
936 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938 }
939 else 1228 else
940 { 1229 {
941 FT_Bitmap bitmap;
942
943 retval = newSV (w * h);
944 SvPOK_only (retval);
945 SvCUR_set (retval, w * h);
946
947 bitmap.rows = h;
948 bitmap.width = w;
949 bitmap.pitch = w;
950 bitmap.buffer = (unsigned char*)SvPVX (retval);
951 bitmap.num_grays = 256;
952 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954 memset (bitmap.buffer, 0, w * h);
955
956 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958 EXTEND (SP, 5);
959 PUSHs (sv_2mortal (newSViv (w))); 1230 PUSHs (sv_2mortal (newSViv (index)));
960 PUSHs (sv_2mortal (newSViv (h))); 1231 PUSHs (sv_2mortal (newSViv (trailing)));
961 PUSHs (sv_2mortal (retval));
962 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964 } 1232 }
965} 1233}
966 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
967MODULE = CFClient PACKAGE = CFClient::Texture 1245MODULE = CFPlus PACKAGE = CFPlus::Texture
968 1246
1247int minpot (int n)
1248
969void 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
970draw_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.)
971 PROTOTYPE: $$$;$$ 1288 PROTOTYPE: $$$;$$
972 ALIAS: 1289 ALIAS:
973 draw_quad_alpha = 1 1290 draw_quad_alpha = 1
974 draw_quad_alpha_premultiplied = 2 1291 draw_quad_alpha_premultiplied = 2
975 CODE: 1292 CODE:
1013 glDisable (GL_ALPHA_TEST); 1330 glDisable (GL_ALPHA_TEST);
1014 glDisable (GL_BLEND); 1331 glDisable (GL_BLEND);
1015 } 1332 }
1016} 1333}
1017 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
1018MODULE = CFClient PACKAGE = CFClient::Map 1346MODULE = CFPlus PACKAGE = CFPlus::Map
1019 1347
1020CFClient::Map 1348CFPlus::Map
1021new (SV *class, int map_width, int map_height) 1349new (SV *class)
1022 CODE: 1350 CODE:
1023 New (0, RETVAL, 1, struct map); 1351 New (0, RETVAL, 1, struct map);
1024 RETVAL->x = 0; 1352 RETVAL->x = 0;
1025 RETVAL->y = 0; 1353 RETVAL->y = 0;
1026 RETVAL->w = map_width; 1354 RETVAL->w = 0;
1027 RETVAL->h = map_height; 1355 RETVAL->h = 0;
1028 RETVAL->ox = 0; 1356 RETVAL->ox = 0;
1029 RETVAL->oy = 0; 1357 RETVAL->oy = 0;
1030 RETVAL->faces = 8192; 1358 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1031 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1359 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1032 RETVAL->texs = 8192;
1033 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1034 RETVAL->rows = 0; 1360 RETVAL->rows = 0;
1035 RETVAL->row = 0; 1361 RETVAL->row = 0;
1036 OUTPUT: 1362 OUTPUT:
1037 RETVAL 1363 RETVAL
1038 1364
1039void 1365void
1040DESTROY (CFClient::Map self) 1366DESTROY (CFPlus::Map self)
1041 CODE: 1367 CODE:
1042{ 1368{
1043 map_clear (self); 1369 map_clear (self);
1044 Safefree (self->face); 1370 Safefree (self->face2tile);
1371 Safefree (self->tex);
1045 Safefree (self); 1372 Safefree (self);
1046} 1373}
1047 1374
1048void 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
1049clear (CFClient::Map self) 1382clear (CFPlus::Map self)
1050 CODE: 1383 CODE:
1051 map_clear (self); 1384 map_clear (self);
1052 1385
1053void 1386void
1054set_face (CFClient::Map self, int face, int texid) 1387set_tileid (CFPlus::Map self, int face, int tile)
1055 CODE: 1388 CODE:
1056{ 1389{
1057 while (self->faces <= face) 1390 need_facenum (self, face); self->face2tile [face] = tile;
1058 { 1391 need_texid (self, tile);
1059 Append (mapface, self->face, self->faces, self->faces);
1060 self->faces *= 2;
1061 }
1062
1063 self->face [face] = texid;
1064} 1392}
1065 1393
1066void 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
1067set_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)
1068 CODE: 1419 CODE:
1069{ 1420{
1070 while (self->texs <= texid) 1421 need_texid (self, texid);
1071 {
1072 Append (maptex, self->tex, self->texs, self->texs);
1073 self->texs *= 2;
1074 }
1075 1422
1076 { 1423 {
1077 maptex *tex = self->tex + texid; 1424 maptex *tex = self->tex + texid;
1078 1425
1079 tex->name = name; 1426 tex->name = name;
1096 // from transparent color bleeding and ugly wrapping effects. 1443 // from transparent color bleeding and ugly wrapping effects.
1097 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1444 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098} 1445}
1099 1446
1100int 1447int
1101ox (CFClient::Map self) 1448ox (CFPlus::Map self)
1102 ALIAS: 1449 ALIAS:
1103 oy = 1 1450 oy = 1
1104 x = 2 1451 x = 2
1105 y = 3 1452 y = 3
1106 w = 4 1453 w = 4
1117 } 1464 }
1118 OUTPUT: 1465 OUTPUT:
1119 RETVAL 1466 RETVAL
1120 1467
1121void 1468void
1122scroll (CFClient::Map self, int dx, int dy) 1469scroll (CFPlus::Map self, int dx, int dy)
1123 CODE: 1470 CODE:
1124{ 1471{
1125 if (dx > 0) 1472 if (dx > 0)
1126 map_blank (self, self->x, self->y, dx - 1, self->h); 1473 map_blank (self, self->x, self->y, dx, self->h);
1127 else if (dx < 0) 1474 else if (dx < 0)
1128 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);
1129 1476
1130 if (dy > 0) 1477 if (dy > 0)
1131 map_blank (self, self->x, self->y, self->w, dy - 1); 1478 map_blank (self, self->x, self->y, self->w, dy);
1132 else if (dy < 0) 1479 else if (dy < 0)
1133 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);
1134 1481
1135 self->ox += dx; self->x += dx; 1482 self->ox += dx; self->x += dx;
1136 self->oy += dy; self->y += dy; 1483 self->oy += dy; self->y += dy;
1137 1484
1138 while (self->y < 0) 1485 while (self->y < 0)
1143 self->y += MAP_EXTEND_Y; 1490 self->y += MAP_EXTEND_Y;
1144 } 1491 }
1145} 1492}
1146 1493
1147void 1494void
1148map1a_update (CFClient::Map self, SV *data_) 1495map1a_update (CFPlus::Map self, SV *data_, int extmap)
1149 CODE: 1496 CODE:
1150{ 1497{
1151 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1498 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1152 uint8_t *data_end = (uint8_t *)SvEND (data_); 1499 uint8_t *data_end = (uint8_t *)SvEND (data_);
1153 mapcell *cell; 1500 mapcell *cell;
1154 int x, y, flags; 1501 int x, y, flags;
1155 1502
1156 while (data < data_end) 1503 while (data < data_end - 1)
1157 { 1504 {
1158 flags = (data [0] << 8) + data [1]; data += 2; 1505 flags = (data [0] << 8) + data [1]; data += 2;
1159 1506
1160 x = ((flags >> 10) & 63) + self->x; 1507 x = self->x + ((flags >> 10) & 63);
1161 y = ((flags >> 4) & 63) + self->y; 1508 y = self->y + ((flags >> 4) & 63);
1162 1509
1163 cell = map_get_cell (self, x, y); 1510 cell = map_get_cell (self, x, y);
1164 1511
1165 if (flags & 15) 1512 if (flags & 15)
1166 { 1513 {
1167 if (cell->darkness < 0) 1514 if (!cell->darkness)
1168 { 1515 {
1516 memset (cell, 0, sizeof (*cell));
1169 cell->darkness = 0; 1517 cell->darkness = 256;
1170 cell->face [0] = 0;
1171 cell->face [1] = 0;
1172 cell->face [2] = 0;
1173 } 1518 }
1174 1519
1175 cell->darkness = flags & 8 ? *data++ : 255;
1176
1177 //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 }
1178 1561
1179 if (flags & 4) 1562 if (flags & 4)
1180 { 1563 {
1181 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];
1182 } 1567 }
1183 1568
1184 if (flags & 2) 1569 if (flags & 2)
1185 { 1570 {
1186 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];
1187 } 1574 }
1188 1575
1189 if (flags & 1) 1576 if (flags & 1)
1190 { 1577 {
1191 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];
1192 } 1581 }
1193 } 1582 }
1194 else 1583 else
1195 cell->darkness = -1; 1584 cell->darkness = 0;
1196 } 1585 }
1197} 1586}
1198 1587
1199SV * 1588SV *
1200mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1589mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1201 CODE: 1590 CODE:
1202{ 1591{
1203 int x1, x; 1592 int x1, x;
1204 int y1, y; 1593 int y1, y;
1205 int z; 1594 int z;
1226 { 1615 {
1227 mapcell *cell = row->col + (x - row->c0); 1616 mapcell *cell = row->col + (x - row->c0);
1228 1617
1229 for (z = 0; z <= 0; z++) 1618 for (z = 0; z <= 0; z++)
1230 { 1619 {
1231 mapface face = cell->face [z];
1232
1233 if (face)
1234 {
1235 maptex tex = self->tex [face]; 1620 maptex tex = self->tex [cell->tile [z]];
1236 int a0 = 255 - tex.a; 1621 int a0 = 255 - tex.a;
1237 int a1 = tex.a; 1622 int a1 = tex.a;
1238 1623
1239 r = (r * a0 + tex.r * a1) / 255; 1624 r = (r * a0 + tex.r * a1) / 255;
1240 g = (g * a0 + tex.g * a1) / 255; 1625 g = (g * a0 + tex.g * a1) / 255;
1241 b = (b * a0 + tex.b * a1) / 255; 1626 b = (b * a0 + tex.b * a1) / 255;
1242 a = (a * a0 + tex.a * a1) / 255; 1627 a = (a * a0 + tex.a * a1) / 255;
1243 }
1244 } 1628 }
1245 } 1629 }
1246 1630
1247 *map++ = (r ) 1631 *map++ = (r )
1248 | (g << 8) 1632 | (g << 8)
1255} 1639}
1256 OUTPUT: 1640 OUTPUT:
1257 RETVAL 1641 RETVAL
1258 1642
1259void 1643void
1260draw (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)
1261 PPCODE: 1645 CODE:
1262{ 1646{
1263 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;
1264 int x, y, z; 1651 int x, y, z;
1265 int last_name; 1652 int last_name;
1266 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;
1267 int sw4 = (sw + 3) & ~3; 1971 int sw4 = (sw + 3) & ~3;
1268 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1972 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1269 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1973 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1270 1974
1271 memset (darkness, 255, sw4 * sh); 1975 memset (darkness, 255, sw4 * sh);
1272 SvPOK_only (darkness_sv); 1976 SvPOK_only (darkness_sv);
1273 SvCUR_set (darkness_sv, sw4 * sh); 1977 SvCUR_set (darkness_sv, sw4 * sh);
1274 1978
1275 vx = self->x + (self->w - sw) / 2 - shift_x; 1979 mx += self->x;
1276 vy = self->y + (self->h - sh) / 2 - shift_y; 1980 my += self->y;
1277 1981
1278 /*
1279 int vx = self->vx = self->w >= sw
1280 ? self->x + (self->w - sw) / 2
1281 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1282
1283 int vy = self->vy = self->h >= sh
1284 ? self->y + (self->h - sh) / 2
1285 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1286 */
1287
1288 glColor4ub (255, 255, 255, 255);
1289
1290 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291 glEnable (GL_BLEND);
1292 glEnable (GL_TEXTURE_2D);
1293 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294
1295 glBegin (GL_QUADS);
1296
1297 last_name = 0;
1298
1299 for (z = 0; z < 3; z++)
1300 for (y = 0; y < sh; y++) 1982 for (y = 0; y < sh; y++)
1301 if (0 <= y + vy && y + vy < self->rows) 1983 if (0 <= y + my && y + my < self->rows)
1302 { 1984 {
1303 maprow *row = self->row + (y + vy); 1985 maprow *row = self->row + (y + my);
1304 1986
1305 for (x = 0; x < sw; x++) 1987 for (x = 0; x < sw; x++)
1306 if (row->c0 <= x + vx && x + vx < row->c1) 1988 if (row->c0 <= x + mx && x + mx < row->c1)
1307 { 1989 {
1308 mapcell *cell = row->col + (x + vx - row->c0); 1990 mapcell *cell = row->col + (x + mx - row->c0);
1309 1991
1310 darkness[y * sw4 + x] = cell->darkness < 0 1992 darkness[y * sw4 + x] = cell->darkness
1993 ? 255 - (cell->darkness - 1)
1311 ? 255 - FOW_DARKNESS 1994 : 255 - FOW_DARKNESS;
1312 : 255 - cell->darkness;
1313
1314 face = cell->face [z];
1315
1316 if (face)
1317 {
1318 maptex tex = self->tex [face];
1319
1320 int px = (x + 1) * 32 - tex.w;
1321 int py = (y + 1) * 32 - tex.h;
1322
1323 if (last_name != tex.name)
1324 {
1325 glEnd ();
1326 last_name = tex.name;
1327 glBindTexture (GL_TEXTURE_2D, last_name);
1328 glBegin (GL_QUADS);
1329 }
1330
1331 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1332 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1333 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1334 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1335 }
1336 } 1995 }
1337 } 1996 }
1338
1339 glEnd ();
1340
1341 glDisable (GL_TEXTURE_2D);
1342 glDisable (GL_BLEND);
1343 1997
1344 EXTEND (SP, 3); 1998 EXTEND (SP, 3);
1345 PUSHs (sv_2mortal (newSViv (sw4))); 1999 PUSHs (sv_2mortal (newSViv (sw4)));
1346 PUSHs (sv_2mortal (newSViv (sh))); 2000 PUSHs (sv_2mortal (newSViv (sh)));
1347 PUSHs (darkness_sv); 2001 PUSHs (darkness_sv);
1348} 2002}
1349 2003
1350SV * 2004SV *
1351get_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)
1352 CODE: 2006 CODE:
1353{ 2007{
1354 int x, y, x1, y1; 2008 int x, y, x1, y1;
1355 SV *data_sv = newSV (w * h * 7 + 5); 2009 SV *data_sv = newSV (w * h * 7 + 5);
1356 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2010 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1381 if (row && row->c0 <= x && x < row->c1) 2035 if (row && row->c0 <= x && x < row->c1)
1382 { 2036 {
1383 mapcell *cell = row->col + (x - row->c0); 2037 mapcell *cell = row->col + (x - row->c0);
1384 uint8_t flags = 0; 2038 uint8_t flags = 0;
1385 2039
1386 if (cell->face [0]) flags |= 1; 2040 if (cell->tile [0]) flags |= 1;
1387 if (cell->face [1]) flags |= 2; 2041 if (cell->tile [1]) flags |= 2;
1388 if (cell->face [2]) flags |= 4; 2042 if (cell->tile [2]) flags |= 4;
1389 2043
1390 *data++ = flags; 2044 *data++ = flags;
1391 2045
1392 if (flags & 1) 2046 if (flags & 1)
1393 { 2047 {
2048 tileid tile = cell->tile [0];
1394 *data++ = cell->face [0] >> 8; 2049 *data++ = tile >> 8;
1395 *data++ = cell->face [0]; 2050 *data++ = tile;
1396 } 2051 }
1397 2052
1398 if (flags & 2) 2053 if (flags & 2)
1399 { 2054 {
2055 tileid tile = cell->tile [1];
1400 *data++ = cell->face [1] >> 8; 2056 *data++ = tile >> 8;
1401 *data++ = cell->face [1]; 2057 *data++ = tile;
1402 } 2058 }
1403 2059
1404 if (flags & 4) 2060 if (flags & 4)
1405 { 2061 {
2062 tileid tile = cell->tile [2];
1406 *data++ = cell->face [2] >> 8; 2063 *data++ = tile >> 8;
1407 *data++ = cell->face [2]; 2064 *data++ = tile;
1408 } 2065 }
1409 } 2066 }
1410 else 2067 else
1411 *data++ = 0; 2068 *data++ = 0;
1412 } 2069 }
1418} 2075}
1419 OUTPUT: 2076 OUTPUT:
1420 RETVAL 2077 RETVAL
1421 2078
1422void 2079void
1423set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2080set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1424 PPCODE: 2081 PPCODE:
1425{ 2082{
1426 int x, y, z; 2083 int x, y, z;
1427 int w, h; 2084 int w, h;
1428 int x1, y1; 2085 int x1, y1;
1452 { 2109 {
1453 uint8_t flags = *data++; 2110 uint8_t flags = *data++;
1454 2111
1455 if (flags) 2112 if (flags)
1456 { 2113 {
1457 mapface face[3] = { 0, 0, 0 };
1458
1459 mapcell *cell = row_get_cell (row, x); 2114 mapcell *cell = row_get_cell (row, x);
2115 tileid tile[3] = { 0, 0, 0 };
1460 2116
1461 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2117 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1462 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2118 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1463 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2119 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1464 2120
1465 if (cell->darkness <= 0) 2121 if (cell->darkness == 0)
1466 { 2122 {
1467 cell->darkness = -1; 2123 cell->darkness = 0;
1468 2124
1469 for (z = 0; z <= 2; z++) 2125 for (z = 0; z <= 2; z++)
1470 { 2126 {
1471 cell->face[z] = face[z]; 2127 tileid t = tile [z];
1472 2128
1473 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2129 if (t >= self->texs || (t && !self->tex [t].name))
2130 {
1474 XPUSHs (sv_2mortal (newSViv (face[z]))); 2131 XPUSHs (sv_2mortal (newSViv (t)));
2132 need_texid (self, t);
2133 }
2134
2135 cell->tile [z] = t;
1475 } 2136 }
1476 } 2137 }
1477 } 2138 }
1478 } 2139 }
1479 } 2140 }
1480} 2141}
1481 2142
1482MODULE = CFClient PACKAGE = CFClient::MixChunk 2143MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483 2144
1484CFClient::MixChunk 2145CFPlus::MixChunk
1485new_from_file (SV *class, char *path) 2146new_from_file (SV *class, char *path)
1486 CODE: 2147 CODE:
1487 RETVAL = Mix_LoadWAV (path); 2148 RETVAL = Mix_LoadWAV (path);
1488 OUTPUT: 2149 OUTPUT:
1489 RETVAL 2150 RETVAL
1490 2151
1491void 2152void
1492DESTROY (CFClient::MixChunk self) 2153DESTROY (CFPlus::MixChunk self)
1493 CODE: 2154 CODE:
1494 Mix_FreeChunk (self); 2155 Mix_FreeChunk (self);
1495 2156
1496int 2157int
1497volume (CFClient::MixChunk self, int volume = -1) 2158volume (CFPlus::MixChunk self, int volume = -1)
1498 CODE: 2159 CODE:
1499 RETVAL = Mix_VolumeChunk (self, volume); 2160 RETVAL = Mix_VolumeChunk (self, volume);
1500 OUTPUT: 2161 OUTPUT:
1501 RETVAL 2162 RETVAL
1502 2163
1503int 2164int
1504play (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)
1505 CODE: 2166 CODE:
1506 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2167 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507 OUTPUT: 2168 OUTPUT:
1508 RETVAL 2169 RETVAL
1509 2170
1510MODULE = CFClient PACKAGE = CFClient::MixMusic 2171MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511 2172
1512int 2173int
1513volume (int volume = -1) 2174volume (int volume = -1)
1514 CODE: 2175 CODE:
1515 RETVAL = Mix_VolumeMusic (volume); 2176 RETVAL = Mix_VolumeMusic (volume);
1516 OUTPUT: 2177 OUTPUT:
1517 RETVAL 2178 RETVAL
1518 2179
2180int
2181fade_out (int ms)
2182 CODE:
2183 RETVAL = Mix_FadeOutMusic (ms);
2184 OUTPUT:
2185 RETVAL
2186
1519CFClient::MixMusic 2187CFPlus::MixMusic
1520new_from_file (SV *class, char *path) 2188new_from_file (SV *class, char *path)
1521 CODE: 2189 CODE:
1522 RETVAL = Mix_LoadMUS (path); 2190 RETVAL = Mix_LoadMUS (path);
1523 OUTPUT: 2191 OUTPUT:
1524 RETVAL 2192 RETVAL
1525 2193
1526void 2194void
1527DESTROY (CFClient::MixMusic self) 2195DESTROY (CFPlus::MixMusic self)
1528 CODE: 2196 CODE:
1529 Mix_FreeMusic (self); 2197 Mix_FreeMusic (self);
1530 2198
1531int 2199int
1532play (CFClient::MixMusic self, int loops = -1) 2200play (CFPlus::MixMusic self, int loops = -1)
1533 CODE: 2201 CODE:
1534 RETVAL = Mix_PlayMusic (self, loops); 2202 RETVAL = Mix_PlayMusic (self, loops);
1535 OUTPUT: 2203 OUTPUT:
1536 RETVAL 2204 RETVAL
1537 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
1538MODULE = CFClient PACKAGE = CFClient::OpenGL 2213MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539 2214
1540BOOT: 2215BOOT:
1541{ 2216{
1542 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2217 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543 static const struct { 2218 static const struct {
1544 const char *name; 2219 const char *name;
1545 IV iv; 2220 IV iv;
1546 } *civ, const_iv[] = { 2221 } *civ, const_iv[] = {
1547# 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),
1548 const_iv (GL_COLOR_MATERIAL), 2226 const_iv (GL_COLOR_MATERIAL),
1549 const_iv (GL_SMOOTH), 2227 const_iv (GL_SMOOTH),
1550 const_iv (GL_FLAT), 2228 const_iv (GL_FLAT),
1551 const_iv (GL_DITHER), 2229 const_iv (GL_DITHER),
1552 const_iv (GL_BLEND), 2230 const_iv (GL_BLEND),
1554 const_iv (GL_SCISSOR_TEST), 2232 const_iv (GL_SCISSOR_TEST),
1555 const_iv (GL_DEPTH_TEST), 2233 const_iv (GL_DEPTH_TEST),
1556 const_iv (GL_ALPHA_TEST), 2234 const_iv (GL_ALPHA_TEST),
1557 const_iv (GL_NORMALIZE), 2235 const_iv (GL_NORMALIZE),
1558 const_iv (GL_RESCALE_NORMAL), 2236 const_iv (GL_RESCALE_NORMAL),
2237 const_iv (GL_FRONT),
2238 const_iv (GL_BACK),
1559 const_iv (GL_AND), 2239 const_iv (GL_AND),
1560 const_iv (GL_ONE), 2240 const_iv (GL_ONE),
1561 const_iv (GL_ZERO), 2241 const_iv (GL_ZERO),
1562 const_iv (GL_SRC_ALPHA), 2242 const_iv (GL_SRC_ALPHA),
1563 const_iv (GL_DST_ALPHA), 2243 const_iv (GL_DST_ALPHA),
1564 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2244 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565 const_iv (GL_ONE_MINUS_DST_ALPHA), 2245 const_iv (GL_ONE_MINUS_DST_ALPHA),
1566 const_iv (GL_SRC_ALPHA_SATURATE), 2246 const_iv (GL_SRC_ALPHA_SATURATE),
1567 const_iv (GL_RGB), 2247 const_iv (GL_RGB),
1568 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),
1569 const_iv (GL_UNSIGNED_BYTE), 2252 const_iv (GL_UNSIGNED_BYTE),
1570 const_iv (GL_UNSIGNED_SHORT), 2253 const_iv (GL_UNSIGNED_SHORT),
1571 const_iv (GL_UNSIGNED_INT), 2254 const_iv (GL_UNSIGNED_INT),
1572 const_iv (GL_ALPHA), 2255 const_iv (GL_ALPHA),
1573 const_iv (GL_INTENSITY), 2256 const_iv (GL_INTENSITY),
1574 const_iv (GL_LUMINANCE), 2257 const_iv (GL_LUMINANCE),
1575 const_iv (GL_LUMINANCE_ALPHA), 2258 const_iv (GL_LUMINANCE_ALPHA),
1576 const_iv (GL_FLOAT), 2259 const_iv (GL_FLOAT),
1577 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2260 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1578 const_iv (GL_COMPILE), 2261 const_iv (GL_COMPILE),
2262 const_iv (GL_PROXY_TEXTURE_1D),
2263 const_iv (GL_PROXY_TEXTURE_2D),
1579 const_iv (GL_TEXTURE_1D), 2264 const_iv (GL_TEXTURE_1D),
1580 const_iv (GL_TEXTURE_2D), 2265 const_iv (GL_TEXTURE_2D),
1581 const_iv (GL_TEXTURE_ENV), 2266 const_iv (GL_TEXTURE_ENV),
1582 const_iv (GL_TEXTURE_MAG_FILTER), 2267 const_iv (GL_TEXTURE_MAG_FILTER),
1583 const_iv (GL_TEXTURE_MIN_FILTER), 2268 const_iv (GL_TEXTURE_MIN_FILTER),
1605 const_iv (GL_SEPARABLE_2D), 2290 const_iv (GL_SEPARABLE_2D),
1606 const_iv (GL_CONVOLUTION_2D), 2291 const_iv (GL_CONVOLUTION_2D),
1607 const_iv (GL_CONVOLUTION_BORDER_MODE), 2292 const_iv (GL_CONVOLUTION_BORDER_MODE),
1608 const_iv (GL_CONSTANT_BORDER), 2293 const_iv (GL_CONSTANT_BORDER),
1609 const_iv (GL_LINES), 2294 const_iv (GL_LINES),
2295 const_iv (GL_LINE_STRIP),
1610 const_iv (GL_LINE_LOOP), 2296 const_iv (GL_LINE_LOOP),
1611 const_iv (GL_QUADS), 2297 const_iv (GL_QUADS),
1612 const_iv (GL_QUAD_STRIP), 2298 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES), 2299 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP), 2300 const_iv (GL_TRIANGLE_STRIP),
1622# undef const_iv 2308# undef const_iv
1623 }; 2309 };
1624 2310
1625 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; )
1626 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);
1627} 2316}
1628 2317
1629char * 2318char *
1630gl_vendor () 2319gl_vendor ()
1631 CODE: 2320 CODE:
1645 CODE: 2334 CODE:
1646 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2335 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1647 OUTPUT: 2336 OUTPUT:
1648 RETVAL 2337 RETVAL
1649 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
1650int glGetError () 2353int glGetError ()
2354
2355void glFinish ()
1651 2356
1652void glClear (int mask) 2357void glClear (int mask)
1653 2358
1654void glClearColor (float r, float g, float b, float a = 1.0) 2359void glClearColor (float r, float g, float b, float a = 1.0)
1655 PROTOTYPE: @ 2360 PROTOTYPE: @
1679void glPushMatrix () 2384void glPushMatrix ()
1680 2385
1681void glPopMatrix () 2386void glPopMatrix ()
1682 2387
1683void glLoadIdentity () 2388void glLoadIdentity ()
2389
2390void glDrawBuffer (int buffer)
2391
2392void glReadBuffer (int buffer)
1684 2393
1685# near_ and far_ are due to microsofts buggy "c" compiler 2394# near_ and far_ are due to microsofts buggy "c" compiler
1686void 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_)
1687 2396
1688# near_ and far_ are due to microsofts buggy "c" compiler 2397# near_ and far_ are due to microsofts buggy "c" compiler
1718 r *= a; 2427 r *= a;
1719 g *= a; 2428 g *= a;
1720 b *= a; 2429 b *= a;
1721 } 2430 }
1722 // microsoft visual "c" rounds instead of truncating... 2431 // microsoft visual "c" rounds instead of truncating...
1723 glColor4ub (MIN ((int)(r * 256.f), 255), 2432 glColor4f (r, g, b, a);
1724 MIN ((int)(g * 256.f), 255),
1725 MIN ((int)(b * 256.f), 255),
1726 MIN ((int)(a * 256.f), 255));
1727 2433
1728void glInterleavedArrays (int format, int stride, char *data) 2434void glInterleavedArrays (int format, int stride, char *data)
1729 2435
1730void glDrawElements (int mode, int count, int type, char *indices) 2436void glDrawElements (int mode, int count, int type, char *indices)
1731 2437
1773 2479
1774void 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)
1775 2481
1776void glDrawPixels (int width, int height, int format, int type, char *pixels) 2482void glDrawPixels (int width, int height, int format, int type, char *pixels)
1777 2483
2484void glPixelZoom (float x, float y)
2485
1778void 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)
1779 2487
1780int glGenTexture () 2488int glGenTexture ()
1781 CODE: 2489 CODE:
1782{ 2490 RETVAL = gen_texture ();
1783 GLuint name;
1784 glGenTextures (1, &name);
1785 RETVAL = name;
1786}
1787 OUTPUT: 2491 OUTPUT:
1788 RETVAL 2492 RETVAL
1789 2493
1790void glDeleteTexture (int name) 2494void glDeleteTexture (int name)
1791 CODE: 2495 CODE:
1792{
1793 GLuint name_ = name;
1794 glDeleteTextures (1, &name_); 2496 del_texture (name);
1795} 2497
1796
1797int glGenList () 2498int glGenList ()
1798 CODE: 2499 CODE:
1799 RETVAL = glGenLists (1); 2500 RETVAL = glGenLists (1);
1800 OUTPUT: 2501 OUTPUT:
1801 RETVAL 2502 RETVAL
1808 2509
1809void glEndList () 2510void glEndList ()
1810 2511
1811void glCallList (int list) 2512void glCallList (int list)
1812 2513
1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines