コミット: 7733154dddaca6ae85c53d02f44cde4ea4ad3866 - MIDITrailMod (git)

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

コミットメタ情報

• リビジョン: 7733154dddaca6ae85c53d02f44cde4ea4ad3866 (tree)
• 日時: 2019-08-28 01:11:45
• 作者: yoshy <yoshy@user...>
• コミッター: yoshy

ログメッセージ

[UPGRADE] original 1.2.4

変更サマリ

• modified: LICENSE.txt
• modified: MIDITrail/MIDITrail.rc
• modified: MIDITrail/MIDITrailApp.cpp
• modified: MIDITrail/MIDITrailApp.h
• modified: MIDITrail/MIDITrailVersion.h
• modified: MIDITrail/MTScene.cpp
• modified: MIDITrail/MTScene.h
• modified: MIDITrail/MTScenePianoRoll3D.cpp
• modified: MIDITrail/MTScenePianoRoll3D.h
• modified: MIDITrail/MTScenePianoRoll3DLive.cpp
• modified: MIDITrail/MTScenePianoRoll3DLive.h
• modified: MIDITrail/MTScenePianoRollRain.cpp
• modified: MIDITrail/MTScenePianoRollRain.h
• modified: MIDITrail/MTScenePianoRollRainLive.cpp
• modified: MIDITrail/MTScenePianoRollRainLive.h
• modified: MIDITrail/MTTimeIndicator.cpp
• modified: MIDITrail/resource.h
• modified: README.en.txt
• modified: README.ja.txt

差分

--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,5 +1,5 @@
 
-Copyright (c) 2010-2017, WADA Masashi <[e-mail]>
+Copyright (c) 2010-2019, WADA Masashi <[e-mail]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 

--- a/MIDITrail/MIDITrail.rc
+++ b/MIDITrail/MIDITrail.rc
@@ -77,10 +77,9 @@ BEGIN
         MENUITEM "Counter",                     IDM_ENABLE_COUNTER
         MENUITEM "Background Image",            IDM_ENABLE_BACKGROUNDIMAGE
         MENUITEM SEPARATOR
-        MENUITEM "Auto save viewpoint",         32838
-        MENUITEM SEPARATOR
-        MENUITEM "Reset viewpoint",             IDM_RESET_VIEWPOINT
-        MENUITEM "Save viewpoint",              IDM_SAVE_VIEWPOINT
+        MENUITEM "Viewpoint 1\t7",              IDM_RESET_VIEWPOINT
+        MENUITEM "Viewpoint 2\t8",              IDM_VIEWPOINT2
+        MENUITEM "Viewpoint 3\t9",              IDM_VIEWPOINT3
         MENUITEM SEPARATOR
         MENUITEM "Window size...",              IDM_WINDOWSIZE
     END

--- a/MIDITrail/MIDITrailApp.cpp
+++ b/MIDITrail/MIDITrailApp.cpp
@@ -4,7 +4,7 @@
 //
 // MIDITrail アプリケーションクラス
 //
-// Copyright (C) 2010-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -631,14 +631,24 @@ LRESULT MIDITrailApp::_WndProcImpl(
 					result = _OnMenuAutoSaveViewpoint();
 					if (result != 0) goto EXIT;
 					break;
+				case IDM_SAVE_VIEWPOINT:
+					//視点保存
+					result = _OnMenuSaveViewpoint();
+					if (result != 0) goto EXIT;
+					break;
 				case IDM_RESET_VIEWPOINT:
 					//視点リセット
 					result = _OnMenuResetViewpoint();
 					if (result != 0) goto EXIT;
 					break;
-				case IDM_SAVE_VIEWPOINT:
-					//視点保存
-					result = _OnMenuSaveViewpoint();
+				case IDM_VIEWPOINT2:
+					//静的視点2に移動
+					result = _OnMenuViewpoint(2);
+					if (result != 0) goto EXIT;
+					break;
+				case IDM_VIEWPOINT3:
+					//静的視点3に移動
+					result = _OnMenuViewpoint(3);
 					if (result != 0) goto EXIT;
 					break;
 				case IDM_ENABLE_PIANOKEYBOARD:
@@ -1162,6 +1172,24 @@ EXIT:;
 }
 
 //******************************************************************************
+// メニュー選択：静的視点移動
+//******************************************************************************
+int MIDITrailApp::_OnMenuViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	int result = 0;
+
+	if (m_PlayStatus == NoData) goto EXIT;
+
+	//静的視点に移動
+	m_pScene->MoveToStaticViewpoint(viewpointNo);
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
 // メニュー選択：視点リセット
 //******************************************************************************
 int MIDITrailApp::_OnMenuResetViewpoint()
@@ -1576,6 +1604,24 @@ int MIDITrailApp::_OnKeyDown(
 			result = _OnMenuPlaySpeedUp();
 			if (result != 0) goto EXIT;
 			break;
+		case '7':
+		case VK_NUMPAD7:
+			//視点リセット
+			result = _OnMenuResetViewpoint();
+			if (result != 0) goto EXIT;
+			break;
+		case '8':
+		case VK_NUMPAD8:
+			//静的視点2移動
+			result = _OnMenuViewpoint(2);
+			if (result != 0) goto EXIT;
+			break;
+		case '9':
+		case VK_NUMPAD9:
+			//静的視点3移動
+			result = _OnMenuViewpoint(3);
+			if (result != 0) goto EXIT;
+			break;
 		case 'O':
 			if (GetKeyState(VK_CONTROL) & 0x8000) {
 				//ファイルオープン
@@ -1992,9 +2038,9 @@ int MIDITrailApp::_ChangeMenuStyle()
 		IDM_VIEW_2DPIANOROLL,
 		IDM_VIEW_PIANOROLLRAIN,
 		IDM_VIEW_PIANOROLLRAIN2D,
-		IDM_AUTO_SAVE_VIEWPOINT,
 		IDM_RESET_VIEWPOINT,
-		IDM_SAVE_VIEWPOINT,
+		IDM_VIEWPOINT2,
+		IDM_VIEWPOINT3,
 		IDM_ENABLE_PIANOKEYBOARD,
 		IDM_ENABLE_RIPPLE,
 		IDM_ENABLE_PITCHBEND,
@@ -2028,9 +2074,9 @@ int MIDITrailApp::_ChangeMenuStyle()
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_VIEW_2DPIANOROLL
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_VIEW_PIANOROLLRAIN
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_VIEW_PIANOROLLRAIN2D
-		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_AUTO_SAVE_VIEWPOINT
 		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_RESET_VIEWPOINT
-		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_SAVE_VIEWPOINT
+		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_VIEWPOINT2
+		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_VIEWPOINT3
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_PIANOKEYBOARD
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_RIPPLE
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_PITCHBEND
@@ -2235,13 +2281,16 @@ int MIDITrailApp::_LoadSceneConf()
 	if (result != 0) goto EXIT;
 
 	//自動視点保存
-	result = m_ViewConf.GetInt(_T("AutoSaveViewpoint"), &autoSaveViewpoint, 0);
-	if (result != 0) goto EXIT;
-	
-	m_isAutoSaveViewpoint = false;
-	if (autoSaveViewpoint == 1) {
-		m_isAutoSaveViewpoint = true;
-	}
+	//result = m_ViewConf.GetInt(_T("AutoSaveViewpoint"), &autoSaveViewpoint, 0);
+	//if (result != 0) goto EXIT;
+	//
+	//m_isAutoSaveViewpoint = false;
+	//if (autoSaveViewpoint == 1) {
+	//	m_isAutoSaveViewpoint = true;
+	//}
+
+	//自動視点保存：常に有効とする
+	m_isAutoSaveViewpoint = true;
 
 EXIT:;
 	return result;

--- a/MIDITrail/MIDITrailApp.h
+++ b/MIDITrail/MIDITrailApp.h
@@ -4,7 +4,7 @@
 //
 // MIDITrail アプリケーションクラス
 //
-// Copyright (C) 2010-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2018 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -253,6 +253,7 @@ private:
 	int _OnMenuStopMonitoring();
 	int _OnMenuAutoSaveViewpoint();
 	int _OnMenuResetViewpoint();
+	int _OnMenuViewpoint(unsigned long viewpointNo);
 	int _OnMenuSaveViewpoint();
 	int _OnMenuEnableEffect(MTScene::EffectType type);
 	int _OnMenuWindowSize();

--- a/MIDITrail/MIDITrailVersion.h
+++ b/MIDITrail/MIDITrailVersion.h
@@ -4,7 +4,7 @@
 //
 // MIDITrail バージョン定義
 //
-// Copyright (C) 2014-2017 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2014-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -16,10 +16,10 @@
 //******************************************************************************
 
 //バージョン文字列
-#define MIDITRAIL_VERSION_STRING_X86  _T("Version 1.2.3 (32bit)")
-#define MIDITRAIL_VERSION_STRING_X64  _T("Version 1.2.3 (64bit)")
+#define MIDITRAIL_VERSION_STRING_X86  _T("Version 1.2.4 (32bit)")
+#define MIDITRAIL_VERSION_STRING_X64  _T("Version 1.2.4 (64bit)")
 
 //コピーライト
-#define MIDITRAIL_COPYRIGHT          _T("Copyright (C) 2010-2017 WADA Masashi");
+#define MIDITRAIL_COPYRIGHT          _T("Copyright (C) 2010-2019 WADA Masashi");
 
 

--- a/MIDITrail/MTScene.cpp
+++ b/MIDITrail/MTScene.cpp
@@ -4,7 +4,7 @@
 //
 // MIDITrail シーン基底クラス
 //
-// Copyright (C) 2010-2014 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2018 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -160,6 +160,16 @@ void MTScene::SetViewParam(
 }
 
 //******************************************************************************
+// 静的視点移動
+//******************************************************************************
+void MTScene::MoveToStaticViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	return;
+}
+
+//******************************************************************************
 // 視点リセット
 //******************************************************************************
 void MTScene::ResetViewpoint()

--- a/MIDITrail/MTScene.h
+++ b/MIDITrail/MTScene.h
@@ -4,7 +4,7 @@
 //
 // MIDITrail シーン基底クラス
 //
-// Copyright (C) 2010-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2018 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -91,6 +91,7 @@ public:
 	virtual void GetDefaultViewParam(MTViewParamMap* pParamMap);
 	virtual void GetViewParam(MTViewParamMap* pParamMap);
 	virtual void SetViewParam(MTViewParamMap* pParamMap);
+	virtual void MoveToStaticViewpoint(unsigned long viewpointNo);
 
 	//視点リセット
 	virtual void ResetViewpoint();

--- a/MIDITrail/MTScenePianoRoll3D.cpp
+++ b/MIDITrail/MTScenePianoRoll3D.cpp
@@ -4,7 +4,7 @@
 //
 // ピアノロール3Dシーン描画クラス
 //
-// Copyright (C) 2010-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -632,6 +632,34 @@ void MTScenePianoRoll3D::SetViewParam(
 }
 
 //******************************************************************************
+// 静的視点移動
+//******************************************************************************
+void MTScenePianoRoll3D::MoveToStaticViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	MTScene::MTViewParamMap::iterator itr;
+	MTViewParamMap paramMap;
+
+	if (viewpointNo == 1) {
+		GetDefaultViewParam(&paramMap);
+		SetViewParam(&paramMap);
+	}
+	else if (viewpointNo == 2) {
+		SetViewParam(&m_Viewpoint2);
+	}
+	else if (viewpointNo == 3) {
+		SetViewParam(&m_Viewpoint3);
+	}
+	else {
+		GetDefaultViewParam(&paramMap);
+		SetViewParam(&paramMap);
+	}
+
+	return;
+}
+
+//******************************************************************************
 // 視点リセット
 //******************************************************************************
 void MTScenePianoRoll3D::ResetViewpoint()
@@ -744,6 +772,70 @@ int MTScenePianoRoll3D::_LoadConf()
 
 	SetBGColor(DXColorUtil::MakeColorFromHexRGBA(hexColor));
 
+	result = _LoadConfViewpoint(&confFile, 2, &m_Viewpoint2);
+	if (result != 0) goto EXIT;
+
+	result = _LoadConfViewpoint(&confFile, 3, &m_Viewpoint3);
+	if (result != 0) goto EXIT;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
+// 設定ファイル読み込み：視点
+//******************************************************************************
+int MTScenePianoRoll3D::_LoadConfViewpoint(
+		MTConfFile* pConfFile,
+		unsigned long viewpointNo,
+		MTViewParamMap* pParamMap
+	)
+{
+	int result = 0;
+	int eresult = 0;
+	TCHAR sectionStr[32] = {0};
+	float x, y, z = 0.0f;
+	float phi, theta = 0.0f;
+	float manualRollAngle = 0.0f;
+	float autoRollVelocity = 0.0f;
+
+	//セクション名作成
+	eresult = _stprintf_s(sectionStr, 32, _T("Viewpoint-%d"), viewpointNo);
+	if (eresult < 0) {
+		result = YN_SET_ERR("Program error.", viewpointNo, 0);
+		goto EXIT;
+	}
+
+	//セクション設定
+	result = pConfFile->SetCurSection(sectionStr);
+	if (result != 0) goto EXIT;
+
+	//パラメータ取得
+	result = pConfFile->GetFloat(_T("X"), &x, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Y"), &y, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Z"), &z, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Phi"), &phi, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Theta"), &theta, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("ManualRollAngle"), &manualRollAngle, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("AutoRollVelocity"), &autoRollVelocity, 0.0f);
+	if (result != 0) goto EXIT;
+
+	//マップ登録
+	pParamMap->clear();
+	pParamMap->insert(MTViewParamMapPair("X", x));
+	pParamMap->insert(MTViewParamMapPair("Y", y));
+	pParamMap->insert(MTViewParamMapPair("Z", z));
+	pParamMap->insert(MTViewParamMapPair("Phi", phi));
+	pParamMap->insert(MTViewParamMapPair("Theta", theta));
+	pParamMap->insert(MTViewParamMapPair("ManualRollAngle", manualRollAngle));
+	pParamMap->insert(MTViewParamMapPair("AutoRollVelocity", autoRollVelocity));
+
 EXIT:;
 	return result;
 }

--- a/MIDITrail/MTScenePianoRoll3D.h
+++ b/MIDITrail/MTScenePianoRoll3D.h
@@ -4,7 +4,7 @@
 //
 // ピアノロール3Dシーン描画クラス
 //
-// Copyright (C) 2010-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -26,6 +26,7 @@
 #include "MTTimeIndicator.h"
 #include "MTMeshCtrl.h"
 #include "MTBackgroundImage.h"
+#include "MTConfFile.h"
 #include "SMIDILib.h"
 
 using namespace SMIDILib;
@@ -87,6 +88,7 @@ public:
 	void GetDefaultViewParam(MTViewParamMap* pParamMap);
 	void GetViewParam(MTViewParamMap* pParamMap);
 	void SetViewParam(MTViewParamMap* pParamMap);
+	void MoveToStaticViewpoint(unsigned long viewpointNo);
 
 	//視点リセット
 	void ResetViewpoint();
@@ -130,6 +132,8 @@ private:
 
 	//視点情報
 	MTViewParamMap m_ViewParamMap;
+	MTViewParamMap m_Viewpoint2;
+	MTViewParamMap m_Viewpoint3;
 
 	//ノートデザインオブジェクト
 	MTNoteDesign m_NoteDesign;
@@ -140,6 +144,7 @@ private:
 	void _Reset();
 	void _SetLightColor(DXDirLight* pLight);
 	int _LoadConf();
+	int _LoadConfViewpoint(MTConfFile* pConfFile, unsigned long viewpointNo, MTScene::MTViewParamMap* pParamMap);
 
 };
 

--- a/MIDITrail/MTScenePianoRoll3DLive.cpp
+++ b/MIDITrail/MTScenePianoRoll3DLive.cpp
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用ピアノロール3Dシーン描画クラス
 //
-// Copyright (C) 2012-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -612,6 +612,34 @@ void MTScenePianoRoll3DLive::SetViewParam(
 }
 
 //******************************************************************************
+// 静的視点移動
+//******************************************************************************
+void MTScenePianoRoll3DLive::MoveToStaticViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	MTScene::MTViewParamMap::iterator itr;
+	MTViewParamMap paramMap;
+
+	if (viewpointNo == 1) {
+		GetDefaultViewParam(&paramMap);
+		SetViewParam(&paramMap);
+	}
+	else if (viewpointNo == 2) {
+		SetViewParam(&m_Viewpoint2);
+	}
+	else if (viewpointNo == 3) {
+		SetViewParam(&m_Viewpoint3);
+	}
+	else {
+		GetDefaultViewParam(&paramMap);
+		SetViewParam(&paramMap);
+	}
+
+	return;
+}
+
+//******************************************************************************
 // 視点リセット
 //******************************************************************************
 void MTScenePianoRoll3DLive::ResetViewpoint()
@@ -679,6 +707,70 @@ int MTScenePianoRoll3DLive::_LoadConf()
 
 	SetBGColor(DXColorUtil::MakeColorFromHexRGBA(hexColor));
 
+	result = _LoadConfViewpoint(&confFile, 2, &m_Viewpoint2);
+	if (result != 0) goto EXIT;
+
+	result = _LoadConfViewpoint(&confFile, 3, &m_Viewpoint3);
+	if (result != 0) goto EXIT;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
+// 設定ファイル読み込み：視点
+//******************************************************************************
+int MTScenePianoRoll3DLive::_LoadConfViewpoint(
+		MTConfFile* pConfFile,
+		unsigned long viewpointNo,
+		MTViewParamMap* pParamMap
+	)
+{
+	int result = 0;
+	int eresult = 0;
+	TCHAR sectionStr[32] = {0};
+	float x, y, z = 0.0f;
+	float phi, theta = 0.0f;
+	float manualRollAngle = 0.0f;
+	float autoRollVelocity = 0.0f;
+
+	//セクション名作成
+	eresult = _stprintf_s(sectionStr, 32, _T("Viewpoint-%d"), viewpointNo);
+	if (eresult < 0) {
+		result = YN_SET_ERR("Program error.", viewpointNo, 0);
+		goto EXIT;
+	}
+
+	//セクション設定
+	result = pConfFile->SetCurSection(sectionStr);
+	if (result != 0) goto EXIT;
+
+	//パラメータ取得
+	result = pConfFile->GetFloat(_T("X"), &x, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Y"), &y, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Z"), &z, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Phi"), &phi, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Theta"), &theta, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("ManualRollAngle"), &manualRollAngle, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("AutoRollVelocity"), &autoRollVelocity, 0.0f);
+	if (result != 0) goto EXIT;
+
+	//マップ登録
+	pParamMap->clear();
+	pParamMap->insert(MTViewParamMapPair("X", x));
+	pParamMap->insert(MTViewParamMapPair("Y", y));
+	pParamMap->insert(MTViewParamMapPair("Z", z));
+	pParamMap->insert(MTViewParamMapPair("Phi", phi));
+	pParamMap->insert(MTViewParamMapPair("Theta", theta));
+	pParamMap->insert(MTViewParamMapPair("ManualRollAngle", manualRollAngle));
+	pParamMap->insert(MTViewParamMapPair("AutoRollVelocity", autoRollVelocity));
+
 EXIT:;
 	return result;
 }

--- a/MIDITrail/MTScenePianoRoll3DLive.h
+++ b/MIDITrail/MTScenePianoRoll3DLive.h
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用ピアノロール3Dシーン描画クラス
 //
-// Copyright (C) 2012-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -26,6 +26,7 @@
 #include "MTTimeIndicator.h"
 #include "MTMeshCtrl.h"
 #include "MTBackgroundImage.h"
+#include "MTConfFile.h"
 #include "SMIDILib.h"
 
 using namespace SMIDILib;
@@ -87,6 +88,7 @@ public:
 	void GetDefaultViewParam(MTViewParamMap* pParamMap);
 	void GetViewParam(MTViewParamMap* pParamMap);
 	void SetViewParam(MTViewParamMap* pParamMap);
+	void MoveToStaticViewpoint(unsigned long viewpointNo);
 	
 	//視点リセット
 	void ResetViewpoint();
@@ -127,6 +129,8 @@ private:
 	
 	//視点情報
 	MTViewParamMap m_ViewParamMap;
+	MTViewParamMap m_Viewpoint2;
+	MTViewParamMap m_Viewpoint3;
 	
 	//ノートデザインオブジェクト
 	MTNoteDesign m_NoteDesign;
@@ -136,6 +140,7 @@ private:
 	
 	void _Reset();
 	int _LoadConf();
+	int _LoadConfViewpoint(MTConfFile* pConfFile, unsigned long viewpointNo, MTScene::MTViewParamMap* pParamMap);
 
 };
 

--- a/MIDITrail/MTScenePianoRollRain.cpp
+++ b/MIDITrail/MTScenePianoRollRain.cpp
@@ -4,7 +4,7 @@
 //
 // ピアノロールレインシーン描画クラス
 //
-// Copyright (C) 2010-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -459,6 +459,7 @@ void MTScenePianoRollRain::GetDefaultViewParam(
 	D3DXVECTOR3 viewPointVector;
 	float phi, theta = 0.0f;
 
+	//視点情報作成
 	viewPointVector.x = 0.0f;
 	viewPointVector.y = 0.0f;
 	viewPointVector.z = - (1.5f * 16.0f / 2.0f) - 10.0f;
@@ -588,6 +589,34 @@ void MTScenePianoRollRain::SetViewParam(
 }
 
 //******************************************************************************
+// 静的視点移動
+//******************************************************************************
+void MTScenePianoRollRain::MoveToStaticViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	MTScene::MTViewParamMap::iterator itr;
+	MTViewParamMap paramMap;
+
+	if (viewpointNo == 1) {
+		GetDefaultViewParam(&paramMap);
+		SetViewParam(&paramMap);
+	}
+	else if (viewpointNo == 2) {
+		SetViewParam(&m_Viewpoint2);
+	}
+	else if (viewpointNo == 3) {
+		SetViewParam(&m_Viewpoint3);
+	}
+	else {
+		GetDefaultViewParam(&paramMap);
+		SetViewParam(&paramMap);
+	}
+
+	return;
+}
+
+//******************************************************************************
 // 視点リセット
 //******************************************************************************
 void MTScenePianoRollRain::ResetViewpoint()
@@ -701,6 +730,70 @@ int MTScenePianoRollRain::_LoadConf()
 
 	SetBGColor(DXColorUtil::MakeColorFromHexRGBA(hexColor));
 
+	result = _LoadConfViewpoint(&confFile, 2, &m_Viewpoint2);
+	if (result != 0) goto EXIT;
+
+	result = _LoadConfViewpoint(&confFile, 3, &m_Viewpoint3);
+	if (result != 0) goto EXIT;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
+// 設定ファイル読み込み：視点
+//******************************************************************************
+int MTScenePianoRollRain::_LoadConfViewpoint(
+		MTConfFile* pConfFile,
+		unsigned long viewpointNo,
+		MTViewParamMap* pParamMap
+	)
+{
+	int result = 0;
+	int eresult = 0;
+	TCHAR sectionStr[32] = {0};
+	float x, y, z = 0.0f;
+	float phi, theta = 0.0f;
+	float manualRollAngle = 0.0f;
+	float autoRollVelocity = 0.0f;
+
+	//セクション名作成
+	eresult = _stprintf_s(sectionStr, 32, _T("Viewpoint-%d"), viewpointNo);
+	if (eresult < 0) {
+		result = YN_SET_ERR("Program error.", viewpointNo, 0);
+		goto EXIT;
+	}
+
+	//セクション設定
+	result = pConfFile->SetCurSection(sectionStr);
+	if (result != 0) goto EXIT;
+
+	//パラメータ取得
+	result = pConfFile->GetFloat(_T("X"), &x, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Y"), &y, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Z"), &z, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Phi"), &phi, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Theta"), &theta, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("ManualRollAngle"), &manualRollAngle, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("AutoRollVelocity"), &autoRollVelocity, 0.0f);
+	if (result != 0) goto EXIT;
+
+	//マップ登録
+	pParamMap->clear();
+	pParamMap->insert(MTViewParamMapPair("X", x));
+	pParamMap->insert(MTViewParamMapPair("Y", y));
+	pParamMap->insert(MTViewParamMapPair("Z", z));
+	pParamMap->insert(MTViewParamMapPair("Phi", phi));
+	pParamMap->insert(MTViewParamMapPair("Theta", theta));
+	pParamMap->insert(MTViewParamMapPair("ManualRollAngle", manualRollAngle));
+	pParamMap->insert(MTViewParamMapPair("AutoRollVelocity", autoRollVelocity));
+
 EXIT:;
 	return result;
 }

--- a/MIDITrail/MTScenePianoRollRain.h
+++ b/MIDITrail/MTScenePianoRollRain.h
@@ -4,7 +4,7 @@
 //
 // ピアノロールレインシーン描画クラス
 //
-// Copyright (C) 2010-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -22,6 +22,7 @@
 #include "MTNotePitchBend.h"
 #include "MTMeshCtrl.h"
 #include "MTBackgroundImage.h"
+#include "MTConfFile.h"
 #include "SMIDILib.h"
 
 using namespace SMIDILib;
@@ -83,6 +84,7 @@ public:
 	virtual void GetDefaultViewParam(MTViewParamMap* pParamMap);
 	void GetViewParam(MTViewParamMap* pParamMap);
 	void SetViewParam(MTViewParamMap* pParamMap);
+	void MoveToStaticViewpoint(unsigned long viewpointNo);
 
 	//視点リセット
 	void ResetViewpoint();
@@ -126,6 +128,8 @@ private:
 
 	//視点情報
 	MTViewParamMap m_ViewParamMap;
+	MTViewParamMap m_Viewpoint2;
+	MTViewParamMap m_Viewpoint3;
 
 	//演奏位置
 	unsigned long m_CurTickTime;
@@ -136,6 +140,7 @@ private:
 	void _Reset();
 	void _SetLightColor(DXDirLight* pLight);
 	int _LoadConf();
+	int _LoadConfViewpoint(MTConfFile* pConfFile, unsigned long viewpointNo, MTScene::MTViewParamMap* pParamMap);
 
 };
 

--- a/MIDITrail/MTScenePianoRollRainLive.cpp
+++ b/MIDITrail/MTScenePianoRollRainLive.cpp
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用ピアノロールレインシーン描画クラス
 //
-// Copyright (C) 2012-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -447,7 +447,7 @@ void MTScenePianoRollRainLive::GetDefaultViewParam(
 	viewPointVector.z = -(1.5f * 16.0f / 2.0f) - 10.0f;
 	phi   = 90.0f;	//+Z軸方向
 	theta = 90.0f;	//+Z軸方向
-	
+
 	pParamMap->clear();
 	pParamMap->insert(MTViewParamMapPair("X", viewPointVector.x));
 	pParamMap->insert(MTViewParamMapPair("Y", viewPointVector.y));
@@ -571,6 +571,34 @@ void MTScenePianoRollRainLive::SetViewParam(
 }
 
 //******************************************************************************
+// 静的視点移動
+//******************************************************************************
+void MTScenePianoRollRainLive::MoveToStaticViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	MTScene::MTViewParamMap::iterator itr;
+	MTViewParamMap paramMap;
+
+	if (viewpointNo == 1) {
+		GetDefaultViewParam(&paramMap);
+		SetViewParam(&paramMap);
+	}
+	else if (viewpointNo == 2) {
+		SetViewParam(&m_Viewpoint2);
+	}
+	else if (viewpointNo == 3) {
+		SetViewParam(&m_Viewpoint3);
+	}
+	else {
+		GetDefaultViewParam(&paramMap);
+		SetViewParam(&paramMap);
+	}
+
+	return;
+}
+
+//******************************************************************************
 // 視点リセット
 //******************************************************************************
 void MTScenePianoRollRainLive::ResetViewpoint()
@@ -639,6 +667,70 @@ int MTScenePianoRollRainLive::_LoadConf()
 
 	SetBGColor(DXColorUtil::MakeColorFromHexRGBA(hexColor));
 
+	result = _LoadConfViewpoint(&confFile, 2, &m_Viewpoint2);
+	if (result != 0) goto EXIT;
+
+	result = _LoadConfViewpoint(&confFile, 3, &m_Viewpoint3);
+	if (result != 0) goto EXIT;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
+// 設定ファイル読み込み：視点
+//******************************************************************************
+int MTScenePianoRollRainLive::_LoadConfViewpoint(
+		MTConfFile* pConfFile,
+		unsigned long viewpointNo,
+		MTViewParamMap* pParamMap
+	)
+{
+	int result = 0;
+	int eresult = 0;
+	TCHAR sectionStr[32] = {0};
+	float x, y, z = 0.0f;
+	float phi, theta = 0.0f;
+	float manualRollAngle = 0.0f;
+	float autoRollVelocity = 0.0f;
+
+	//セクション名作成
+	eresult = _stprintf_s(sectionStr, 32, _T("Viewpoint-%d"), viewpointNo);
+	if (eresult < 0) {
+		result = YN_SET_ERR("Program error.", viewpointNo, 0);
+		goto EXIT;
+	}
+
+	//セクション設定
+	result = pConfFile->SetCurSection(sectionStr);
+	if (result != 0) goto EXIT;
+
+	//パラメータ取得
+	result = pConfFile->GetFloat(_T("X"), &x, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Y"), &y, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Z"), &z, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Phi"), &phi, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("Theta"), &theta, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("ManualRollAngle"), &manualRollAngle, 0.0f);
+	if (result != 0) goto EXIT;
+	result = pConfFile->GetFloat(_T("AutoRollVelocity"), &autoRollVelocity, 0.0f);
+	if (result != 0) goto EXIT;
+
+	//マップ登録
+	pParamMap->clear();
+	pParamMap->insert(MTViewParamMapPair("X", x));
+	pParamMap->insert(MTViewParamMapPair("Y", y));
+	pParamMap->insert(MTViewParamMapPair("Z", z));
+	pParamMap->insert(MTViewParamMapPair("Phi", phi));
+	pParamMap->insert(MTViewParamMapPair("Theta", theta));
+	pParamMap->insert(MTViewParamMapPair("ManualRollAngle", manualRollAngle));
+	pParamMap->insert(MTViewParamMapPair("AutoRollVelocity", autoRollVelocity));
+
 EXIT:;
 	return result;
 }

--- a/MIDITrail/MTScenePianoRollRainLive.h
+++ b/MIDITrail/MTScenePianoRollRainLive.h
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用ピアノロールレインシーン描画クラス
 //
-// Copyright (C) 2012-2016 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -22,6 +22,7 @@
 #include "MTNotePitchBend.h"
 #include "MTMeshCtrl.h"
 #include "MTBackgroundImage.h"
+#include "MTConfFile.h"
 #include "SMIDILib.h"
 
 using namespace SMIDILib;
@@ -86,6 +87,7 @@ public:
 	
 	//視点リセット
 	void ResetViewpoint();
+	void MoveToStaticViewpoint(unsigned long viewpointNo);
 	
 	//エフェクト設定
 	void SetEffect(MTScene::EffectType type, bool isEnable);
@@ -123,9 +125,12 @@ private:
 	
 	//視点情報
 	MTViewParamMap m_ViewParamMap;
+	MTViewParamMap m_Viewpoint2;
+	MTViewParamMap m_Viewpoint3;
 	
 	void _Reset();
 	int _LoadConf();
+	int _LoadConfViewpoint(MTConfFile* pConfFile, unsigned long viewpointNo, MTScene::MTViewParamMap* pParamMap);
 	
 };
 

--- a/MIDITrail/MTTimeIndicator.cpp
+++ b/MIDITrail/MTTimeIndicator.cpp
@@ -4,7 +4,7 @@
 //
 // タイムインジケータ描画クラス
 //
-// Copyright (C) 2010-2013 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -203,6 +203,18 @@ int MTTimeIndicator::Draw(
 {
 	int result = 0;
 
+	//テクスチャステージ設定
+	//  カラー演算：引数1を使用  引数1：テクスチャ
+	pD3DDevice->SetTextureStageState(0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1);
+	pD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+	// アルファ演算：引数1を使用  引数1：テクスチャ
+	pD3DDevice->SetTextureStageState(0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
+	pD3DDevice->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
+
+	//テクスチャフィルタ
+	pD3DDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
+	pD3DDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+
 	if (m_isEnableLine) {
 		result = m_PrimitiveLine.Draw(pD3DDevice);
 		if (result != 0) goto EXIT;
@@ -239,6 +251,7 @@ int MTTimeIndicator::_CreateVertexOfIndicator(
 	D3DXVECTOR3 vectorRU;
 	D3DXVECTOR3 vectorLD;
 	D3DXVECTOR3 vectorRD;
+	float delta = 0.0f;
 
 	//              y x
 	//  0+----+1    |/
@@ -261,8 +274,12 @@ int MTTimeIndicator::_CreateVertexOfIndicator(
 	pVertex[2].p = vectorLD;
 	pVertex[3].p = vectorRD;
 
-	//再生面の幅がゼロの場合はラインを描画する
-	if (vectorLU.z == vectorRU.z) {
+	//再生面の幅がゼロに近い場合はラインを描画する
+	delta = vectorLU.z - vectorRU.z;
+	if (delta < 0) {
+		delta = -1.0f * delta;
+	}
+	if (delta < 0.1) {
 		m_isEnableLine = true;
 	}
 

--- a/MIDITrail/resource.h
+++ b/MIDITrail/resource.h
@@ -67,6 +67,8 @@
 #define IDM_AUTO_SAVE_VIEWPOINT         32838
 #define IDM_VIEW_PIANOROLLRAIN2D        32840
 #define IDM_ENABLE_BACKGROUNDIMAGE      32842
+#define IDM_VIEWPOINT2                  32843
+#define IDM_VIEWPOINT3                  32844
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -75,7 +77,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        134
-#define _APS_NEXT_COMMAND_VALUE         32843
+#define _APS_NEXT_COMMAND_VALUE         32848
 #define _APS_NEXT_CONTROL_VALUE         1024
 #define _APS_NEXT_SYMED_VALUE           110
 #endif

--- a/README.en.txt
+++ b/README.en.txt
@@ -1,8 +1,8 @@
 ******************************************************************************
 
-  MIDITrail source code Ver.1.2.3 for Windows
+  MIDITrail source code Ver.1.2.4 for Windows
 
-  Copyright (C) 2010-2017 WADA Masashi. All Rights Reserved.
+  Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 
   Web : https://osdn.jp/projects/miditrail/
   Mail: [e-mail]

--- a/README.ja.txt
+++ b/README.ja.txt
@@ -1,8 +1,8 @@
 ******************************************************************************
 
-  MIDITrail ソースコード Ver.1.2.3 for Windows
+  MIDITrail ソースコード Ver.1.2.4 for Windows
 
-  Copyright (C) 2010-2017 WADA Masashi. All Rights Reserved.
+  Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
 
   Web : https://osdn.jp/projects/miditrail/
   Mail: [e-mail]