Commit: 99fcc2d3f814b85b9e3ebc8861737b453d5b65d9 - MIDITrailMod (git)

MIDITrail をピカピカにする。鍵盤方向自動切替・多ポート・歌詞対応等

Commit MetaInfo

• Revision: 99fcc2d3f814b85b9e3ebc8861737b453d5b65d9 (tree)
• Time: 2019-12-20 00:52:35
• Author: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

[UPDATE] original 1.3.1 をマージ

Merge branch 'master/yknk' into merge_org_131

# Conflicts:
# MIDITrail/MIDITrailVersion.h
# SMIDILib/SMFPUCtrl.cpp

Change Summary

• modified: MIDITrail/MIDITrail.vcxproj
• modified: MIDITrail/MIDITrail.vcxproj.filters
• modified: MIDITrail/MIDITrailApp.cpp
• modified: MIDITrail/MIDITrailVersion.h
• modified: MIDITrail/MTHowToViewDlg.cpp
• modified: MIDITrail/MTNoteBoxRingLive.cpp
• modified: MIDITrail/MTNoteDesignRing.cpp
• modified: MIDITrail/MTNoteDesignRing.h
• modified: MIDITrail/MTNoteRippleRing.cpp
• modified: MIDITrail/MTNoteRippleRing.h
• add: MIDITrail/MTNoteRippleRingLive.cpp
• add: MIDITrail/MTNoteRippleRingLive.h
• modified: MIDITrail/MTPictBoard.cpp
• modified: MIDITrail/MTPictBoardRing.cpp
• modified: MIDITrail/MTScenePianoRollRingLive.h
• modified: MIDITrail/MTTimeIndicatorRing.cpp
• modified: MIDITrail/MTTimeIndicatorRing.h
• modified: README.en.txt
• modified: README.ja.txt
• modified: Resources/conf/PianoRollRingLive.ini
• modified: Resources/doc/MANUAL.en.html
• modified: Resources/doc/MANUAL.ja.html
• modified: SMIDILib/SMFPUCtrl.cpp

Incremental Difference

--- a/MIDITrail/MIDITrail.vcxproj
+++ b/MIDITrail/MIDITrail.vcxproj
@@ -246,6 +246,7 @@
     <ClCompile Include="MTNoteRipple.cpp" />
     <ClCompile Include="MTNoteRippleMod.cpp" />
     <ClCompile Include="MTNoteRippleRing.cpp" />
+    <ClCompile Include="MTNoteRippleRingLive.cpp" />
     <ClCompile Include="MTPianoKeyboard.cpp" />
     <ClCompile Include="MTPianoKeyboardCtrl.cpp" />
     <ClCompile Include="MTPianoKeyboardCtrlLive.cpp" />
@@ -332,6 +333,7 @@
     <ClInclude Include="MTNoteRipple.h" />
     <ClInclude Include="MTNoteRippleMod.h" />
     <ClInclude Include="MTNoteRippleRing.h" />
+    <ClInclude Include="MTNoteRippleRingLive.h" />
     <ClInclude Include="MTParam.h" />
     <ClInclude Include="MTPianoKeyboard.h" />
     <ClInclude Include="MTPianoKeyboardCtrl.h" />

--- a/MIDITrail/MIDITrail.vcxproj.filters
+++ b/MIDITrail/MIDITrail.vcxproj.filters
@@ -284,6 +284,9 @@
     <ClCompile Include="DXH.cpp">
       <Filter>Sources\DirectXUtility</Filter>
     </ClCompile>
+    <ClCompile Include="MTNoteRippleRingLive.cpp">
+      <Filter>Sources\SceneObject</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="MIDITrailApp.h">
@@ -532,5 +535,8 @@
     <ClInclude Include="DXH.h">
       <Filter>Sources\DirectXUtility</Filter>
     </ClInclude>
+    <ClInclude Include="MTNoteRippleRingLive.h">
+      <Filter>Sources\SceneObject</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

--- a/MIDITrail/MIDITrailApp.cpp
+++ b/MIDITrail/MIDITrailApp.cpp
@@ -2307,12 +2307,18 @@ int MIDITrailApp::_ChangeWindowSize()
 {
 	int result = 0;
 	bool isMonitor = false;
+	MTScene::MTViewParamMap viewParamMap;
 
 	//モニタ状態の確認
 	if ((m_PlayStatus == MonitorOFF) || (m_PlayStatus == MonitorON)) {
 		isMonitor = true;
 	}
 
+	//現在の視点を退避
+	if (m_pScene != NULL) {
+		m_pScene->GetViewParam(&viewParamMap);
+	}
+
 	//シーン破棄
 	if (m_pScene != NULL) {
 		m_pScene->Release();
@@ -2343,6 +2349,11 @@ int MIDITrailApp::_ChangeWindowSize()
 		if (result != 0) goto EXIT;
 	}
 
+	//視点を復帰
+	if (m_pScene != NULL) {
+		m_pScene->SetViewParam(&viewParamMap);
+	}
+
 EXIT:;
 	return result;
 }

--- a/MIDITrail/MIDITrailVersion.h
+++ b/MIDITrail/MIDITrailVersion.h
@@ -17,8 +17,8 @@
 
 //バージョン文字列
 // >>> modify 20191219 yossiepon begin
-#define MIDITRAIL_VERSION_STRING_X86  _T("1.3.0 (x86), mod. yossiepon_20191219")
-#define MIDITRAIL_VERSION_STRING_X64  _T("1.3.0 (x64), mod. yossiepon_20191219")
+#define MIDITRAIL_VERSION_STRING_X86  _T("1.3.1 (x86), mod. yossiepon_20191219")
+#define MIDITRAIL_VERSION_STRING_X64  _T("1.3.1 (x64), mod. yossiepon_20191219")
 // <<< modify 20191219 yossiepon end
 
 //コピーライト

--- a/MIDITrail/MTHowToViewDlg.cpp
+++ b/MIDITrail/MTHowToViewDlg.cpp
@@ -4,7 +4,7 @@
 //
 // 操作方法ダイアログ
 //
-// Copyright (C) 2010-2014 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -186,6 +186,7 @@ int MTHowToViewDlg::_LoadHowToBmp()
 	BYTE* pBmpPixcel = NULL;
 	TCHAR bmpFilePath[_MAX_PATH] = {_T('\0')};
 	TCHAR* pBmpFileName[3] = { MT_IMGFILE_HOWTOVIEW1, MT_IMGFILE_HOWTOVIEW2, MT_IMGFILE_HOWTOVIEW3 };
+	DWORD bmpPixelDataSize = 0;
 
 	_Clear();
 
@@ -225,9 +226,9 @@ int MTHowToViewDlg::_LoadHowToBmp()
 	//BMPファイルヘッダ読み込み
 	bresult = ReadFile(
 					hFile,							//ファイルハンドル
-					(LPBITMAPFILEHEADER)&m_BmpHead,	//バッファ位置
-					sizeof(BITMAPFILEHEADER),		//バッファサイズ
-					&numOfBytesRead,				//読み取りサイズ
+					&m_BmpHead,						//バッファ位置
+					sizeof(BITMAPFILEHEADER),		//読み取りサイズ
+					&numOfBytesRead,				//読み取ったサイズ
 					NULL							//オーバーラップ構造体バッファ
 				);
 	if (!bresult) {
@@ -247,9 +248,9 @@ int MTHowToViewDlg::_LoadHowToBmp()
 	//BMP情報ヘッダ読み込み
 	bresult = ReadFile(
 					hFile,							//ファイルハンドル
-					(LPBITMAPINFOHEADER)&m_BmpInfo,	//バッファ位置
-					sizeof(BITMAPINFOHEADER),		//バッファサイズ
-					&numOfBytesRead,				//読み取りサイズ
+					&m_BmpInfo,						//バッファ位置
+					sizeof(BITMAPINFOHEADER),		//読み取りサイズ
+					&numOfBytesRead,				//読み取ったサイズ
 					NULL							//オーバーラップ構造体バッファ
 				);
 	if (!bresult) {
@@ -258,6 +259,7 @@ int MTHowToViewDlg::_LoadHowToBmp()
 	}
 
 	//24bit画像以外は読みません
+	//カラーテーブルが存在しないことを前提とする
 	if ((m_BmpInfo.biBitCount != 24) || (m_BmpInfo.biClrUsed != 0)) {
 		result = YN_SET_ERR("Invalid BMP file.", m_BmpInfo.biBitCount, m_BmpInfo.biClrUsed);
 		goto EXIT;
@@ -278,8 +280,12 @@ int MTHowToViewDlg::_LoadHowToBmp()
 		goto EXIT;
 	}
 
+	//BMPピクセルデータサイズ
+	//カラーテーブルが存在しないことを前提とする
+	bmpPixelDataSize = m_BmpHead.bfSize - sizeof(BITMAPFILEHEADER) - sizeof(BITMAPINFOHEADER);
+
 	//ピクセルデータ読み込み用メモリ確保
-	hMemBmpPixel = GlobalAlloc(GHND, m_BmpHead.bfSize);
+	hMemBmpPixel = GlobalAlloc(GHND, bmpPixelDataSize);
 	if (hMemBmpPixel == NULL) {
 		result = YN_SET_ERR("Could not allocate memory.", 0, 0);
 		goto EXIT;
@@ -294,8 +300,8 @@ int MTHowToViewDlg::_LoadHowToBmp()
 	bresult = ReadFile(
 					hFile,				//ファイルハンドル
 					pBmpPixcel,			//バッファ位置
-					m_BmpHead.bfSize,	//バッファサイズ
-					&numOfBytesRead,	//読み取りサイズ
+					bmpPixelDataSize,	//読み取りサイズ
+					&numOfBytesRead,	//読み取ったサイズ
 					NULL				//オーバーラップ構造体バッファ
 				);
 	if (!bresult) {
@@ -370,7 +376,7 @@ EXIT:;
 void MTHowToViewDlg::_Clear()
 {
 	ZeroMemory(&m_BmpHead, sizeof(BITMAPFILEHEADER));
-	ZeroMemory(&m_BmpInfo, sizeof(BITMAPINFO));
+	ZeroMemory(&m_BmpInfo, sizeof(BITMAPINFOHEADER));
 
 	if (m_hMemBmpPixel != NULL) {
 		GlobalUnlock(m_hMemBmpPixel);

--- a/MIDITrail/MTNoteBoxRingLive.cpp
+++ b/MIDITrail/MTNoteBoxRingLive.cpp
@@ -44,7 +44,10 @@ int MTNoteBoxRingLive::_CreateNoteDesign()
 		result = YN_SET_ERR("Could not allocate memory.", 0, 0);
 		goto EXIT;
 	}
-
+	
+	//ライブモニタモード設定
+	((MTNoteDesignRing*)m_pNoteDesign)->SetLiveMode();
+	
 EXIT:;
 	return result;
 }

--- a/MIDITrail/MTNoteDesignRing.cpp
+++ b/MIDITrail/MTNoteDesignRing.cpp
@@ -24,6 +24,7 @@ using namespace YNBaseLib;
 //******************************************************************************
 MTNoteDesignRing::MTNoteDesignRing(void)
 {
+	m_isLiveMode = false;
 	m_NoteAngleStep = 360.0f / (float)SM_MAX_NOTE_NUM;
 	m_RingRadius = 0.0f;
 }
@@ -36,6 +37,14 @@ MTNoteDesignRing::~MTNoteDesignRing(void)
 }
 
 //******************************************************************************
+// ライブモニタモード設定
+//******************************************************************************
+void MTNoteDesignRing::SetLiveMode(void)
+{
+	m_isLiveMode = true;
+}
+
+//******************************************************************************
 // ノートボックス中心座標取得
 //******************************************************************************
 D3DXVECTOR3 MTNoteDesignRing::GetNoteBoxCenterPosX(
@@ -356,7 +365,12 @@ float MTNoteDesignRing::_GetNoteAngle(
 	}
 
 	//ノート番号で角度を決定
-	angle = (m_NoteAngleStep * noteNo) + (m_NoteAngleStep / 2.0f) + pb;
+	angle = ((m_NoteAngleStep * noteNo) + (m_NoteAngleStep / 2.0f) + pb) * (-1.0f);
+
+	//ライブモニタの場合は反転する
+	if (m_isLiveMode) {
+		angle = angle * (-1.0f);
+	}
 
 	return angle;
 }

--- a/MIDITrail/MTNoteDesignRing.h
+++ b/MIDITrail/MTNoteDesignRing.h
@@ -26,6 +26,9 @@ public:
 	MTNoteDesignRing(void);
 	virtual ~MTNoteDesignRing(void);
 
+	//ライブモニタモード設定
+	void SetLiveMode(void);
+
 	//ノートボックス中心座標取得
 	virtual D3DXVECTOR3 GetNoteBoxCenterPosX(
 				unsigned long curTickTime,
@@ -101,6 +104,7 @@ public:
 
 private:
 
+	bool m_isLiveMode;
 	float m_NoteAngleStep;
 	float m_RingRadius;
 

--- a/MIDITrail/MTNoteRippleRing.cpp
+++ b/MIDITrail/MTNoteRippleRing.cpp
@@ -2,7 +2,7 @@
 //
 // MIDITrail / MTNoteRippleRing
 //
-// リング用ノート波紋描画クラス
+// ノート波紋リング描画クラス
 //
 // Copyright (C) 2019 WADA Masashi. All Rights Reserved.
 //

--- a/MIDITrail/MTNoteRippleRing.h
+++ b/MIDITrail/MTNoteRippleRing.h
@@ -2,7 +2,7 @@
 //
 // MIDITrail / MTNoteRippleRing
 //
-// リング用ノート波紋描画クラス
+// ノート波紋リング描画クラス
 //
 // Copyright (C) 2019 WADA Masashi. All Rights Reserved.
 //
@@ -12,8 +12,6 @@
 
 #include "MTNoteRipple.h"
 
-using namespace SMIDILib;
-
 
 //******************************************************************************
 // リング用ノート波紋描画クラス

--- /dev/null
+++ b/MIDITrail/MTNoteRippleRingLive.cpp
@@ -0,0 +1,55 @@
+//******************************************************************************
+//
+// MIDITrail / MTNoteRippleRingLive
+//
+// ライブモニタ用ノート波紋リング描画クラス
+//
+// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+//
+//******************************************************************************
+
+#include "StdAfx.h"
+#include "YNBaseLib.h"
+#include "MTNoteDesignRing.h"
+#include "MTNoteRippleRingLive.h"
+
+using namespace YNBaseLib;
+
+
+//******************************************************************************
+// コンストラクタ
+//******************************************************************************
+MTNoteRippleRingLive::MTNoteRippleRingLive(void)
+{
+}
+
+//******************************************************************************
+// デストラクタ
+//******************************************************************************
+MTNoteRippleRingLive::~MTNoteRippleRingLive(void)
+{
+}
+
+//******************************************************************************
+// ノートデザイン生成
+//******************************************************************************
+int MTNoteRippleRingLive::_CreateNoteDesign()
+{
+	int result = 0;
+
+	try {
+		m_pNoteDesign = new MTNoteDesignRing();
+	}
+	catch (std::bad_alloc) {
+		result = YN_SET_ERR("Could not allocate memory.", 0, 0);
+		goto EXIT;
+	}
+	
+	//ライブモニタモード設定
+	((MTNoteDesignRing*)m_pNoteDesign)->SetLiveMode();
+	
+EXIT:;
+	return result;
+}
+
+

--- /dev/null
+++ b/MIDITrail/MTNoteRippleRingLive.h
@@ -0,0 +1,33 @@
+//******************************************************************************
+//
+// MIDITrail / MTNoteRippleRingLive
+//
+// ライブモニタ用ノート波紋リング描画クラス
+//
+// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+//
+//******************************************************************************
+
+#pragma once
+
+#include "MTNoteRipple.h"
+
+
+//******************************************************************************
+// ライブモニタ用ノート波紋リング描画クラス
+//******************************************************************************
+class MTNoteRippleRingLive : public MTNoteRipple
+{
+public:
+
+	//コンストラクタ／デストラクタ
+	MTNoteRippleRingLive(void);
+	virtual ~MTNoteRippleRingLive(void);
+
+private:
+
+	virtual int _CreateNoteDesign();
+
+};
+
+

--- a/MIDITrail/MTPictBoard.cpp
+++ b/MIDITrail/MTPictBoard.cpp
@@ -4,7 +4,7 @@
 //
 // ピクチャボード描画クラス
 //
-// Copyright (C) 2010-2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -202,7 +202,7 @@ int MTPictBoard::_CreateVertexOfBoard(
 	D3DXVECTOR3 vectorRU;
 	D3DXVECTOR3 vectorLD;
 	D3DXVECTOR3 vectorRD;
-	float boardHight = 0.0f;
+	float boardHeight = 0.0f;
 	float boardWidth = 0.0f;
 	float chStep = 0.0f;
 
@@ -223,8 +223,8 @@ int MTPictBoard::_CreateVertexOfBoard(
 			&vectorRD
 		);
 
-	boardHight = vectorLU.y - vectorLD.y;
-	boardWidth = boardHight * ((float)m_ImgInfo.Width / (float)m_ImgInfo.Height);
+	boardHeight = vectorLU.y - vectorLD.y;
+	boardWidth = boardHeight * ((float)m_ImgInfo.Width / (float)m_ImgInfo.Height);
 	chStep = m_NoteDesign.GetChStep();
 
 	//頂点座標：左の面

--- a/MIDITrail/MTPictBoardRing.cpp
+++ b/MIDITrail/MTPictBoardRing.cpp
@@ -74,7 +74,7 @@ int MTPictBoardRing::Create(
 	if (result != 0) goto EXIT;
 
 	//頂点バッファ生成
-	vertexNum = (SM_MAX_NOTE_NUM + 1)* 2;
+	vertexNum = (SM_MAX_NOTE_NUM + 1) * 2;
 	result = m_Primitive.CreateVertexBuffer(pD3DDevice, vertexNum);
 	if (result != 0) goto EXIT;
 
@@ -206,19 +206,34 @@ int MTPictBoardRing::_CreateVertexOfBoard(
 	unsigned long virtexIndexStart = 0;
 	D3DXVECTOR3 basePos;
 	D3DXVECTOR3 rotatedPos;
-	float boardHight = 0.0f;
+	float boardHeight = 0.0f;
 	float boardWidth = 0.0f;
 	float chStep = 0.0f;
 	float angle = 0.0f;
-	float tx1 = 0.0f;
-	float tx2 = 0.0f;
+	float direction = 0.0f;
+	D3DXVECTOR2 clipAreaP1;
+	D3DXVECTOR2 clipAreaP2;
+	D3DXVECTOR2 textureP1;
+	D3DXVECTOR2 textureP2;
 
-	//テクスチャX座標
-	tx1 = 1.0f;
-	tx2 = 0.0f;
+	//テクスチャクリップ領域の座標
+	clipAreaP1 = D3DXVECTOR2(0.0f, 0.0f);  //左上
+	clipAreaP2 = D3DXVECTOR2(1.0f, 1.0f);  //右下
+
+	//テスクチャX座標
 	if (isReverseMode) {
-		tx1 = 0.0f;
-		tx2 = 1.0f;
+		textureP1.x = clipAreaP1.x;
+		textureP1.y = clipAreaP2.y;
+		textureP2.x = clipAreaP2.x;
+		textureP2.y = clipAreaP1.y;
+		direction = -1.0f;
+	}
+	else {
+		textureP1.x = clipAreaP2.x;
+		textureP1.y = clipAreaP1.y;
+		textureP2.x = clipAreaP1.x;
+		textureP2.y = clipAreaP2.y;
+		direction = 1.0f;
 	}
 
 	//基準座標
@@ -227,8 +242,8 @@ int MTPictBoardRing::_CreateVertexOfBoard(
 				m_NoteDesign.GetPlayPosX(0),
 				m_NoteDesign.GetPortOriginY(0) + (chStep * (float)SM_MAX_CH_NUM) + chStep + 0.01f,
 				m_NoteDesign.GetPortOriginZ(0));
-	boardHight = 2.0f * 3.1415926f * basePos.y;
-	boardWidth = boardHight * ((float)m_ImgInfo.Width / (float)m_ImgInfo.Height);
+	boardHeight = 2.0f * 3.1415926f * basePos.y;
+	boardWidth = boardHeight * ((float)m_ImgInfo.Width / (float)m_ImgInfo.Height);
 	basePos.x -= (boardWidth * m_NoteDesign.GetPictBoardRelativePos());
 
 	//頂点作成：X軸回りの円筒
@@ -236,13 +251,13 @@ int MTPictBoardRing::_CreateVertexOfBoard(
 	pVertex[virtexIndex].p = basePos;
 	pVertex[virtexIndex].n = D3DXVECTOR3(-1.0f, 0.0f, 0.0f);
 	pVertex[virtexIndex].c = D3DXCOLOR(1.0f, 1.0f, 1.0f, 1.0f);
-	pVertex[virtexIndex].t = D3DXVECTOR2(tx1, 1.0f);
+	pVertex[virtexIndex].t = D3DXVECTOR2(textureP1.x, textureP1.y);
 	virtexIndex++;
 	pVertex[virtexIndex].p = basePos;
 	pVertex[virtexIndex].p.x += boardWidth;
 	pVertex[virtexIndex].n = D3DXVECTOR3(-1.0f, 0.0f, 0.0f);
 	pVertex[virtexIndex].c = D3DXCOLOR(1.0f, 1.0f, 1.0f, 1.0f);
-	pVertex[virtexIndex].t = D3DXVECTOR2(tx2, 1.0f);
+	pVertex[virtexIndex].t = D3DXVECTOR2(textureP2.x, textureP1.y);
 	for (i = 1; i < SM_MAX_NOTE_NUM; i++) {
 		virtexIndex++;
 		
@@ -252,13 +267,13 @@ int MTPictBoardRing::_CreateVertexOfBoard(
 		pVertex[virtexIndex].p = rotatedPos;
 		pVertex[virtexIndex].n = D3DXVECTOR3(-1.0f, 0.0f, 0.0f);
 		pVertex[virtexIndex].c = D3DXCOLOR(1.0f, 1.0f, 1.0f, 1.0f);
-		pVertex[virtexIndex].t = D3DXVECTOR2(tx1, (float)(SM_MAX_NOTE_NUM - i) / (float)SM_MAX_NOTE_NUM);
+		pVertex[virtexIndex].t = D3DXVECTOR2(textureP1.x, textureP1.y + (direction * (float)i / (float)SM_MAX_NOTE_NUM));
 		virtexIndex++;
 		pVertex[virtexIndex].p = rotatedPos;
 		pVertex[virtexIndex].p.x += boardWidth;
 		pVertex[virtexIndex].n = D3DXVECTOR3(-1.0f, 0.0f, 0.0f);
 		pVertex[virtexIndex].c = D3DXCOLOR(1.0f, 1.0f, 1.0f, 1.0f);
-		pVertex[virtexIndex].t = D3DXVECTOR2(tx2, (float)(SM_MAX_NOTE_NUM - i) / (float)SM_MAX_NOTE_NUM);
+		pVertex[virtexIndex].t = D3DXVECTOR2(textureP2.x, textureP1.y + (direction * (float)i / (float)SM_MAX_NOTE_NUM));
 		
 		//インデックスバッファ
 		//  直前の頂点0,1と追加した頂点2,3で三角形0-1-3と0-3-2を追加
@@ -276,10 +291,10 @@ int MTPictBoardRing::_CreateVertexOfBoard(
 	//最後の頂点2,3は最初0,1の頂点と同じ（リングを閉じる）
 	virtexIndex++;
 	pVertex[virtexIndex] =pVertex[0];
-	pVertex[virtexIndex].t = D3DXVECTOR2(tx1, 0.0f);
+	pVertex[virtexIndex].t = D3DXVECTOR2(textureP1.x, textureP2.y);
 	virtexIndex++;
 	pVertex[virtexIndex] =pVertex[1];
-	pVertex[virtexIndex].t = D3DXVECTOR2(tx2, 0.0f);
+	pVertex[virtexIndex].t = D3DXVECTOR2(textureP2.x, textureP2.y);
 
 	//インデックスバッファ（リングを閉じる）
 	pIndex[(i-1)*6 + 0] = (i-1)*2 + 0;  //0 1つ目の三角形

--- a/MIDITrail/MTScenePianoRollRingLive.h
+++ b/MIDITrail/MTScenePianoRollRingLive.h
@@ -16,7 +16,7 @@
 #include "MTScene.h"
 #include "MTFirstPersonCam.h"
 #include "MTNoteBoxRingLive.h"
-#include "MTNoteRippleRing.h"
+#include "MTNoteRippleRingLive.h"
 #include "MTNoteDesignRing.h"
 #include "MTNotePitchBend.h"
 #include "MTGridRingLive.h"
@@ -111,7 +111,7 @@ private:
 	
 	//描画オブジェクト
 	MTNoteBoxRingLive m_NoteBoxLive;
-	MTNoteRippleRing m_NoteRipple;
+	MTNoteRippleRingLive m_NoteRipple;
 	MTNotePitchBend m_NotePitchBend;
 	MTGridRingLive m_GridBoxLive;
 	MTPictBoardRing m_PictBoard;

--- a/MIDITrail/MTTimeIndicatorRing.cpp
+++ b/MIDITrail/MTTimeIndicatorRing.cpp
@@ -85,8 +85,8 @@ int MTTimeIndicatorRing::_CreatePrimitiveLine(
 	result = m_PrimitiveLine.CreateVertexBuffer(pD3DDevice, vertexNum);
 	if (result != 0) goto EXIT;
 
-	//インデックスバッファ生成：1サークル128辺 * 2(始点/終点) * 2(先端/終端)
-	indexNum = 128 * 2 * 2;
+	//インデックスバッファ生成：1サークル128辺 * 2(始点/終点)
+	indexNum = 128 * 2;
 	result = m_PrimitiveLine.CreateIndexBuffer(pD3DDevice, indexNum);
 	if (result != 0) goto EXIT;
 

--- a/MIDITrail/MTTimeIndicatorRing.h
+++ b/MIDITrail/MTTimeIndicatorRing.h
@@ -78,13 +78,6 @@ private:
 	int _CreatePrimitiveLine(LPDIRECT3DDEVICE9 pD3DDevice);
 	int _CreateVertexOfIndicatorLine(MTTIMEINDICATOR_VERTEX* pVertex, unsigned long* pIndex);
 
-	D3DXVECTOR3 _RotateYZ(
-			float centerY,
-			float centerZ,
-			D3DXVECTOR3 p1,
-			float angle
-		);
-
 };
 
 

--- a/README.en.txt
+++ b/README.en.txt
@@ -1,6 +1,6 @@
 ******************************************************************************
 
-  MIDITrail source code Ver.1.3.0 for Windows
+  MIDITrail source code Ver.1.3.1 for Windows
 
   Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 

--- a/README.ja.txt
+++ b/README.ja.txt
@@ -1,6 +1,6 @@
 ******************************************************************************
 
-  MIDITrail ソースコード Ver.1.3.0 for Windows
+  MIDITrail ソースコード Ver.1.3.1 for Windows
 
   Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 

--- a/Resources/conf/PianoRollRingLive.ini
+++ b/Resources/conf/PianoRollRingLive.ini
@@ -12,7 +12,7 @@ QuarterNoteLength=2.0
 NoteBoxHeight=0.1
 NoteBoxWidth=0.0
 NoteStep=0.1
-ChStep=0.001
+ChStep=0.004
 RippleHeight=1.0
 RippleWidth=1.0
 PictBoardRelativePos=0.0
@@ -94,4 +94,3 @@ Theta=90.0
 ManualRollAngle=0.0
 AutoRollVelocity=0.0
 
-

--- a/Resources/doc/MANUAL.en.html
+++ b/Resources/doc/MANUAL.en.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <meta http-equiv="Content-Language" content="en">
 <link rel="stylesheet" href="Files/doc.css" type="text/css">
-<title>MIDITrail Ver.1.3.0 for Windows User Manual</title>
+<title>MIDITrail Ver.1.3.1 for Windows User Manual</title>
 </head>
 <body>
 
@@ -15,7 +15,7 @@
 English / <a href="MANUAL.ja.html">Japanese</a>
 </div>
 
-<h1>MIDITrail Ver.1.3.0 for Windows User Manual</h1>
+<h1>MIDITrail Ver.1.3.1 for Windows User Manual</h1>
 
 <p>
 Copyright (c) 2010-2019, WADA Masashi All rights reserved.<br>
@@ -822,22 +822,22 @@ POSSIBILITY OF SUCH DAMAGE.
   <tr><td>2010/05/18</td><td>Ver.1.0.0 beta</td><td>Beta release.</td></tr>
   <tr><td>2010/06/02</td><td>Ver.1.0.0</td><td>First formal release.</td></tr>
   <tr><td>2010/06/05</td><td>Ver.1.0.1</td><td>
-#22102 Fixed bug. (execution fails by missing Visual C++ runtime library)<br>
-#22106 Fixed bug. (size of about dialog is big on Windows English version)<br>
+#22102 Fixed bug (execution fails by missing Visual C++ runtime library)<br>
+#22106 Fixed bug (size of about dialog is big on Windows English version)<br>
   </td></tr>
   <tr><td>2010/06/20</td><td>Ver.1.0.2</td><td>
 #22218 Added English manual.<br>
-#22108 Fixed bug. (crash when opening the MIDI file exported from VOCALOID)<br>
-#22217 Fixed bug. (overlapped ripples flicker)<br>
+#22108 Fixed bug (crash when opening the MIDI file exported from VOCALOID)<br>
+#22217 Fixed bug (overlapped ripples flicker)<br>
   </td></tr>
   <tr><td>2010/07/11</td><td>Ver.1.0.3</td><td>
 #22319 Added color effect to active piano roll bar.<br>
 #22412 Added pitch bend effect to piano roll bar.<br>
 #22425 Added view mode of piano roll 2D.<br>
 #22442 Added switch interface of display and effect.<br>
-#22413 Fixed bug. (rendering performance has declined by specular effect)<br>
-#22414 Fixed bug. (total count of notes is incorrect)<br>
-#22424 Fixed bug. (duration of a ripple is not constant)<br>
+#22413 Fixed bug (rendering performance has declined by specular effect)<br>
+#22414 Fixed bug (total count of notes is incorrect)<br>
+#22424 Fixed bug (duration of a ripple is not constant)<br>
   </td></tr>
   <tr><td>2010/07/25</td><td>Ver.1.0.4</td><td>
 #22320 Added application icon.<br>
@@ -845,34 +845,34 @@ POSSIBILITY OF SUCH DAMAGE.
 #22523 Added command line interface.<br>
 #22582 Added double speed playback mode.<br>
 #22585 Added function of piano roll rotation by a mouse wheel.<br>
-#22566 Fixed bug. (Playback time was slightly short)<br>
-#22506 Fixed bug. (Note may continue sounding after the end of playback)<br>
+#22566 Fixed bug (Playback time was slightly short)<br>
+#22506 Fixed bug (Note may continue sounding after the end of playback)<br>
   </td></tr>
   <tr><td>2010/08/06</td><td>Ver.1.0.5</td><td>
-#22633 Fixed bug. (Piano roll rotation status is not saved by "Save viewpoint")<br>
-#22652 Fixed bug. (Parse error when opening 55MCMDL1.MID "WATANABE Michiaki MEDLEY")<br>
-#22709 Fixed bug. (MIDITrail sends redundant "F7" to MIDI-OUT with multi-packet system exclusive message)<br>
-#22710 Fixed bug. (Auto rotation speed of piano roll is not constant)<br>
+#22633 Fixed bug (Piano roll rotation status is not saved by "Save viewpoint")<br>
+#22652 Fixed bug (Parse error when opening 55MCMDL1.MID "WATANABE Michiaki MEDLEY")<br>
+#22709 Fixed bug (MIDITrail sends redundant "F7" to MIDI-OUT with multi-packet system exclusive message)<br>
+#22710 Fixed bug (Auto rotation speed of piano roll is not constant)<br>
   </td></tr>
   <tr><td>2010/08/29</td><td>Ver.1.1.0 beta</td><td>Beta release.(Added "Piano Roll Rain")</td></tr>
   <tr><td>2010/09/19</td><td>Ver.1.1.0</td><td>
 #23174 Added view mode "Piano Roll Rain"<br>
-#23175 Fixed bug. (File open dialog is not modal)<br>
+#23175 Fixed bug (File open dialog is not modal)<br>
   </td></tr>
   <tr><td>2010/10/17</td><td>Ver.1.1.1</td><td>
 #23439 Added Anti-aliasing support<br>
-#23347 Fixed bug. (Key down timing and a piano roll don't synchronize in PianoRollRain)<br>
-#23348 Fixed bug. (Spelling error in file open dialog)<br>
-#23422 Fixed bug. (Position of black is not correct in PianoRollRain)<br>
+#23347 Fixed bug (Key down timing and a piano roll don't synchronize in PianoRollRain)<br>
+#23348 Fixed bug (Spelling error in file open dialog)<br>
+#23422 Fixed bug (Position of black is not correct in PianoRollRain)<br>
   </td></tr>
   <tr><td>2010/12/26</td><td>Ver.1.1.2</td><td>
 This version was released with MIDITrail for Mac OS X.<br>
 #23970 Added eye direction control by key operation.<br>
 #23971 Updated texture images.<br>
 #23972 Updated application icon.<br>
-#23497 Fixed bug. ("Piano Roll Rain" item in "View" menu is always enable)<br>
-#23968 Fixed bug. (Time signature was always 4/4 after loading file)<br>
-#23969 Fixed bug. (Space charactor in the title string has been ignored)<br>
+#23497 Fixed bug ("Piano Roll Rain" item in "View" menu is always enable)<br>
+#23968 Fixed bug (Time signature was always 4/4 after loading file)<br>
+#23969 Fixed bug (Space charactor in the title string has been ignored)<br>
   </td></tr>
   <tr><td>2012/01/15</td><td>Ver.1.1.3</td><td>
 #27006 Merged features of MIDITrail Ver.1.1.3 for Mac OS X<br>
@@ -882,16 +882,16 @@ This version was released with MIDITrail for Mac OS X.<br>
 #26989 Added stars and counter display control<br>
 #27005 Added figure of player operations guide to "How to view dialog"<br>
 #27091 Added check of DirectX feature support (Index Buffer)<br>
-#26990 Fixed bug. (Typographical errors on the license)<br>
-#27139 Fixed bug. (The color of note boxes are whitish in Piano Roll 3D)<br>
-#27140 Fixed bug. (The color of stars are dark in Piano Roll Rain)<br>
+#26990 Fixed bug (Typographical errors on the license)<br>
+#27139 Fixed bug (The color of note boxes are whitish in Piano Roll 3D)<br>
+#27140 Fixed bug (The color of stars are dark in Piano Roll Rain)<br>
   </td></tr>
   <tr><td>2012/03/04</td><td>Ver.1.2.0</td><td>
 #27711 Merged features of MIDITrail Ver.1.2.0 for Mac OS X<br>
 #27458 Added MIDI IN monitoring<br>
 #27459 Added MIDI OUT auto configuration<br>
 #27712 Added shortcut key of File Open<br>
-#27725 Fixed bug. (Error occurs when the MIDI data contains the track with 6 or more port numbers)<br>
+#27725 Fixed bug (Error occurs when the MIDI data contains the track with 6 or more port numbers)<br>
   </td></tr>
   <tr><td>2013/12/04</td><td>Ver.1.2.1</td><td>
 #30545 Added key display range control<br>
@@ -908,15 +908,15 @@ This version was released with MIDITrail for Mac OS X.<br>
 #32427 Added note color assignment to active key<br>
 #32365 Changed title caption ("TITLE:" string was removed)<br>
 #30552 Improved event message queue mechanism<br>
-#30548 Fixed bug. (At the start of playback, MIDI data transmission is blocked)<br>
-#32359 Fixed bug. (MIDITrail does not send some CC events at skip processing)<br>
+#30548 Fixed bug (At the start of playback, MIDI data transmission is blocked)<br>
+#32359 Fixed bug (MIDITrail does not send some CC events at skip processing)<br>
   </td></tr>
   <tr><td>2014/02/23</td><td>Ver.1.2.1a</td><td>
 #33252 Added support for Windows 64bit<br>
   </td></tr>
   <tr><td>2014/04/20</td><td>Ver.1.2.1b</td><td>
-#33674 Fixed bug. (When NSX-39 was selected as MIDI OUT device, error occurs at the start of playback)<br>
-#33695 Fixed bug. (Program error occurs in MTFont2Bmp::_writeGlyphToBmpBuf.)<br>
+#33674 Fixed bug (When NSX-39 was selected as MIDI OUT device, error occurs at the start of playback)<br>
+#33695 Fixed bug (Program error occurs in MTFont2Bmp::_writeGlyphToBmpBuf)<br>
   </td></tr>
   <tr><td>2016/12/05</td><td>Ver.1.2.2</td><td>
 #35775 Changed URL and mail address in user's manual<br>
@@ -937,7 +937,7 @@ This version was released with MIDITrail for Mac OS X.<br>
 #39227 Added quarter note length configuration<br>
 #39226 Changed development environment to Visual Studio 2017<br>
 #39228 Changed appendix of user's manual<br>
-#39229 fixed bug (Code analysis found some mistakes)<br>
+#39229 Fixed bug (Code analysis found some mistakes)<br>
   </td></tr>
   <tr><td>2019/06/02</td><td>Ver.1.2.6</td><td>
 #39274 Added full screen mode<br>
@@ -946,6 +946,12 @@ This version was released with MIDITrail for Mac OS X.<br>
   <tr><td>2019/10/14</td><td>Ver.1.3.0</td><td>
 #39675 Added view mode "Piano Roll Ring"<br>
   </td></tr>
+  <tr><td>2019/11/09</td><td>Ver.1.3.1</td><td>
+#39733 Changed keyboard display direction on Piano Roll Ring.<br>
+#39734 Changed processing to keep viewpoint when window size changed.<br>
+#39735 Fixed bug (Assertion occurs in _controlfp_s when x64 debug configuration)<br>
+#39736 Fixed bug (Exception occurs in "How to view" dialog when x64 debug configuration)<br>
+  </td></tr>
 </table>
 </p>
 

--- a/Resources/doc/MANUAL.ja.html
+++ b/Resources/doc/MANUAL.ja.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <meta http-equiv="Content-Language" content="ja">
 <link rel="stylesheet" href="Files/doc.css" type="text/css">
-<title>MIDITrail Ver.1.3.0 for Windows ユーザーマニュアル</title>
+<title>MIDITrail Ver.1.3.1 for Windows ユーザーマニュアル</title>
 </head>
 <body>
 
@@ -14,7 +14,7 @@
 <a href="MANUAL.en.html">English</a> / Japanese
 </div>
 
-<h1>MIDITrail Ver.1.3.0 for Windows ユーザーマニュアル</h1>
+<h1>MIDITrail Ver.1.3.1 for Windows ユーザーマニュアル</h1>
 
 <p>
 Copyright (c) 2010-2019, WADA Masashi All rights reserved.<br>
@@ -936,6 +936,12 @@ MIDITrail for Mac OS Xと同時にリリース<br>
   <tr><td>2019/10/14</td><td>Ver.1.3.0</td><td>
 #39675 機能追加：ビューモード「ピアノロールリング」追加<br>
   </td></tr>
+  <tr><td>2019/11/09</td><td>Ver.1.3.1</td><td>
+#39733 仕様変更：「ピアノロールリング」のキーボードを反転する<br>
+#39734 仕様変更：ウィンドウサイズ変更時に視点を維持する<br>
+#39735 バグ修正：x64デバッグ構成のとき_controlfp_sでアサーション発生<br>
+#39736 バグ修正：x64デバッグ構成のときHow to viewダイアログで例外発生<br>
+  </td></tr>
 </table>
 </p>
 

--- a/SMIDILib/SMFPUCtrl.cpp
+++ b/SMIDILib/SMFPUCtrl.cpp
@@ -4,7 +4,7 @@
 //
 // 浮動点小数プロセッサ制御クラス
 //
-// Copyright (C) 2010 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -89,17 +89,22 @@ int SMFPUCtrl::Start(FPUPrecision precision)
 			result = YN_SET_ERR("Program error.", 0, 0);
 			goto EXIT;
 	}
-#ifndef _WIN64
+
+#ifdef _WIN64
+	//x64(64bit)
+	//精度制御の必要なし
+#else
+	//x86(32bit)
 	eresult = _controlfp_s(
 					&curCtrl,	//現在の制御ワード
 					flag,		//制御ワード：制御種別
-					_MCW_PC		//マスク：制度制御
+					_MCW_PC		//マスク：精度制御
 				);
-#endif
 	if (eresult != 0) {
 		result = YN_SET_ERR("Windows API error.", eresult, GetLastError());
 		goto EXIT;
 	}
+#endif
 
 	_DisplayCurCtrl(_T("Start after"));
 
@@ -131,18 +136,22 @@ int SMFPUCtrl::End()
 		goto EXIT;
 	}
 
-#ifndef _WIN64
 	//浮動小数点精度を復元する
+#ifdef _WIN64
+	//x64(64bit)
+	//精度制御の必要なし
+#else
+	//x86(32bit)
 	eresult = _controlfp_s(
 					&curCtrl,	//現在の制御ワード
 					m_FPUCtrl,	//制御ワード：設定開始時点
-					_MCW_PC		//マスク：制度制御
+					_MCW_PC		//マスク：精度制御
 				);
-#endif
 	if (eresult != 0) {
 		result = YN_SET_ERR("Windows API error.", eresult, GetLastError());
 		goto EXIT;
 	}
+#endif
 
 	_DisplayCurCtrl(_T("End after"));