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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines