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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines