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.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC

… …
150typedef struct cf_layout { 150typedef struct cf_layout {
151 PangoLayout *pl; 151 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
153 int base_height; 153 int base_height;
154 CFPlus__Font font; 154 CFPlus__Font font;
155 rc_t *rc;
155} *CFPlus__Layout; 156} *CFPlus__Layout;
156 157
157static CFPlus__Font default_font; 158static CFPlus__Font default_font;
158static PangoContext *opengl_context; 159static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
… …
202 203
203typedef uint16_t tileid; 204typedef uint16_t tileid;
204typedef uint16_t faceid; 205typedef uint16_t faceid;
205 206
206typedef struct { 207typedef struct {
207 int name; 208 GLuint name;
208 int w, h; 209 int w, h;
209 float s, t; 210 float s, t;
210 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
211 tileid smoothtile; 212 tileid smoothtile;
212 uint8_t smoothlevel; 213 uint8_t smoothlevel;
… …
437 n |= n >> 4; 438 n |= n >> 4;
438 n |= n >> 8; 439 n |= n >> 8;
439 n |= n >> 16; 440 n |= n >> 16;
440 441
441 return n + 1; 442 return n + 1;
443}
444
445static unsigned int
446popcount (unsigned int n)
447{
448 n -= (n >> 1) & 0x55555555U;
449 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
450 n = ((n >> 4) + n) & 0x0f0f0f0fU;
451 n *= 0x01010101U;
452
453 return n >> 24;
442} 454}
443 455
444/* SDL should provide this, really. */ 456/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 457#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 458#define SDLK_MODIFIER_MAX 314
… …
524 536
525 const_iv (SDL_APPINPUTFOCUS), 537 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 538 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 539 const_iv (SDL_APPACTIVE),
528 540
541 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 543 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 544 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 545 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 546 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 547 const_iv (SDLK_KP4),
… …
605 const_iv (KMOD_LMETA), 619 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 620 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 621 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 622 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 623 const_iv (KMOD_MODE),
624
625 const_iv (MIX_DEFAULT_FORMAT),
610# undef const_iv 626# undef const_iv
611 }; 627 };
612 628
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
631 RETVAL 647 RETVAL
632 648
633NV floor (NV x) 649NV floor (NV x)
634 650
635NV ceil (NV x) 651NV ceil (NV x)
652
653IV minpot (UV n)
654
655IV popcount (UV n)
636 656
637void 657void
638pango_init () 658pango_init ()
639 CODE: 659 CODE:
640{ 660{
… …
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 701
682 if (m && m != (SDL_Rect **)-1) 702 if (m && m != (SDL_Rect **)-1)
683 while (*m) 703 while (*m)
684 { 704 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 705 if ((*m)->w >= 800 && (*m)->h >= 600)
686 { 706 {
687 AV *av = newAV (); 707 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 708 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 709 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 710 av_push (av, newSViv (rgb));
… …
714 734
715 if (RETVAL) 735 if (RETVAL)
716 { 736 {
717 av_clear (texture_av); 737 av_clear (texture_av);
718 738
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 741#include "glfunc.h"
722#undef GL_FUNC 742#undef GL_FUNC
723 } 743 }
724} 744}
… …
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
811 } 831 }
812} 832}
813 833
814int 834int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 836 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 837 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 838 Mix_ChannelFinished (channel_finished);
839
840void
841Mix_QuerySpec ()
842 PPCODE:
843{
844 int freq, channels;
845 Uint16 format;
846
847 if (Mix_QuerySpec (&freq, &format, &channels))
848 {
849 EXTEND (SP, 3);
850 PUSHs (sv_2mortal (newSViv (freq)));
851 PUSHs (sv_2mortal (newSViv (format)));
852 PUSHs (sv_2mortal (newSViv (channels)));
853 }
854}
819 855
820void 856void
821Mix_CloseAudio () 857Mix_CloseAudio ()
822 858
823int 859int
… …
957void 993void
958error (char *message) 994error (char *message)
959 CODE: 995 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 996 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 997#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 998 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 999#endif
964 1000
965void 1001void
966fatal (char *message) 1002fatal (char *message)
967 CODE: 1003 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1004 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1005#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1006 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1007#endif
972 _exit (1); 1008 _exit (1);
973 1009
974void 1010void
975_exit (int retval = 0) 1011_exit (int retval = 0)
… …
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1055MODULE = CFPlus PACKAGE = CFPlus::Layout
1020 1056
1021PROTOTYPES: DISABLE 1057PROTOTYPES: DISABLE
1022 1058
1023void 1059void
1024reset_glyph_cache () 1060glyph_cache_backup ()
1025 PROTOTYPE: 1061 PROTOTYPE:
1026 CODE: 1062 CODE:
1063 tc_backup ();
1064
1065void
1066glyph_cache_restore ()
1067 PROTOTYPE:
1068 CODE:
1027 tc_clear (); 1069 tc_restore ();
1028 1070
1029CFPlus::Layout 1071CFPlus::Layout
1030new (SV *class) 1072new (SV *class)
1031 CODE: 1073 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1074 New (0, RETVAL, 1, struct cf_layout);
… …
1036 RETVAL->g = 1.; 1078 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1079 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1080 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1081 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1082 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
1041 1084
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1086 layout_update_font (RETVAL);
1044 OUTPUT: 1087 OUTPUT:
1045 RETVAL 1088 RETVAL
1046 1089
1047void 1090void
1048DESTROY (CFPlus::Layout self) 1091DESTROY (CFPlus::Layout self)
1049 CODE: 1092 CODE:
1050 g_object_unref (self->pl); 1093 g_object_unref (self->pl);
1094 rc_free (self->rc);
1051 Safefree (self); 1095 Safefree (self);
1052 1096
1053void 1097void
1054set_text (CFPlus::Layout self, SV *text_) 1098set_text (CFPlus::Layout self, SV *text_)
1055 CODE: 1099 CODE:
… …
1307 } 1351 }
1308} 1352}
1309 1353
1310void 1354void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1355render (CFPlus::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1356 CODE:
1357 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1358 pango_opengl_render_layout_subpixel (
1314 self->pl, 1359 self->pl,
1360 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1361 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1362 self->r, self->g, self->b, self->a,
1317 flags 1363 flags
1318 ); 1364 );
1365 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl);
1368
1369void
1370draw (CFPlus::Layout self)
1371 CODE:
1372{
1373 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND);
1376 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1377 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1378 glEnable (GL_ALPHA_TEST);
1379 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1380
1381 rc_draw (self->rc);
1382
1383 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D);
1386}
1319 1387
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1388MODULE = CFPlus PACKAGE = CFPlus::Texture
1321 1389
1322PROTOTYPES: ENABLE 1390PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1391
1326void 1392void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1393pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1394 CODE:
1329{ 1395{
… …
1718{ 1784{
1719 int x, y, z; 1785 int x, y, z;
1720 1786
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1790 smooth_key skey;
1725 1791
1726 rc_t *rc = rc_alloc (); 1792 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1793 rc_key_t key;
1728 rc_array_t *arr; 1794 rc_array_t *arr;
… …
1790 if (tile) 1856 if (tile)
1791 { 1857 {
1792 maptex tex = self->tex [tile]; 1858 maptex tex = self->tex [tile];
1793 int px, py; 1859 int px, py;
1794 1860
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1861 if (key.texname != tex.name)
1798 { 1862 {
1799 if (!tex.name) 1863 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1864 tex = self->tex [2]; /* missing, replace by noface */
1801 1865
… …
1876 } 1940 }
1877 } 1941 }
1878 } 1942 }
1879 } 1943 }
1880 1944
1945 rc_draw (rc);
1946 rc_clear (rc);
1947
1881 // go through all smoothlevels, lowest to highest, then draw. 1948 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 1949 // this is basically counting sort
1883 { 1950 {
1884 int w, b; 1951 int w, b;
1885 1952
1953 glEnable (GL_TEXTURE_2D);
1954 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 1955 for (w = 0; w < 256 / 32; ++w)
1887 { 1956 {
1888 uint32_t smask = smooth_level [w]; 1957 uint32_t smask = smooth_level [w];
1889 if (smask) 1958 if (smask)
1890 for (b = 0; b < 32; ++b) 1959 for (b = 0; b < 32; ++b)
… …
1915 { 1984 {
1916 // this time avoiding texture state changes 1985 // this time avoiding texture state changes
1917 // save gobs of state changes. 1986 // save gobs of state changes.
1918 if (key.texname != tex.name) 1987 if (key.texname != tex.name)
1919 { 1988 {
1989 glEnd ();
1920 key.texname = tex.name; 1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 1991 glBegin (GL_QUADS);
1922 } 1992 }
1923 1993
1924 if (border) 1994 if (border)
1925 { 1995 {
1926 float ox = border * dx; 1996 float ox = border * dx;
1927 1997
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1932 } 2002 }
1933 2003
1934 if (corner) 2004 if (corner)
1935 { 2005 {
1936 float ox = corner * dx; 2006 float ox = corner * dx;
1937 2007
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2008 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1942 } 2012 }
1943 } 2013 }
1944 } 2014 }
1945 } 2015 }
1946 } 2016 }
1947 } 2017 }
2018
2019 glEnd ();
2020 glDisable (GL_TEXTURE_2D);
2021 key.texname = -1;
1948 } 2022 }
1949 2023
1950 hv_clear (smooth); 2024 hv_clear (smooth);
1951 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2025 }
1954 2026
1955 glDisable (GL_BLEND); 2027 glDisable (GL_BLEND);
1956 rc_free (rc); 2028 rc_free (rc);
1957 2029
… …
2210 int x, y, z; 2282 int x, y, z;
2211 int w, h; 2283 int w, h;
2212 int x1, y1; 2284 int x1, y1;
2213 2285
2214 if (*data++ != 0) 2286 if (*data++ != 0)
2215 return; /* version mismatch */ 2287 XSRETURN_EMPTY; /* version mismatch */
2216 2288
2217 w = *data++ << 8; w |= *data++; 2289 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2290 h = *data++ << 8; h |= *data++;
2219 2291
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2292 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2516 const_iv (GL_INTENSITY), 2588 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 2589 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 2590 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 2591 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2592 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2593 const_iv (GL_COMPRESSED_ALPHA_ARB),
2594 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2595 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2596 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2597 const_iv (GL_COMPRESSED_RGB_ARB),
2598 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 2599 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 2600 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 2601 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 2602 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 2603 const_iv (GL_TEXTURE_2D),
… …
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2642 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 2643 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 2644 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 2645 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 2646 const_iv (GL_GENERATE_MIPMAP_HINT),
2647 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 2648 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 2649 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 2650 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 2651 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 2652 const_iv (GL_V3F),
… …
2581 2660
2582 texture_av = newAV (); 2661 texture_av = newAV ();
2583 AvREAL_off (texture_av); 2662 AvREAL_off (texture_av);
2584} 2663}
2585 2664
2665void
2666disable_GL_EXT_blend_func_separate ()
2667 CODE:
2668 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0;
2670
2586char * 2671char *
2587gl_vendor () 2672gl_vendor ()
2588 CODE: 2673 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 2674 RETVAL = (char *)glGetString (GL_VENDOR);
2590 OUTPUT: 2675 OUTPUT:
… …
2711 2796
2712void glRect (float x1, float y1, float x2, float y2) 2797void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 2798 CODE:
2714 glRectf (x1, y1, x2, y2); 2799 glRectf (x1, y1, x2, y2);
2715 2800
2801void glRect_lineloop (float x1, float y1, float x2, float y2)
2802 CODE:
2803 glBegin (GL_LINE_LOOP);
2804 glVertex2f (x1, y1);
2805 glVertex2f (x2, y1);
2806 glVertex2f (x2, y2);
2807 glVertex2f (x1, y2);
2808 glEnd ();
2809
2716PROTOTYPES: ENABLE 2810PROTOTYPES: ENABLE
2717 2811
2718void glBegin (int mode) 2812void glBegin (int mode)
2719 2813
2720void glEnd () 2814void glEnd ()
… …
2821 NV x, y, w, h; 2915 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 2916 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 2917 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 2918 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 2919 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 2920 double draw_x, draw_y;
2828 2921
2829 if (!SvROK (self)) 2922 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2831 2924
2832 hv = (HV *)SvRV (self); 2925 hv = (HV *)SvRV (self);
… …
2860 { 2953 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2954 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 2955
2863 if (svp && SvTRUE (*svp)) 2956 if (svp && SvTRUE (*svp))
2864 { 2957 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2958 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 2959 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2960 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 2961 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 2962 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 2963 glVertex2f (w, 0);
… …
2873 glEnd (); 2966 glEnd ();
2874 glDisable (GL_BLEND); 2967 glDisable (GL_BLEND);
2875 } 2968 }
2876 } 2969 }
2877#if 0 2970#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 2971 // draw borders, for debugging
2879 glPushMatrix; 2972 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 2973 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 2974 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 2975 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 2976 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 2977 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 2978 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 2979 glVertex2f (0 , h - 1);
2887 glEnd; 2980 glEnd ();
2888 glPopMatrix; 2981 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 2982#endif
2892 PUSHMARK (SP); 2983 PUSHMARK (SP);
2893 XPUSHs (self); 2984 XPUSHs (self);
2894 PUTBACK; 2985 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 2986 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines