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.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.137 by root, Sun Aug 13 19:47:05 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines