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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines