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.66 by root, Mon Apr 24 11:45:16 2006 UTC vs.
Revision 1.157 by root, Sun Oct 1 14:48:50 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 4# include <malloc.h>
5# include <windows.h>
6# include <wininet.h>
7# pragma warning(disable:4244)
3#endif 8#endif
4 9
5#include "EXTERN.h" 10#include "EXTERN.h"
6#include "perl.h" 11#include "perl.h"
7#include "XSUB.h" 12#include "XSUB.h"
8 13
14#ifdef _WIN32
15# undef pipe
16#endif
17
18#include <math.h>
9#include <string.h> 19#include <string.h>
10#include <stdio.h> 20#include <stdio.h>
21#include <stdlib.h>
11 22
12#include <SDL.h> 23#include <SDL.h>
24#include <SDL_endian.h>
13#include <SDL_image.h> 25#include <SDL_image.h>
14#include <SDL_mixer.h> 26#include <SDL_mixer.h>
15#include <SDL_opengl.h> 27#include <SDL_opengl.h>
16 28
29#define PANGO_ENABLE_BACKEND
30#define G_DISABLE_CAST_CHECKS
31
17#include <glib/gmacros.h> 32#include <glib/gmacros.h>
18 33
19#include <pango/pango.h> 34#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 35
23#ifndef _WIN32 36#ifndef _WIN32
24# include <sys/types.h> 37# include <sys/types.h>
25# include <sys/socket.h> 38# include <sys/socket.h>
26# include <netinet/in.h> 39# include <netinet/in.h>
33 typedef signed char int8_t; 46 typedef signed char int8_t;
34 typedef signed short int16_t; 47 typedef signed short int16_t;
35 typedef signed int int32_t; 48 typedef signed int int32_t;
36#endif 49#endif
37 50
38#include "glext.h" 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39 52
40#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
41 54
42#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
44 57
45#define MIN_FONT_HEIGHT 10 58#define MIN_FONT_HEIGHT 10
46 59
47#define GL_CALL(type,func,args) \ 60#if 0
48 { \ 61# define PARACHUTE SDL_INIT_NOPARACHUTE
49 static int init_; \ 62#else
50 static type fptr_; \ 63# define PARACHUTE 0
51 \ 64#endif
52 if (!init_) \
53 { \
54 init_ = 1; \
55 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56 } \
57 \
58 if (fptr_) \
59 fptr_ args; \
60 }
61 65
66static struct
67{
68#define GL_FUNC(ptr,name) ptr name;
69#include "glfunc.h"
70#undef GL_FUNC
71} gl;
72
73static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
74{
75 if (gl.BlendFuncSeparate)
76 gl.BlendFuncSeparate (sa, da, saa, daa);
77 else if (gl.BlendFuncSeparateEXT)
78 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
79 else
80 glBlendFunc (sa, da);
81}
82
83#include "texcache.c"
84
85#include "pango-font.c"
86#include "pango-fontmap.c"
87#include "pango-render.c"
88
62typedef Mix_Chunk *CFClient__MixChunk; 89typedef Mix_Chunk *CFPlus__MixChunk;
63typedef Mix_Music *CFClient__MixMusic; 90typedef Mix_Music *CFPlus__MixMusic;
64 91
65typedef PangoFontDescription *CFClient__Font; 92typedef PangoFontDescription *CFPlus__Font;
93
94static int
95shape_attr_p (PangoLayoutRun *run)
96{
97 GSList *attrs = run->item->analysis.extra_attrs;
98
99 while (attrs)
100 {
101 PangoAttribute *attr = attrs->data;
102
103 if (attr->klass->type == PANGO_ATTR_SHAPE)
104 return 1;
105
106 attrs = attrs->next;
107 }
108
109 return 0;
110}
66 111
67typedef struct cf_layout { 112typedef struct cf_layout {
68 PangoLayout *pl; 113 PangoLayout *pl;
114 float r, g, b, a; // default color for rgba mode
69 int base_height; 115 int base_height;
70 CFClient__Font font; 116 CFPlus__Font font;
71} *CFClient__Layout; 117} *CFPlus__Layout;
72 118
73static CFClient__Font default_font; 119static CFPlus__Font default_font;
74static PangoContext *context; 120static PangoContext *opengl_context;
75static PangoFontMap *fontmap; 121static PangoFontMap *opengl_fontmap;
76 122
77static void 123static void
78substitute_func (FcPattern *pattern, gpointer data) 124substitute_func (FcPattern *pattern, gpointer data)
79{ 125{
80 FcPatternAddBool (pattern, FC_HINTING , 1); 126 FcPatternAddBool (pattern, FC_HINTING, 1);
127#ifdef FC_HINT_STYLE
128 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
129#endif
81 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 130 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82} 131}
83 132
84static void 133static void
85layout_update_font (CFClient__Layout self) 134layout_update_font (CFPlus__Layout self)
86{ 135{
87 /* use a random scale factor to account for unknown descenders, 0.8 works 136 /* use a random scale factor to account for unknown descenders, 0.8 works
88 * reasonably well with bitstream vera 137 * reasonably well with bitstream vera
89 */ 138 */
90 PangoFontDescription *font = self->font ? self->font : default_font; 139 PangoFontDescription *font = self->font ? self->font : default_font;
94 143
95 pango_layout_set_font_description (self->pl, font); 144 pango_layout_set_font_description (self->pl, font);
96} 145}
97 146
98static void 147static void
99layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 148layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
100{ 149{
150 PangoRectangle rect;
151
152 // get_pixel_* wrongly rounds down
101 pango_layout_get_pixel_size (self->pl, w, h); 153 pango_layout_get_extents (self->pl, 0, &rect);
102 154
103 *w = (*w + 3) & ~3; 155 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
104 if (!*w) *w = 1; 156 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
105 if (!*h) *h = 1; 157
158 if (!rect.width) rect.width = 1;
159 if (!rect.height) rect.height = 1;
160
161 *w = rect.width;
162 *h = rect.height;
106} 163}
107 164
108typedef uint16_t mapface; 165typedef uint16_t mapface;
109 166
110typedef struct { 167typedef struct {
113 float s, t; 170 float s, t;
114 uint8_t r, g, b, a; 171 uint8_t r, g, b, a;
115} maptex; 172} maptex;
116 173
117typedef struct { 174typedef struct {
118 int16_t darkness; 175 uint32_t player;
119 mapface face[3]; 176 mapface face[3];
177 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags;
120} mapcell; 179} mapcell;
121 180
122typedef struct { 181typedef struct {
123 int32_t c0, c1; 182 int32_t c0, c1;
124 mapcell *col; 183 mapcell *col;
133 int texs; 192 int texs;
134 maptex *tex; 193 maptex *tex;
135 194
136 int32_t rows; 195 int32_t rows;
137 maprow *row; 196 maprow *row;
138} *CFClient__Map; 197} *CFPlus__Map;
139 198
140static char * 199static char *
141prepend (char *ptr, int sze, int inc) 200prepend (char *ptr, int sze, int inc)
142{ 201{
143 char *p; 202 char *p;
161 220
162#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 221#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
163#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 222#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
164 223
165static maprow * 224static maprow *
166map_get_row (CFClient__Map self, int y) 225map_get_row (CFPlus__Map self, int y)
167{ 226{
168 if (0 > y) 227 if (0 > y)
169 { 228 {
170 int extend = - y + MAP_EXTEND_Y; 229 int extend = - y + MAP_EXTEND_Y;
171 Prepend (maprow, self->row, self->rows, extend); 230 Prepend (maprow, self->row, self->rows, extend);
209 268
210 return row->col + (x - row->c0); 269 return row->col + (x - row->c0);
211} 270}
212 271
213static mapcell * 272static mapcell *
214map_get_cell (CFClient__Map self, int x, int y) 273map_get_cell (CFPlus__Map self, int x, int y)
215{ 274{
216 return row_get_cell (map_get_row (self, y), x); 275 return row_get_cell (map_get_row (self, y), x);
217} 276}
218 277
219static void 278static void
220map_clear (CFClient__Map self) 279map_clear (CFPlus__Map self)
221{ 280{
222 int r; 281 int r;
223 282
224 for (r = 0; r < self->rows; r++) 283 for (r = 0; r < self->rows; r++)
225 Safefree (self->row[r].col); 284 Safefree (self->row[r].col);
233 self->row = 0; 292 self->row = 0;
234 self->rows = 0; 293 self->rows = 0;
235} 294}
236 295
237static void 296static void
238map_blank (CFClient__Map self, int x0, int y0, int w, int h) 297map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
239{ 298{
240 int x, y; 299 int x, y;
241 maprow *row; 300 maprow *row;
301 mapcell *cell;
242 302
243 for (y = y0; y < y0 + h; y++) 303 for (y = y0; y < y0 + h; y++)
244 if (y >= 0) 304 if (y >= 0)
245 { 305 {
246 if (y >= self->rows) 306 if (y >= self->rows)
252 if (x >= row->c0) 312 if (x >= row->c0)
253 { 313 {
254 if (x >= row->c1) 314 if (x >= row->c1)
255 break; 315 break;
256 316
257 row->col[x - row->c0].darkness = -1; 317 cell = row->col + x - row->c0;
318
319 cell->darkness = 0;
320 cell->stat_hp = 0;
321 cell->flags = 0;
322 cell->player = 0;
258 } 323 }
259 } 324 }
260} 325}
261 326
262static void 327static void
263music_finished () 328music_finished (void)
264{ 329{
265 SDL_UserEvent ev; 330 SDL_UserEvent ev;
266 331
267 ev.type = SDL_USEREVENT; 332 ev.type = SDL_USEREVENT;
268 ev.code = 0; 333 ev.code = 0;
270 ev.data2 = 0; 335 ev.data2 = 0;
271 336
272 SDL_PushEvent ((SDL_Event *)&ev); 337 SDL_PushEvent ((SDL_Event *)&ev);
273} 338}
274 339
340static void
341channel_finished (int channel)
342{
343 SDL_UserEvent ev;
344
345 ev.type = SDL_USEREVENT;
346 ev.code = 1;
347 ev.data1 = (void *)(long)channel;
348 ev.data2 = 0;
349
350 SDL_PushEvent ((SDL_Event *)&ev);
351}
352
353static unsigned int
354minpot (unsigned int n)
355{
356 if (!n)
357 return 0;
358
359 --n;
360
361 n |= n >> 1;
362 n |= n >> 2;
363 n |= n >> 4;
364 n |= n >> 8;
365 n |= n >> 16;
366
367 return n + 1;
368}
369
275MODULE = CFClient PACKAGE = CFClient 370MODULE = CFPlus PACKAGE = CFPlus
276 371
277PROTOTYPES: ENABLE 372PROTOTYPES: ENABLE
278 373
279BOOT: 374BOOT:
280{ 375{
281 HV *stash = gv_stashpv ("CFClient", 1); 376 HV *stash = gv_stashpv ("CFPlus", 1);
282 static const struct { 377 static const struct {
283 const char *name; 378 const char *name;
284 IV iv; 379 IV iv;
285 } *civ, const_iv[] = { 380 } *civ, const_iv[] = {
286# define const_iv(name) { # name, (IV)name } 381# define const_iv(name) { # name, (IV)name }
385# undef const_iv 480# undef const_iv
386 }; 481 };
387 482
388 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 483 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 484 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
390
391 fontmap = pango_ft2_font_map_new ();
392 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
393 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
394} 485}
395 486
396int 487int
488in_destruct ()
489 CODE:
490 RETVAL = PL_main_cv == Nullcv;
491 OUTPUT:
492 RETVAL
493
494NV floor (NV x)
495
496NV ceil (NV x)
497
498void
499pango_init ()
500 CODE:
501{
502 opengl_fontmap = pango_opengl_font_map_new ();
503 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
504 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
505}
506
507int
397SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 508SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
398 509
399void 510void
400SDL_Quit () 511SDL_Quit ()
401 512
402void 513void
408 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 519 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 520 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 521 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 522 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412 523
524 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
525 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
526
413 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 530 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417 531
418 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 532 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
533#if SDL_VERSION_ATLEAST(1,2,10)
419 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 534 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
420 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 535 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
536#endif
421 537
422 SDL_EnableUNICODE (1); 538 SDL_EnableUNICODE (1);
423 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 539 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424 540
425 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 541 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
434 550
435 ++m; 551 ++m;
436 } 552 }
437} 553}
438 554
555char *
556SDL_GetError ()
557
439int 558int
440SDL_SetVideoMode (int w, int h, int fullscreen) 559SDL_SetVideoMode (int w, int h, int fullscreen)
441 CODE: 560 CODE:
442 RETVAL = !!SDL_SetVideoMode ( 561 RETVAL = !!SDL_SetVideoMode (
443 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 562 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
444 ); 563 );
564 if (RETVAL)
565 {
445 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 566 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
567# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
568# include "glfunc.h"
569# undef GL_FUNC
570 }
446 OUTPUT: 571 OUTPUT:
447 RETVAL 572 RETVAL
448 573
449void 574void
450SDL_GL_SwapBuffers () 575SDL_GL_SwapBuffers ()
576
577char *
578SDL_GetKeyName (int sym)
451 579
452void 580void
453SDL_PollEvent () 581SDL_PollEvent ()
454 PPCODE: 582 PPCODE:
455{ 583{
457 585
458 while (SDL_PollEvent (&ev)) 586 while (SDL_PollEvent (&ev))
459 { 587 {
460 HV *hv = newHV (); 588 HV *hv = newHV ();
461 hv_store (hv, "type", 4, newSViv (ev.type), 0); 589 hv_store (hv, "type", 4, newSViv (ev.type), 0);
590
462 switch (ev.type) 591 switch (ev.type)
463 { 592 {
464 case SDL_KEYDOWN: 593 case SDL_KEYDOWN:
465 case SDL_KEYUP: 594 case SDL_KEYUP:
466 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 595 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
473 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 602 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
474 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 603 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
475 break; 604 break;
476 605
477 case SDL_MOUSEMOTION: 606 case SDL_MOUSEMOTION:
607 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
608
478 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 609 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
479 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 610 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
480 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 611 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
481 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 612 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
482 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 613 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
483 break; 614 break;
484 615
485 case SDL_MOUSEBUTTONDOWN: 616 case SDL_MOUSEBUTTONDOWN:
486 case SDL_MOUSEBUTTONUP: 617 case SDL_MOUSEBUTTONUP:
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
619
487 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 620 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 621 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 622 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 623 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
624 break;
625
626 case SDL_USEREVENT:
627 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
628 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
629 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
630 break;
491 } 631 }
492 632
493 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 633 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
494 } 634 }
495} 635}
496 636
497int 637int
498Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 638Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499 POSTCALL: 639 POSTCALL:
500 Mix_HookMusicFinished (music_finished); 640 Mix_HookMusicFinished (music_finished);
641 Mix_ChannelFinished (channel_finished);
501 642
502void 643void
503Mix_CloseAudio () 644Mix_CloseAudio ()
504 645
505int 646int
510 CODE: 651 CODE:
511#ifndef _WIN32 652#ifndef _WIN32
512 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
513#endif 654#endif
514 655
515char * 656void
516gl_version () 657win32_proxy_info ()
517 CODE: 658 PPCODE:
518 RETVAL = (char *)glGetString (GL_VERSION); 659{
519 OUTPUT: 660#ifdef _WIN32
520 RETVAL 661 INTERNET_PROXY_INFO proxyinfo;
662 char buffer[2048];
663 DWORD buflen;
521 664
522char * 665 EXTEND (SP, 3);
523gl_extensions () 666
524 CODE: 667 buflen = sizeof (buffer);
525 RETVAL = (char *)glGetString (GL_EXTENSIONS); 668 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
526 OUTPUT: 669 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
527 RETVAL 670 {
671 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
672
673 buflen = sizeof (buffer);
674 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
675 {
676 PUSHs (newSVpv (buffer, 0));
677
678 buflen = sizeof (buffer);
679 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
680 PUSHs (newSVpv (buffer, 0));
681 }
682 }
683#endif
684}
528 685
529void 686void
530add_font (char *file) 687add_font (char *file)
531 CODE: 688 CODE:
532 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 689 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
533 690
534void 691void
535load_image_inline (SV *image_) 692load_image_inline (SV *image_)
536 ALIAS: 693 ALIAS:
537 load_image_file = 1 694 load_image_file = 1
579 736
580 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 737 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
581 738
582 assert (surface2->pitch == surface2->w * 4); 739 assert (surface2->pitch == surface2->w * 4);
583 740
741 SDL_LockSurface (surface2);
584 EXTEND (SP, 5); 742 EXTEND (SP, 6);
585 PUSHs (sv_2mortal (newSViv (surface2->w))); 743 PUSHs (sv_2mortal (newSViv (surface2->w)));
586 PUSHs (sv_2mortal (newSViv (surface2->h))); 744 PUSHs (sv_2mortal (newSViv (surface2->h)));
587 SDL_LockSurface (surface2);
588 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 745 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
589 SDL_UnlockSurface (surface2);
590 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 746 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
591 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 747 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
592 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 748 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
749 SDL_UnlockSurface (surface2);
593 750
594 SDL_FreeSurface (surface); 751 SDL_FreeSurface (surface);
595 SDL_FreeSurface (surface2); 752 SDL_FreeSurface (surface2);
596} 753}
597 754
621} 778}
622 779
623void 780void
624error (char *message) 781error (char *message)
625 CODE: 782 CODE:
783 fprintf (stderr, "ERROR: %s\n", message);
626#ifdef _WIN32 784#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 785 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
628#else
629 fprintf (stderr, "ERROR: %s\n", message);
630#endif 786#endif
631 787
632void 788void
633fatal (char *message) 789fatal (char *message)
634 CODE: 790 CODE:
791 fprintf (stderr, "FATAL: %s\n", message);
635#ifdef _WIN32 792#ifdef _WIN32
636 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 793 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
637#else
638 fprintf (stderr, "FATAL: %s\n", message);
639#endif 794#endif
640 exit (1); 795 _exit (1);
641 796
797void
798_exit (int retval)
799 CODE:
800 _exit (retval);
801
642MODULE = CFClient PACKAGE = CFClient::Font 802MODULE = CFPlus PACKAGE = CFPlus::Font
643 803
644CFClient::Font 804CFPlus::Font
645new_from_file (SV *class, char *path) 805new_from_file (SV *class, char *path, int id = 0)
646 CODE: 806 CODE:
647{ 807{
648 int count; 808 int count;
649 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 809 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
650 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 810 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651 FcPatternDestroy (pattern); 811 FcPatternDestroy (pattern);
652} 812}
653 OUTPUT: 813 OUTPUT:
654 RETVAL 814 RETVAL
655 815
656void 816void
657DESTROY (CFClient::Font self) 817DESTROY (CFPlus::Font self)
658 CODE: 818 CODE:
659 pango_font_description_free (self); 819 pango_font_description_free (self);
660 820
661void 821void
662make_default (CFClient::Font self) 822make_default (CFPlus::Font self)
663 CODE: 823 CODE:
664 default_font = self; 824 default_font = self;
665 825
666MODULE = CFClient PACKAGE = CFClient::Layout 826MODULE = CFPlus PACKAGE = CFPlus::Layout
667 827
668CFClient::Layout 828void
669new (SV *class, int base_height = MIN_FONT_HEIGHT) 829reset_glyph_cache ()
830 CODE:
831 tc_clear ();
832
833CFPlus::Layout
834new (SV *class)
670 CODE: 835 CODE:
671 New (0, RETVAL, 1, struct cf_layout); 836 New (0, RETVAL, 1, struct cf_layout);
837
672 RETVAL->pl = pango_layout_new (context); 838 RETVAL->pl = pango_layout_new (opengl_context);
673 RETVAL->base_height = base_height; 839 RETVAL->r = 1.;
840 RETVAL->g = 1.;
841 RETVAL->b = 1.;
842 RETVAL->a = 1.;
843 RETVAL->base_height = MIN_FONT_HEIGHT;
674 RETVAL->font = 0; 844 RETVAL->font = 0;
845
675 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 846 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676 pango_layout_set_font_description (RETVAL->pl, default_font); 847 layout_update_font (RETVAL);
677 OUTPUT: 848 OUTPUT:
678 RETVAL 849 RETVAL
679 850
680void 851void
681DESTROY (CFClient::Layout self) 852DESTROY (CFPlus::Layout self)
682 CODE: 853 CODE:
683 g_object_unref (self->pl); 854 g_object_unref (self->pl);
684 Safefree (self); 855 Safefree (self);
685 856
686void 857void
687set_text (CFClient::Layout self, SV *text_) 858set_text (CFPlus::Layout self, SV *text_)
688 CODE: 859 CODE:
689{ 860{
690 STRLEN textlen; 861 STRLEN textlen;
691 char *text = SvPVutf8 (text_, textlen); 862 char *text = SvPVutf8 (text_, textlen);
692 863
693 pango_layout_set_text (self->pl, text, textlen); 864 pango_layout_set_text (self->pl, text, textlen);
694} 865}
695 866
696void 867void
697set_markup (CFClient::Layout self, SV *text_) 868set_markup (CFPlus::Layout self, SV *text_)
698 CODE: 869 CODE:
699{ 870{
700 STRLEN textlen; 871 STRLEN textlen;
701 char *text = SvPVutf8 (text_, textlen); 872 char *text = SvPVutf8 (text_, textlen);
702 873
703 pango_layout_set_markup (self->pl, text, textlen); 874 pango_layout_set_markup (self->pl, text, textlen);
704} 875}
705 876
877void
878set_shapes (CFPlus::Layout self, ...)
879 CODE:
880{
881 PangoAttrList *attrs = 0;
882 const char *text = pango_layout_get_text (self->pl);
883 const char *pos = text;
884 int arg = 4;
885
886 while (arg < items && (pos = strstr (pos, OBJ_STR)))
887 {
888 PangoRectangle inkrect, rect;
889 PangoAttribute *attr;
890
891 int x = SvIV (ST (arg - 3));
892 int y = SvIV (ST (arg - 2));
893 int w = SvIV (ST (arg - 1));
894 int h = SvIV (ST (arg ));
895
896 inkrect.x = 0;
897 inkrect.y = 0;
898 inkrect.width = 0;
899 inkrect.height = 0;
900
901 rect.x = x * PANGO_SCALE;
902 rect.y = y * PANGO_SCALE;
903 rect.width = w * PANGO_SCALE;
904 rect.height = h * PANGO_SCALE;
905
906 if (!attrs)
907 attrs = pango_layout_get_attributes (self->pl);
908
909 attr = pango_attr_shape_new (&inkrect, &rect);
910 attr->start_index = pos - text;
911 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
912 pango_attr_list_insert (attrs, attr);
913
914 arg += 4;
915 pos += sizeof (OBJ_STR) - 1;
916 }
917
918 if (attrs)
919 pango_layout_set_attributes (self->pl, attrs);
920}
921
922void
923get_shapes (CFPlus::Layout self)
924 PPCODE:
925{
926 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
927
928 do
929 {
930 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
931
932 if (run && shape_attr_p (run))
933 {
934 PangoRectangle extents;
935 pango_layout_iter_get_run_extents (iter, 0, &extents);
936
937 EXTEND (SP, 2);
938 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
939 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
940 }
941 }
942 while (pango_layout_iter_next_run (iter));
943
944 pango_layout_iter_free (iter);
945}
946
947int
948has_wrapped (CFPlus::Layout self)
949 CODE:
950{
951 int lines = 1;
952 const char *text = pango_layout_get_text (self->pl);
953
954 while (*text)
955 lines += *text++ == '\n';
956
957 RETVAL = lines < pango_layout_get_line_count (self->pl);
958}
959 OUTPUT:
960 RETVAL
961
706SV * 962SV *
707get_text (CFClient::Layout self) 963get_text (CFPlus::Layout self)
708 CODE: 964 CODE:
709 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 965 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710 SvUTF8_on (RETVAL); 966 sv_utf8_decode (RETVAL);
711 OUTPUT: 967 OUTPUT:
712 RETVAL 968 RETVAL
713 969
714void 970void
971set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
972 CODE:
973 self->r = r;
974 self->g = g;
975 self->b = b;
976 self->a = a;
977
978void
715set_font (CFClient::Layout self, CFClient::Font font = 0) 979set_font (CFPlus::Layout self, CFPlus::Font font = 0)
716 CODE: 980 CODE:
717 if (self->font != font) 981 if (self->font != font)
718 { 982 {
719 self->font = font; 983 self->font = font;
720 layout_update_font (self); 984 layout_update_font (self);
721 } 985 }
722 986
723void 987void
724set_height (CFClient::Layout self, int base_height) 988set_height (CFPlus::Layout self, int base_height)
725 CODE: 989 CODE:
726 if (self->base_height != base_height) 990 if (self->base_height != base_height)
727 { 991 {
728 self->base_height = base_height; 992 self->base_height = base_height;
729 layout_update_font (self); 993 layout_update_font (self);
730 } 994 }
731 995
732void 996void
733set_width (CFClient::Layout self, int max_width = -1) 997set_width (CFPlus::Layout self, int max_width = -1)
734 CODE: 998 CODE:
735 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 999 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
736 1000
737void 1001void
1002set_indent (CFPlus::Layout self, int indent)
1003 CODE:
1004 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1005
1006void
1007set_spacing (CFPlus::Layout self, int spacing)
1008 CODE:
1009 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1010
1011void
1012set_ellipsise (CFPlus::Layout self, int ellipsise)
1013 CODE:
1014 pango_layout_set_ellipsize (self->pl,
1015 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1016 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1017 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1018 : PANGO_ELLIPSIZE_NONE
1019 );
1020
1021void
1022set_single_paragraph_mode (CFPlus::Layout self, int spm)
1023 CODE:
1024 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1025
1026void
738size (CFClient::Layout self) 1027size (CFPlus::Layout self)
739 PPCODE: 1028 PPCODE:
740{ 1029{
741 int w, h; 1030 int w, h;
742 1031
743 layout_get_pixel_size (self, &w, &h); 1032 layout_get_pixel_size (self, &w, &h);
746 PUSHs (sv_2mortal (newSViv (w))); 1035 PUSHs (sv_2mortal (newSViv (w)));
747 PUSHs (sv_2mortal (newSViv (h))); 1036 PUSHs (sv_2mortal (newSViv (h)));
748} 1037}
749 1038
750int 1039int
1040descent (CFPlus::Layout self)
1041 CODE:
1042{
1043 PangoRectangle rect;
1044 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1045 pango_layout_line_get_pixel_extents (line, 0, &rect);
1046 RETVAL = PANGO_DESCENT (rect);
1047}
1048 OUTPUT:
1049 RETVAL
1050
1051int
751xy_to_index (CFClient::Layout self, int x, int y) 1052xy_to_index (CFPlus::Layout self, int x, int y)
752 CODE: 1053 CODE:
753{ 1054{
754 int index, trailing; 1055 int index, trailing;
755 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1056 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
756 RETVAL = index; 1057 RETVAL = index;
757} 1058}
758 OUTPUT: 1059 OUTPUT:
759 RETVAL 1060 RETVAL
760 1061
761void 1062void
762cursor_pos (CFClient::Layout self, int index) 1063cursor_pos (CFPlus::Layout self, int index)
763 PPCODE: 1064 PPCODE:
764{ 1065{
765 PangoRectangle strong_pos; 1066 PangoRectangle strong_pos;
766 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1067 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
767 1068
770 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
771 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1072 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
772} 1073}
773 1074
774void 1075void
775render (CFClient::Layout self) 1076render (CFPlus::Layout self, float x, float y, int flags = 0)
776 PPCODE: 1077 PPCODE:
777{ 1078 pango_opengl_render_layout_subpixel (
778 SV *retval; 1079 self->pl,
779 int w, h; 1080 x * PANGO_SCALE, y * PANGO_SCALE,
780 FT_Bitmap bitmap; 1081 self->r, self->g, self->b, self->a,
1082 flags
1083 );
781 1084
782 layout_get_pixel_size (self, &w, &h); 1085MODULE = CFPlus PACKAGE = CFPlus::Texture
783 1086
784 retval = newSV (w * h); 1087void
785 SvPOK_only (retval); 1088pad2pot (SV *data_, SV *w_, SV *h_)
786 SvCUR_set (retval, w * h); 1089 CODE:
1090{
1091 int ow = SvIV (w_);
1092 int oh = SvIV (h_);
787 1093
788 bitmap.rows = h; 1094 if (ow && oh)
789 bitmap.width = w; 1095 {
790 bitmap.pitch = w; 1096 int nw = minpot (ow);
791 bitmap.buffer = (unsigned char*)SvPVX (retval); 1097 int nh = minpot (oh);
792 bitmap.num_grays = 256;
793 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794 1098
795 memset (bitmap.buffer, 0, w * h); 1099 if (nw != ow || nh != oh)
796 1100 {
797 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 1101 if (SvOK (data_))
1102 {
1103 STRLEN datalen;
1104 char *data = SvPVbyte (data_, datalen);
1105 int bpp = datalen / (ow * oh);
1106 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
798 1107
799 EXTEND (SP, 3); 1108 SvPOK_only (result_);
800 PUSHs (sv_2mortal (newSViv (w))); 1109 SvCUR_set (result_, nw * nh * bpp);
801 PUSHs (sv_2mortal (newSViv (h)));
802 PUSHs (sv_2mortal (retval));
803}
804 1110
805MODULE = CFClient PACKAGE = CFClient::Texture 1111 memset (SvPVX (result_), 0, nw * nh * bpp);
1112 while (oh--)
1113 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
806 1114
1115 sv_setsv (data_, result_);
1116 }
1117
1118 sv_setiv (w_, nw);
1119 sv_setiv (h_, nh);
1120 }
1121 }
1122}
1123
807void 1124void
808draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1125draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
809 PROTOTYPE: $$$;$$ 1126 PROTOTYPE: $$$;$$
1127 ALIAS:
1128 draw_quad_alpha = 1
1129 draw_quad_alpha_premultiplied = 2
810 CODE: 1130 CODE:
811{ 1131{
812 HV *hv = (HV *)SvRV (self); 1132 HV *hv = (HV *)SvRV (self);
813 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1133 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1134 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
815 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1135 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
816 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
817 1136
818 if (items < 5) 1137 if (items < 5)
819 { 1138 {
820 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1139 w = SvNV (*hv_fetch (hv, "w", 1, 1));
821 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1140 h = SvNV (*hv_fetch (hv, "h", 1, 1));
822 } 1141 }
823 1142
1143 if (ix)
1144 {
1145 glEnable (GL_BLEND);
1146
1147 if (ix == 2)
1148 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1149 else
1150 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1151 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1152
1153 glEnable (GL_ALPHA_TEST);
1154 glAlphaFunc (GL_GREATER, 0.01f);
1155 }
1156
824 glBindTexture (GL_TEXTURE_2D, name); 1157 glBindTexture (GL_TEXTURE_2D, name);
825 if (wrap_mode) { 1158
826 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
827 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
828 }
829 glBegin (GL_QUADS); 1159 glBegin (GL_QUADS);
830 glTexCoord2f (0, 0); glVertex2f (x , y ); 1160 glTexCoord2f (0, 0); glVertex2f (x , y );
831 glTexCoord2f (0, t); glVertex2f (x , y + h); 1161 glTexCoord2f (0, t); glVertex2f (x , y + h);
832 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1162 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1163 glTexCoord2f (s, 0); glVertex2f (x + w, y );
834 glEnd (); 1164 glEnd ();
835}
836 1165
1166 if (ix)
1167 {
1168 glDisable (GL_ALPHA_TEST);
1169 glDisable (GL_BLEND);
1170 }
1171}
1172
837MODULE = CFClient PACKAGE = CFClient::Map 1173MODULE = CFPlus PACKAGE = CFPlus::Map
838 1174
839CFClient::Map 1175CFPlus::Map
840new (SV *class, int map_width, int map_height) 1176new (SV *class, int map_width, int map_height)
841 CODE: 1177 CODE:
842 New (0, RETVAL, 1, struct map); 1178 New (0, RETVAL, 1, struct map);
843 RETVAL->x = 0; 1179 RETVAL->x = 0;
844 RETVAL->y = 0; 1180 RETVAL->y = 0;
854 RETVAL->row = 0; 1190 RETVAL->row = 0;
855 OUTPUT: 1191 OUTPUT:
856 RETVAL 1192 RETVAL
857 1193
858void 1194void
859DESTROY (CFClient::Map self) 1195DESTROY (CFPlus::Map self)
860 CODE: 1196 CODE:
861{ 1197{
862 map_clear (self); 1198 map_clear (self);
863 Safefree (self->face); 1199 Safefree (self->face);
1200 Safefree (self->tex);
864 Safefree (self); 1201 Safefree (self);
865} 1202}
866 1203
867void 1204void
868clear (CFClient::Map self) 1205clear (CFPlus::Map self)
869 CODE: 1206 CODE:
870 map_clear (self); 1207 map_clear (self);
871 1208
872void 1209void
873set_face (CFClient::Map self, int face, int texid) 1210set_face (CFPlus::Map self, int face, int texid)
874 CODE: 1211 CODE:
875{ 1212{
876 while (self->faces <= face) 1213 while (self->faces <= face)
877 { 1214 {
878 Append (mapface, self->face, self->faces, self->faces); 1215 Append (mapface, self->face, self->faces, self->faces);
881 1218
882 self->face [face] = texid; 1219 self->face [face] = texid;
883} 1220}
884 1221
885void 1222void
886set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1223set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
887 CODE: 1224 CODE:
888{ 1225{
889 while (self->texs <= texid) 1226 while (self->texs <= texid)
890 { 1227 {
891 Append (maptex, self->tex, self->texs, self->texs); 1228 Append (maptex, self->tex, self->texs, self->texs);
903 tex->r = r; 1240 tex->r = r;
904 tex->g = g; 1241 tex->g = g;
905 tex->b = b; 1242 tex->b = b;
906 tex->a = a; 1243 tex->a = a;
907 } 1244 }
1245
1246 // somewhat hackish, but for textures that require it, it really
1247 // improves the look, and most others don't suffer.
1248 glBindTexture (GL_TEXTURE_2D, name);
1249 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1250 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1251 // use uglier nearest interpolation because linear suffers
1252 // from transparent color bleeding and ugly wrapping effects.
1253 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
908} 1254}
909 1255
910int 1256int
911ox (CFClient::Map self) 1257ox (CFPlus::Map self)
912 ALIAS: 1258 ALIAS:
913 oy = 1 1259 oy = 1
1260 x = 2
1261 y = 3
1262 w = 4
1263 h = 5
914 CODE: 1264 CODE:
915 switch (ix) 1265 switch (ix)
916 { 1266 {
917 case 0: RETVAL = self->ox; break; 1267 case 0: RETVAL = self->ox; break;
918 case 1: RETVAL = self->oy; break; 1268 case 1: RETVAL = self->oy; break;
1269 case 2: RETVAL = self->x; break;
1270 case 3: RETVAL = self->y; break;
1271 case 4: RETVAL = self->w; break;
1272 case 5: RETVAL = self->h; break;
919 } 1273 }
920 OUTPUT: 1274 OUTPUT:
921 RETVAL 1275 RETVAL
922 1276
923void 1277void
924scroll (CFClient::Map self, int dx, int dy) 1278scroll (CFPlus::Map self, int dx, int dy)
925 CODE: 1279 CODE:
926{ 1280{
927 if (dx > 0) 1281 if (dx > 0)
928 map_blank (self, self->x, self->y, dx - 1, self->h); 1282 map_blank (self, self->x, self->y, dx, self->h);
929 else if (dx < 0) 1283 else if (dx < 0)
930 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1284 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
931 1285
932 if (dy > 0) 1286 if (dy > 0)
933 map_blank (self, self->x, self->y, self->w, dy - 1); 1287 map_blank (self, self->x, self->y, self->w, dy);
934 else if (dy < 0) 1288 else if (dy < 0)
935 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1289 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
936 1290
937 self->ox += dx; self->x += dx; 1291 self->ox += dx; self->x += dx;
938 self->oy += dy; self->y += dy; 1292 self->oy += dy; self->y += dy;
939 1293
940 while (self->y < 0) 1294 while (self->y < 0)
945 self->y += MAP_EXTEND_Y; 1299 self->y += MAP_EXTEND_Y;
946 } 1300 }
947} 1301}
948 1302
949void 1303void
950map1a_update (CFClient::Map self, SV *data_) 1304map1a_update (CFPlus::Map self, SV *data_, int extmap)
951 CODE: 1305 CODE:
952{ 1306{
953 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1307 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
954 uint8_t *data_end = (uint8_t *)SvEND (data_); 1308 uint8_t *data_end = (uint8_t *)SvEND (data_);
955 mapcell *cell; 1309 mapcell *cell;
956 int x, y, flags; 1310 int x, y, flags;
957 1311
958 while (data < data_end) 1312 while (data < data_end - 1)
959 { 1313 {
960 flags = (data [0] << 8) + data [1]; data += 2; 1314 flags = (data [0] << 8) + data [1]; data += 2;
961 1315
962 x = ((flags >> 10) & 63) + self->x; 1316 x = self->x + ((flags >> 10) & 63);
963 y = ((flags >> 4) & 63) + self->y; 1317 y = self->y + ((flags >> 4) & 63);
964 1318
965 cell = map_get_cell (self, x, y); 1319 cell = map_get_cell (self, x, y);
966 1320
967 if (flags & 15) 1321 if (flags & 15)
968 { 1322 {
969 if (cell->darkness < 0) 1323 if (!cell->darkness)
970 { 1324 {
1325 memset (cell, 0, sizeof (*cell));
971 cell->darkness = 0; 1326 cell->darkness = 256;
972 cell->face [0] = 0;
973 cell->face [1] = 0;
974 cell->face [2] = 0;
975 } 1327 }
976 1328
977 cell->darkness = flags & 8 ? *data++ : 255;
978
979 //TODO: don't trust server data to be in-range(!) 1329 //TODO: don't trust server data to be in-range(!)
1330
1331 if (flags & 8)
1332 {
1333 if (extmap)
1334 {
1335 uint8_t ext, cmd;
1336
1337 do
1338 {
1339 ext = *data++;
1340 cmd = ext & 0x3f;
1341
1342 if (cmd < 4)
1343 cell->darkness = 255 - ext * 64 + 1;
1344 else if (cmd == 5) // health
1345 {
1346 cell->stat_width = 1;
1347 cell->stat_hp = *data++;
1348 }
1349 else if (cmd == 6) // monster width
1350 cell->stat_width = *data++ + 1;
1351 else if (cmd == 0x47) // monster width
1352 {
1353 if (*data == 4)
1354 ; // decode player tag
1355
1356 data += *data + 1;
1357 }
1358 else if (cmd == 8) // cell flags
1359 cell->flags = *data++;
1360 else if (ext & 0x40) // unknown, multibyte => skip
1361 data += *data + 1;
1362 else
1363 data++;
1364 }
1365 while (ext & 0x80);
1366 }
1367 else
1368 cell->darkness = *data++ + 1;
1369 }
980 1370
981 if (flags & 4) 1371 if (flags & 4)
982 { 1372 {
983 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1373 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
984 } 1374 }
992 { 1382 {
993 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1383 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
994 } 1384 }
995 } 1385 }
996 else 1386 else
997 cell->darkness = -1; 1387 cell->darkness = 0;
998 } 1388 }
999} 1389}
1000 1390
1001SV * 1391SV *
1002mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1392mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1003 CODE: 1393 CODE:
1004{ 1394{
1005 int x1, x; 1395 int x1, x;
1006 int y1, y; 1396 int y1, y;
1007 int z; 1397 int z;
1057} 1447}
1058 OUTPUT: 1448 OUTPUT:
1059 RETVAL 1449 RETVAL
1060 1450
1061void 1451void
1062draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1452draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1063 PPCODE: 1453 CODE:
1064{ 1454{
1065 int vx, vy; 1455 int vx, vy;
1066 int x, y, z; 1456 int x, y, z;
1067 int last_name; 1457 int last_name;
1068 mapface face; 1458 mapface face;
1069 int sw4 = (sw + 3) & ~3;
1070 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1071 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1072 1459
1073 memset (darkness, 255, sw4 * sh);
1074 SvPOK_only (darkness_sv);
1075 SvCUR_set (darkness_sv, sw4 * sh);
1076
1077 vx = self->x + (self->w - sw) / 2 - shift_x; 1460 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1078 vy = self->y + (self->h - sh) / 2 - shift_y; 1461 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1079 1462
1080 /* 1463 /*
1081 int vx = self->vx = self->w >= sw 1464 int vx = self->vx = self->w >= sw
1082 ? self->x + (self->w - sw) / 2 1465 ? self->x + (self->w - sw) / 2
1083 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1466 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1087 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1470 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1088 */ 1471 */
1089 1472
1090 glColor4ub (255, 255, 255, 255); 1473 glColor4ub (255, 255, 255, 255);
1091 1474
1475 glEnable (GL_BLEND);
1092 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1476 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1093 glEnable (GL_BLEND);
1094 glEnable (GL_TEXTURE_2D); 1477 glEnable (GL_TEXTURE_2D);
1095 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1478 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1096 1479
1097 glBegin (GL_QUADS); 1480 glBegin (GL_QUADS);
1098 1481
1107 for (x = 0; x < sw; x++) 1490 for (x = 0; x < sw; x++)
1108 if (row->c0 <= x + vx && x + vx < row->c1) 1491 if (row->c0 <= x + vx && x + vx < row->c1)
1109 { 1492 {
1110 mapcell *cell = row->col + (x + vx - row->c0); 1493 mapcell *cell = row->col + (x + vx - row->c0);
1111 1494
1112 darkness[y * sw4 + x] = cell->darkness < 0
1113 ? 255 - FOW_DARKNESS
1114 : 255 - cell->darkness;
1115
1116 face = cell->face [z]; 1495 face = cell->face [z];
1117 1496
1118 if (face) 1497 if (face && face < self->texs)
1119 { 1498 {
1120 maptex tex = self->tex [face]; 1499 maptex tex = self->tex [face];
1121
1122 int px = (x + 1) * 32 - tex.w; 1500 int px = (x + 1) * 32 - tex.w;
1123 int py = (y + 1) * 32 - tex.h; 1501 int py = (y + 1) * 32 - tex.h;
1124 1502
1125 if (last_name != tex.name) 1503 if (last_name != tex.name)
1126 { 1504 {
1127 glEnd (); 1505 glEnd ();
1128 last_name = tex.name;
1129 glBindTexture (GL_TEXTURE_2D, last_name); 1506 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1130 glBegin (GL_QUADS); 1507 glBegin (GL_QUADS);
1131 } 1508 }
1132 1509
1133 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1510 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1134 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1511 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1135 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1512 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1136 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1513 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1137 } 1514 }
1515
1516 if (cell->flags && z == 2)
1517 {
1518 if (cell->flags & 1)
1519 {
1520 maptex tex = self->tex [1];
1521 int px = (x + 1) * 32 - tex.w + 2;
1522 int py = (y + 1) * 32 - tex.h - 6;
1523
1524 glEnd ();
1525 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1526 glBegin (GL_QUADS);
1527
1528 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1529 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1530 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1531 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1532 }
1533 }
1138 } 1534 }
1139 } 1535 }
1140 1536
1141 glEnd (); 1537 glEnd ();
1142 1538
1143 glDisable (GL_TEXTURE_2D); 1539 glDisable (GL_TEXTURE_2D);
1144 glDisable (GL_BLEND); 1540 glDisable (GL_BLEND);
1541
1542 // top layer: overlays such as the health bar
1543 for (y = 0; y < sh; y++)
1544 if (0 <= y + vy && y + vy < self->rows)
1545 {
1546 maprow *row = self->row + (y + vy);
1547
1548 for (x = 0; x < sw; x++)
1549 if (row->c0 <= x + vx && x + vx < row->c1)
1550 {
1551 mapcell *cell = row->col + (x + vx - row->c0);
1552
1553 int px = x * 32;
1554 int py = y * 32;
1555
1556 if (cell->stat_hp)
1557 {
1558 int width = cell->stat_width * 32;
1559 int thick = sh / 28 + 1 + cell->stat_width;
1560
1561 glColor3ub (0, 0, 0);
1562 glRectf (px + 1, py - thick - 2,
1563 px + width - 1, py);
1564
1565 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1566 glRectf (px + 2,
1567 py - thick - 1,
1568 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1569 }
1570 }
1571 }
1572}
1573
1574void
1575draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1576 CODE:
1577{
1578 static float color[16][3] = {
1579 { 0.00F, 0.00F, 0.00F },
1580 { 1.00F, 1.00F, 1.00F },
1581 { 0.00F, 0.00F, 0.55F },
1582 { 1.00F, 0.00F, 0.00F },
1583
1584 { 1.00F, 0.54F, 0.00F },
1585 { 0.11F, 0.56F, 1.00F },
1586 { 0.93F, 0.46F, 0.00F },
1587 { 0.18F, 0.54F, 0.34F },
1588
1589 { 0.56F, 0.73F, 0.56F },
1590 { 0.80F, 0.80F, 0.80F },
1591 { 0.55F, 0.41F, 0.13F },
1592 { 0.99F, 0.77F, 0.26F },
1593
1594 { 0.74F, 0.65F, 0.41F },
1595
1596 { 0.00F, 1.00F, 1.00F },
1597 { 1.00F, 0.00F, 1.00F },
1598 { 1.00F, 1.00F, 0.00F },
1599 };
1600
1601 int x, y;
1602
1603 glEnable (GL_TEXTURE_2D);
1604 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1605 glEnable (GL_BLEND);
1606 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1607 glBegin (GL_QUADS);
1608
1609 for (y = 0; y < h; y++)
1610 for (x = 0; x < w; x++)
1611 {
1612 unsigned char m = data [x + y * w];
1613
1614 if (m)
1615 {
1616 float *c = color [m & 15];
1617
1618 float tx1 = m & 0x40 ? 0.5 : 0.;
1619 float tx2 = tx1 + 0.5;
1620
1621 glColor4f (c[0], c[1], c[2], 0.75);
1622 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1623 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1624 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1625 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1626 }
1627 }
1628
1629 glEnd ();
1630 glDisable (GL_BLEND);
1631 glDisable (GL_TEXTURE_2D);
1632}
1633
1634void
1635fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1636 PPCODE:
1637{
1638 int vx, vy;
1639 int x, y;
1640 int sw4 = (sw + 3) & ~3;
1641 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1642 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1643
1644 memset (darkness, 255, sw4 * sh);
1645 SvPOK_only (darkness_sv);
1646 SvCUR_set (darkness_sv, sw4 * sh);
1647
1648 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1649 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1650
1651 for (y = 0; y < sh; y++)
1652 if (0 <= y + vy && y + vy < self->rows)
1653 {
1654 maprow *row = self->row + (y + vy);
1655
1656 for (x = 0; x < sw; x++)
1657 if (row->c0 <= x + vx && x + vx < row->c1)
1658 {
1659 mapcell *cell = row->col + (x + vx - row->c0);
1660
1661 darkness[y * sw4 + x] = cell->darkness
1662 ? 255 - (cell->darkness - 1)
1663 : 255 - FOW_DARKNESS;
1664 }
1665 }
1145 1666
1146 EXTEND (SP, 3); 1667 EXTEND (SP, 3);
1147 PUSHs (sv_2mortal (newSViv (sw4))); 1668 PUSHs (sv_2mortal (newSViv (sw4)));
1148 PUSHs (sv_2mortal (newSViv (sh))); 1669 PUSHs (sv_2mortal (newSViv (sh)));
1149 PUSHs (darkness_sv); 1670 PUSHs (darkness_sv);
1150} 1671}
1151 1672
1152SV * 1673SV *
1153get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1674get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1154 CODE: 1675 CODE:
1155{ 1676{
1156 int x, y, x1, y1; 1677 int x, y, x1, y1;
1157 SV *data_sv = newSV (w * h * 7 + 5); 1678 SV *data_sv = newSV (w * h * 7 + 5);
1158 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1679 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1220} 1741}
1221 OUTPUT: 1742 OUTPUT:
1222 RETVAL 1743 RETVAL
1223 1744
1224void 1745void
1225set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1746set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1226 PPCODE: 1747 PPCODE:
1227{ 1748{
1228 int x, y, z; 1749 int x, y, z;
1229 int w, h; 1750 int w, h;
1230 int x1, y1; 1751 int x1, y1;
1262 1783
1263 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1784 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1264 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1785 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1265 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1786 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1266 1787
1267 if (cell->darkness <= 0) 1788 if (cell->darkness == 0)
1268 { 1789 {
1269 cell->darkness = -1; 1790 cell->darkness = 0;
1270 1791
1271 for (z = 0; z <= 2; z++) 1792 for (z = 0; z <= 2; z++)
1272 { 1793 {
1273 cell->face[z] = face[z]; 1794 cell->face[z] = face[z];
1274 1795
1279 } 1800 }
1280 } 1801 }
1281 } 1802 }
1282} 1803}
1283 1804
1284MODULE = CFClient PACKAGE = CFClient::MixChunk 1805MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1285 1806
1286CFClient::MixChunk 1807CFPlus::MixChunk
1287new_from_file (SV *class, char *path) 1808new_from_file (SV *class, char *path)
1288 CODE: 1809 CODE:
1289 RETVAL = Mix_LoadWAV (path); 1810 RETVAL = Mix_LoadWAV (path);
1290 OUTPUT: 1811 OUTPUT:
1291 RETVAL 1812 RETVAL
1292 1813
1293void 1814void
1294DESTROY (CFClient::MixChunk self) 1815DESTROY (CFPlus::MixChunk self)
1295 CODE: 1816 CODE:
1296 Mix_FreeChunk (self); 1817 Mix_FreeChunk (self);
1297 1818
1298int 1819int
1299volume (CFClient::MixChunk self, int volume = -1) 1820volume (CFPlus::MixChunk self, int volume = -1)
1300 CODE: 1821 CODE:
1301 RETVAL = Mix_VolumeChunk (self, volume); 1822 RETVAL = Mix_VolumeChunk (self, volume);
1302 OUTPUT: 1823 OUTPUT:
1303 RETVAL 1824 RETVAL
1304 1825
1305int 1826int
1306play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1827play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1307 CODE: 1828 CODE:
1308 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1829 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1309 OUTPUT: 1830 OUTPUT:
1310 RETVAL 1831 RETVAL
1311 1832
1312MODULE = CFClient PACKAGE = CFClient::MixMusic 1833MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1313 1834
1314int 1835int
1315volume (int volume = -1) 1836volume (int volume = -1)
1316 CODE: 1837 CODE:
1317 RETVAL = Mix_VolumeMusic (volume); 1838 RETVAL = Mix_VolumeMusic (volume);
1318 OUTPUT: 1839 OUTPUT:
1319 RETVAL 1840 RETVAL
1320 1841
1321CFClient::MixMusic 1842CFPlus::MixMusic
1322new_from_file (SV *class, char *path) 1843new_from_file (SV *class, char *path)
1323 CODE: 1844 CODE:
1324 RETVAL = Mix_LoadMUS (path); 1845 RETVAL = Mix_LoadMUS (path);
1325 OUTPUT: 1846 OUTPUT:
1326 RETVAL 1847 RETVAL
1327 1848
1328void 1849void
1329DESTROY (CFClient::MixMusic self) 1850DESTROY (CFPlus::MixMusic self)
1330 CODE: 1851 CODE:
1331 Mix_FreeMusic (self); 1852 Mix_FreeMusic (self);
1332 1853
1333int 1854int
1334play (CFClient::MixMusic self, int loops = -1) 1855play (CFPlus::MixMusic self, int loops = -1)
1335 CODE: 1856 CODE:
1336 RETVAL = Mix_PlayMusic (self, loops); 1857 RETVAL = Mix_PlayMusic (self, loops);
1337 OUTPUT: 1858 OUTPUT:
1338 RETVAL 1859 RETVAL
1339 1860
1340MODULE = CFClient PACKAGE = CFClient::OpenGL 1861MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1341 1862
1342BOOT: 1863BOOT:
1343{ 1864{
1344 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1865 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1345 static const struct { 1866 static const struct {
1346 const char *name; 1867 const char *name;
1347 IV iv; 1868 IV iv;
1348 } *civ, const_iv[] = { 1869 } *civ, const_iv[] = {
1349# define const_iv(name) { # name, (IV)name } 1870# define const_iv(name) { # name, (IV)name }
1350 const_iv (GL_COLOR_MATERIAL), 1871 const_iv (GL_COLOR_MATERIAL),
1351 const_iv (GL_SMOOTH), 1872 const_iv (GL_SMOOTH),
1352 const_iv (GL_FLAT), 1873 const_iv (GL_FLAT),
1874 const_iv (GL_DITHER),
1353 const_iv (GL_BLEND), 1875 const_iv (GL_BLEND),
1876 const_iv (GL_CULL_FACE),
1877 const_iv (GL_SCISSOR_TEST),
1878 const_iv (GL_DEPTH_TEST),
1879 const_iv (GL_ALPHA_TEST),
1880 const_iv (GL_NORMALIZE),
1881 const_iv (GL_RESCALE_NORMAL),
1882 const_iv (GL_FRONT),
1883 const_iv (GL_BACK),
1354 const_iv (GL_AND), 1884 const_iv (GL_AND),
1885 const_iv (GL_ONE),
1886 const_iv (GL_ZERO),
1355 const_iv (GL_SRC_ALPHA), 1887 const_iv (GL_SRC_ALPHA),
1888 const_iv (GL_DST_ALPHA),
1356 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1889 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1890 const_iv (GL_ONE_MINUS_DST_ALPHA),
1891 const_iv (GL_SRC_ALPHA_SATURATE),
1357 const_iv (GL_RGB), 1892 const_iv (GL_RGB),
1358 const_iv (GL_RGBA), 1893 const_iv (GL_RGBA),
1894 const_iv (GL_RGBA4),
1895 const_iv (GL_RGBA8),
1896 const_iv (GL_RGB5_A1),
1359 const_iv (GL_UNSIGNED_BYTE), 1897 const_iv (GL_UNSIGNED_BYTE),
1898 const_iv (GL_UNSIGNED_SHORT),
1899 const_iv (GL_UNSIGNED_INT),
1360 const_iv (GL_ALPHA), 1900 const_iv (GL_ALPHA),
1901 const_iv (GL_INTENSITY),
1902 const_iv (GL_LUMINANCE),
1903 const_iv (GL_LUMINANCE_ALPHA),
1361 const_iv (GL_FLOAT), 1904 const_iv (GL_FLOAT),
1362 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1905 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1363 const_iv (GL_COMPILE), 1906 const_iv (GL_COMPILE),
1364 const_iv (GL_TEXTURE_1D), 1907 const_iv (GL_TEXTURE_1D),
1365 const_iv (GL_TEXTURE_2D), 1908 const_iv (GL_TEXTURE_2D),
1367 const_iv (GL_TEXTURE_MAG_FILTER), 1910 const_iv (GL_TEXTURE_MAG_FILTER),
1368 const_iv (GL_TEXTURE_MIN_FILTER), 1911 const_iv (GL_TEXTURE_MIN_FILTER),
1369 const_iv (GL_TEXTURE_ENV_MODE), 1912 const_iv (GL_TEXTURE_ENV_MODE),
1370 const_iv (GL_TEXTURE_WRAP_S), 1913 const_iv (GL_TEXTURE_WRAP_S),
1371 const_iv (GL_TEXTURE_WRAP_T), 1914 const_iv (GL_TEXTURE_WRAP_T),
1915 const_iv (GL_REPEAT),
1372 const_iv (GL_CLAMP), 1916 const_iv (GL_CLAMP),
1373 const_iv (GL_REPEAT), 1917 const_iv (GL_CLAMP_TO_EDGE),
1374 const_iv (GL_NEAREST), 1918 const_iv (GL_NEAREST),
1375 const_iv (GL_LINEAR), 1919 const_iv (GL_LINEAR),
1376 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1920 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1377 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1921 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1378 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1922 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1379 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1923 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1380 const_iv (GL_GENERATE_MIPMAP), 1924 const_iv (GL_GENERATE_MIPMAP),
1381 const_iv (GL_LINEAR),
1382 const_iv (GL_MODULATE), 1925 const_iv (GL_MODULATE),
1926 const_iv (GL_DECAL),
1383 const_iv (GL_REPLACE), 1927 const_iv (GL_REPLACE),
1928 const_iv (GL_DEPTH_BUFFER_BIT),
1384 const_iv (GL_COLOR_BUFFER_BIT), 1929 const_iv (GL_COLOR_BUFFER_BIT),
1385 const_iv (GL_PROJECTION), 1930 const_iv (GL_PROJECTION),
1386 const_iv (GL_MODELVIEW), 1931 const_iv (GL_MODELVIEW),
1387 const_iv (GL_COLOR_LOGIC_OP), 1932 const_iv (GL_COLOR_LOGIC_OP),
1933 const_iv (GL_SEPARABLE_2D),
1388 const_iv (GL_CONVOLUTION_2D), 1934 const_iv (GL_CONVOLUTION_2D),
1389 const_iv (GL_CONVOLUTION_BORDER_MODE), 1935 const_iv (GL_CONVOLUTION_BORDER_MODE),
1390 const_iv (GL_CONSTANT_BORDER), 1936 const_iv (GL_CONSTANT_BORDER),
1391 const_iv (GL_LINES), 1937 const_iv (GL_LINES),
1938 const_iv (GL_LINE_STRIP),
1939 const_iv (GL_LINE_LOOP),
1392 const_iv (GL_QUADS), 1940 const_iv (GL_QUADS),
1393 const_iv (GL_LINE_LOOP), 1941 const_iv (GL_QUAD_STRIP),
1942 const_iv (GL_TRIANGLES),
1943 const_iv (GL_TRIANGLE_STRIP),
1944 const_iv (GL_TRIANGLE_FAN),
1394 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1945 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1395 const_iv (GL_FASTEST), 1946 const_iv (GL_FASTEST),
1947 const_iv (GL_V2F),
1948 const_iv (GL_V3F),
1949 const_iv (GL_T2F_V3F),
1950 const_iv (GL_T2F_N3F_V3F),
1396# undef const_iv 1951# undef const_iv
1397 }; 1952 };
1398 1953
1399 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1954 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1400 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1955 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1401} 1956}
1402 1957
1958char *
1959gl_vendor ()
1960 CODE:
1961 RETVAL = (char *)glGetString (GL_VENDOR);
1962 OUTPUT:
1963 RETVAL
1964
1965char *
1966gl_version ()
1967 CODE:
1968 RETVAL = (char *)glGetString (GL_VERSION);
1969 OUTPUT:
1970 RETVAL
1971
1972char *
1973gl_extensions ()
1974 CODE:
1975 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1976 OUTPUT:
1977 RETVAL
1978
1403int glGetError () 1979int glGetError ()
1980
1981void glFinish ()
1404 1982
1405void glClear (int mask) 1983void glClear (int mask)
1406 1984
1407void glClearColor (float r, float g, float b, float a = 1.0) 1985void glClearColor (float r, float g, float b, float a = 1.0)
1408 PROTOTYPE: @ 1986 PROTOTYPE: @
1415 1993
1416void glHint (int target, int mode) 1994void glHint (int target, int mode)
1417 1995
1418void glBlendFunc (int sfactor, int dfactor) 1996void glBlendFunc (int sfactor, int dfactor)
1419 1997
1998void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1999 CODE:
2000 gl_BlendFuncSeparate (sa, da, saa, daa);
2001
2002void glDepthMask (int flag)
2003
1420void glLogicOp (int opcode) 2004void glLogicOp (int opcode)
1421 2005
2006void glColorMask (int red, int green, int blue, int alpha)
2007
1422void glMatrixMode (int mode) 2008void glMatrixMode (int mode)
1423 2009
1424void glPushMatrix () 2010void glPushMatrix ()
1425 2011
1426void glPopMatrix () 2012void glPopMatrix ()
1427 2013
1428void glLoadIdentity () 2014void glLoadIdentity ()
1429 2015
2016void glDrawBuffer (int buffer)
2017
2018void glReadBuffer (int buffer)
2019
1430# near and far are due to microsofts buggy c compiler 2020# near_ and far_ are due to microsofts buggy "c" compiler
2021void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2022
2023# near_ and far_ are due to microsofts buggy "c" compiler
1431void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2024void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1432 2025
1433void glViewport (int x, int y, int width, int height) 2026void glViewport (int x, int y, int width, int height)
2027
2028void glScissor (int x, int y, int width, int height)
1434 2029
1435void glTranslate (float x, float y, float z = 0.) 2030void glTranslate (float x, float y, float z = 0.)
1436 CODE: 2031 CODE:
1437 glTranslatef (x, y, z); 2032 glTranslatef (x, y, z);
1438 2033
1448 2043
1449void glEnd () 2044void glEnd ()
1450 2045
1451void glColor (float r, float g, float b, float a = 1.0) 2046void glColor (float r, float g, float b, float a = 1.0)
1452 PROTOTYPE: @ 2047 PROTOTYPE: @
2048 ALIAS:
2049 glColor_premultiply = 1
1453 CODE: 2050 CODE:
2051 if (ix)
2052 {
2053 r *= a;
2054 g *= a;
2055 b *= a;
2056 }
2057 // microsoft visual "c" rounds instead of truncating...
1454 glColor4f (r, g, b, a); 2058 glColor4f (r, g, b, a);
2059
2060void glInterleavedArrays (int format, int stride, char *data)
2061
2062void glDrawElements (int mode, int count, int type, char *indices)
2063
2064# 1.2 void glDrawRangeElements (int mode, int start, int end
2065
2066void glRasterPos (float x, float y, float z = 0.)
2067 CODE:
2068 glRasterPos3f (0, 0, z);
2069 glBitmap (0, 0, 0, 0, x, y, 0);
1455 2070
1456void glVertex (float x, float y, float z = 0.) 2071void glVertex (float x, float y, float z = 0.)
1457 CODE: 2072 CODE:
1458 glVertex3f (x, y, z); 2073 glVertex3f (x, y, z);
1459 2074
1471 2086
1472void glBindTexture (int target, int name) 2087void glBindTexture (int target, int name)
1473 2088
1474void glConvolutionParameter (int target, int pname, float params) 2089void glConvolutionParameter (int target, int pname, float params)
1475 CODE: 2090 CODE:
1476 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2091 if (gl.ConvolutionParameterf)
2092 gl.ConvolutionParameterf (target, pname, params);
1477 2093
1478void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2094void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1479 CODE: 2095 CODE:
1480 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2096 if (gl.ConvolutionFilter2D)
1481 (target, internalformat, width, height, format, type, data)); 2097 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
2098
2099void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2100 CODE:
2101 if (gl.SeparableFilter2D)
2102 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1482 2103
1483void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2104void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1484 2105
1485void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2106void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2107
2108void glDrawPixels (int width, int height, int format, int type, char *pixels)
2109
2110void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1486 2111
1487int glGenTexture () 2112int glGenTexture ()
1488 CODE: 2113 CODE:
1489{ 2114{
1490 GLuint name; 2115 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines