ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines