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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines