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.90 by root, Sun May 21 00:34:58 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, 16);
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
… …
1508 const_iv (GL_COLOR_MATERIAL), 1530 const_iv (GL_COLOR_MATERIAL),
1509 const_iv (GL_SMOOTH), 1531 const_iv (GL_SMOOTH),
1510 const_iv (GL_FLAT), 1532 const_iv (GL_FLAT),
1511 const_iv (GL_DITHER), 1533 const_iv (GL_DITHER),
1512 const_iv (GL_BLEND), 1534 const_iv (GL_BLEND),
1535 const_iv (GL_CULL_FACE),
1513 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),
1514 const_iv (GL_AND), 1541 const_iv (GL_AND),
1515 const_iv (GL_ONE), 1542 const_iv (GL_ONE),
1516 const_iv (GL_ZERO), 1543 const_iv (GL_ZERO),
1517 const_iv (GL_SRC_ALPHA), 1544 const_iv (GL_SRC_ALPHA),
1518 const_iv (GL_SRC_ALPHA_SATURATE), 1545 const_iv (GL_SRC_ALPHA_SATURATE),
1519 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1546 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520 const_iv (GL_ONE_MINUS_DST_ALPHA), 1547 const_iv (GL_ONE_MINUS_DST_ALPHA),
1521 const_iv (GL_RGB), 1548 const_iv (GL_RGB),
1522 const_iv (GL_RGBA), 1549 const_iv (GL_RGBA),
1523 const_iv (GL_UNSIGNED_BYTE), 1550 const_iv (GL_UNSIGNED_BYTE),
1551 const_iv (GL_UNSIGNED_SHORT),
1552 const_iv (GL_UNSIGNED_INT),
1524 const_iv (GL_ALPHA), 1553 const_iv (GL_ALPHA),
1554 const_iv (GL_INTENSITY),
1525 const_iv (GL_LUMINANCE), 1555 const_iv (GL_LUMINANCE),
1556 const_iv (GL_LUMINANCE_ALPHA),
1526 const_iv (GL_FLOAT), 1557 const_iv (GL_FLOAT),
1527 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1558 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528 const_iv (GL_COMPILE), 1559 const_iv (GL_COMPILE),
1529 const_iv (GL_TEXTURE_1D), 1560 const_iv (GL_TEXTURE_1D),
1530 const_iv (GL_TEXTURE_2D), 1561 const_iv (GL_TEXTURE_2D),
… …
1544 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1575 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545 const_iv (GL_GENERATE_MIPMAP), 1576 const_iv (GL_GENERATE_MIPMAP),
1546 const_iv (GL_MODULATE), 1577 const_iv (GL_MODULATE),
1547 const_iv (GL_DECAL), 1578 const_iv (GL_DECAL),
1548 const_iv (GL_REPLACE), 1579 const_iv (GL_REPLACE),
1580 const_iv (GL_DEPTH_BUFFER_BIT),
1549 const_iv (GL_COLOR_BUFFER_BIT), 1581 const_iv (GL_COLOR_BUFFER_BIT),
1550 const_iv (GL_PROJECTION), 1582 const_iv (GL_PROJECTION),
1551 const_iv (GL_MODELVIEW), 1583 const_iv (GL_MODELVIEW),
1552 const_iv (GL_COLOR_LOGIC_OP), 1584 const_iv (GL_COLOR_LOGIC_OP),
1553 const_iv (GL_SEPARABLE_2D), 1585 const_iv (GL_SEPARABLE_2D),
1554 const_iv (GL_CONVOLUTION_2D), 1586 const_iv (GL_CONVOLUTION_2D),
1555 const_iv (GL_CONVOLUTION_BORDER_MODE), 1587 const_iv (GL_CONVOLUTION_BORDER_MODE),
1556 const_iv (GL_CONSTANT_BORDER), 1588 const_iv (GL_CONSTANT_BORDER),
1557 const_iv (GL_LINES), 1589 const_iv (GL_LINES),
1590 const_iv (GL_LINE_LOOP),
1558 const_iv (GL_QUADS), 1591 const_iv (GL_QUADS),
1559 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),
1560 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1596 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561 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),
1562# undef const_iv 1602# undef const_iv
1563 }; 1603 };
1564 1604
1565 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; )
1566 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1581 1621
1582void glHint (int target, int mode) 1622void glHint (int target, int mode)
1583 1623
1584void glBlendFunc (int sfactor, int dfactor) 1624void glBlendFunc (int sfactor, int dfactor)
1585 1625
1626void glDepthMask (int flag)
1627
1586void glLogicOp (int opcode) 1628void glLogicOp (int opcode)
1587 1629
1588void glColorMask (int red, int green, int blue, int alpha) 1630void glColorMask (int red, int green, int blue, int alpha)
1589 1631
1590void glMatrixMode (int mode) 1632void glMatrixMode (int mode)
… …
1593 1635
1594void glPopMatrix () 1636void glPopMatrix ()
1595 1637
1596void glLoadIdentity () 1638void glLoadIdentity ()
1597 1639
1598# near and far are due to microsofts buggy c compiler 1640# near_ and far_ are due to microsofts buggy "c" compiler
1641void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1642
1643# near_ and far_ are due to microsofts buggy "c" compiler
1599void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1644void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1600 1645
1601void glViewport (int x, int y, int width, int height) 1646void glViewport (int x, int y, int width, int height)
1602 1647
1603void glScissor (int x, int y, int width, int height) 1648void glScissor (int x, int y, int width, int height)
… …
1619void glEnd () 1664void glEnd ()
1620 1665
1621void glColor (float r, float g, float b, float a = 1.0) 1666void glColor (float r, float g, float b, float a = 1.0)
1622 PROTOTYPE: @ 1667 PROTOTYPE: @
1623 CODE: 1668 CODE:
1669 // microsoft visual "c" rounds instead of truncating...
1624 glColor4ub (MIN ((int)(r * 255.f), 255), 1670 glColor4ub (MIN ((int)(r * 255.f), 255),
1625 MIN ((int)(g * 255.f), 255), 1671 MIN ((int)(g * 255.f), 255),
1626 MIN ((int)(b * 255.f), 255), 1672 MIN ((int)(b * 255.f), 255),
1627 MIN ((int)(a * 255.f), 255)); 1673 MIN ((int)(a * 255.f), 255));
1628 1674
1675void glInterleavedArrays (int format, int stride, char *data)
1676
1677void glDrawElements (int mode, int count, int type, char *indices)
1678
1679# 1.2 void glDrawRangeElements (int mode, int start, int end
1680
1629void glVertex (float x, float y, float z = 0.) 1681void glVertex (float x, float y, float z = 0.)
1630 CODE: 1682 CODE:
1631 glVertex3f (x, y, z); 1683 glVertex3f (x, y, z);
1632 1684
1633void glTexCoord (float s, float t) 1685void glTexCoord (float s, float t)
… …
1699 1751
1700void glEndList () 1752void glEndList ()
1701 1753
1702void glCallList (int list) 1754void glCallList (int list)
1703 1755
1756

Diff Legend

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