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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines