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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines