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.57 by root, Fri Apr 21 07:09:10 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
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
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
45typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
46typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
47 90
48static PangoContext *context; 91typedef PangoFontDescription *CFPlus__Font;
49static 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}
50 110
51typedef struct cf_layout { 111typedef struct cf_layout {
52 PangoLayout *pl; 112 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode
53 int base_height; 114 int base_height;
115 CFPlus__Font font;
54} *CFClient__Layout; 116} *CFPlus__Layout;
117
118static CFPlus__Font default_font;
119static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap;
55 121
56static void 122static void
57substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
58{ 124{
59 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
60 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
61} 130}
62 131
63static void 132static void
64layout_update (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
65{ 134{
66 /* 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
67 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
68 */ 137 */
69 PangoFontDescription *font = pango_context_get_font_description (context); 138 PangoFontDescription *font = self->font ? self->font : default_font;
70 139
71 int height = self->base_height * (PANGO_SCALE * 8 / 10);
72
73 if (pango_font_description_get_size (font) != height)
74 {
75 pango_font_description_set_absolute_size (font, height); 140 pango_font_description_set_absolute_size (font,
76 pango_layout_context_changed (self->pl); 141 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
77 } 142
143 pango_layout_set_font_description (self->pl, font);
78} 144}
79 145
80static void 146static void
81layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
82{ 148{
83 layout_update (self); 149 PangoRectangle rect;
84 150
151 // get_pixel_* wrongly rounds down
85 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
86 153
87 *w = (*w + 3) & ~3; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
88 if (!*w) *w = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
89 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;
90} 164}
91 165
92typedef uint16_t mapface; 166typedef uint16_t mapface;
93 167
94typedef struct { 168typedef struct {
117 int texs; 191 int texs;
118 maptex *tex; 192 maptex *tex;
119 193
120 int32_t rows; 194 int32_t rows;
121 maprow *row; 195 maprow *row;
122} *CFClient__Map; 196} *CFPlus__Map;
123 197
124static char * 198static char *
125prepend (char *ptr, int sze, int inc) 199prepend (char *ptr, int sze, int inc)
126{ 200{
127 char *p; 201 char *p;
145 219
146#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))
147#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))
148 222
149static maprow * 223static maprow *
150map_get_row (CFClient__Map self, int y) 224map_get_row (CFPlus__Map self, int y)
151{ 225{
152 if (0 > y) 226 if (0 > y)
153 { 227 {
154 int extend = - y + MAP_EXTEND_Y; 228 int extend = - y + MAP_EXTEND_Y;
155 Prepend (maprow, self->row, self->rows, extend); 229 Prepend (maprow, self->row, self->rows, extend);
193 267
194 return row->col + (x - row->c0); 268 return row->col + (x - row->c0);
195} 269}
196 270
197static mapcell * 271static mapcell *
198map_get_cell (CFClient__Map self, int x, int y) 272map_get_cell (CFPlus__Map self, int x, int y)
199{ 273{
200 return row_get_cell (map_get_row (self, y), x); 274 return row_get_cell (map_get_row (self, y), x);
201} 275}
202 276
203static void 277static void
204map_clear (CFClient__Map self) 278map_clear (CFPlus__Map self)
205{ 279{
206 int r; 280 int r;
207 281
208 for (r = 0; r < self->rows; r++) 282 for (r = 0; r < self->rows; r++)
209 Safefree (self->row[r].col); 283 Safefree (self->row[r].col);
217 self->row = 0; 291 self->row = 0;
218 self->rows = 0; 292 self->rows = 0;
219} 293}
220 294
221static void 295static void
222map_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)
223{ 297{
224 int x, y; 298 int x, y;
225 maprow *row; 299 maprow *row;
226 300
227 for (y = y0; y < y0 + h; y++) 301 for (y = y0; y < y0 + h; y++)
242 } 316 }
243 } 317 }
244} 318}
245 319
246static void 320static void
247music_finished () 321music_finished (void)
248{ 322{
249 SDL_UserEvent ev; 323 SDL_UserEvent ev;
250 324
251 ev.type = SDL_USEREVENT; 325 ev.type = SDL_USEREVENT;
252 ev.code = 0; 326 ev.code = 0;
254 ev.data2 = 0; 328 ev.data2 = 0;
255 329
256 SDL_PushEvent ((SDL_Event *)&ev); 330 SDL_PushEvent ((SDL_Event *)&ev);
257} 331}
258 332
333static void
334channel_finished (int channel)
335{
336 SDL_UserEvent ev;
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
259MODULE = CFClient PACKAGE = CFClient 363MODULE = CFPlus PACKAGE = CFPlus
260 364
261PROTOTYPES: ENABLE 365PROTOTYPES: ENABLE
262 366
263BOOT: 367BOOT:
264{ 368{
265 HV *stash = gv_stashpv ("CFClient", 1); 369 HV *stash = gv_stashpv ("CFPlus", 1);
266 static const struct { 370 static const struct {
267 const char *name; 371 const char *name;
268 IV iv; 372 IV iv;
269 } *civ, const_iv[] = { 373 } *civ, const_iv[] = {
270# define const_iv(name) { # name, (IV)name } 374# define const_iv(name) { # name, (IV)name }
369# undef const_iv 473# undef const_iv
370 }; 474 };
371 475
372 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; )
373 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 477 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
374
375 fontmap = pango_ft2_font_map_new ();
376 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
377 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
378} 478}
379 479
380int 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
381SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 501SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
382 502
383void 503void
384SDL_Quit () 504SDL_Quit ()
385 505
386void 506void
392 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
393 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
394 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 514 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
395 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 515 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
396 516
517 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
518 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
519
397 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
398 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
399 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
400 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
401 524
402 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 525 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
526#if SDL_VERSION_ATLEAST(1,2,10)
403 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 527 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
404 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
529#endif
405 530
406 SDL_EnableUNICODE (1); 531 SDL_EnableUNICODE (1);
407 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 532 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
408 533
409 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 534 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
418 543
419 ++m; 544 ++m;
420 } 545 }
421} 546}
422 547
548char *
549SDL_GetError ()
550
423int 551int
424SDL_SetVideoMode (int w, int h, int fullscreen) 552SDL_SetVideoMode (int w, int h, int fullscreen)
425 CODE: 553 CODE:
426 RETVAL = !!SDL_SetVideoMode ( 554 RETVAL = !!SDL_SetVideoMode (
427 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 555 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
428 ); 556 );
557 if (RETVAL)
558 {
429 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 }
430 OUTPUT: 564 OUTPUT:
431 RETVAL 565 RETVAL
432 566
433void 567void
434SDL_GL_SwapBuffers () 568SDL_GL_SwapBuffers ()
569
570char *
571SDL_GetKeyName (int sym)
435 572
436void 573void
437SDL_PollEvent () 574SDL_PollEvent ()
438 PPCODE: 575 PPCODE:
439{ 576{
441 578
442 while (SDL_PollEvent (&ev)) 579 while (SDL_PollEvent (&ev))
443 { 580 {
444 HV *hv = newHV (); 581 HV *hv = newHV ();
445 hv_store (hv, "type", 4, newSViv (ev.type), 0); 582 hv_store (hv, "type", 4, newSViv (ev.type), 0);
583
446 switch (ev.type) 584 switch (ev.type)
447 { 585 {
448 case SDL_KEYDOWN: 586 case SDL_KEYDOWN:
449 case SDL_KEYUP: 587 case SDL_KEYUP:
450 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 588 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
457 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 595 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
458 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 596 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
459 break; 597 break;
460 598
461 case SDL_MOUSEMOTION: 599 case SDL_MOUSEMOTION:
600 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
601
462 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 602 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
463 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 603 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
464 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 604 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
465 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 605 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
466 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 606 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
467 break; 607 break;
468 608
469 case SDL_MOUSEBUTTONDOWN: 609 case SDL_MOUSEBUTTONDOWN:
470 case SDL_MOUSEBUTTONUP: 610 case SDL_MOUSEBUTTONUP:
611 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
612
471 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 613 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
472 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 614 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
473 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 615 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
474 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;
475 } 624 }
476 625
477 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 626 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
478 } 627 }
479} 628}
480 629
481int 630int
482Mix_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)
483 POSTCALL: 632 POSTCALL:
484 Mix_HookMusicFinished (music_finished); 633 Mix_HookMusicFinished (music_finished);
634 Mix_ChannelFinished (channel_finished);
485 635
486void 636void
487Mix_CloseAudio () 637Mix_CloseAudio ()
488 638
489int 639int
494 CODE: 644 CODE:
495#ifndef _WIN32 645#ifndef _WIN32
496 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 646 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
497#endif 647#endif
498 648
499char *
500gl_version ()
501 CODE:
502 RETVAL = (char *)glGetString (GL_VERSION);
503 OUTPUT:
504 RETVAL
505
506char *
507gl_extensions ()
508 CODE:
509 RETVAL = (char *)glGetString (GL_EXTENSIONS);
510 OUTPUT:
511 RETVAL
512
513void 649void
514add_font (char *file) 650add_font (char *file)
515 CODE: 651 CODE:
516 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 652 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
517
518void
519set_font (char *file)
520 CODE:
521{
522 int count;
523 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
524 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
525 FcPatternDestroy (pattern);
526 pango_context_set_font_description (context, font);
527}
528 653
529void 654void
530load_image_inline (SV *image_) 655load_image_inline (SV *image_)
531 ALIAS: 656 ALIAS:
532 load_image_file = 1 657 load_image_file = 1
574 699
575 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 700 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
576 701
577 assert (surface2->pitch == surface2->w * 4); 702 assert (surface2->pitch == surface2->w * 4);
578 703
704 SDL_LockSurface (surface2);
579 EXTEND (SP, 5); 705 EXTEND (SP, 6);
580 PUSHs (sv_2mortal (newSViv (surface2->w))); 706 PUSHs (sv_2mortal (newSViv (surface2->w)));
581 PUSHs (sv_2mortal (newSViv (surface2->h))); 707 PUSHs (sv_2mortal (newSViv (surface2->h)));
582 SDL_LockSurface (surface2);
583 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 708 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
584 SDL_UnlockSurface (surface2);
585 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)));
586 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 710 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
587 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 711 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
712 SDL_UnlockSurface (surface2);
588 713
589 SDL_FreeSurface (surface); 714 SDL_FreeSurface (surface);
590 SDL_FreeSurface (surface2); 715 SDL_FreeSurface (surface2);
591} 716}
592 717
614 PUSHs (sv_2mortal (newSViv (b / y))); 739 PUSHs (sv_2mortal (newSViv (b / y)));
615 PUSHs (sv_2mortal (newSViv (a / y))); 740 PUSHs (sv_2mortal (newSViv (a / y)));
616} 741}
617 742
618void 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
619fatal (char *message) 752fatal (char *message)
620 CODE: 753 CODE:
754 fprintf (stderr, "FATAL: %s\n", message);
621#ifdef _WIN32 755#ifdef _WIN32
622 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 756 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
623#else
624 fprintf (stderr, "FATAL: %s\n", message);
625#endif 757#endif
626 exit (1); 758 _exit (1);
627 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
628MODULE = CFClient PACKAGE = CFClient::Layout 789MODULE = CFPlus PACKAGE = CFPlus::Layout
629 790
630CFClient::Layout 791void
631new (SV *class, int base_height = 10) 792reset_glyph_cache ()
793 CODE:
794 tc_clear ();
795
796CFPlus::Layout
797new (SV *class)
632 CODE: 798 CODE:
633 New (0, RETVAL, 1, struct cf_layout); 799 New (0, RETVAL, 1, struct cf_layout);
634 RETVAL->base_height = base_height; 800
635 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
636 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);
637 OUTPUT: 811 OUTPUT:
638 RETVAL 812 RETVAL
639 813
640void 814void
641DESTROY (CFClient::Layout self) 815DESTROY (CFPlus::Layout self)
642 CODE: 816 CODE:
643 g_object_unref (self->pl); 817 g_object_unref (self->pl);
644 Safefree (self); 818 Safefree (self);
645 819
646void 820void
647set_text (CFClient::Layout self, SV *text_) 821set_text (CFPlus::Layout self, SV *text_)
648 CODE: 822 CODE:
649{ 823{
650 STRLEN textlen; 824 STRLEN textlen;
651 char *text = SvPVutf8 (text_, textlen); 825 char *text = SvPVutf8 (text_, textlen);
652 826
653 pango_layout_set_text (self->pl, text, textlen); 827 pango_layout_set_text (self->pl, text, textlen);
654} 828}
655 829
656void 830void
657set_markup (CFClient::Layout self, SV *text_) 831set_markup (CFPlus::Layout self, SV *text_)
658 CODE: 832 CODE:
659{ 833{
660 STRLEN textlen; 834 STRLEN textlen;
661 char *text = SvPVutf8 (text_, textlen); 835 char *text = SvPVutf8 (text_, textlen);
662 836
663 pango_layout_set_markup (self->pl, text, textlen); 837 pango_layout_set_markup (self->pl, text, textlen);
664} 838}
665 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
666SV * 925SV *
667get_text (CFClient::Layout self) 926get_text (CFPlus::Layout self)
668 CODE: 927 CODE:
669 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 928 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
670 SvUTF8_on (RETVAL); 929 sv_utf8_decode (RETVAL);
671 OUTPUT: 930 OUTPUT:
672 RETVAL 931 RETVAL
673 932
674void 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
675set_height (CFClient::Layout self, int base_height) 951set_height (CFPlus::Layout self, int base_height)
676 CODE: 952 CODE:
953 if (self->base_height != base_height)
954 {
677 self->base_height = base_height; 955 self->base_height = base_height;
956 layout_update_font (self);
957 }
678 958
679void 959void
680set_width (CFClient::Layout self, int max_width = -1) 960set_width (CFPlus::Layout self, int max_width = -1)
681 CODE: 961 CODE:
682 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);
683 963
684void 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
685size (CFClient::Layout self) 990size (CFPlus::Layout self)
686 PPCODE: 991 PPCODE:
687{ 992{
688 int w, h; 993 int w, h;
689 994
690 layout_update (self);
691 layout_get_pixel_size (self, &w, &h); 995 layout_get_pixel_size (self, &w, &h);
692 996
693 EXTEND (SP, 2); 997 EXTEND (SP, 2);
694 PUSHs (sv_2mortal (newSViv (w))); 998 PUSHs (sv_2mortal (newSViv (w)));
695 PUSHs (sv_2mortal (newSViv (h))); 999 PUSHs (sv_2mortal (newSViv (h)));
696} 1000}
697 1001
698int 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
699xy_to_index (CFClient::Layout self, int x, int y) 1015xy_to_index (CFPlus::Layout self, int x, int y)
700 CODE: 1016 CODE:
701{ 1017{
702 int index, trailing; 1018 int index, trailing;
703
704 layout_update (self);
705 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);
706
707 RETVAL = index; 1020 RETVAL = index;
708} 1021}
709 OUTPUT: 1022 OUTPUT:
710 RETVAL 1023 RETVAL
711 1024
712void 1025void
713cursor_pos (CFClient::Layout self, int index) 1026cursor_pos (CFPlus::Layout self, int index)
714 PPCODE: 1027 PPCODE:
715{ 1028{
716 PangoRectangle strong_pos; 1029 PangoRectangle strong_pos;
717 layout_update (self);
718 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1030 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719 1031
720 EXTEND (SP, 3); 1032 EXTEND (SP, 3);
721 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
723 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1035 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
724} 1036}
725 1037
726void 1038void
727render (CFClient::Layout self) 1039render (CFPlus::Layout self, float x, float y, int flags = 0)
728 PPCODE: 1040 PPCODE:
729{ 1041 pango_opengl_render_layout_subpixel (
730 SV *retval; 1042 self->pl,
731 int w, h; 1043 x * PANGO_SCALE, y * PANGO_SCALE,
732 FT_Bitmap bitmap; 1044 self->r, self->g, self->b, self->a,
1045 flags
1046 );
733 1047
734 layout_update (self); 1048MODULE = CFPlus PACKAGE = CFPlus::Texture
735 layout_get_pixel_size (self, &w, &h);
736 1049
737 retval = newSV (w * h); 1050void
738 SvPOK_only (retval); 1051pad2pot (SV *data_, SV *w_, SV *h_)
739 SvCUR_set (retval, w * h); 1052 CODE:
1053{
1054 int ow = SvIV (w_);
1055 int oh = SvIV (h_);
740 1056
741 bitmap.rows = h; 1057 if (ow && oh)
742 bitmap.width = w; 1058 {
743 bitmap.pitch = w; 1059 int nw = minpot (ow);
744 bitmap.buffer = (unsigned char*)SvPVX (retval); 1060 int nh = minpot (oh);
745 bitmap.num_grays = 256;
746 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
747 1061
748 memset (bitmap.buffer, 0, w * h); 1062 if (nw != ow || nh != oh)
749 1063 {
750 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));
751 1070
752 EXTEND (SP, 3); 1071 SvPOK_only (result_);
753 PUSHs (sv_2mortal (newSViv (w))); 1072 SvCUR_set (result_, nw * nh * bpp);
754 PUSHs (sv_2mortal (newSViv (h)));
755 PUSHs (sv_2mortal (retval));
756}
757 1073
758MODULE = 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);
759 1077
1078 sv_setsv (data_, result_);
1079 }
1080
1081 sv_setiv (w_, nw);
1082 sv_setiv (h_, nh);
1083 }
1084 }
1085}
1086
760void 1087void
761draw_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.)
762 PROTOTYPE: $$$;$$ 1089 PROTOTYPE: $$$;$$
1090 ALIAS:
1091 draw_quad_alpha = 1
1092 draw_quad_alpha_premultiplied = 2
763 CODE: 1093 CODE:
764{ 1094{
765 HV *hv = (HV *)SvRV (self); 1095 HV *hv = (HV *)SvRV (self);
766 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1096 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
767 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1097 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
768 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1098 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
769 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
770 1099
771 if (items < 5) 1100 if (items < 5)
772 { 1101 {
773 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1102 w = SvNV (*hv_fetch (hv, "w", 1, 1));
774 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1103 h = SvNV (*hv_fetch (hv, "h", 1, 1));
775 } 1104 }
776 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
777 glBindTexture (GL_TEXTURE_2D, name); 1120 glBindTexture (GL_TEXTURE_2D, name);
778 if (wrap_mode) { 1121
779 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
780 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
781 }
782 glBegin (GL_QUADS); 1122 glBegin (GL_QUADS);
783 glTexCoord2f (0, 0); glVertex2f (x , y ); 1123 glTexCoord2f (0, 0); glVertex2f (x , y );
784 glTexCoord2f (0, t); glVertex2f (x , y + h); 1124 glTexCoord2f (0, t); glVertex2f (x , y + h);
785 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1125 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
786 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1126 glTexCoord2f (s, 0); glVertex2f (x + w, y );
787 glEnd (); 1127 glEnd ();
788}
789 1128
1129 if (ix)
1130 {
1131 glDisable (GL_ALPHA_TEST);
1132 glDisable (GL_BLEND);
1133 }
1134}
1135
790MODULE = CFClient PACKAGE = CFClient::Map 1136MODULE = CFPlus PACKAGE = CFPlus::Map
791 1137
792CFClient::Map 1138CFPlus::Map
793new (SV *class, int map_width, int map_height) 1139new (SV *class, int map_width, int map_height)
794 CODE: 1140 CODE:
795 New (0, RETVAL, 1, struct map); 1141 New (0, RETVAL, 1, struct map);
796 RETVAL->x = 0; 1142 RETVAL->x = 0;
797 RETVAL->y = 0; 1143 RETVAL->y = 0;
807 RETVAL->row = 0; 1153 RETVAL->row = 0;
808 OUTPUT: 1154 OUTPUT:
809 RETVAL 1155 RETVAL
810 1156
811void 1157void
812DESTROY (CFClient::Map self) 1158DESTROY (CFPlus::Map self)
813 CODE: 1159 CODE:
814{ 1160{
815 map_clear (self); 1161 map_clear (self);
816 Safefree (self->face); 1162 Safefree (self->face);
1163 Safefree (self->tex);
817 Safefree (self); 1164 Safefree (self);
818} 1165}
819 1166
820void 1167void
821clear (CFClient::Map self) 1168clear (CFPlus::Map self)
822 CODE: 1169 CODE:
823 map_clear (self); 1170 map_clear (self);
824 1171
825void 1172void
826set_face (CFClient::Map self, int face, int texid) 1173set_face (CFPlus::Map self, int face, int texid)
827 CODE: 1174 CODE:
828{ 1175{
829 while (self->faces <= face) 1176 while (self->faces <= face)
830 { 1177 {
831 Append (mapface, self->face, self->faces, self->faces); 1178 Append (mapface, self->face, self->faces, self->faces);
834 1181
835 self->face [face] = texid; 1182 self->face [face] = texid;
836} 1183}
837 1184
838void 1185void
839set_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)
840 CODE: 1187 CODE:
841{ 1188{
842 while (self->texs <= texid) 1189 while (self->texs <= texid)
843 { 1190 {
844 Append (maptex, self->tex, self->texs, self->texs); 1191 Append (maptex, self->tex, self->texs, self->texs);
856 tex->r = r; 1203 tex->r = r;
857 tex->g = g; 1204 tex->g = g;
858 tex->b = b; 1205 tex->b = b;
859 tex->a = a; 1206 tex->a = a;
860 } 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);
861} 1217}
862 1218
863int 1219int
864ox (CFClient::Map self) 1220ox (CFPlus::Map self)
865 ALIAS: 1221 ALIAS:
866 oy = 1 1222 oy = 1
1223 x = 2
1224 y = 3
1225 w = 4
1226 h = 5
867 CODE: 1227 CODE:
868 switch (ix) 1228 switch (ix)
869 { 1229 {
870 case 0: RETVAL = self->ox; break; 1230 case 0: RETVAL = self->ox; break;
871 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;
872 } 1236 }
873 OUTPUT: 1237 OUTPUT:
874 RETVAL 1238 RETVAL
875 1239
876void 1240void
877scroll (CFClient::Map self, int dx, int dy) 1241scroll (CFPlus::Map self, int dx, int dy)
878 CODE: 1242 CODE:
879{ 1243{
880 if (dx > 0) 1244 if (dx > 0)
881 map_blank (self, self->x, self->y, dx - 1, self->h); 1245 map_blank (self, self->x, self->y, dx - 1, self->h);
882 else if (dx < 0) 1246 else if (dx < 0)
898 self->y += MAP_EXTEND_Y; 1262 self->y += MAP_EXTEND_Y;
899 } 1263 }
900} 1264}
901 1265
902void 1266void
903map1a_update (CFClient::Map self, SV *data_) 1267map1a_update (CFPlus::Map self, SV *data_)
904 CODE: 1268 CODE:
905{ 1269{
906 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1270 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
907 uint8_t *data_end = (uint8_t *)SvEND (data_); 1271 uint8_t *data_end = (uint8_t *)SvEND (data_);
908 mapcell *cell; 1272 mapcell *cell;
910 1274
911 while (data < data_end) 1275 while (data < data_end)
912 { 1276 {
913 flags = (data [0] << 8) + data [1]; data += 2; 1277 flags = (data [0] << 8) + data [1]; data += 2;
914 1278
915 x = ((flags >> 10) & 63) + self->x; 1279 x = self->x + ((flags >> 10) & 63);
916 y = ((flags >> 4) & 63) + self->y; 1280 y = self->y + ((flags >> 4) & 63);
917 1281
918 cell = map_get_cell (self, x, y); 1282 cell = map_get_cell (self, x, y);
919 1283
920 if (flags & 15) 1284 if (flags & 15)
921 { 1285 {
950 cell->darkness = -1; 1314 cell->darkness = -1;
951 } 1315 }
952} 1316}
953 1317
954SV * 1318SV *
955mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1319mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
956 CODE: 1320 CODE:
957{ 1321{
958 int x1, x; 1322 int x1, x;
959 int y1, y; 1323 int y1, y;
960 int z; 1324 int z;
1010} 1374}
1011 OUTPUT: 1375 OUTPUT:
1012 RETVAL 1376 RETVAL
1013 1377
1014void 1378void
1015draw (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)
1016 PPCODE: 1380 CODE:
1017{ 1381{
1018 int vx, vy; 1382 int vx, vy;
1019 int x, y, z; 1383 int x, y, z;
1020 int last_name; 1384 int last_name;
1021 mapface face; 1385 mapface face;
1022 int sw4 = (sw + 3) & ~3;
1023 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1024 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1025 1386
1026 memset (darkness, 255, sw4 * sh);
1027 SvPOK_only (darkness_sv);
1028 SvCUR_set (darkness_sv, sw4 * sh);
1029
1030 vx = self->x + (self->w - sw) / 2 - shift_x; 1387 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1031 vy = self->y + (self->h - sh) / 2 - shift_y; 1388 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1032 1389
1033 /* 1390 /*
1034 int vx = self->vx = self->w >= sw 1391 int vx = self->vx = self->w >= sw
1035 ? self->x + (self->w - sw) / 2 1392 ? self->x + (self->w - sw) / 2
1036 : 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));
1040 : 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));
1041 */ 1398 */
1042 1399
1043 glColor4ub (255, 255, 255, 255); 1400 glColor4ub (255, 255, 255, 255);
1044 1401
1402 glEnable (GL_BLEND);
1045 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1403 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1046 glEnable (GL_BLEND);
1047 glEnable (GL_TEXTURE_2D); 1404 glEnable (GL_TEXTURE_2D);
1048 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1405 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1049 1406
1050 glBegin (GL_QUADS); 1407 glBegin (GL_QUADS);
1051 1408
1059 1416
1060 for (x = 0; x < sw; x++) 1417 for (x = 0; x < sw; x++)
1061 if (row->c0 <= x + vx && x + vx < row->c1) 1418 if (row->c0 <= x + vx && x + vx < row->c1)
1062 { 1419 {
1063 mapcell *cell = row->col + (x + vx - row->c0); 1420 mapcell *cell = row->col + (x + vx - row->c0);
1064
1065 darkness[y * sw4 + x] = cell->darkness < 0
1066 ? 255 - FOW_DARKNESS
1067 : 255 - cell->darkness;
1068 1421
1069 face = cell->face [z]; 1422 face = cell->face [z];
1070 1423
1071 if (face) 1424 if (face)
1072 { 1425 {
1093 1446
1094 glEnd (); 1447 glEnd ();
1095 1448
1096 glDisable (GL_TEXTURE_2D); 1449 glDisable (GL_TEXTURE_2D);
1097 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 }
1098 1545
1099 EXTEND (SP, 3); 1546 EXTEND (SP, 3);
1100 PUSHs (sv_2mortal (newSViv (sw4))); 1547 PUSHs (sv_2mortal (newSViv (sw4)));
1101 PUSHs (sv_2mortal (newSViv (sh))); 1548 PUSHs (sv_2mortal (newSViv (sh)));
1102 PUSHs (darkness_sv); 1549 PUSHs (darkness_sv);
1103} 1550}
1104 1551
1105SV * 1552SV *
1106get_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)
1107 CODE: 1554 CODE:
1108{ 1555{
1109 int x, y, x1, y1; 1556 int x, y, x1, y1;
1110 SV *data_sv = newSV (w * h * 7 + 5); 1557 SV *data_sv = newSV (w * h * 7 + 5);
1111 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1558 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1173} 1620}
1174 OUTPUT: 1621 OUTPUT:
1175 RETVAL 1622 RETVAL
1176 1623
1177void 1624void
1178set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1625set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1179 PPCODE: 1626 PPCODE:
1180{ 1627{
1181 int x, y, z; 1628 int x, y, z;
1182 int w, h; 1629 int w, h;
1183 int x1, y1; 1630 int x1, y1;
1232 } 1679 }
1233 } 1680 }
1234 } 1681 }
1235} 1682}
1236 1683
1237MODULE = CFClient PACKAGE = CFClient::MixChunk 1684MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1238 1685
1239CFClient::MixChunk 1686CFPlus::MixChunk
1240new_from_file (SV *class, char *path) 1687new_from_file (SV *class, char *path)
1241 CODE: 1688 CODE:
1242 RETVAL = Mix_LoadWAV (path); 1689 RETVAL = Mix_LoadWAV (path);
1243 OUTPUT: 1690 OUTPUT:
1244 RETVAL 1691 RETVAL
1245 1692
1246void 1693void
1247DESTROY (CFClient::MixChunk self) 1694DESTROY (CFPlus::MixChunk self)
1248 CODE: 1695 CODE:
1249 Mix_FreeChunk (self); 1696 Mix_FreeChunk (self);
1250 1697
1251int 1698int
1252volume (CFClient::MixChunk self, int volume = -1) 1699volume (CFPlus::MixChunk self, int volume = -1)
1253 CODE: 1700 CODE:
1254 RETVAL = Mix_VolumeChunk (self, volume); 1701 RETVAL = Mix_VolumeChunk (self, volume);
1255 OUTPUT: 1702 OUTPUT:
1256 RETVAL 1703 RETVAL
1257 1704
1258int 1705int
1259play (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)
1260 CODE: 1707 CODE:
1261 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1708 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1262 OUTPUT: 1709 OUTPUT:
1263 RETVAL 1710 RETVAL
1264 1711
1265MODULE = CFClient PACKAGE = CFClient::MixMusic 1712MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1266 1713
1267int 1714int
1268volume (int volume = -1) 1715volume (int volume = -1)
1269 CODE: 1716 CODE:
1270 RETVAL = Mix_VolumeMusic (volume); 1717 RETVAL = Mix_VolumeMusic (volume);
1271 OUTPUT: 1718 OUTPUT:
1272 RETVAL 1719 RETVAL
1273 1720
1274CFClient::MixMusic 1721CFPlus::MixMusic
1275new_from_file (SV *class, char *path) 1722new_from_file (SV *class, char *path)
1276 CODE: 1723 CODE:
1277 RETVAL = Mix_LoadMUS (path); 1724 RETVAL = Mix_LoadMUS (path);
1278 OUTPUT: 1725 OUTPUT:
1279 RETVAL 1726 RETVAL
1280 1727
1281void 1728void
1282DESTROY (CFClient::MixMusic self) 1729DESTROY (CFPlus::MixMusic self)
1283 CODE: 1730 CODE:
1284 Mix_FreeMusic (self); 1731 Mix_FreeMusic (self);
1285 1732
1286int 1733int
1287play (CFClient::MixMusic self, int loops = -1) 1734play (CFPlus::MixMusic self, int loops = -1)
1288 CODE: 1735 CODE:
1289 RETVAL = Mix_PlayMusic (self, loops); 1736 RETVAL = Mix_PlayMusic (self, loops);
1290 OUTPUT: 1737 OUTPUT:
1291 RETVAL 1738 RETVAL
1292 1739
1293MODULE = CFClient PACKAGE = CFClient::OpenGL 1740MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1294 1741
1295BOOT: 1742BOOT:
1296{ 1743{
1297 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1744 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1298 static const struct { 1745 static const struct {
1299 const char *name; 1746 const char *name;
1300 IV iv; 1747 IV iv;
1301 } *civ, const_iv[] = { 1748 } *civ, const_iv[] = {
1302# define const_iv(name) { # name, (IV)name } 1749# define const_iv(name) { # name, (IV)name }
1303 const_iv (GL_COLOR_MATERIAL), 1750 const_iv (GL_COLOR_MATERIAL),
1304 const_iv (GL_SMOOTH), 1751 const_iv (GL_SMOOTH),
1305 const_iv (GL_FLAT), 1752 const_iv (GL_FLAT),
1753 const_iv (GL_DITHER),
1306 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),
1307 const_iv (GL_AND), 1763 const_iv (GL_AND),
1764 const_iv (GL_ONE),
1765 const_iv (GL_ZERO),
1308 const_iv (GL_SRC_ALPHA), 1766 const_iv (GL_SRC_ALPHA),
1767 const_iv (GL_DST_ALPHA),
1309 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),
1310 const_iv (GL_RGB), 1771 const_iv (GL_RGB),
1311 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),
1312 const_iv (GL_UNSIGNED_BYTE), 1776 const_iv (GL_UNSIGNED_BYTE),
1313 const_iv (GL_ALPHA4), 1777 const_iv (GL_UNSIGNED_SHORT),
1778 const_iv (GL_UNSIGNED_INT),
1314 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),
1315 const_iv (GL_FLOAT), 1783 const_iv (GL_FLOAT),
1316 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1784 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317 const_iv (GL_COMPILE), 1785 const_iv (GL_COMPILE),
1318 const_iv (GL_TEXTURE_1D), 1786 const_iv (GL_TEXTURE_1D),
1319 const_iv (GL_TEXTURE_2D), 1787 const_iv (GL_TEXTURE_2D),
1321 const_iv (GL_TEXTURE_MAG_FILTER), 1789 const_iv (GL_TEXTURE_MAG_FILTER),
1322 const_iv (GL_TEXTURE_MIN_FILTER), 1790 const_iv (GL_TEXTURE_MIN_FILTER),
1323 const_iv (GL_TEXTURE_ENV_MODE), 1791 const_iv (GL_TEXTURE_ENV_MODE),
1324 const_iv (GL_TEXTURE_WRAP_S), 1792 const_iv (GL_TEXTURE_WRAP_S),
1325 const_iv (GL_TEXTURE_WRAP_T), 1793 const_iv (GL_TEXTURE_WRAP_T),
1794 const_iv (GL_REPEAT),
1326 const_iv (GL_CLAMP), 1795 const_iv (GL_CLAMP),
1327 const_iv (GL_REPEAT), 1796 const_iv (GL_CLAMP_TO_EDGE),
1328 const_iv (GL_NEAREST), 1797 const_iv (GL_NEAREST),
1329 const_iv (GL_LINEAR), 1798 const_iv (GL_LINEAR),
1330 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1799 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1331 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1800 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1332 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1801 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1333 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1802 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1334 const_iv (GL_GENERATE_MIPMAP), 1803 const_iv (GL_GENERATE_MIPMAP),
1335 const_iv (GL_LINEAR),
1336 const_iv (GL_MODULATE), 1804 const_iv (GL_MODULATE),
1805 const_iv (GL_DECAL),
1337 const_iv (GL_REPLACE), 1806 const_iv (GL_REPLACE),
1807 const_iv (GL_DEPTH_BUFFER_BIT),
1338 const_iv (GL_COLOR_BUFFER_BIT), 1808 const_iv (GL_COLOR_BUFFER_BIT),
1339 const_iv (GL_PROJECTION), 1809 const_iv (GL_PROJECTION),
1340 const_iv (GL_MODELVIEW), 1810 const_iv (GL_MODELVIEW),
1341 const_iv (GL_COLOR_LOGIC_OP), 1811 const_iv (GL_COLOR_LOGIC_OP),
1812 const_iv (GL_SEPARABLE_2D),
1342 const_iv (GL_CONVOLUTION_2D), 1813 const_iv (GL_CONVOLUTION_2D),
1343 const_iv (GL_CONVOLUTION_BORDER_MODE), 1814 const_iv (GL_CONVOLUTION_BORDER_MODE),
1344 const_iv (GL_CONSTANT_BORDER), 1815 const_iv (GL_CONSTANT_BORDER),
1345 const_iv (GL_LINES), 1816 const_iv (GL_LINES),
1817 const_iv (GL_LINE_STRIP),
1818 const_iv (GL_LINE_LOOP),
1346 const_iv (GL_QUADS), 1819 const_iv (GL_QUADS),
1347 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),
1348 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1824 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1349 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),
1350# undef const_iv 1830# undef const_iv
1351 }; 1831 };
1352 1832
1353 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; )
1354 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1834 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1355} 1835}
1356 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
1357int glGetError () 1858int glGetError ()
1859
1860void glFinish ()
1358 1861
1359void glClear (int mask) 1862void glClear (int mask)
1360 1863
1361void glClearColor (float r, float g, float b, float a = 1.0) 1864void glClearColor (float r, float g, float b, float a = 1.0)
1362 PROTOTYPE: @ 1865 PROTOTYPE: @
1369 1872
1370void glHint (int target, int mode) 1873void glHint (int target, int mode)
1371 1874
1372void glBlendFunc (int sfactor, int dfactor) 1875void glBlendFunc (int sfactor, int dfactor)
1373 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
1374void glLogicOp (int opcode) 1883void glLogicOp (int opcode)
1375 1884
1885void glColorMask (int red, int green, int blue, int alpha)
1886
1376void glMatrixMode (int mode) 1887void glMatrixMode (int mode)
1377 1888
1378void glPushMatrix () 1889void glPushMatrix ()
1379 1890
1380void glPopMatrix () 1891void glPopMatrix ()
1381 1892
1382void glLoadIdentity () 1893void glLoadIdentity ()
1383 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
1384void 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_)
1385 1904
1386void 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)
1387 1908
1388void glTranslate (float x, float y, float z = 0.) 1909void glTranslate (float x, float y, float z = 0.)
1389 CODE: 1910 CODE:
1390 glTranslatef (x, y, z); 1911 glTranslatef (x, y, z);
1391 1912
1392void glScale (float x, float y, float z) 1913void glScale (float x, float y, float z = 1.)
1393 CODE: 1914 CODE:
1394 glScalef (x, y, z); 1915 glScalef (x, y, z);
1395 1916
1396void glRotate (float angle, float x, float y, float z) 1917void glRotate (float angle, float x, float y, float z)
1397 CODE: 1918 CODE:
1401 1922
1402void glEnd () 1923void glEnd ()
1403 1924
1404void glColor (float r, float g, float b, float a = 1.0) 1925void glColor (float r, float g, float b, float a = 1.0)
1405 PROTOTYPE: @ 1926 PROTOTYPE: @
1927 ALIAS:
1928 glColor_premultiply = 1
1406 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...
1407 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);
1408 1949
1409void glVertex (float x, float y, float z = 0.) 1950void glVertex (float x, float y, float z = 0.)
1410 CODE: 1951 CODE:
1411 glVertex3f (x, y, z); 1952 glVertex3f (x, y, z);
1412 1953
1424 1965
1425void glBindTexture (int target, int name) 1966void glBindTexture (int target, int name)
1426 1967
1427void glConvolutionParameter (int target, int pname, float params) 1968void glConvolutionParameter (int target, int pname, float params)
1428 CODE: 1969 CODE:
1970 if (gl.ConvolutionParameterf)
1429 glConvolutionParameterf (target, pname, params); 1971 gl.ConvolutionParameterf (target, pname, params);
1430 1972
1431void 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);
1432 1982
1433void 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)
1434 1984
1435void 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)
1436 1990
1437int glGenTexture () 1991int glGenTexture ()
1438 CODE: 1992 CODE:
1439{ 1993{
1440 GLuint name; 1994 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines