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.67 by root, Tue Apr 25 11:18:48 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 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
406 SDL_Rect **m; 517 SDL_Rect **m;
407 518
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, 0); 522 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
523
524 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
525 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
412 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 char buffer[2048];
662 DWORD buflen;
521 663
522char * 664 EXTEND (SP, 3);
523gl_extensions () 665
524 CODE: 666 buflen = sizeof (buffer);
525 RETVAL = (char *)glGetString (GL_EXTENSIONS); 667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
526 OUTPUT: 668 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
527 RETVAL 669 {
670 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
671
672 buflen = sizeof (buffer);
673 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
674 {
675 PUSHs (newSVpv (buffer, 0));
676
677 buflen = sizeof (buffer);
678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
679 PUSHs (newSVpv (buffer, 0));
680 }
681 }
682#endif
683}
528 684
529void 685void
530add_font (char *file) 686add_font (char *file)
531 CODE: 687 CODE:
532 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 688 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
533 689
534void 690void
535load_image_inline (SV *image_) 691load_image_inline (SV *image_)
536 ALIAS: 692 ALIAS:
537 load_image_file = 1 693 load_image_file = 1
579 735
580 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 736 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
581 737
582 assert (surface2->pitch == surface2->w * 4); 738 assert (surface2->pitch == surface2->w * 4);
583 739
740 SDL_LockSurface (surface2);
584 EXTEND (SP, 5); 741 EXTEND (SP, 6);
585 PUSHs (sv_2mortal (newSViv (surface2->w))); 742 PUSHs (sv_2mortal (newSViv (surface2->w)));
586 PUSHs (sv_2mortal (newSViv (surface2->h))); 743 PUSHs (sv_2mortal (newSViv (surface2->h)));
587 SDL_LockSurface (surface2);
588 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 744 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))); 745 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
591 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 746 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
592 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 747 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
748 SDL_UnlockSurface (surface2);
593 749
594 SDL_FreeSurface (surface); 750 SDL_FreeSurface (surface);
595 SDL_FreeSurface (surface2); 751 SDL_FreeSurface (surface2);
596} 752}
597 753
621} 777}
622 778
623void 779void
624error (char *message) 780error (char *message)
625 CODE: 781 CODE:
782 fprintf (stderr, "ERROR: %s\n", message);
626#ifdef _WIN32 783#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 784 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
628#else
629 fprintf (stderr, "ERROR: %s\n", message);
630#endif 785#endif
631 786
632void 787void
633fatal (char *message) 788fatal (char *message)
634 CODE: 789 CODE:
790 fprintf (stderr, "FATAL: %s\n", message);
635#ifdef _WIN32 791#ifdef _WIN32
636 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
637#else
638 fprintf (stderr, "FATAL: %s\n", message);
639#endif 793#endif
640 exit (1); 794 _exit (1);
641 795
796void
797_exit (int retval = 0)
798 CODE:
799 _exit (retval);
800
642MODULE = CFClient PACKAGE = CFClient::Font 801MODULE = CFPlus PACKAGE = CFPlus::Font
643 802
644CFClient::Font 803CFPlus::Font
645new_from_file (SV *class, char *path) 804new_from_file (SV *class, char *path, int id = 0)
646 CODE: 805 CODE:
647{ 806{
648 int count; 807 int count;
649 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 808 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
650 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 809 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651 FcPatternDestroy (pattern); 810 FcPatternDestroy (pattern);
652} 811}
653 OUTPUT: 812 OUTPUT:
654 RETVAL 813 RETVAL
655 814
656void 815void
657DESTROY (CFClient::Font self) 816DESTROY (CFPlus::Font self)
658 CODE: 817 CODE:
659 pango_font_description_free (self); 818 pango_font_description_free (self);
660 819
661void 820void
662make_default (CFClient::Font self) 821make_default (CFPlus::Font self)
663 CODE: 822 CODE:
664 default_font = self; 823 default_font = self;
665 824
666MODULE = CFClient PACKAGE = CFClient::Layout 825MODULE = CFPlus PACKAGE = CFPlus::Layout
667 826
668CFClient::Layout 827void
669new (SV *class, int base_height = MIN_FONT_HEIGHT) 828reset_glyph_cache ()
829 CODE:
830 tc_clear ();
831
832CFPlus::Layout
833new (SV *class)
670 CODE: 834 CODE:
671 New (0, RETVAL, 1, struct cf_layout); 835 New (0, RETVAL, 1, struct cf_layout);
836
672 RETVAL->pl = pango_layout_new (context); 837 RETVAL->pl = pango_layout_new (opengl_context);
673 RETVAL->base_height = base_height; 838 RETVAL->r = 1.;
839 RETVAL->g = 1.;
840 RETVAL->b = 1.;
841 RETVAL->a = 1.;
842 RETVAL->base_height = MIN_FONT_HEIGHT;
674 RETVAL->font = 0; 843 RETVAL->font = 0;
844
675 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 845 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676 pango_layout_set_font_description (RETVAL->pl, default_font); 846 layout_update_font (RETVAL);
677 OUTPUT: 847 OUTPUT:
678 RETVAL 848 RETVAL
679 849
680void 850void
681DESTROY (CFClient::Layout self) 851DESTROY (CFPlus::Layout self)
682 CODE: 852 CODE:
683 g_object_unref (self->pl); 853 g_object_unref (self->pl);
684 Safefree (self); 854 Safefree (self);
685 855
686void 856void
687set_text (CFClient::Layout self, SV *text_) 857set_text (CFPlus::Layout self, SV *text_)
688 CODE: 858 CODE:
689{ 859{
690 STRLEN textlen; 860 STRLEN textlen;
691 char *text = SvPVutf8 (text_, textlen); 861 char *text = SvPVutf8 (text_, textlen);
692 862
693 pango_layout_set_text (self->pl, text, textlen); 863 pango_layout_set_text (self->pl, text, textlen);
694} 864}
695 865
696void 866void
697set_markup (CFClient::Layout self, SV *text_) 867set_markup (CFPlus::Layout self, SV *text_)
698 CODE: 868 CODE:
699{ 869{
700 STRLEN textlen; 870 STRLEN textlen;
701 char *text = SvPVutf8 (text_, textlen); 871 char *text = SvPVutf8 (text_, textlen);
702 872
703 pango_layout_set_markup (self->pl, text, textlen); 873 pango_layout_set_markup (self->pl, text, textlen);
704} 874}
705 875
876void
877set_shapes (CFPlus::Layout self, ...)
878 CODE:
879{
880 PangoAttrList *attrs = 0;
881 const char *text = pango_layout_get_text (self->pl);
882 const char *pos = text;
883 int arg = 4;
884
885 while (arg < items && (pos = strstr (pos, OBJ_STR)))
886 {
887 PangoRectangle inkrect, rect;
888 PangoAttribute *attr;
889
890 int x = SvIV (ST (arg - 3));
891 int y = SvIV (ST (arg - 2));
892 int w = SvIV (ST (arg - 1));
893 int h = SvIV (ST (arg ));
894
895 inkrect.x = 0;
896 inkrect.y = 0;
897 inkrect.width = 0;
898 inkrect.height = 0;
899
900 rect.x = x * PANGO_SCALE;
901 rect.y = y * PANGO_SCALE;
902 rect.width = w * PANGO_SCALE;
903 rect.height = h * PANGO_SCALE;
904
905 if (!attrs)
906 attrs = pango_layout_get_attributes (self->pl);
907
908 attr = pango_attr_shape_new (&inkrect, &rect);
909 attr->start_index = pos - text;
910 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
911 pango_attr_list_insert (attrs, attr);
912
913 arg += 4;
914 pos += sizeof (OBJ_STR) - 1;
915 }
916
917 if (attrs)
918 pango_layout_set_attributes (self->pl, attrs);
919}
920
921void
922get_shapes (CFPlus::Layout self)
923 PPCODE:
924{
925 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
926
927 do
928 {
929 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
930
931 if (run && shape_attr_p (run))
932 {
933 PangoRectangle extents;
934 pango_layout_iter_get_run_extents (iter, 0, &extents);
935
936 EXTEND (SP, 2);
937 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
938 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
939 }
940 }
941 while (pango_layout_iter_next_run (iter));
942
943 pango_layout_iter_free (iter);
944}
945
946int
947has_wrapped (CFPlus::Layout self)
948 CODE:
949{
950 int lines = 1;
951 const char *text = pango_layout_get_text (self->pl);
952
953 while (*text)
954 lines += *text++ == '\n';
955
956 RETVAL = lines < pango_layout_get_line_count (self->pl);
957}
958 OUTPUT:
959 RETVAL
960
706SV * 961SV *
707get_text (CFClient::Layout self) 962get_text (CFPlus::Layout self)
708 CODE: 963 CODE:
709 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 964 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710 SvUTF8_on (RETVAL); 965 sv_utf8_decode (RETVAL);
711 OUTPUT: 966 OUTPUT:
712 RETVAL 967 RETVAL
713 968
714void 969void
970set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
971 CODE:
972 self->r = r;
973 self->g = g;
974 self->b = b;
975 self->a = a;
976
977void
715set_font (CFClient::Layout self, CFClient::Font font = 0) 978set_font (CFPlus::Layout self, CFPlus::Font font = 0)
716 CODE: 979 CODE:
717 if (self->font != font) 980 if (self->font != font)
718 { 981 {
719 self->font = font; 982 self->font = font;
720 layout_update_font (self); 983 layout_update_font (self);
721 } 984 }
722 985
723void 986void
724set_height (CFClient::Layout self, int base_height) 987set_height (CFPlus::Layout self, int base_height)
725 CODE: 988 CODE:
726 if (self->base_height != base_height) 989 if (self->base_height != base_height)
727 { 990 {
728 self->base_height = base_height; 991 self->base_height = base_height;
729 layout_update_font (self); 992 layout_update_font (self);
730 } 993 }
731 994
732void 995void
733set_width (CFClient::Layout self, int max_width = -1) 996set_width (CFPlus::Layout self, int max_width = -1)
734 CODE: 997 CODE:
735 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 998 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
736 999
737void 1000void
1001set_indent (CFPlus::Layout self, int indent)
1002 CODE:
1003 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1004
1005void
1006set_spacing (CFPlus::Layout self, int spacing)
1007 CODE:
1008 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1009
1010void
1011set_ellipsise (CFPlus::Layout self, int ellipsise)
1012 CODE:
1013 pango_layout_set_ellipsize (self->pl,
1014 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1015 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1016 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1017 : PANGO_ELLIPSIZE_NONE
1018 );
1019
1020void
1021set_single_paragraph_mode (CFPlus::Layout self, int spm)
1022 CODE:
1023 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1024
1025void
738size (CFClient::Layout self) 1026size (CFPlus::Layout self)
739 PPCODE: 1027 PPCODE:
740{ 1028{
741 int w, h; 1029 int w, h;
742 1030
743 layout_get_pixel_size (self, &w, &h); 1031 layout_get_pixel_size (self, &w, &h);
746 PUSHs (sv_2mortal (newSViv (w))); 1034 PUSHs (sv_2mortal (newSViv (w)));
747 PUSHs (sv_2mortal (newSViv (h))); 1035 PUSHs (sv_2mortal (newSViv (h)));
748} 1036}
749 1037
750int 1038int
1039descent (CFPlus::Layout self)
1040 CODE:
1041{
1042 PangoRectangle rect;
1043 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1044 pango_layout_line_get_pixel_extents (line, 0, &rect);
1045 RETVAL = PANGO_DESCENT (rect);
1046}
1047 OUTPUT:
1048 RETVAL
1049
1050int
751xy_to_index (CFClient::Layout self, int x, int y) 1051xy_to_index (CFPlus::Layout self, int x, int y)
752 CODE: 1052 CODE:
753{ 1053{
754 int index, trailing; 1054 int index, trailing;
755 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1055 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
756 RETVAL = index; 1056 RETVAL = index;
757} 1057}
758 OUTPUT: 1058 OUTPUT:
759 RETVAL 1059 RETVAL
760 1060
761void 1061void
762cursor_pos (CFClient::Layout self, int index) 1062cursor_pos (CFPlus::Layout self, int index)
763 PPCODE: 1063 PPCODE:
764{ 1064{
765 PangoRectangle strong_pos; 1065 PangoRectangle strong_pos;
766 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1066 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
767 1067
770 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
771 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
772} 1072}
773 1073
774void 1074void
775render (CFClient::Layout self) 1075render (CFPlus::Layout self, float x, float y, int flags = 0)
776 PPCODE: 1076 PPCODE:
777{ 1077 pango_opengl_render_layout_subpixel (
778 SV *retval; 1078 self->pl,
779 int w, h; 1079 x * PANGO_SCALE, y * PANGO_SCALE,
780 FT_Bitmap bitmap; 1080 self->r, self->g, self->b, self->a,
1081 flags
1082 );
781 1083
782 layout_get_pixel_size (self, &w, &h); 1084MODULE = CFPlus PACKAGE = CFPlus::Texture
783 1085
784 retval = newSV (w * h); 1086void
785 SvPOK_only (retval); 1087pad2pot (SV *data_, SV *w_, SV *h_)
786 SvCUR_set (retval, w * h); 1088 CODE:
1089{
1090 int ow = SvIV (w_);
1091 int oh = SvIV (h_);
787 1092
788 bitmap.rows = h; 1093 if (ow && oh)
789 bitmap.width = w; 1094 {
790 bitmap.pitch = w; 1095 int nw = minpot (ow);
791 bitmap.buffer = (unsigned char*)SvPVX (retval); 1096 int nh = minpot (oh);
792 bitmap.num_grays = 256;
793 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794 1097
795 memset (bitmap.buffer, 0, w * h); 1098 if (nw != ow || nh != oh)
796 1099 {
797 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 1100 if (SvOK (data_))
1101 {
1102 STRLEN datalen;
1103 char *data = SvPVbyte (data_, datalen);
1104 int bpp = datalen / (ow * oh);
1105 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
798 1106
799 EXTEND (SP, 3); 1107 SvPOK_only (result_);
800 PUSHs (sv_2mortal (newSViv (w))); 1108 SvCUR_set (result_, nw * nh * bpp);
801 PUSHs (sv_2mortal (newSViv (h)));
802 PUSHs (sv_2mortal (retval));
803}
804 1109
805MODULE = CFClient PACKAGE = CFClient::Texture 1110 memset (SvPVX (result_), 0, nw * nh * bpp);
1111 while (oh--)
1112 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
806 1113
1114 sv_setsv (data_, result_);
1115 }
1116
1117 sv_setiv (w_, nw);
1118 sv_setiv (h_, nh);
1119 }
1120 }
1121}
1122
807void 1123void
808draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1124draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
809 PROTOTYPE: $$$;$$ 1125 PROTOTYPE: $$$;$$
1126 ALIAS:
1127 draw_quad_alpha = 1
1128 draw_quad_alpha_premultiplied = 2
810 CODE: 1129 CODE:
811{ 1130{
812 HV *hv = (HV *)SvRV (self); 1131 HV *hv = (HV *)SvRV (self);
813 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1132 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1133 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
815 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1134 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
816 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
817 1135
818 if (items < 5) 1136 if (items < 5)
819 { 1137 {
820 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1138 w = SvNV (*hv_fetch (hv, "w", 1, 1));
821 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1139 h = SvNV (*hv_fetch (hv, "h", 1, 1));
822 } 1140 }
823 1141
1142 if (ix)
1143 {
1144 glEnable (GL_BLEND);
1145
1146 if (ix == 2)
1147 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1148 else
1149 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1150 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1151
1152 glEnable (GL_ALPHA_TEST);
1153 glAlphaFunc (GL_GREATER, 0.01f);
1154 }
1155
824 glBindTexture (GL_TEXTURE_2D, name); 1156 glBindTexture (GL_TEXTURE_2D, name);
825 if (wrap_mode) { 1157
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); 1158 glBegin (GL_QUADS);
830 glTexCoord2f (0, 0); glVertex2f (x , y ); 1159 glTexCoord2f (0, 0); glVertex2f (x , y );
831 glTexCoord2f (0, t); glVertex2f (x , y + h); 1160 glTexCoord2f (0, t); glVertex2f (x , y + h);
832 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1161 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1162 glTexCoord2f (s, 0); glVertex2f (x + w, y );
834 glEnd (); 1163 glEnd ();
835}
836 1164
1165 if (ix)
1166 {
1167 glDisable (GL_ALPHA_TEST);
1168 glDisable (GL_BLEND);
1169 }
1170}
1171
837MODULE = CFClient PACKAGE = CFClient::Map 1172MODULE = CFPlus PACKAGE = CFPlus::Map
838 1173
839CFClient::Map 1174CFPlus::Map
840new (SV *class, int map_width, int map_height) 1175new (SV *class, int map_width, int map_height)
841 CODE: 1176 CODE:
842 New (0, RETVAL, 1, struct map); 1177 New (0, RETVAL, 1, struct map);
843 RETVAL->x = 0; 1178 RETVAL->x = 0;
844 RETVAL->y = 0; 1179 RETVAL->y = 0;
854 RETVAL->row = 0; 1189 RETVAL->row = 0;
855 OUTPUT: 1190 OUTPUT:
856 RETVAL 1191 RETVAL
857 1192
858void 1193void
859DESTROY (CFClient::Map self) 1194DESTROY (CFPlus::Map self)
860 CODE: 1195 CODE:
861{ 1196{
862 map_clear (self); 1197 map_clear (self);
863 Safefree (self->face); 1198 Safefree (self->face);
1199 Safefree (self->tex);
864 Safefree (self); 1200 Safefree (self);
865} 1201}
866 1202
867void 1203void
868clear (CFClient::Map self) 1204clear (CFPlus::Map self)
869 CODE: 1205 CODE:
870 map_clear (self); 1206 map_clear (self);
871 1207
872void 1208void
873set_face (CFClient::Map self, int face, int texid) 1209set_face (CFPlus::Map self, int face, int texid)
874 CODE: 1210 CODE:
875{ 1211{
876 while (self->faces <= face) 1212 while (self->faces <= face)
877 { 1213 {
878 Append (mapface, self->face, self->faces, self->faces); 1214 Append (mapface, self->face, self->faces, self->faces);
881 1217
882 self->face [face] = texid; 1218 self->face [face] = texid;
883} 1219}
884 1220
885void 1221void
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) 1222set_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: 1223 CODE:
888{ 1224{
889 while (self->texs <= texid) 1225 while (self->texs <= texid)
890 { 1226 {
891 Append (maptex, self->tex, self->texs, self->texs); 1227 Append (maptex, self->tex, self->texs, self->texs);
903 tex->r = r; 1239 tex->r = r;
904 tex->g = g; 1240 tex->g = g;
905 tex->b = b; 1241 tex->b = b;
906 tex->a = a; 1242 tex->a = a;
907 } 1243 }
1244
1245 // somewhat hackish, but for textures that require it, it really
1246 // improves the look, and most others don't suffer.
1247 glBindTexture (GL_TEXTURE_2D, name);
1248 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1249 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1250 // use uglier nearest interpolation because linear suffers
1251 // from transparent color bleeding and ugly wrapping effects.
1252 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
908} 1253}
909 1254
910int 1255int
911ox (CFClient::Map self) 1256ox (CFPlus::Map self)
912 ALIAS: 1257 ALIAS:
913 oy = 1 1258 oy = 1
1259 x = 2
1260 y = 3
1261 w = 4
1262 h = 5
914 CODE: 1263 CODE:
915 switch (ix) 1264 switch (ix)
916 { 1265 {
917 case 0: RETVAL = self->ox; break; 1266 case 0: RETVAL = self->ox; break;
918 case 1: RETVAL = self->oy; break; 1267 case 1: RETVAL = self->oy; break;
1268 case 2: RETVAL = self->x; break;
1269 case 3: RETVAL = self->y; break;
1270 case 4: RETVAL = self->w; break;
1271 case 5: RETVAL = self->h; break;
919 } 1272 }
920 OUTPUT: 1273 OUTPUT:
921 RETVAL 1274 RETVAL
922 1275
923void 1276void
924scroll (CFClient::Map self, int dx, int dy) 1277scroll (CFPlus::Map self, int dx, int dy)
925 CODE: 1278 CODE:
926{ 1279{
927 if (dx > 0) 1280 if (dx > 0)
928 map_blank (self, self->x, self->y, dx - 1, self->h); 1281 map_blank (self, self->x, self->y, dx, self->h);
929 else if (dx < 0) 1282 else if (dx < 0)
930 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1283 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
931 1284
932 if (dy > 0) 1285 if (dy > 0)
933 map_blank (self, self->x, self->y, self->w, dy - 1); 1286 map_blank (self, self->x, self->y, self->w, dy);
934 else if (dy < 0) 1287 else if (dy < 0)
935 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1288 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
936 1289
937 self->ox += dx; self->x += dx; 1290 self->ox += dx; self->x += dx;
938 self->oy += dy; self->y += dy; 1291 self->oy += dy; self->y += dy;
939 1292
940 while (self->y < 0) 1293 while (self->y < 0)
945 self->y += MAP_EXTEND_Y; 1298 self->y += MAP_EXTEND_Y;
946 } 1299 }
947} 1300}
948 1301
949void 1302void
950map1a_update (CFClient::Map self, SV *data_) 1303map1a_update (CFPlus::Map self, SV *data_, int extmap)
951 CODE: 1304 CODE:
952{ 1305{
953 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1306 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
954 uint8_t *data_end = (uint8_t *)SvEND (data_); 1307 uint8_t *data_end = (uint8_t *)SvEND (data_);
955 mapcell *cell; 1308 mapcell *cell;
956 int x, y, flags; 1309 int x, y, flags;
957 1310
958 while (data < data_end) 1311 while (data < data_end - 1)
959 { 1312 {
960 flags = (data [0] << 8) + data [1]; data += 2; 1313 flags = (data [0] << 8) + data [1]; data += 2;
961 1314
962 x = ((flags >> 10) & 63) + self->x; 1315 x = self->x + ((flags >> 10) & 63);
963 y = ((flags >> 4) & 63) + self->y; 1316 y = self->y + ((flags >> 4) & 63);
964 1317
965 cell = map_get_cell (self, x, y); 1318 cell = map_get_cell (self, x, y);
966 1319
967 if (flags & 15) 1320 if (flags & 15)
968 { 1321 {
969 if (cell->darkness < 0) 1322 if (!cell->darkness)
970 { 1323 {
1324 memset (cell, 0, sizeof (*cell));
971 cell->darkness = 0; 1325 cell->darkness = 256;
972 cell->face [0] = 0;
973 cell->face [1] = 0;
974 cell->face [2] = 0;
975 } 1326 }
976 1327
977 cell->darkness = flags & 8 ? *data++ : 255;
978
979 //TODO: don't trust server data to be in-range(!) 1328 //TODO: don't trust server data to be in-range(!)
1329
1330 if (flags & 8)
1331 {
1332 if (extmap)
1333 {
1334 uint8_t ext, cmd;
1335
1336 do
1337 {
1338 ext = *data++;
1339 cmd = ext & 0x3f;
1340
1341 if (cmd < 4)
1342 cell->darkness = 255 - ext * 64 + 1;
1343 else if (cmd == 5) // health
1344 {
1345 cell->stat_width = 1;
1346 cell->stat_hp = *data++;
1347 }
1348 else if (cmd == 6) // monster width
1349 cell->stat_width = *data++ + 1;
1350 else if (cmd == 0x47) // monster width
1351 {
1352 if (*data == 4)
1353 ; // decode player tag
1354
1355 data += *data + 1;
1356 }
1357 else if (cmd == 8) // cell flags
1358 cell->flags = *data++;
1359 else if (ext & 0x40) // unknown, multibyte => skip
1360 data += *data + 1;
1361 else
1362 data++;
1363 }
1364 while (ext & 0x80);
1365 }
1366 else
1367 cell->darkness = *data++ + 1;
1368 }
980 1369
981 if (flags & 4) 1370 if (flags & 4)
982 { 1371 {
983 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1372 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
984 } 1373 }
992 { 1381 {
993 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1382 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
994 } 1383 }
995 } 1384 }
996 else 1385 else
997 cell->darkness = -1; 1386 cell->darkness = 0;
998 } 1387 }
999} 1388}
1000 1389
1001SV * 1390SV *
1002mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1391mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1003 CODE: 1392 CODE:
1004{ 1393{
1005 int x1, x; 1394 int x1, x;
1006 int y1, y; 1395 int y1, y;
1007 int z; 1396 int z;
1057} 1446}
1058 OUTPUT: 1447 OUTPUT:
1059 RETVAL 1448 RETVAL
1060 1449
1061void 1450void
1062draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1451draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1063 PPCODE: 1452 CODE:
1064{ 1453{
1065 int vx, vy; 1454 int vx, vy;
1066 int x, y, z; 1455 int x, y, z;
1067 int last_name; 1456 int last_name;
1068 mapface face; 1457 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 1458
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; 1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1078 vy = self->y + (self->h - sh) / 2 - shift_y; 1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1079 1461
1080 /* 1462 /*
1081 int vx = self->vx = self->w >= sw 1463 int vx = self->vx = self->w >= sw
1082 ? self->x + (self->w - sw) / 2 1464 ? self->x + (self->w - sw) / 2
1083 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1465 : 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)); 1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1088 */ 1470 */
1089 1471
1090 glColor4ub (255, 255, 255, 255); 1472 glColor4ub (255, 255, 255, 255);
1091 1473
1474 glEnable (GL_BLEND);
1092 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1093 glEnable (GL_BLEND);
1094 glEnable (GL_TEXTURE_2D); 1476 glEnable (GL_TEXTURE_2D);
1095 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1477 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1096 1478
1097 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1098 1480
1107 for (x = 0; x < sw; x++) 1489 for (x = 0; x < sw; x++)
1108 if (row->c0 <= x + vx && x + vx < row->c1) 1490 if (row->c0 <= x + vx && x + vx < row->c1)
1109 { 1491 {
1110 mapcell *cell = row->col + (x + vx - row->c0); 1492 mapcell *cell = row->col + (x + vx - row->c0);
1111 1493
1112 darkness[y * sw4 + x] = cell->darkness < 0
1113 ? 255 - FOW_DARKNESS
1114 : 255 - cell->darkness;
1115
1116 face = cell->face [z]; 1494 face = cell->face [z];
1117 1495
1118 if (face) 1496 if (face && face < self->texs)
1119 { 1497 {
1120 maptex tex = self->tex [face]; 1498 maptex tex = self->tex [face];
1121
1122 int px = (x + 1) * 32 - tex.w; 1499 int px = (x + 1) * 32 - tex.w;
1123 int py = (y + 1) * 32 - tex.h; 1500 int py = (y + 1) * 32 - tex.h;
1124 1501
1125 if (last_name != tex.name) 1502 if (last_name != tex.name)
1126 { 1503 {
1127 glEnd (); 1504 glEnd ();
1128 last_name = tex.name;
1129 glBindTexture (GL_TEXTURE_2D, last_name); 1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1130 glBegin (GL_QUADS); 1506 glBegin (GL_QUADS);
1131 } 1507 }
1132 1508
1133 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1134 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1135 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1511 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1136 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1137 } 1513 }
1514
1515 if (cell->flags && z == 2)
1516 {
1517 if (cell->flags & 1)
1518 {
1519 maptex tex = self->tex [1];
1520 int px = (x + 1) * 32 - tex.w + 2;
1521 int py = (y + 1) * 32 - tex.h - 6;
1522
1523 glEnd ();
1524 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1525 glBegin (GL_QUADS);
1526
1527 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1528 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1529 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1530 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1531 }
1532 }
1138 } 1533 }
1139 } 1534 }
1140 1535
1141 glEnd (); 1536 glEnd ();
1142 1537
1143 glDisable (GL_TEXTURE_2D); 1538 glDisable (GL_TEXTURE_2D);
1144 glDisable (GL_BLEND); 1539 glDisable (GL_BLEND);
1540
1541 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows)
1544 {
1545 maprow *row = self->row + (y + vy);
1546
1547 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1)
1549 {
1550 mapcell *cell = row->col + (x + vx - row->c0);
1551
1552 int px = x * 32;
1553 int py = y * 32;
1554
1555 if (cell->stat_hp)
1556 {
1557 int width = cell->stat_width * 32;
1558 int thick = sh / 28 + 1 + cell->stat_width;
1559
1560 glColor3ub (0, 0, 0);
1561 glRectf (px + 1, py - thick - 2,
1562 px + width - 1, py);
1563
1564 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1565 glRectf (px + 2,
1566 py - thick - 1,
1567 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1568 }
1569 }
1570 }
1571}
1572
1573void
1574draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1575 CODE:
1576{
1577 static float color[16][3] = {
1578 { 0.00F, 0.00F, 0.00F },
1579 { 1.00F, 1.00F, 1.00F },
1580 { 0.00F, 0.00F, 0.55F },
1581 { 1.00F, 0.00F, 0.00F },
1582
1583 { 1.00F, 0.54F, 0.00F },
1584 { 0.11F, 0.56F, 1.00F },
1585 { 0.93F, 0.46F, 0.00F },
1586 { 0.18F, 0.54F, 0.34F },
1587
1588 { 0.56F, 0.73F, 0.56F },
1589 { 0.80F, 0.80F, 0.80F },
1590 { 0.55F, 0.41F, 0.13F },
1591 { 0.99F, 0.77F, 0.26F },
1592
1593 { 0.74F, 0.65F, 0.41F },
1594
1595 { 0.00F, 1.00F, 1.00F },
1596 { 1.00F, 0.00F, 1.00F },
1597 { 1.00F, 1.00F, 0.00F },
1598 };
1599
1600 int x, y;
1601
1602 glEnable (GL_TEXTURE_2D);
1603 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1604 glEnable (GL_BLEND);
1605 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1606 glBegin (GL_QUADS);
1607
1608 for (y = 0; y < h; y++)
1609 for (x = 0; x < w; x++)
1610 {
1611 unsigned char m = data [x + y * w];
1612
1613 if (m)
1614 {
1615 float *c = color [m & 15];
1616
1617 float tx1 = m & 0x40 ? 0.5 : 0.;
1618 float tx2 = tx1 + 0.5;
1619
1620 glColor4f (c[0], c[1], c[2], 0.75);
1621 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1622 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1623 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1624 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1625 }
1626 }
1627
1628 glEnd ();
1629 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D);
1631}
1632
1633void
1634fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1635 PPCODE:
1636{
1637 int vx, vy;
1638 int x, y;
1639 int sw4 = (sw + 3) & ~3;
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1642
1643 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh);
1646
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1649
1650 for (y = 0; y < sh; y++)
1651 if (0 <= y + vy && y + vy < self->rows)
1652 {
1653 maprow *row = self->row + (y + vy);
1654
1655 for (x = 0; x < sw; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1)
1657 {
1658 mapcell *cell = row->col + (x + vx - row->c0);
1659
1660 darkness[y * sw4 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS;
1663 }
1664 }
1145 1665
1146 EXTEND (SP, 3); 1666 EXTEND (SP, 3);
1147 PUSHs (sv_2mortal (newSViv (sw4))); 1667 PUSHs (sv_2mortal (newSViv (sw4)));
1148 PUSHs (sv_2mortal (newSViv (sh))); 1668 PUSHs (sv_2mortal (newSViv (sh)));
1149 PUSHs (darkness_sv); 1669 PUSHs (darkness_sv);
1150} 1670}
1151 1671
1152SV * 1672SV *
1153get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1673get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1154 CODE: 1674 CODE:
1155{ 1675{
1156 int x, y, x1, y1; 1676 int x, y, x1, y1;
1157 SV *data_sv = newSV (w * h * 7 + 5); 1677 SV *data_sv = newSV (w * h * 7 + 5);
1158 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1220} 1740}
1221 OUTPUT: 1741 OUTPUT:
1222 RETVAL 1742 RETVAL
1223 1743
1224void 1744void
1225set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1745set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1226 PPCODE: 1746 PPCODE:
1227{ 1747{
1228 int x, y, z; 1748 int x, y, z;
1229 int w, h; 1749 int w, h;
1230 int x1, y1; 1750 int x1, y1;
1262 1782
1263 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1264 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1265 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1266 1786
1267 if (cell->darkness <= 0) 1787 if (cell->darkness == 0)
1268 { 1788 {
1269 cell->darkness = -1; 1789 cell->darkness = 0;
1270 1790
1271 for (z = 0; z <= 2; z++) 1791 for (z = 0; z <= 2; z++)
1272 { 1792 {
1273 cell->face[z] = face[z]; 1793 cell->face[z] = face[z];
1274 1794
1279 } 1799 }
1280 } 1800 }
1281 } 1801 }
1282} 1802}
1283 1803
1284MODULE = CFClient PACKAGE = CFClient::MixChunk 1804MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1285 1805
1286CFClient::MixChunk 1806CFPlus::MixChunk
1287new_from_file (SV *class, char *path) 1807new_from_file (SV *class, char *path)
1288 CODE: 1808 CODE:
1289 RETVAL = Mix_LoadWAV (path); 1809 RETVAL = Mix_LoadWAV (path);
1290 OUTPUT: 1810 OUTPUT:
1291 RETVAL 1811 RETVAL
1292 1812
1293void 1813void
1294DESTROY (CFClient::MixChunk self) 1814DESTROY (CFPlus::MixChunk self)
1295 CODE: 1815 CODE:
1296 Mix_FreeChunk (self); 1816 Mix_FreeChunk (self);
1297 1817
1298int 1818int
1299volume (CFClient::MixChunk self, int volume = -1) 1819volume (CFPlus::MixChunk self, int volume = -1)
1300 CODE: 1820 CODE:
1301 RETVAL = Mix_VolumeChunk (self, volume); 1821 RETVAL = Mix_VolumeChunk (self, volume);
1302 OUTPUT: 1822 OUTPUT:
1303 RETVAL 1823 RETVAL
1304 1824
1305int 1825int
1306play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1826play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1307 CODE: 1827 CODE:
1308 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1828 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1309 OUTPUT: 1829 OUTPUT:
1310 RETVAL 1830 RETVAL
1311 1831
1312MODULE = CFClient PACKAGE = CFClient::MixMusic 1832MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1313 1833
1314int 1834int
1315volume (int volume = -1) 1835volume (int volume = -1)
1316 CODE: 1836 CODE:
1317 RETVAL = Mix_VolumeMusic (volume); 1837 RETVAL = Mix_VolumeMusic (volume);
1318 OUTPUT: 1838 OUTPUT:
1319 RETVAL 1839 RETVAL
1320 1840
1321CFClient::MixMusic 1841CFPlus::MixMusic
1322new_from_file (SV *class, char *path) 1842new_from_file (SV *class, char *path)
1323 CODE: 1843 CODE:
1324 RETVAL = Mix_LoadMUS (path); 1844 RETVAL = Mix_LoadMUS (path);
1325 OUTPUT: 1845 OUTPUT:
1326 RETVAL 1846 RETVAL
1327 1847
1328void 1848void
1329DESTROY (CFClient::MixMusic self) 1849DESTROY (CFPlus::MixMusic self)
1330 CODE: 1850 CODE:
1331 Mix_FreeMusic (self); 1851 Mix_FreeMusic (self);
1332 1852
1333int 1853int
1334play (CFClient::MixMusic self, int loops = -1) 1854play (CFPlus::MixMusic self, int loops = -1)
1335 CODE: 1855 CODE:
1336 RETVAL = Mix_PlayMusic (self, loops); 1856 RETVAL = Mix_PlayMusic (self, loops);
1337 OUTPUT: 1857 OUTPUT:
1338 RETVAL 1858 RETVAL
1339 1859
1340MODULE = CFClient PACKAGE = CFClient::OpenGL 1860MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1341 1861
1342BOOT: 1862BOOT:
1343{ 1863{
1344 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1864 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1345 static const struct { 1865 static const struct {
1346 const char *name; 1866 const char *name;
1347 IV iv; 1867 IV iv;
1348 } *civ, const_iv[] = { 1868 } *civ, const_iv[] = {
1349# define const_iv(name) { # name, (IV)name } 1869# define const_iv(name) { # name, (IV)name }
1350 const_iv (GL_COLOR_MATERIAL), 1870 const_iv (GL_COLOR_MATERIAL),
1351 const_iv (GL_SMOOTH), 1871 const_iv (GL_SMOOTH),
1352 const_iv (GL_FLAT), 1872 const_iv (GL_FLAT),
1873 const_iv (GL_DITHER),
1353 const_iv (GL_BLEND), 1874 const_iv (GL_BLEND),
1875 const_iv (GL_CULL_FACE),
1876 const_iv (GL_SCISSOR_TEST),
1877 const_iv (GL_DEPTH_TEST),
1878 const_iv (GL_ALPHA_TEST),
1879 const_iv (GL_NORMALIZE),
1880 const_iv (GL_RESCALE_NORMAL),
1881 const_iv (GL_FRONT),
1882 const_iv (GL_BACK),
1354 const_iv (GL_AND), 1883 const_iv (GL_AND),
1355 const_iv (GL_ONE), 1884 const_iv (GL_ONE),
1356 const_iv (GL_ZERO), 1885 const_iv (GL_ZERO),
1357 const_iv (GL_SRC_ALPHA), 1886 const_iv (GL_SRC_ALPHA),
1358 const_iv (GL_SRC_ALPHA_SATURATE), 1887 const_iv (GL_DST_ALPHA),
1359 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1888 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1360 const_iv (GL_ONE_MINUS_DST_ALPHA), 1889 const_iv (GL_ONE_MINUS_DST_ALPHA),
1890 const_iv (GL_SRC_ALPHA_SATURATE),
1361 const_iv (GL_RGB), 1891 const_iv (GL_RGB),
1362 const_iv (GL_RGBA), 1892 const_iv (GL_RGBA),
1893 const_iv (GL_RGBA4),
1894 const_iv (GL_RGBA8),
1895 const_iv (GL_RGB5_A1),
1363 const_iv (GL_UNSIGNED_BYTE), 1896 const_iv (GL_UNSIGNED_BYTE),
1897 const_iv (GL_UNSIGNED_SHORT),
1898 const_iv (GL_UNSIGNED_INT),
1364 const_iv (GL_ALPHA), 1899 const_iv (GL_ALPHA),
1900 const_iv (GL_INTENSITY),
1901 const_iv (GL_LUMINANCE),
1902 const_iv (GL_LUMINANCE_ALPHA),
1365 const_iv (GL_FLOAT), 1903 const_iv (GL_FLOAT),
1366 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1904 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1367 const_iv (GL_COMPILE), 1905 const_iv (GL_COMPILE),
1368 const_iv (GL_TEXTURE_1D), 1906 const_iv (GL_TEXTURE_1D),
1369 const_iv (GL_TEXTURE_2D), 1907 const_iv (GL_TEXTURE_2D),
1371 const_iv (GL_TEXTURE_MAG_FILTER), 1909 const_iv (GL_TEXTURE_MAG_FILTER),
1372 const_iv (GL_TEXTURE_MIN_FILTER), 1910 const_iv (GL_TEXTURE_MIN_FILTER),
1373 const_iv (GL_TEXTURE_ENV_MODE), 1911 const_iv (GL_TEXTURE_ENV_MODE),
1374 const_iv (GL_TEXTURE_WRAP_S), 1912 const_iv (GL_TEXTURE_WRAP_S),
1375 const_iv (GL_TEXTURE_WRAP_T), 1913 const_iv (GL_TEXTURE_WRAP_T),
1914 const_iv (GL_REPEAT),
1376 const_iv (GL_CLAMP), 1915 const_iv (GL_CLAMP),
1377 const_iv (GL_REPEAT), 1916 const_iv (GL_CLAMP_TO_EDGE),
1378 const_iv (GL_NEAREST), 1917 const_iv (GL_NEAREST),
1379 const_iv (GL_LINEAR), 1918 const_iv (GL_LINEAR),
1380 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1919 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1381 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1920 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1382 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1921 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1383 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1922 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1384 const_iv (GL_GENERATE_MIPMAP), 1923 const_iv (GL_GENERATE_MIPMAP),
1385 const_iv (GL_MODULATE), 1924 const_iv (GL_MODULATE),
1925 const_iv (GL_DECAL),
1386 const_iv (GL_REPLACE), 1926 const_iv (GL_REPLACE),
1927 const_iv (GL_DEPTH_BUFFER_BIT),
1387 const_iv (GL_COLOR_BUFFER_BIT), 1928 const_iv (GL_COLOR_BUFFER_BIT),
1388 const_iv (GL_PROJECTION), 1929 const_iv (GL_PROJECTION),
1389 const_iv (GL_MODELVIEW), 1930 const_iv (GL_MODELVIEW),
1390 const_iv (GL_COLOR_LOGIC_OP), 1931 const_iv (GL_COLOR_LOGIC_OP),
1932 const_iv (GL_SEPARABLE_2D),
1391 const_iv (GL_CONVOLUTION_2D), 1933 const_iv (GL_CONVOLUTION_2D),
1392 const_iv (GL_CONVOLUTION_BORDER_MODE), 1934 const_iv (GL_CONVOLUTION_BORDER_MODE),
1393 const_iv (GL_CONSTANT_BORDER), 1935 const_iv (GL_CONSTANT_BORDER),
1394 const_iv (GL_LINES), 1936 const_iv (GL_LINES),
1937 const_iv (GL_LINE_STRIP),
1938 const_iv (GL_LINE_LOOP),
1395 const_iv (GL_QUADS), 1939 const_iv (GL_QUADS),
1396 const_iv (GL_LINE_LOOP), 1940 const_iv (GL_QUAD_STRIP),
1941 const_iv (GL_TRIANGLES),
1942 const_iv (GL_TRIANGLE_STRIP),
1943 const_iv (GL_TRIANGLE_FAN),
1397 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1944 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1398 const_iv (GL_FASTEST), 1945 const_iv (GL_FASTEST),
1946 const_iv (GL_V2F),
1947 const_iv (GL_V3F),
1948 const_iv (GL_T2F_V3F),
1949 const_iv (GL_T2F_N3F_V3F),
1399# undef const_iv 1950# undef const_iv
1400 }; 1951 };
1401 1952
1402 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1953 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1403 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1954 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1404} 1955}
1405 1956
1957char *
1958gl_vendor ()
1959 CODE:
1960 RETVAL = (char *)glGetString (GL_VENDOR);
1961 OUTPUT:
1962 RETVAL
1963
1964char *
1965gl_version ()
1966 CODE:
1967 RETVAL = (char *)glGetString (GL_VERSION);
1968 OUTPUT:
1969 RETVAL
1970
1971char *
1972gl_extensions ()
1973 CODE:
1974 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1975 OUTPUT:
1976 RETVAL
1977
1406int glGetError () 1978int glGetError ()
1979
1980void glFinish ()
1407 1981
1408void glClear (int mask) 1982void glClear (int mask)
1409 1983
1410void glClearColor (float r, float g, float b, float a = 1.0) 1984void glClearColor (float r, float g, float b, float a = 1.0)
1411 PROTOTYPE: @ 1985 PROTOTYPE: @
1418 1992
1419void glHint (int target, int mode) 1993void glHint (int target, int mode)
1420 1994
1421void glBlendFunc (int sfactor, int dfactor) 1995void glBlendFunc (int sfactor, int dfactor)
1422 1996
1997void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1998 CODE:
1999 gl_BlendFuncSeparate (sa, da, saa, daa);
2000
2001void glDepthMask (int flag)
2002
1423void glLogicOp (int opcode) 2003void glLogicOp (int opcode)
1424 2004
2005void glColorMask (int red, int green, int blue, int alpha)
2006
1425void glMatrixMode (int mode) 2007void glMatrixMode (int mode)
1426 2008
1427void glPushMatrix () 2009void glPushMatrix ()
1428 2010
1429void glPopMatrix () 2011void glPopMatrix ()
1430 2012
1431void glLoadIdentity () 2013void glLoadIdentity ()
1432 2014
2015void glDrawBuffer (int buffer)
2016
2017void glReadBuffer (int buffer)
2018
1433# near and far are due to microsofts buggy c compiler 2019# near_ and far_ are due to microsofts buggy "c" compiler
2020void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2021
2022# near_ and far_ are due to microsofts buggy "c" compiler
1434void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2023void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1435 2024
1436void glViewport (int x, int y, int width, int height) 2025void glViewport (int x, int y, int width, int height)
2026
2027void glScissor (int x, int y, int width, int height)
1437 2028
1438void glTranslate (float x, float y, float z = 0.) 2029void glTranslate (float x, float y, float z = 0.)
1439 CODE: 2030 CODE:
1440 glTranslatef (x, y, z); 2031 glTranslatef (x, y, z);
1441 2032
1451 2042
1452void glEnd () 2043void glEnd ()
1453 2044
1454void glColor (float r, float g, float b, float a = 1.0) 2045void glColor (float r, float g, float b, float a = 1.0)
1455 PROTOTYPE: @ 2046 PROTOTYPE: @
2047 ALIAS:
2048 glColor_premultiply = 1
1456 CODE: 2049 CODE:
2050 if (ix)
2051 {
2052 r *= a;
2053 g *= a;
2054 b *= a;
2055 }
2056 // microsoft visual "c" rounds instead of truncating...
1457 glColor4f (r, g, b, a); 2057 glColor4f (r, g, b, a);
2058
2059void glInterleavedArrays (int format, int stride, char *data)
2060
2061void glDrawElements (int mode, int count, int type, char *indices)
2062
2063# 1.2 void glDrawRangeElements (int mode, int start, int end
2064
2065void glRasterPos (float x, float y, float z = 0.)
2066 CODE:
2067 glRasterPos3f (0, 0, z);
2068 glBitmap (0, 0, 0, 0, x, y, 0);
1458 2069
1459void glVertex (float x, float y, float z = 0.) 2070void glVertex (float x, float y, float z = 0.)
1460 CODE: 2071 CODE:
1461 glVertex3f (x, y, z); 2072 glVertex3f (x, y, z);
1462 2073
1474 2085
1475void glBindTexture (int target, int name) 2086void glBindTexture (int target, int name)
1476 2087
1477void glConvolutionParameter (int target, int pname, float params) 2088void glConvolutionParameter (int target, int pname, float params)
1478 CODE: 2089 CODE:
1479 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2090 if (gl.ConvolutionParameterf)
2091 gl.ConvolutionParameterf (target, pname, params);
1480 2092
1481void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2093void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1482 CODE: 2094 CODE:
1483 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2095 if (gl.ConvolutionFilter2D)
1484 (target, internalformat, width, height, format, type, data)); 2096 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
2097
2098void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2099 CODE:
2100 if (gl.SeparableFilter2D)
2101 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1485 2102
1486void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2103void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1487 2104
1488void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2105void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2106
2107void glDrawPixels (int width, int height, int format, int type, char *pixels)
2108
2109void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1489 2110
1490int glGenTexture () 2111int glGenTexture ()
1491 CODE: 2112 CODE:
1492{ 2113{
1493 GLuint name; 2114 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines