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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.88 by root, Fri May 19 23:18:40 2006 UTC

… …
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, 1);
447 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452 455
453 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456 457
457 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
458 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459 460
460 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
468 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
469 470
470 ++m; 471 ++m;
471 } 472 }
472} 473}
474
475char *
476SDL_GetError ()
473 477
474int 478int
475SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
476 CODE: 480 CODE:
477 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
… …
669} 673}
670 674
671void 675void
672error (char *message) 676error (char *message)
673 CODE: 677 CODE:
678 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 679#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 680 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 681#endif
679 682
680void 683void
681fatal (char *message) 684fatal (char *message)
682 CODE: 685 CODE:
686 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 687#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 689#endif
688 exit (1); 690 exit (1);
689 691
690MODULE = CFClient PACKAGE = CFClient::Font 692MODULE = CFClient PACKAGE = CFClient::Font
691 693
… …
714MODULE = CFClient PACKAGE = CFClient::Layout 716MODULE = CFClient PACKAGE = CFClient::Layout
715 717
716CFClient::Layout 718CFClient::Layout
717new (SV *class, int rgba = 0) 719new (SV *class, int rgba = 0)
718 CODE: 720 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
719 New (0, RETVAL, 1, struct cf_layout); 724 New (0, RETVAL, 1, struct cf_layout);
720 725
721 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
722 RETVAL->rgba = rgba; 727 RETVAL->rgba = rgba;
723 RETVAL->r = 1.; 728 RETVAL->r = 1.;
… …
903 908
904 while (p < e) 909 while (p < e)
905 { 910 {
906 uint32_t rgba = *p; 911 uint32_t rgba = *p;
907 rgba = (rgba >> 24) | (rgba << 8); 912 rgba = (rgba >> 24) | (rgba << 8);
913#if 0
914#ifdef _WIN32
915 {//D
916 uint8_t r = rgba >> 24;
917 uint8_t g = rgba >> 16;
918 uint8_t b = rgba >> 8;
919 uint8_t a = rgba >> 0;
920
921 rgba = (rgba & 0xffffff00) | a;
922 }
923#endif
924#endif
908 rgba = SDL_SwapBE32 (rgba); 925 rgba = SDL_SwapBE32 (rgba);
909 *p++ = rgba; 926 *p++ = rgba;
910 } 927 }
911 } 928 }
912 929
… …
969 986
970 if (ix) 987 if (ix)
971 { 988 {
972 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
973 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 990 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
991 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f);
974 } 993 }
975 994
976 glBindTexture (GL_TEXTURE_2D, name); 995 glBindTexture (GL_TEXTURE_2D, name);
977 996
978 if (wrap_mode) 997 if (wrap_mode)
… …
987 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
989 glEnd (); 1008 glEnd ();
990 1009
991 if (ix) 1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
992 glDisable (GL_BLEND); 1013 glDisable (GL_BLEND);
1014 }
993} 1015}
994 1016
995MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
996 1018
997CFClient::Map 1019CFClient::Map
… …
1520 const_iv (GL_ONE_MINUS_DST_ALPHA), 1542 const_iv (GL_ONE_MINUS_DST_ALPHA),
1521 const_iv (GL_RGB), 1543 const_iv (GL_RGB),
1522 const_iv (GL_RGBA), 1544 const_iv (GL_RGBA),
1523 const_iv (GL_UNSIGNED_BYTE), 1545 const_iv (GL_UNSIGNED_BYTE),
1524 const_iv (GL_ALPHA), 1546 const_iv (GL_ALPHA),
1547 const_iv (GL_INTENSITY),
1525 const_iv (GL_LUMINANCE), 1548 const_iv (GL_LUMINANCE),
1549 const_iv (GL_LUMINANCE_ALPHA),
1526 const_iv (GL_FLOAT), 1550 const_iv (GL_FLOAT),
1527 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1551 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528 const_iv (GL_COMPILE), 1552 const_iv (GL_COMPILE),
1529 const_iv (GL_TEXTURE_1D), 1553 const_iv (GL_TEXTURE_1D),
1530 const_iv (GL_TEXTURE_2D), 1554 const_iv (GL_TEXTURE_2D),

Diff Legend

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