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.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC

… …
7 7
8#include "EXTERN.h" 8#include "EXTERN.h"
9#include "perl.h" 9#include "perl.h"
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h>
12#include <string.h> 13#include <string.h>
13#include <stdio.h> 14#include <stdio.h>
14 15
15#include <SDL.h> 16#include <SDL.h>
16#include <SDL_endian.h> 17#include <SDL_endian.h>
… …
83 84
84static void 85static void
85substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
86{ 87{
87 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
88 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
89} 94}
90 95
91static void 96static void
92layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
93{ 98{
… …
436 SDL_Rect **m; 441 SDL_Rect **m;
437 442
438 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
442 450
443 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447 455
448 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
449 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
450 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
451 457
452 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
453 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454 460
455 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
664} 670}
665 671
666void 672void
667error (char *message) 673error (char *message)
668 CODE: 674 CODE:
675 fprintf (stderr, "ERROR: %s\n", message);
669#ifdef _WIN32 676#ifdef _WIN32
670 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 677 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
671#else
672 fprintf (stderr, "ERROR: %s\n", message);
673#endif 678#endif
674 679
675void 680void
676fatal (char *message) 681fatal (char *message)
677 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
678#ifdef _WIN32 684#ifdef _WIN32
679 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
680#else
681 fprintf (stderr, "FATAL: %s\n", message);
682#endif 686#endif
683 exit (1); 687 exit (1);
684 688
685MODULE = CFClient PACKAGE = CFClient::Font 689MODULE = CFClient PACKAGE = CFClient::Font
686 690
… …
709MODULE = CFClient PACKAGE = CFClient::Layout 713MODULE = CFClient PACKAGE = CFClient::Layout
710 714
711CFClient::Layout 715CFClient::Layout
712new (SV *class, int rgba = 0) 716new (SV *class, int rgba = 0)
713 CODE: 717 CODE:
718#if _WIN32
719 rgba = 0;//D
720#endif
714 New (0, RETVAL, 1, struct cf_layout); 721 New (0, RETVAL, 1, struct cf_layout);
715 722
716 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 723 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
717 RETVAL->rgba = rgba; 724 RETVAL->rgba = rgba;
718 RETVAL->r = 1.; 725 RETVAL->r = 1.;
… …
798set_width (CFClient::Layout self, int max_width = -1) 805set_width (CFClient::Layout self, int max_width = -1)
799 CODE: 806 CODE:
800 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 807 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
801 808
802void 809void
810set_indent (CFClient::Layout self, int indent)
811 CODE:
812 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
813
814void
815set_spacing (CFClient::Layout self, int spacing)
816 CODE:
817 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
818
819void
820set_ellipsise (CFClient::Layout self, int ellipsise)
821 CODE:
822 pango_layout_set_ellipsize (self->pl,
823 ellipsise == 1 ? PANGO_ELLIPSIZE_START
824 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
825 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
826 : PANGO_ELLIPSIZE_NONE
827 );
828
829void
830set_single_paragraph_mode (CFClient::Layout self, int spm)
831 CODE:
832 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
833
834void
803size (CFClient::Layout self) 835size (CFClient::Layout self)
804 PPCODE: 836 PPCODE:
805{ 837{
806 int w, h; 838 int w, h;
807 839
… …
873 905
874 while (p < e) 906 while (p < e)
875 { 907 {
876 uint32_t rgba = *p; 908 uint32_t rgba = *p;
877 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
878 rgba = SDL_SwapBE32 (rgba); 922 rgba = SDL_SwapBE32 (rgba);
879 *p++ = rgba; 923 *p++ = rgba;
880 } 924 }
881 } 925 }
882 926
… …
939 983
940 if (ix) 984 if (ix)
941 { 985 {
942 glEnable (GL_BLEND); 986 glEnable (GL_BLEND);
943 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);
944 } 990 }
945 991
946 glBindTexture (GL_TEXTURE_2D, name); 992 glBindTexture (GL_TEXTURE_2D, name);
947 993
948 if (wrap_mode) 994 if (wrap_mode)
… …
957 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1003 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1004 glTexCoord2f (s, 0); glVertex2f (x + w, y );
959 glEnd (); 1005 glEnd ();
960 1006
961 if (ix) 1007 if (ix)
1008 {
1009 glDisable (GL_ALPHA_TEST);
962 glDisable (GL_BLEND); 1010 glDisable (GL_BLEND);
1011 }
963} 1012}
964 1013
965MODULE = CFClient PACKAGE = CFClient::Map 1014MODULE = CFClient PACKAGE = CFClient::Map
966 1015
967CFClient::Map 1016CFClient::Map
… …
1490 const_iv (GL_ONE_MINUS_DST_ALPHA), 1539 const_iv (GL_ONE_MINUS_DST_ALPHA),
1491 const_iv (GL_RGB), 1540 const_iv (GL_RGB),
1492 const_iv (GL_RGBA), 1541 const_iv (GL_RGBA),
1493 const_iv (GL_UNSIGNED_BYTE), 1542 const_iv (GL_UNSIGNED_BYTE),
1494 const_iv (GL_ALPHA), 1543 const_iv (GL_ALPHA),
1544 const_iv (GL_INTENSITY),
1495 const_iv (GL_LUMINANCE), 1545 const_iv (GL_LUMINANCE),
1546 const_iv (GL_LUMINANCE_ALPHA),
1496 const_iv (GL_FLOAT), 1547 const_iv (GL_FLOAT),
1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1548 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498 const_iv (GL_COMPILE), 1549 const_iv (GL_COMPILE),
1499 const_iv (GL_TEXTURE_1D), 1550 const_iv (GL_TEXTURE_1D),
1500 const_iv (GL_TEXTURE_2D), 1551 const_iv (GL_TEXTURE_2D),
… …
1589void glEnd () 1640void glEnd ()
1590 1641
1591void glColor (float r, float g, float b, float a = 1.0) 1642void glColor (float r, float g, float b, float a = 1.0)
1592 PROTOTYPE: @ 1643 PROTOTYPE: @
1593 CODE: 1644 CODE:
1594 // 255.999 is close enough to correctness (256 and clamp) 1645 glColor4ub (MIN ((int)(r * 255.f), 255),
1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 1646 MIN ((int)(g * 255.f), 255),
1647 MIN ((int)(b * 255.f), 255),
1648 MIN ((int)(a * 255.f), 255));
1596 1649
1597void glVertex (float x, float y, float z = 0.) 1650void glVertex (float x, float y, float z = 0.)
1598 CODE: 1651 CODE:
1599 glVertex3f (x, y, z); 1652 glVertex3f (x, y, z);
1600 1653

Diff Legend

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