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.119 by root, Sat Jun 17 15:07:52 2006 UTC vs.
Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines