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.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC

… …
441 SDL_Rect **m; 441 SDL_Rect **m;
442 442
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
447 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 450
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
… …
670} 670}
671 671
672void 672void
673error (char *message) 673error (char *message)
674 CODE: 674 CODE:
675 fprintf (stderr, "ERROR: %s\n", message);
675#ifdef _WIN32 676#ifdef _WIN32
676 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 677 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
677#else
678 fprintf (stderr, "ERROR: %s\n", message);
679#endif 678#endif
680 679
681void 680void
682fatal (char *message) 681fatal (char *message)
683 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 684#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#else
687 fprintf (stderr, "FATAL: %s\n", message);
688#endif 686#endif
689 exit (1); 687 exit (1);
690 688
691MODULE = CFClient PACKAGE = CFClient::Font 689MODULE = CFClient PACKAGE = CFClient::Font
692 690
… …
715MODULE = CFClient PACKAGE = CFClient::Layout 713MODULE = CFClient PACKAGE = CFClient::Layout
716 714
717CFClient::Layout 715CFClient::Layout
718new (SV *class, int rgba = 0) 716new (SV *class, int rgba = 0)
719 CODE: 717 CODE:
718#if _WIN32
719 rgba = 0;//D
720#endif
720 New (0, RETVAL, 1, struct cf_layout); 721 New (0, RETVAL, 1, struct cf_layout);
721 722
722 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 723 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
723 RETVAL->rgba = rgba; 724 RETVAL->rgba = rgba;
724 RETVAL->r = 1.; 725 RETVAL->r = 1.;
… …
904 905
905 while (p < e) 906 while (p < e)
906 { 907 {
907 uint32_t rgba = *p; 908 uint32_t rgba = *p;
908 rgba = (rgba >> 24) | (rgba << 8); 909 rgba = (rgba >> 24) | (rgba << 8);
910#if 0
911#ifdef _WIN32
912 {//D
913 uint8_t r = rgba >> 24;
914 uint8_t g = rgba >> 16;
915 uint8_t b = rgba >> 8;
916 uint8_t a = rgba >> 0;
917
918 rgba = (rgba & 0xffffff00) | a;
919 }
920#endif
921#endif
909 rgba = SDL_SwapBE32 (rgba); 922 rgba = SDL_SwapBE32 (rgba);
910 *p++ = rgba; 923 *p++ = rgba;
911 } 924 }
912 } 925 }
913 926
… …
970 983
971 if (ix) 984 if (ix)
972 { 985 {
973 glEnable (GL_BLEND); 986 glEnable (GL_BLEND);
974 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 987 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
988 glEnable (GL_ALPHA_TEST);
989 glAlphaFunc (GL_GREATER, 0.01f);
975 } 990 }
976 991
977 glBindTexture (GL_TEXTURE_2D, name); 992 glBindTexture (GL_TEXTURE_2D, name);
978 993
979 if (wrap_mode) 994 if (wrap_mode)
… …
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1003 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1004 glTexCoord2f (s, 0); glVertex2f (x + w, y );
990 glEnd (); 1005 glEnd ();
991 1006
992 if (ix) 1007 if (ix)
1008 {
1009 glDisable (GL_ALPHA_TEST);
993 glDisable (GL_BLEND); 1010 glDisable (GL_BLEND);
1011 }
994} 1012}
995 1013
996MODULE = CFClient PACKAGE = CFClient::Map 1014MODULE = CFClient PACKAGE = CFClient::Map
997 1015
998CFClient::Map 1016CFClient::Map
… …
1521 const_iv (GL_ONE_MINUS_DST_ALPHA), 1539 const_iv (GL_ONE_MINUS_DST_ALPHA),
1522 const_iv (GL_RGB), 1540 const_iv (GL_RGB),
1523 const_iv (GL_RGBA), 1541 const_iv (GL_RGBA),
1524 const_iv (GL_UNSIGNED_BYTE), 1542 const_iv (GL_UNSIGNED_BYTE),
1525 const_iv (GL_ALPHA), 1543 const_iv (GL_ALPHA),
1544 const_iv (GL_INTENSITY),
1526 const_iv (GL_LUMINANCE), 1545 const_iv (GL_LUMINANCE),
1546 const_iv (GL_LUMINANCE_ALPHA),
1527 const_iv (GL_FLOAT), 1547 const_iv (GL_FLOAT),
1528 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1548 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529 const_iv (GL_COMPILE), 1549 const_iv (GL_COMPILE),
1530 const_iv (GL_TEXTURE_1D), 1550 const_iv (GL_TEXTURE_1D),
1531 const_iv (GL_TEXTURE_2D), 1551 const_iv (GL_TEXTURE_2D),

Diff Legend

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