X operations(XOPS)に非常に近いFPSゲームを制作・リメイクし、成果物をオープンソースとして公開することを目的としたプロジェクトです。
| Revision | 132 (tree) |
|---|---|
| Time | 2016-05-29 22:18:14 |
| Author | |
線分を描画するDrawline()関数にて、色を指定できるよう仕様変更。
| @@ -273,7 +273,7 @@ | ||
| 273 | 273 | void RenderBoard(int id_texture, float alpha); |
| 274 | 274 | void ScreenBrightness(int Width, int Height, int Brightness); |
| 275 | 275 | void Centerline(); |
| 276 | - void Drawline(float x1, float y1, float z1, float x2, float y2, float z2); | |
| 276 | + void Drawline(float x1, float y1, float z1, float x2, float y2, float z2, int color); | |
| 277 | 277 | void Draw2DMSFontText(int x, int y, char *str, int color); |
| 278 | 278 | void Draw2DMSFontTextCenter(int x, int y, int w, int h, char *str, int color); |
| 279 | 279 | void Draw2DTextureFontText(int x, int y, char *str, int color, int fontwidth, int fontheight); |
| @@ -1422,18 +1422,18 @@ | ||
| 1422 | 1422 | //ワイヤーフレーム表示 |
| 1423 | 1423 | for(int i=0; i<bs; i++){ |
| 1424 | 1424 | blockdata->Getdata(&data, i); |
| 1425 | - Drawline(data.x[0], data.y[0], data.z[0], data.x[1], data.y[1], data.z[1]); | |
| 1426 | - Drawline(data.x[1], data.y[1], data.z[1], data.x[2], data.y[2], data.z[2]); | |
| 1427 | - Drawline(data.x[2], data.y[2], data.z[2], data.x[3], data.y[3], data.z[3]); | |
| 1428 | - Drawline(data.x[3], data.y[3], data.z[3], data.x[0], data.y[0], data.z[0]); | |
| 1429 | - Drawline(data.x[4], data.y[4], data.z[4], data.x[5], data.y[5], data.z[5]); | |
| 1430 | - Drawline(data.x[5], data.y[5], data.z[5], data.x[6], data.y[6], data.z[6]); | |
| 1431 | - Drawline(data.x[6], data.y[6], data.z[6], data.x[7], data.y[7], data.z[7]); | |
| 1432 | - Drawline(data.x[7], data.y[7], data.z[7], data.x[4], data.y[4], data.z[4]); | |
| 1433 | - Drawline(data.x[0], data.y[0], data.z[0], data.x[4], data.y[4], data.z[4]); | |
| 1434 | - Drawline(data.x[1], data.y[1], data.z[1], data.x[5], data.y[5], data.z[5]); | |
| 1435 | - Drawline(data.x[2], data.y[2], data.z[2], data.x[6], data.y[6], data.z[6]); | |
| 1436 | - Drawline(data.x[3], data.y[3], data.z[3], data.x[7], data.y[7], data.z[7]); | |
| 1425 | + Drawline(data.x[0], data.y[0], data.z[0], data.x[1], data.y[1], data.z[1], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1426 | + Drawline(data.x[1], data.y[1], data.z[1], data.x[2], data.y[2], data.z[2], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1427 | + Drawline(data.x[2], data.y[2], data.z[2], data.x[3], data.y[3], data.z[3], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1428 | + Drawline(data.x[3], data.y[3], data.z[3], data.x[0], data.y[0], data.z[0], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1429 | + Drawline(data.x[4], data.y[4], data.z[4], data.x[5], data.y[5], data.z[5], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1430 | + Drawline(data.x[5], data.y[5], data.z[5], data.x[6], data.y[6], data.z[6], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1431 | + Drawline(data.x[6], data.y[6], data.z[6], data.x[7], data.y[7], data.z[7], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1432 | + Drawline(data.x[7], data.y[7], data.z[7], data.x[4], data.y[4], data.z[4], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1433 | + Drawline(data.x[0], data.y[0], data.z[0], data.x[4], data.y[4], data.z[4], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1434 | + Drawline(data.x[1], data.y[1], data.z[1], data.x[5], data.y[5], data.z[5], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1435 | + Drawline(data.x[2], data.y[2], data.z[2], data.x[6], data.y[6], data.z[6], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1436 | + Drawline(data.x[3], data.y[3], data.z[3], data.x[7], data.y[7], data.z[7], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1437 | 1437 | } |
| 1438 | 1438 | return; |
| 1439 | 1439 | } |
| @@ -1668,13 +1668,13 @@ | ||
| 1668 | 1668 | void D3DGraphics::Centerline() |
| 1669 | 1669 | { |
| 1670 | 1670 | ResetWorldTransform(); |
| 1671 | - Drawline(100.0f, 0.0f, 0.0f, -100.0f, 0.0f, 0.0f); | |
| 1672 | - Drawline(0.0f, 100.0f, 0.0f, 0.0f, -100.0f, 0.0f); | |
| 1673 | - Drawline(0.0f, 0.0f, 100.0f, 0.0f, 0.0f, -100.0f); | |
| 1671 | + Drawline(100.0f, 0.0f, 0.0f, -100.0f, 0.0f, 0.0f, GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1672 | + Drawline(0.0f, 100.0f, 0.0f, 0.0f, -100.0f, 0.0f, GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1673 | + Drawline(0.0f, 0.0f, 100.0f, 0.0f, 0.0f, -100.0f, GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1674 | 1674 | } |
| 1675 | 1675 | |
| 1676 | -//! @brief 【デバック用】緑線描画 | |
| 1677 | -void D3DGraphics::Drawline(float x1, float y1, float z1, float x2, float y2, float z2) | |
| 1676 | +//! @brief 【デバック用】線描画 | |
| 1677 | +void D3DGraphics::Drawline(float x1, float y1, float z1, float x2, float y2, float z2, int color) | |
| 1678 | 1678 | { |
| 1679 | 1679 | float VertexAry[2*3]; |
| 1680 | 1680 | unsigned char ColorAry[2*4]; |
| @@ -1687,10 +1687,10 @@ | ||
| 1687 | 1687 | VertexAry[3] = (float)x2*-1; VertexAry[4] = (float)y2; VertexAry[5] = (float)z2; |
| 1688 | 1688 | |
| 1689 | 1689 | //色情報配列を用意 |
| 1690 | - ColorAry[0] = 0; | |
| 1691 | - ColorAry[1] = 255; | |
| 1692 | - ColorAry[2] = 0; | |
| 1693 | - ColorAry[3] = 255; | |
| 1690 | + ColorAry[0] = (color>>24)&0xFF; | |
| 1691 | + ColorAry[1] = (color>>16)&0xFF; | |
| 1692 | + ColorAry[2] = (color>>8)&0xFF; | |
| 1693 | + ColorAry[3] = color&0xFF; | |
| 1694 | 1694 | memcpy(&(ColorAry[4]), ColorAry, sizeof(unsigned char)*4); |
| 1695 | 1695 | |
| 1696 | 1696 | //配列有効化 |
| @@ -1027,18 +1027,18 @@ | ||
| 1027 | 1027 | //ワイヤーフレーム表示 |
| 1028 | 1028 | for(int i=0; i<bs; i++){ |
| 1029 | 1029 | blockdata->Getdata(&data, i); |
| 1030 | - Drawline(data.x[0], data.y[0], data.z[0], data.x[1], data.y[1], data.z[1]); | |
| 1031 | - Drawline(data.x[1], data.y[1], data.z[1], data.x[2], data.y[2], data.z[2]); | |
| 1032 | - Drawline(data.x[2], data.y[2], data.z[2], data.x[3], data.y[3], data.z[3]); | |
| 1033 | - Drawline(data.x[3], data.y[3], data.z[3], data.x[0], data.y[0], data.z[0]); | |
| 1034 | - Drawline(data.x[4], data.y[4], data.z[4], data.x[5], data.y[5], data.z[5]); | |
| 1035 | - Drawline(data.x[5], data.y[5], data.z[5], data.x[6], data.y[6], data.z[6]); | |
| 1036 | - Drawline(data.x[6], data.y[6], data.z[6], data.x[7], data.y[7], data.z[7]); | |
| 1037 | - Drawline(data.x[7], data.y[7], data.z[7], data.x[4], data.y[4], data.z[4]); | |
| 1038 | - Drawline(data.x[0], data.y[0], data.z[0], data.x[4], data.y[4], data.z[4]); | |
| 1039 | - Drawline(data.x[1], data.y[1], data.z[1], data.x[5], data.y[5], data.z[5]); | |
| 1040 | - Drawline(data.x[2], data.y[2], data.z[2], data.x[6], data.y[6], data.z[6]); | |
| 1041 | - Drawline(data.x[3], data.y[3], data.z[3], data.x[7], data.y[7], data.z[7]); | |
| 1030 | + Drawline(data.x[0], data.y[0], data.z[0], data.x[1], data.y[1], data.z[1], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1031 | + Drawline(data.x[1], data.y[1], data.z[1], data.x[2], data.y[2], data.z[2], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1032 | + Drawline(data.x[2], data.y[2], data.z[2], data.x[3], data.y[3], data.z[3], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1033 | + Drawline(data.x[3], data.y[3], data.z[3], data.x[0], data.y[0], data.z[0], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1034 | + Drawline(data.x[4], data.y[4], data.z[4], data.x[5], data.y[5], data.z[5], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1035 | + Drawline(data.x[5], data.y[5], data.z[5], data.x[6], data.y[6], data.z[6], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1036 | + Drawline(data.x[6], data.y[6], data.z[6], data.x[7], data.y[7], data.z[7], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1037 | + Drawline(data.x[7], data.y[7], data.z[7], data.x[4], data.y[4], data.z[4], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1038 | + Drawline(data.x[0], data.y[0], data.z[0], data.x[4], data.y[4], data.z[4], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1039 | + Drawline(data.x[1], data.y[1], data.z[1], data.x[5], data.y[5], data.z[5], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1040 | + Drawline(data.x[2], data.y[2], data.z[2], data.x[6], data.y[6], data.z[6], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1041 | + Drawline(data.x[3], data.y[3], data.z[3], data.x[7], data.y[7], data.z[7], GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1042 | 1042 | } |
| 1043 | 1043 | return; |
| 1044 | 1044 | } |
| @@ -1245,13 +1245,13 @@ | ||
| 1245 | 1245 | void D3DGraphics::Centerline() |
| 1246 | 1246 | { |
| 1247 | 1247 | ResetWorldTransform(); |
| 1248 | - Drawline(100.0f, 0.0f, 0.0f, -100.0f, 0.0f, 0.0f); | |
| 1249 | - Drawline(0.0f, 100.0f, 0.0f, 0.0f, -100.0f, 0.0f); | |
| 1250 | - Drawline(0.0f, 0.0f, 100.0f, 0.0f, 0.0f, -100.0f); | |
| 1248 | + Drawline(100.0f, 0.0f, 0.0f, -100.0f, 0.0f, 0.0f, GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1249 | + Drawline(0.0f, 100.0f, 0.0f, 0.0f, -100.0f, 0.0f, GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1250 | + Drawline(0.0f, 0.0f, 100.0f, 0.0f, 0.0f, -100.0f, GetColorCode(0.0f,1.0f,0.0f,1.0f)); | |
| 1251 | 1251 | } |
| 1252 | 1252 | |
| 1253 | -//! @brief 【デバック用】緑線描画 | |
| 1254 | -void D3DGraphics::Drawline(float x1, float y1, float z1, float x2, float y2, float z2) | |
| 1253 | +//! @brief 【デバック用】線描画 | |
| 1254 | +void D3DGraphics::Drawline(float x1, float y1, float z1, float x2, float y2, float z2, int color) | |
| 1255 | 1255 | { |
| 1256 | 1256 | VERTEXTXTA mv[2]; |
| 1257 | 1257 |
| @@ -1258,7 +1258,7 @@ | ||
| 1258 | 1258 | mv[0].position = D3DXVECTOR3(x1, y1, z1); |
| 1259 | 1259 | mv[1].position = D3DXVECTOR3(x2, y2, z2); |
| 1260 | 1260 | for(int i=0; i<2; i++){ |
| 1261 | - mv[i].color = 0xFF00FF00; | |
| 1261 | + mv[i].color = color; | |
| 1262 | 1262 | mv[i].tu = 0.0f; |
| 1263 | 1263 | mv[i].tv = 0.0f; |
| 1264 | 1264 | } |