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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines