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.89 by root, Sun May 21 00:02:01 2006 UTC

… …
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); 448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
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);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
470 470
471 ++m; 471 ++m;
472 } 472 }
473} 473}
474
475char *
476SDL_GetError ()
474 477
475int 478int
476SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 480 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
… …
670} 673}
671 674
672void 675void
673error (char *message) 676error (char *message)
674 CODE: 677 CODE:
678 fprintf (stderr, "ERROR: %s\n", message);
675#ifdef _WIN32 679#ifdef _WIN32
676 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 680 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
677#else
678 fprintf (stderr, "ERROR: %s\n", message);
679#endif 681#endif
680 682
681void 683void
682fatal (char *message) 684fatal (char *message)
683 CODE: 685 CODE:
686 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 687#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#else
687 fprintf (stderr, "FATAL: %s\n", message);
688#endif 689#endif
689 exit (1); 690 exit (1);
690 691
691MODULE = CFClient PACKAGE = CFClient::Font 692MODULE = CFClient PACKAGE = CFClient::Font
692 693
… …
715MODULE = CFClient PACKAGE = CFClient::Layout 716MODULE = CFClient PACKAGE = CFClient::Layout
716 717
717CFClient::Layout 718CFClient::Layout
718new (SV *class, int rgba = 0) 719new (SV *class, int rgba = 0)
719 CODE: 720 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
720 New (0, RETVAL, 1, struct cf_layout); 724 New (0, RETVAL, 1, struct cf_layout);
721 725
722 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
723 RETVAL->rgba = rgba; 727 RETVAL->rgba = rgba;
724 RETVAL->r = 1.; 728 RETVAL->r = 1.;
… …
904 908
905 while (p < e) 909 while (p < e)
906 { 910 {
907 uint32_t rgba = *p; 911 uint32_t rgba = *p;
908 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
909 rgba = SDL_SwapBE32 (rgba); 925 rgba = SDL_SwapBE32 (rgba);
910 *p++ = rgba; 926 *p++ = rgba;
911 } 927 }
912 } 928 }
913 929
… …
970 986
971 if (ix) 987 if (ix)
972 { 988 {
973 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
974 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);
975 } 993 }
976 994
977 glBindTexture (GL_TEXTURE_2D, name); 995 glBindTexture (GL_TEXTURE_2D, name);
978 996
979 if (wrap_mode) 997 if (wrap_mode)
… …
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
990 glEnd (); 1008 glEnd ();
991 1009
992 if (ix) 1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
993 glDisable (GL_BLEND); 1013 glDisable (GL_BLEND);
1014 }
994} 1015}
995 1016
996MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
997 1018
998CFClient::Map 1019CFClient::Map
… …
1509 const_iv (GL_COLOR_MATERIAL), 1530 const_iv (GL_COLOR_MATERIAL),
1510 const_iv (GL_SMOOTH), 1531 const_iv (GL_SMOOTH),
1511 const_iv (GL_FLAT), 1532 const_iv (GL_FLAT),
1512 const_iv (GL_DITHER), 1533 const_iv (GL_DITHER),
1513 const_iv (GL_BLEND), 1534 const_iv (GL_BLEND),
1535 const_iv (GL_CULL_FACE),
1514 const_iv (GL_SCISSOR_TEST), 1536 const_iv (GL_SCISSOR_TEST),
1537 const_iv (GL_DEPTH_TEST),
1538 const_iv (GL_ALPHA_TEST),
1539 const_iv (GL_NORMALIZE),
1540 const_iv (GL_RESCALE_NORMAL),
1515 const_iv (GL_AND), 1541 const_iv (GL_AND),
1516 const_iv (GL_ONE), 1542 const_iv (GL_ONE),
1517 const_iv (GL_ZERO), 1543 const_iv (GL_ZERO),
1518 const_iv (GL_SRC_ALPHA), 1544 const_iv (GL_SRC_ALPHA),
1519 const_iv (GL_SRC_ALPHA_SATURATE), 1545 const_iv (GL_SRC_ALPHA_SATURATE),
1520 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1546 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521 const_iv (GL_ONE_MINUS_DST_ALPHA), 1547 const_iv (GL_ONE_MINUS_DST_ALPHA),
1522 const_iv (GL_RGB), 1548 const_iv (GL_RGB),
1523 const_iv (GL_RGBA), 1549 const_iv (GL_RGBA),
1524 const_iv (GL_UNSIGNED_BYTE), 1550 const_iv (GL_UNSIGNED_BYTE),
1551 const_iv (GL_UNSIGNED_SHORT),
1552 const_iv (GL_UNSIGNED_INT),
1525 const_iv (GL_ALPHA), 1553 const_iv (GL_ALPHA),
1554 const_iv (GL_INTENSITY),
1526 const_iv (GL_LUMINANCE), 1555 const_iv (GL_LUMINANCE),
1556 const_iv (GL_LUMINANCE_ALPHA),
1527 const_iv (GL_FLOAT), 1557 const_iv (GL_FLOAT),
1528 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1558 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529 const_iv (GL_COMPILE), 1559 const_iv (GL_COMPILE),
1530 const_iv (GL_TEXTURE_1D), 1560 const_iv (GL_TEXTURE_1D),
1531 const_iv (GL_TEXTURE_2D), 1561 const_iv (GL_TEXTURE_2D),
… …
1545 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1575 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546 const_iv (GL_GENERATE_MIPMAP), 1576 const_iv (GL_GENERATE_MIPMAP),
1547 const_iv (GL_MODULATE), 1577 const_iv (GL_MODULATE),
1548 const_iv (GL_DECAL), 1578 const_iv (GL_DECAL),
1549 const_iv (GL_REPLACE), 1579 const_iv (GL_REPLACE),
1580 const_iv (GL_DEPTH_BUFFER_BIT),
1550 const_iv (GL_COLOR_BUFFER_BIT), 1581 const_iv (GL_COLOR_BUFFER_BIT),
1551 const_iv (GL_PROJECTION), 1582 const_iv (GL_PROJECTION),
1552 const_iv (GL_MODELVIEW), 1583 const_iv (GL_MODELVIEW),
1553 const_iv (GL_COLOR_LOGIC_OP), 1584 const_iv (GL_COLOR_LOGIC_OP),
1554 const_iv (GL_SEPARABLE_2D), 1585 const_iv (GL_SEPARABLE_2D),
1555 const_iv (GL_CONVOLUTION_2D), 1586 const_iv (GL_CONVOLUTION_2D),
1556 const_iv (GL_CONVOLUTION_BORDER_MODE), 1587 const_iv (GL_CONVOLUTION_BORDER_MODE),
1557 const_iv (GL_CONSTANT_BORDER), 1588 const_iv (GL_CONSTANT_BORDER),
1558 const_iv (GL_LINES), 1589 const_iv (GL_LINES),
1590 const_iv (GL_LINE_LOOP),
1559 const_iv (GL_QUADS), 1591 const_iv (GL_QUADS),
1560 const_iv (GL_LINE_LOOP), 1592 const_iv (GL_QUAD_STRIP),
1593 const_iv (GL_TRIANGLES),
1594 const_iv (GL_TRIANGLE_STRIP),
1595 const_iv (GL_TRIANGLE_FAN),
1561 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1596 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562 const_iv (GL_FASTEST), 1597 const_iv (GL_FASTEST),
1598 const_iv (GL_V2F),
1599 const_iv (GL_V3F),
1600 const_iv (GL_T2F_V3F),
1601 const_iv (GL_T2F_N3F_V3F),
1563# undef const_iv 1602# undef const_iv
1564 }; 1603 };
1565 1604
1566 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1605 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1567 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1581void glShadeModel (int mode) 1620void glShadeModel (int mode)
1582 1621
1583void glHint (int target, int mode) 1622void glHint (int target, int mode)
1584 1623
1585void glBlendFunc (int sfactor, int dfactor) 1624void glBlendFunc (int sfactor, int dfactor)
1625
1626void glDepthMask (int flag)
1586 1627
1587void glLogicOp (int opcode) 1628void glLogicOp (int opcode)
1588 1629
1589void glColorMask (int red, int green, int blue, int alpha) 1630void glColorMask (int red, int green, int blue, int alpha)
1590 1631
… …
1625 glColor4ub (MIN ((int)(r * 255.f), 255), 1666 glColor4ub (MIN ((int)(r * 255.f), 255),
1626 MIN ((int)(g * 255.f), 255), 1667 MIN ((int)(g * 255.f), 255),
1627 MIN ((int)(b * 255.f), 255), 1668 MIN ((int)(b * 255.f), 255),
1628 MIN ((int)(a * 255.f), 255)); 1669 MIN ((int)(a * 255.f), 255));
1629 1670
1671void glInterleavedArrays (int format, int stride, char *data)
1672
1673void glDrawElements (int mode, int count, int type, char *indices)
1674
1675# 1.2 void glDrawRangeElements (int mode, int start, int end
1676
1630void glVertex (float x, float y, float z = 0.) 1677void glVertex (float x, float y, float z = 0.)
1631 CODE: 1678 CODE:
1632 glVertex3f (x, y, z); 1679 glVertex3f (x, y, z);
1633 1680
1634void glTexCoord (float s, float t) 1681void glTexCoord (float s, float t)
… …
1700 1747
1701void glEndList () 1748void glEndList ()
1702 1749
1703void glCallList (int list) 1750void glCallList (int list)
1704 1751
1752

Diff Legend

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