• R/O
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

X operations(XOPS)に非常に近いFPSゲームを制作・リメイクし、成果物をオープンソースとして公開することを目的としたプロジェクトです。


Commit MetaInfo

Revision132 (tree)
Time2016-05-29 22:18:14
Authorxops-mikan

Log Message

線分を描画するDrawline()関数にて、色を指定できるよう仕様変更。

Change Summary

Incremental Difference

--- trunk/d3dgraphics.h (revision 131)
+++ trunk/d3dgraphics.h (revision 132)
@@ -273,7 +273,7 @@
273273 void RenderBoard(int id_texture, float alpha);
274274 void ScreenBrightness(int Width, int Height, int Brightness);
275275 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);
277277 void Draw2DMSFontText(int x, int y, char *str, int color);
278278 void Draw2DMSFontTextCenter(int x, int y, int w, int h, char *str, int color);
279279 void Draw2DTextureFontText(int x, int y, char *str, int color, int fontwidth, int fontheight);
--- trunk/d3dgraphics-opengl.cpp (revision 131)
+++ trunk/d3dgraphics-opengl.cpp (revision 132)
@@ -1422,18 +1422,18 @@
14221422 //ワイヤーフレーム表示
14231423 for(int i=0; i<bs; i++){
14241424 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));
14371437 }
14381438 return;
14391439 }
@@ -1668,13 +1668,13 @@
16681668 void D3DGraphics::Centerline()
16691669 {
16701670 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));
16741674 }
16751675
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)
16781678 {
16791679 float VertexAry[2*3];
16801680 unsigned char ColorAry[2*4];
@@ -1687,10 +1687,10 @@
16871687 VertexAry[3] = (float)x2*-1; VertexAry[4] = (float)y2; VertexAry[5] = (float)z2;
16881688
16891689 //色情報配列を用意
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;
16941694 memcpy(&(ColorAry[4]), ColorAry, sizeof(unsigned char)*4);
16951695
16961696 //配列有効化
--- trunk/d3dgraphics-directx.cpp (revision 131)
+++ trunk/d3dgraphics-directx.cpp (revision 132)
@@ -1027,18 +1027,18 @@
10271027 //ワイヤーフレーム表示
10281028 for(int i=0; i<bs; i++){
10291029 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));
10421042 }
10431043 return;
10441044 }
@@ -1245,13 +1245,13 @@
12451245 void D3DGraphics::Centerline()
12461246 {
12471247 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));
12511251 }
12521252
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)
12551255 {
12561256 VERTEXTXTA mv[2];
12571257
@@ -1258,7 +1258,7 @@
12581258 mv[0].position = D3DXVECTOR3(x1, y1, z1);
12591259 mv[1].position = D3DXVECTOR3(x2, y2, z2);
12601260 for(int i=0; i<2; i++){
1261- mv[i].color = 0xFF00FF00;
1261+ mv[i].color = color;
12621262 mv[i].tu = 0.0f;
12631263 mv[i].tv = 0.0f;
12641264 }