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.115 by root, Wed Jun 14 18:59:30 2006 UTC vs.
Revision 1.200 by root, Tue Jul 17 16:02:13 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines