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.154 by root, Tue Sep 19 22:23:30 2006 UTC vs.
Revision 1.204 by root, Thu Jul 19 14:54:50 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
22#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
23#include <SDL_endian.h> 32#include <SDL_endian.h>
24#include <SDL_image.h> 33#include <SDL_image.h>
25#include <SDL_mixer.h> 34#include <SDL_mixer.h>
26#include <SDL_opengl.h> 35#include <SDL_opengl.h>
27 36
36# include <sys/types.h> 45# include <sys/types.h>
37# include <sys/socket.h> 46# include <sys/socket.h>
38# include <netinet/in.h> 47# include <netinet/in.h>
39# include <netinet/tcp.h> 48# include <netinet/tcp.h>
40# include <inttypes.h> 49# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 50#endif
49 51
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 53
52#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
53 55
54#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 63#else
62# define PARACHUTE 0 64# define PARACHUTE 0
63#endif 65#endif
64 66
67static AV *texture_av;
68
65static struct 69static struct
66{ 70{
67#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 72#include "glfunc.h"
69#undef GL_FUNC 73#undef GL_FUNC
70} gl; 74} gl;
71 75
76static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 78{
74 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 83 else
79 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
80} 85}
81 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
82#include "texcache.c" 111#include "texcache.c"
83 112
84#include "pango-font.c" 113#include "pango-font.c"
85#include "pango-fontmap.c" 114#include "pango-fontmap.c"
86#include "pango-render.c" 115#include "pango-render.c"
159 188
160 *w = rect.width; 189 *w = rect.width;
161 *h = rect.height; 190 *h = rect.height;
162} 191}
163 192
193typedef uint16_t tileid;
164typedef uint16_t mapface; 194typedef uint16_t faceid;
165 195
166typedef struct { 196typedef struct {
167 GLint name; 197 int name;
168 int w, h; 198 int w, h;
169 float s, t; 199 float s, t;
170 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
171} maptex; 203} maptex;
172 204
173typedef struct { 205typedef struct {
174 uint32_t player; 206 uint32_t player;
175 mapface face[3]; 207 tileid tile[3];
176 uint16_t darkness; 208 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
178} mapcell; 210} mapcell;
179 211
180typedef struct { 212typedef struct {
181 int32_t c0, c1; 213 int32_t c0, c1;
182 mapcell *col; 214 mapcell *col;
183} maprow; 215} maprow;
184 216
185typedef struct map { 217typedef struct map {
186 int x, y, w, h; 218 int x, y, w, h;
187 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
188 int faces; 220 int faces; tileid *face2tile; // [faceid]
189 mapface *face; 221 int texs; maptex *tex; // [tileid]
190
191 int texs;
192 maptex *tex;
193 222
194 int32_t rows; 223 int32_t rows;
195 maprow *row; 224 maprow *row;
196} *CFPlus__Map; 225} *CFPlus__Map;
197 226
217 return ptr; 246 return ptr;
218} 247}
219 248
220#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((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)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
222 271
223static maprow * 272static maprow *
224map_get_row (CFPlus__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
225{ 274{
226 if (0 > y) 275 if (0 > y)
321 cell->player = 0; 370 cell->player = 0;
322 } 371 }
323 } 372 }
324} 373}
325 374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
389}
390
326static void 391static void
327music_finished (void) 392music_finished (void)
328{ 393{
329 SDL_UserEvent ev; 394 SDL_UserEvent ev;
330 395
363 n |= n >> 8; 428 n |= n >> 8;
364 n |= n >> 16; 429 n |= n >> 16;
365 430
366 return n + 1; 431 return n + 1;
367} 432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
368 437
369MODULE = CFPlus PACKAGE = CFPlus 438MODULE = CFPlus PACKAGE = CFPlus
370 439
371PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
372 441
376 static const struct { 445 static const struct {
377 const char *name; 446 const char *name;
378 IV iv; 447 IV iv;
379 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
380# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
381 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
382 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
383 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
384 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
385 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
394 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
395 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
396 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
397 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
398 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
399 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
400 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
401 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
402 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
403 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
458 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
459 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
460 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
461 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
462 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
463 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
464 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
465 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
466 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
467 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
468 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
469 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
470 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
471 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
472 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
473 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
474 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
475 const_iv (KMOD_CTRL),
476 const_iv (KMOD_SHIFT),
477 const_iv (KMOD_ALT),
478 const_iv (KMOD_META)
479# undef const_iv 557# undef const_iv
480 }; 558 };
481 559
482 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
483 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
484} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
485 572
486int 573int
487in_destruct () 574in_destruct ()
488 CODE: 575 CODE:
489 RETVAL = PL_main_cv == Nullcv; 576 RETVAL = PL_main_cv == Nullcv;
501 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
502 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
503 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
504} 591}
505 592
593char *
594SDL_GetError ()
595
506int 596int
507SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
508 598
509void 599void
510SDL_Quit () 600SDL_Quit ()
511 601
512void 602void
513SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
514 PPCODE: 604 PPCODE:
515{ 605{
516 SDL_Rect **m; 606 SDL_Rect **m;
517 607
518 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
519 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
520 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
521 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
522 612
523 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
524 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
525 615
526 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
527 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
528 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
529 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
530 620
531 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
532#if SDL_VERSION_ATLEAST(1,2,10) 622#if SDL_VERSION_ATLEAST(1,2,10)
533 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
534 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
535#endif 625#endif
536 626
537 SDL_EnableUNICODE (1);
538 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
539
540 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
541 628
542 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
543 while (*m) 630 while (*m)
544 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
545 AV *av = newAV (); 634 AV *av = newAV ();
546 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
547 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
548 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
549 641
550 ++m; 642 ++m;
551 } 643 }
552} 644}
553 645
554char *
555SDL_GetError ()
556
557int 646int
558SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
559 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
560 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
561 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
562 ); 660 );
661
563 if (RETVAL) 662 if (RETVAL)
564 { 663 {
664 av_clear (texture_av);
665
565 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
566# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
567# include "glfunc.h" 668#include "glfunc.h"
568# undef GL_FUNC 669#undef GL_FUNC
569 } 670 }
671}
570 OUTPUT: 672 OUTPUT:
571 RETVAL 673 RETVAL
572 674
573void 675void
574SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
575 677
576char * 678char *
577SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
578 680
681int
682SDL_GetAppState ()
683
579void 684void
580SDL_PollEvent () 685poll_events ()
581 PPCODE: 686 PPCODE:
582{ 687{
583 SDL_Event ev; 688 SDL_Event ev;
584 689
585 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
586 { 692 {
587 HV *hv = newHV (); 693 HV *hv = newHV ();
588 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
589 695
590 switch (ev.type) 696 switch (ev.type)
592 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
593 case SDL_KEYUP: 699 case SDL_KEYUP:
594 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
595 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
596 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
597 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
598 break; 705 break;
599 706
600 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
601 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
602 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
603 break; 710 break;
604 711
605 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
606 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
607
608 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
609 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
610 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
611 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
612 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
613 break; 738 break;
614 739
615 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
616 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
617 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
646Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
647 772
648void 773void
649lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
650 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
651#ifndef _WIN32 782#ifdef _WIN32
652 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 783 char buffer[2048];
784 DWORD buflen;
785
786 EXTEND (SP, 3);
787
788 buflen = sizeof (buffer);
789 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
790 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
791 {
792 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
793
794 buflen = sizeof (buffer);
795 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
796 {
797 PUSHs (newSVpv (buffer, 0));
798
799 buflen = sizeof (buffer);
800 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
801 PUSHs (newSVpv (buffer, 0));
802 }
803 }
653#endif 804#endif
805}
654 806
655void 807void
656add_font (char *file) 808add_font (char *file)
657 CODE: 809 CODE:
658 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
762 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
763#endif 915#endif
764 _exit (1); 916 _exit (1);
765 917
766void 918void
767_exit (int retval) 919_exit (int retval = 0)
768 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
769 _exit (retval); 924 _exit (retval);
925#endif
926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
770 935
771MODULE = CFPlus PACKAGE = CFPlus::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
772 937
773CFPlus::Font 938CFPlus::Font
774new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
1021xy_to_index (CFPlus::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
1022 CODE: 1187 CODE:
1023{ 1188{
1024 int index, trailing; 1189 int index, trailing;
1025 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1026 RETVAL = index; 1191 RETVAL = index + trailing;
1027} 1192}
1028 OUTPUT: 1193 OUTPUT:
1029 RETVAL 1194 RETVAL
1030 1195
1031void 1196void
1037 1202
1038 EXTEND (SP, 3); 1203 EXTEND (SP, 3);
1039 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1207}
1208
1209void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1211 PPCODE:
1212{
1213 int line, x;
1214
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217
1218 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221}
1222
1223void
1224line_x_to_index (CFPlus::Layout self, int line, int x)
1225 PPCODE:
1226{
1227 PangoLayoutLine *lp;
1228 int index, trailing;
1229
1230 if (line < 0)
1231 XSRETURN_EMPTY;
1232
1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */
1235
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237
1238 EXTEND (SP, 2);
1239 if (GIMME_V == G_SCALAR)
1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1241 else
1242 {
1243 PUSHs (sv_2mortal (newSViv (index)));
1244 PUSHs (sv_2mortal (newSViv (trailing)));
1245 }
1042} 1246}
1043 1247
1044void 1248void
1045render (CFPlus::Layout self, float x, float y, int flags = 0) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1046 PPCODE: 1250 PPCODE:
1051 flags 1255 flags
1052 ); 1256 );
1053 1257
1054MODULE = CFPlus PACKAGE = CFPlus::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1055 1259
1056void 1260int minpot (int n)
1057pad2pot (SV *data_, SV *w_, SV *h_)
1058 CODE:
1059{
1060 int ow = SvIV (w_);
1061 int oh = SvIV (h_);
1062 1261
1063 if (ow && oh) 1262void
1263pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE:
1265{
1266 if ((nw != ow || nh != oh) && SvOK (data_))
1064 { 1267 {
1065 int nw = minpot (ow);
1066 int nh = minpot (oh);
1067
1068 if (nw != ow || nh != oh)
1069 {
1070 if (SvOK (data_))
1071 {
1072 STRLEN datalen; 1268 STRLEN datalen;
1073 char *data = SvPVbyte (data_, datalen); 1269 char *data = SvPVbyte (data_, datalen);
1074 int bpp = datalen / (ow * oh); 1270 int bpp = datalen / (ow * oh);
1075 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1271 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1076 1272
1077 SvPOK_only (result_); 1273 SvPOK_only (result_);
1078 SvCUR_set (result_, nw * nh * bpp); 1274 SvCUR_set (result_, nw * nh * bpp);
1079 1275
1080 memset (SvPVX (result_), 0, nw * nh * bpp); 1276 memset (SvPVX (result_), 0, nw * nh * bpp);
1081 while (oh--) 1277 while (oh--)
1082 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1278 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1083 1279
1084 sv_setsv (data_, result_); 1280 sv_setsv (data_, result_);
1085 }
1086
1087 sv_setiv (w_, nw);
1088 sv_setiv (h_, nh);
1089 }
1090 } 1281 }
1091} 1282}
1092 1283
1093void 1284void
1094draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1137 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1138 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1139 } 1330 }
1140} 1331}
1141 1332
1333IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1334 CODE:
1335{
1336 GLint width;
1337 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1338 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1339 RETVAL = width > 0;
1340}
1341 OUTPUT:
1342 RETVAL
1343
1142MODULE = CFPlus PACKAGE = CFPlus::Map 1344MODULE = CFPlus PACKAGE = CFPlus::Map
1143 1345
1144CFPlus::Map 1346CFPlus::Map
1145new (SV *class, int map_width, int map_height) 1347new (SV *class)
1146 CODE: 1348 CODE:
1147 New (0, RETVAL, 1, struct map); 1349 New (0, RETVAL, 1, struct map);
1148 RETVAL->x = 0; 1350 RETVAL->x = 0;
1149 RETVAL->y = 0; 1351 RETVAL->y = 0;
1150 RETVAL->w = map_width; 1352 RETVAL->w = 0;
1151 RETVAL->h = map_height; 1353 RETVAL->h = 0;
1152 RETVAL->ox = 0; 1354 RETVAL->ox = 0;
1153 RETVAL->oy = 0; 1355 RETVAL->oy = 0;
1154 RETVAL->faces = 8192; 1356 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1155 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1357 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1156 RETVAL->texs = 8192;
1157 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1158 RETVAL->rows = 0; 1358 RETVAL->rows = 0;
1159 RETVAL->row = 0; 1359 RETVAL->row = 0;
1160 OUTPUT: 1360 OUTPUT:
1161 RETVAL 1361 RETVAL
1162 1362
1163void 1363void
1164DESTROY (CFPlus::Map self) 1364DESTROY (CFPlus::Map self)
1165 CODE: 1365 CODE:
1166{ 1366{
1167 map_clear (self); 1367 map_clear (self);
1168 Safefree (self->face); 1368 Safefree (self->face2tile);
1169 Safefree (self->tex); 1369 Safefree (self->tex);
1170 Safefree (self); 1370 Safefree (self);
1171} 1371}
1172 1372
1173void 1373void
1374resize (CFPlus::Map self, int map_width, int map_height)
1375 CODE:
1376 self->w = map_width;
1377 self->h = map_height;
1378
1379void
1174clear (CFPlus::Map self) 1380clear (CFPlus::Map self)
1175 CODE: 1381 CODE:
1176 map_clear (self); 1382 map_clear (self);
1177 1383
1178void 1384void
1179set_face (CFPlus::Map self, int face, int texid) 1385set_tileid (CFPlus::Map self, int face, int tile)
1180 CODE: 1386 CODE:
1181{ 1387{
1182 while (self->faces <= face) 1388 need_facenum (self, face); self->face2tile [face] = tile;
1183 { 1389 need_texid (self, tile);
1184 Append (mapface, self->face, self->faces, self->faces); 1390}
1185 self->faces *= 2;
1186 }
1187 1391
1188 self->face [face] = texid; 1392void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level)
1394 CODE:
1395{
1396 tileid texid;
1397 maptex *tex;
1398
1399 if (face < 0 || face >= self->faces)
1400 return;
1401
1402 if (smooth < 0 || smooth >= self->faces)
1403 return;
1404
1405 texid = self->face2tile [face];
1406
1407 if (!texid)
1408 return;
1409
1410 tex = self->tex + texid;
1411 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level;
1189} 1413}
1190 1414
1191void 1415void
1192set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1416set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1193 CODE: 1417 CODE:
1194{ 1418{
1195 while (self->texs <= texid) 1419 need_texid (self, texid);
1196 {
1197 Append (maptex, self->tex, self->texs, self->texs);
1198 self->texs *= 2;
1199 }
1200 1420
1201 { 1421 {
1202 maptex *tex = self->tex + texid; 1422 maptex *tex = self->tex + texid;
1203 1423
1204 tex->name = name; 1424 tex->name = name;
1248 CODE: 1468 CODE:
1249{ 1469{
1250 if (dx > 0) 1470 if (dx > 0)
1251 map_blank (self, self->x, self->y, dx, self->h); 1471 map_blank (self, self->x, self->y, dx, self->h);
1252 else if (dx < 0) 1472 else if (dx < 0)
1253 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1473 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1254 1474
1255 if (dy > 0) 1475 if (dy > 0)
1256 map_blank (self, self->x, self->y, self->w, dy); 1476 map_blank (self, self->x, self->y, self->w, dy);
1257 else if (dy < 0) 1477 else if (dy < 0)
1258 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1478 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1259 1479
1260 self->ox += dx; self->x += dx; 1480 self->ox += dx; self->x += dx;
1261 self->oy += dy; self->y += dy; 1481 self->oy += dy; self->y += dy;
1262 1482
1263 while (self->y < 0) 1483 while (self->y < 0)
1315 cell->stat_width = 1; 1535 cell->stat_width = 1;
1316 cell->stat_hp = *data++; 1536 cell->stat_hp = *data++;
1317 } 1537 }
1318 else if (cmd == 6) // monster width 1538 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1; 1539 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width 1540 else if (cmd == 0x47)
1321 { 1541 {
1322 if (*data == 4) 1542 if (*data == 4)
1323 ; // decode player tag 1543 ; // decode player count
1324 1544
1325 data += *data + 1; 1545 data += *data + 1;
1326 } 1546 }
1327 else if (cmd == 8) // cell flags 1547 else if (cmd == 8) // cell flags
1328 cell->flags = *data++; 1548 cell->flags = *data++;
1333 } 1553 }
1334 while (ext & 0x80); 1554 while (ext & 0x80);
1335 } 1555 }
1336 else 1556 else
1337 cell->darkness = *data++ + 1; 1557 cell->darkness = *data++ + 1;
1338
1339 } 1558 }
1340 1559
1341 if (flags & 4) 1560 if (flags & 4)
1342 { 1561 {
1343 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1562 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face];
1344 } 1565 }
1345 1566
1346 if (flags & 2) 1567 if (flags & 2)
1347 { 1568 {
1348 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1569 faceid face = (data [0] << 8) + data [1]; data += 2;
1570 need_facenum (self, face);
1571 cell->tile [1] = self->face2tile [face];
1349 } 1572 }
1350 1573
1351 if (flags & 1) 1574 if (flags & 1)
1352 { 1575 {
1353 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [2] = self->face2tile [face];
1354 } 1579 }
1355 } 1580 }
1356 else 1581 else
1357 {
1358 cell->darkness = 0; 1582 cell->darkness = 0;
1359 cell->stat_hp = 0;
1360 cell->flags = 0;
1361 cell->player = 0;
1362 }
1363 } 1583 }
1364} 1584}
1365 1585
1366SV * 1586SV *
1367mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1393 { 1613 {
1394 mapcell *cell = row->col + (x - row->c0); 1614 mapcell *cell = row->col + (x - row->c0);
1395 1615
1396 for (z = 0; z <= 0; z++) 1616 for (z = 0; z <= 0; z++)
1397 { 1617 {
1398 mapface face = cell->face [z];
1399
1400 if (face)
1401 {
1402 maptex tex = self->tex [face]; 1618 maptex tex = self->tex [cell->tile [z]];
1403 int a0 = 255 - tex.a; 1619 int a0 = 255 - tex.a;
1404 int a1 = tex.a; 1620 int a1 = tex.a;
1405 1621
1406 r = (r * a0 + tex.r * a1) / 255; 1622 r = (r * a0 + tex.r * a1) / 255;
1407 g = (g * a0 + tex.g * a1) / 255; 1623 g = (g * a0 + tex.g * a1) / 255;
1408 b = (b * a0 + tex.b * a1) / 255; 1624 b = (b * a0 + tex.b * a1) / 255;
1409 a = (a * a0 + tex.a * a1) / 255; 1625 a = (a * a0 + tex.a * a1) / 255;
1410 }
1411 } 1626 }
1412 } 1627 }
1413 1628
1414 *map++ = (r ) 1629 *map++ = (r )
1415 | (g << 8) 1630 | (g << 8)
1422} 1637}
1423 OUTPUT: 1638 OUTPUT:
1424 RETVAL 1639 RETVAL
1425 1640
1426void 1641void
1427draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1428 CODE: 1643 CODE:
1429{ 1644{
1430 int vx, vy; 1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1647 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1648 smooth_key skey;
1431 int x, y, z; 1649 int x, y, z;
1432 int last_name; 1650 int last_name;
1433 mapface face;
1434 1651
1435 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1652 // thats current max. sorry.
1436 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1653 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255;
1437 1655
1438 /* 1656 // clear key, in case of extra padding
1439 int vx = self->vx = self->w >= sw 1657 memset (&skey, 0, sizeof (skey));
1440 ? self->x + (self->w - sw) / 2
1441 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1442
1443 int vy = self->vy = self->h >= sh
1444 ? self->y + (self->h - sh) / 2
1445 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1446 */
1447 1658
1448 glColor4ub (255, 255, 255, 255); 1659 glColor4ub (255, 255, 255, 255);
1449 1660
1450 glEnable (GL_BLEND); 1661 glEnable (GL_BLEND);
1451 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1454 1665
1455 glBegin (GL_QUADS); 1666 glBegin (GL_QUADS);
1456 1667
1457 last_name = 0; 1668 last_name = 0;
1458 1669
1670 mx += self->x;
1671 my += self->y;
1672
1673 // first pass: determine smooth_max
1674 // rather ugly, if you ask me
1675 // could also be stored inside mapcell and updated on change
1676 memset (smooth_max, 0, sizeof (smooth_max));
1677
1678 for (y = 0; y < sh; y++)
1679 if (0 <= y + my && y + my < self->rows)
1680 {
1681 maprow *row = self->row + (y + my);
1682
1683 for (x = 0; x < sw; x++)
1684 if (row->c0 <= x + mx && x + mx < row->c1)
1685 {
1686 mapcell *cell = row->col + (x + mx - row->c0);
1687
1688 smooth_max[x + 1][y + 1] =
1689 MAX (self->tex [cell->tile [0]].smoothlevel,
1690 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel));
1692 }
1693 }
1694
1459 for (z = 0; z < 3; z++) 1695 for (z = 0; z <= 2; z++)
1696 {
1697 memset (smooth_level, 0, sizeof (smooth_level));
1698
1460 for (y = 0; y < sh; y++) 1699 for (y = 0; y < sh; y++)
1461 if (0 <= y + vy && y + vy < self->rows) 1700 if (0 <= y + my && y + my < self->rows)
1462 { 1701 {
1463 maprow *row = self->row + (y + vy); 1702 maprow *row = self->row + (y + my);
1464 1703
1465 for (x = 0; x < sw; x++) 1704 for (x = 0; x < sw; x++)
1466 if (row->c0 <= x + vx && x + vx < row->c1) 1705 if (row->c0 <= x + mx && x + mx < row->c1)
1467 { 1706 {
1468 mapcell *cell = row->col + (x + vx - row->c0); 1707 mapcell *cell = row->col + (x + mx - row->c0);
1469
1470 face = cell->face [z]; 1708 tileid tile = cell->tile [z];
1709
1710 if (tile)
1711 {
1712 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w;
1714 int py = (y + 1) * T - tex.h;
1471 1715
1472 if (face && face < self->texs) 1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name)
1719 {
1720 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */
1722
1723 glEnd ();
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1725 glBegin (GL_QUADS);
1726 }
1727
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1729 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1730 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1731 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1732
1733 if (cell->flags && z == 2)
1734 {
1735 if (cell->flags & 1)
1736 {
1737 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32;
1740
1741 glEnd ();
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1743 glBegin (GL_QUADS);
1744
1745 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1746 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1747 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1748 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1749 }
1750 }
1751
1752 // update smooth hash
1753 if (tex.smoothtile)
1754 {
1755 skey.tile = tex.smoothtile;
1756 skey.level = tex.smoothlevel;
1757
1758 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1759
1760 // add bits to current tile and all neighbours. skey.x|y is
1761 // shifted +1|+1 so we always stay positive.
1762
1763 // bits is ___n cccc CCCC bbbb
1764 // n do not draw borders&corners
1765 // c draw these corners, but...
1766 // C ... not these
1767 // b draw these borders
1768
1769 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1770 // ┃· ·· ·┃ ━━
1771
1772 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1773 // ·· ·· ·┏ ┓·
1774
1775 // full tile
1776 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1777
1778 // borders
1779 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1780 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1781 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1782 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1783
1784 // corners
1785 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1786 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1787 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1788 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1789 }
1790 }
1791 }
1792 }
1793
1794 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort
1796 {
1797 int w, b;
1798
1799 for (w = 0; w < 256 / 32; ++w)
1800 {
1801 uint32_t smask = smooth_level [w];
1802 if (smask)
1803 for (b = 0; b < 32; ++b)
1804 if (smask & (((uint32_t)1) << b))
1473 { 1805 {
1474 maptex tex = self->tex [face]; 1806 int level = (w << 5) | b;
1475 int px = (x + 1) * 32 - tex.w; 1807 HE *he;
1476 int py = (y + 1) * 32 - tex.h;
1477 1808
1478 if (last_name != tex.name) 1809 hv_iterinit (smooth);
1810 while ((he = hv_iternext (smooth)))
1479 { 1811 {
1812 smooth_key *skey = (smooth_key *)HeKEY (he);
1813 IV bits = SvIVX (HeVAL (he));
1814
1815 if (!(bits & 0x1000)
1816 && skey->level == level
1817 && level > smooth_max [skey->x][skey->y])
1818 {
1819 maptex tex = self->tex [skey->tile];
1820 int px = (((int)skey->x) - 1) * T;
1821 int py = (((int)skey->y) - 1) * T;
1822 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column
1826
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name)
1830 {
1831 if (!tex.name)
1832 continue; // smoothing not yet available
1833
1480 glEnd (); 1834 glEnd ();
1481 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1482 glBegin (GL_QUADS); 1836 glBegin (GL_QUADS);
1837 }
1838
1839 if (border)
1840 {
1841 float ox = border * dx;
1842
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1847 }
1848
1849 if (corner)
1850 {
1851 float ox = corner * dx;
1852
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1857 }
1483 } 1858 }
1484
1485 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1486 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1487 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1488 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1489 }
1490
1491 if (cell->flags && z == 2)
1492 {
1493 if (cell->flags & 1)
1494 {
1495 maptex tex = self->tex [1];
1496 int px = (x + 1) * 32 - tex.w + 2;
1497 int py = (y + 1) * 32 - tex.h - 6;
1498
1499 glEnd ();
1500 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1501 glBegin (GL_QUADS);
1502
1503 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1504 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1505 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1506 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1507 } 1859 }
1508 } 1860 }
1509 }
1510 } 1861 }
1862 }
1863
1864 hv_clear (smooth);
1865 }
1511 1866
1512 glEnd (); 1867 glEnd ();
1513 1868
1514 glDisable (GL_TEXTURE_2D); 1869 glDisable (GL_TEXTURE_2D);
1515 glDisable (GL_BLEND); 1870 glDisable (GL_BLEND);
1516 1871
1517 // top layer: overlays such as the health bar 1872 // top layer: overlays such as the health bar
1518 for (y = 0; y < sh; y++) 1873 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows) 1874 if (0 <= y + my && y + my < self->rows)
1520 { 1875 {
1521 maprow *row = self->row + (y + vy); 1876 maprow *row = self->row + (y + my);
1522 1877
1523 for (x = 0; x < sw; x++) 1878 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1) 1879 if (row->c0 <= x + mx && x + mx < row->c1)
1525 { 1880 {
1526 mapcell *cell = row->col + (x + vx - row->c0); 1881 mapcell *cell = row->col + (x + mx - row->c0);
1527 1882
1528 int px = x * 32; 1883 int px = x * T;
1529 int py = y * 32; 1884 int py = y * T;
1530 1885
1531 if (cell->stat_hp) 1886 if (cell->stat_hp)
1532 { 1887 {
1533 int width = cell->stat_width * 32; 1888 int width = cell->stat_width * T;
1534 int thick = sh / 28 + 1 + cell->stat_width; 1889 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1535 1890
1536 glColor3ub (0, 0, 0); 1891 glColor3ub (0, 0, 0);
1537 glRectf (px + 1, py - thick - 2, 1892 glRectf (px + 1, py - thick - 2,
1538 px + width - 1, py); 1893 px + width - 1, py);
1539 1894
1605 glDisable (GL_BLEND); 1960 glDisable (GL_BLEND);
1606 glDisable (GL_TEXTURE_2D); 1961 glDisable (GL_TEXTURE_2D);
1607} 1962}
1608 1963
1609void 1964void
1610fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1611 PPCODE: 1966 PPCODE:
1612{ 1967{
1613 int vx, vy;
1614 int x, y; 1968 int x, y;
1969 int sw1 = sw + 2;
1970 int sh1 = sh + 2;
1971 int sh3 = sh * 3;
1615 int sw4 = (sw + 3) & ~3; 1972 int sw34 = (sw * 3 + 3) & ~3;
1973 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1616 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1974 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1617 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1975 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1618 1976
1619 memset (darkness, 255, sw4 * sh);
1620 SvPOK_only (darkness_sv); 1977 SvPOK_only (darkness3_sv);
1621 SvCUR_set (darkness_sv, sw4 * sh); 1978 SvCUR_set (darkness3_sv, sw34 * sh3);
1622 1979
1623 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1980 mx += self->x - 1;
1624 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1981 my += self->y - 1;
1625 1982
1983 memset (darkness1, 255, sw1 * sh1);
1984
1626 for (y = 0; y < sh; y++) 1985 for (y = 0; y < sh1; y++)
1627 if (0 <= y + vy && y + vy < self->rows) 1986 if (0 <= y + my && y + my < self->rows)
1628 { 1987 {
1629 maprow *row = self->row + (y + vy); 1988 maprow *row = self->row + (y + my);
1630 1989
1631 for (x = 0; x < sw; x++) 1990 for (x = 0; x < sw1; x++)
1632 if (row->c0 <= x + vx && x + vx < row->c1) 1991 if (row->c0 <= x + mx && x + mx < row->c1)
1633 { 1992 {
1634 mapcell *cell = row->col + (x + vx - row->c0); 1993 mapcell *cell = row->col + (x + mx - row->c0);
1635 1994
1636 darkness[y * sw4 + x] = cell->darkness 1995 darkness1 [y * sw1 + x] = cell->darkness
1637 ? 255 - (cell->darkness - 1) 1996 ? 255 - (cell->darkness - 1)
1638 : 255 - FOW_DARKNESS; 1997 : 255 - FOW_DARKNESS;
1639 } 1998 }
1640 } 1999 }
1641 2000
2001 for (y = 0; y < sh; ++y)
2002 for (x = 0; x < sw; ++x)
2003 {
2004 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2005 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2006 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2007 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2008 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2009 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2010 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2011 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2012 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2013
2014 uint8_t r11 = (d11 + d21 + d12) / 3;
2015 uint8_t r21 = d21;
2016 uint8_t r31 = (d21 + d31 + d32) / 3;
2017
2018 uint8_t r12 = d12;
2019 uint8_t r22 = d22;
2020 uint8_t r32 = d32;
2021
2022 uint8_t r13 = (d13 + d23 + d12) / 3;
2023 uint8_t r23 = d23;
2024 uint8_t r33 = (d23 + d33 + d32) / 3;
2025
2026 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2027 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2028 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2029 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2030 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2031 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2032 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2033 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2034 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2035 }
2036
2037 free (darkness1);
2038
1642 EXTEND (SP, 3); 2039 EXTEND (SP, 3);
1643 PUSHs (sv_2mortal (newSViv (sw4))); 2040 PUSHs (sv_2mortal (newSViv (sw34)));
1644 PUSHs (sv_2mortal (newSViv (sh))); 2041 PUSHs (sv_2mortal (newSViv (sh3)));
1645 PUSHs (darkness_sv); 2042 PUSHs (darkness3_sv);
1646} 2043}
1647 2044
1648SV * 2045SV *
1649get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2046get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1650 CODE: 2047 CODE:
1679 if (row && row->c0 <= x && x < row->c1) 2076 if (row && row->c0 <= x && x < row->c1)
1680 { 2077 {
1681 mapcell *cell = row->col + (x - row->c0); 2078 mapcell *cell = row->col + (x - row->c0);
1682 uint8_t flags = 0; 2079 uint8_t flags = 0;
1683 2080
1684 if (cell->face [0]) flags |= 1; 2081 if (cell->tile [0]) flags |= 1;
1685 if (cell->face [1]) flags |= 2; 2082 if (cell->tile [1]) flags |= 2;
1686 if (cell->face [2]) flags |= 4; 2083 if (cell->tile [2]) flags |= 4;
1687 2084
1688 *data++ = flags; 2085 *data++ = flags;
1689 2086
1690 if (flags & 1) 2087 if (flags & 1)
1691 { 2088 {
2089 tileid tile = cell->tile [0];
1692 *data++ = cell->face [0] >> 8; 2090 *data++ = tile >> 8;
1693 *data++ = cell->face [0]; 2091 *data++ = tile;
1694 } 2092 }
1695 2093
1696 if (flags & 2) 2094 if (flags & 2)
1697 { 2095 {
2096 tileid tile = cell->tile [1];
1698 *data++ = cell->face [1] >> 8; 2097 *data++ = tile >> 8;
1699 *data++ = cell->face [1]; 2098 *data++ = tile;
1700 } 2099 }
1701 2100
1702 if (flags & 4) 2101 if (flags & 4)
1703 { 2102 {
2103 tileid tile = cell->tile [2];
1704 *data++ = cell->face [2] >> 8; 2104 *data++ = tile >> 8;
1705 *data++ = cell->face [2]; 2105 *data++ = tile;
1706 } 2106 }
1707 } 2107 }
1708 else 2108 else
1709 *data++ = 0; 2109 *data++ = 0;
1710 } 2110 }
1750 { 2150 {
1751 uint8_t flags = *data++; 2151 uint8_t flags = *data++;
1752 2152
1753 if (flags) 2153 if (flags)
1754 { 2154 {
1755 mapface face[3] = { 0, 0, 0 };
1756
1757 mapcell *cell = row_get_cell (row, x); 2155 mapcell *cell = row_get_cell (row, x);
2156 tileid tile[3] = { 0, 0, 0 };
1758 2157
1759 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2158 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1760 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2159 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1761 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2160 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1762 2161
1763 if (cell->darkness == 0) 2162 if (cell->darkness == 0)
1764 { 2163 {
1765 cell->darkness = 0; 2164 cell->darkness = 0;
1766 2165
1767 for (z = 0; z <= 2; z++) 2166 for (z = 0; z <= 2; z++)
1768 { 2167 {
1769 cell->face[z] = face[z]; 2168 tileid t = tile [z];
1770 2169
1771 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2170 if (t >= self->texs || (t && !self->tex [t].name))
2171 {
1772 XPUSHs (sv_2mortal (newSViv (face[z]))); 2172 XPUSHs (sv_2mortal (newSViv (t)));
2173 need_texid (self, t);
2174 }
2175
2176 cell->tile [z] = t;
1773 } 2177 }
1774 } 2178 }
1775 } 2179 }
1776 } 2180 }
1777 } 2181 }
1812 CODE: 2216 CODE:
1813 RETVAL = Mix_VolumeMusic (volume); 2217 RETVAL = Mix_VolumeMusic (volume);
1814 OUTPUT: 2218 OUTPUT:
1815 RETVAL 2219 RETVAL
1816 2220
2221int
2222fade_out (int ms)
2223 CODE:
2224 RETVAL = Mix_FadeOutMusic (ms);
2225 OUTPUT:
2226 RETVAL
2227
1817CFPlus::MixMusic 2228CFPlus::MixMusic
1818new_from_file (SV *class, char *path) 2229new_from_file (SV *class, char *path)
1819 CODE: 2230 CODE:
1820 RETVAL = Mix_LoadMUS (path); 2231 RETVAL = Mix_LoadMUS (path);
1821 OUTPUT: 2232 OUTPUT:
1828 2239
1829int 2240int
1830play (CFPlus::MixMusic self, int loops = -1) 2241play (CFPlus::MixMusic self, int loops = -1)
1831 CODE: 2242 CODE:
1832 RETVAL = Mix_PlayMusic (self, loops); 2243 RETVAL = Mix_PlayMusic (self, loops);
2244 OUTPUT:
2245 RETVAL
2246
2247int
2248fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2249 CODE:
2250 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1833 OUTPUT: 2251 OUTPUT:
1834 RETVAL 2252 RETVAL
1835 2253
1836MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2254MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1837 2255
1841 static const struct { 2259 static const struct {
1842 const char *name; 2260 const char *name;
1843 IV iv; 2261 IV iv;
1844 } *civ, const_iv[] = { 2262 } *civ, const_iv[] = {
1845# define const_iv(name) { # name, (IV)name } 2263# define const_iv(name) { # name, (IV)name }
2264 const_iv (GL_VENDOR),
2265 const_iv (GL_VERSION),
2266 const_iv (GL_EXTENSIONS),
1846 const_iv (GL_COLOR_MATERIAL), 2267 const_iv (GL_COLOR_MATERIAL),
1847 const_iv (GL_SMOOTH), 2268 const_iv (GL_SMOOTH),
1848 const_iv (GL_FLAT), 2269 const_iv (GL_FLAT),
1849 const_iv (GL_DITHER), 2270 const_iv (GL_DITHER),
1850 const_iv (GL_BLEND), 2271 const_iv (GL_BLEND),
1877 const_iv (GL_LUMINANCE), 2298 const_iv (GL_LUMINANCE),
1878 const_iv (GL_LUMINANCE_ALPHA), 2299 const_iv (GL_LUMINANCE_ALPHA),
1879 const_iv (GL_FLOAT), 2300 const_iv (GL_FLOAT),
1880 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2301 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1881 const_iv (GL_COMPILE), 2302 const_iv (GL_COMPILE),
2303 const_iv (GL_PROXY_TEXTURE_1D),
2304 const_iv (GL_PROXY_TEXTURE_2D),
1882 const_iv (GL_TEXTURE_1D), 2305 const_iv (GL_TEXTURE_1D),
1883 const_iv (GL_TEXTURE_2D), 2306 const_iv (GL_TEXTURE_2D),
1884 const_iv (GL_TEXTURE_ENV), 2307 const_iv (GL_TEXTURE_ENV),
1885 const_iv (GL_TEXTURE_MAG_FILTER), 2308 const_iv (GL_TEXTURE_MAG_FILTER),
1886 const_iv (GL_TEXTURE_MIN_FILTER), 2309 const_iv (GL_TEXTURE_MIN_FILTER),
1926# undef const_iv 2349# undef const_iv
1927 }; 2350 };
1928 2351
1929 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2352 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1930 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2353 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2354
2355 texture_av = newAV ();
2356 AvREAL_off (texture_av);
1931} 2357}
1932 2358
1933char * 2359char *
1934gl_vendor () 2360gl_vendor ()
1935 CODE: 2361 CODE:
1946 2372
1947char * 2373char *
1948gl_extensions () 2374gl_extensions ()
1949 CODE: 2375 CODE:
1950 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2376 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2377 OUTPUT:
2378 RETVAL
2379
2380const char *glGetString (GLenum pname)
2381
2382GLint glGetInteger (GLenum pname)
2383 CODE:
2384 glGetIntegerv (pname, &RETVAL);
2385 OUTPUT:
2386 RETVAL
2387
2388GLdouble glGetDouble (GLenum pname)
2389 CODE:
2390 glGetDoublev (pname, &RETVAL);
1951 OUTPUT: 2391 OUTPUT:
1952 RETVAL 2392 RETVAL
1953 2393
1954int glGetError () 2394int glGetError ()
1955 2395
2080 2520
2081void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2521void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2082 2522
2083void glDrawPixels (int width, int height, int format, int type, char *pixels) 2523void glDrawPixels (int width, int height, int format, int type, char *pixels)
2084 2524
2525void glPixelZoom (float x, float y)
2526
2085void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2527void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2086 2528
2087int glGenTexture () 2529int glGenTexture ()
2088 CODE: 2530 CODE:
2089{ 2531 RETVAL = gen_texture ();
2090 GLuint name;
2091 glGenTextures (1, &name);
2092 RETVAL = name;
2093}
2094 OUTPUT: 2532 OUTPUT:
2095 RETVAL 2533 RETVAL
2096 2534
2097void glDeleteTexture (int name) 2535void glDeleteTexture (int name)
2098 CODE: 2536 CODE:
2099{
2100 GLuint name_ = name;
2101 glDeleteTextures (1, &name_); 2537 del_texture (name);
2102} 2538
2103
2104int glGenList () 2539int glGenList ()
2105 CODE: 2540 CODE:
2106 RETVAL = glGenLists (1); 2541 RETVAL = glGenLists (1);
2107 OUTPUT: 2542 OUTPUT:
2108 RETVAL 2543 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines