色んなトランジションを追加

boxerprogrammer · Jan 23, 2024 · b17cd7e · b17cd7e
1 parent 7fbfbc0
commit b17cd7e
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 26 deletions.
diff --git a/JsonToBinary/jikki/PauseMenu/PauseMenu.vcxproj b/JsonToBinary/jikki/PauseMenu/PauseMenu.vcxproj
@@ -166,6 +166,7 @@
     <ClCompile Include="Enemy\Slime.cpp" />
     <ClCompile Include="StringUtility.cpp" />
     <ClCompile Include="Transition\Transitor.cpp" />
+    <ClCompile Include="Transition\WipeTransitor.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Application.h" />
@@ -200,6 +201,7 @@
     <ClInclude Include="Enemy\Slime.h" />
     <ClInclude Include="StringUtility.h" />
     <ClInclude Include="Transition\Transitor.h" />
+    <ClInclude Include="Transition\WipeTransitor.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="PauseMenu.rc" />

diff --git a/JsonToBinary/jikki/PauseMenu/PauseMenu.vcxproj.filters b/JsonToBinary/jikki/PauseMenu/PauseMenu.vcxproj.filters
@@ -126,6 +126,9 @@
     <ClCompile Include="Transition\PushTransitor.cpp">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="Transition\WipeTransitor.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Scene\SceneManager.h">
@@ -230,6 +233,9 @@
     <ClInclude Include="Transition\PushTransitor.h">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="Transition\WipeTransitor.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="PauseMenu.rc">

diff --git a/JsonToBinary/jikki/PauseMenu/Scene/GameScene.cpp b/JsonToBinary/jikki/PauseMenu/Scene/GameScene.cpp
@@ -19,6 +19,7 @@
 #include"../Transition/TileTransitor.h"
 #include"../Transition/FallTileTransitor.h"
 #include"../Transition/IrisTransitor.h"
+#include"../Transition/WipeTransitor.h"
 void GameScene::InitializeUpdate(Input& input)
 {
 	auto& app = Application::GetInstance();
@@ -248,6 +249,9 @@ drawFunc_ (&GameScene::InitializeDraw)
 {
 	static int count = 0;
 	std::vector<std::function<std::shared_ptr<Transitor>(void)>> transitMakers;
+	transitMakers.push_back([]() {
+		return std::make_shared<WipeTransitor>();
+	});
 	transitMakers.push_back([]() {
 		return std::make_shared<FadeTransitor>();
 	});

diff --git a/JsonToBinary/jikki/PauseMenu/Transition/IrisTransitor.h b/JsonToBinary/jikki/PauseMenu/Transition/IrisTransitor.h
@@ -5,10 +5,10 @@ class IrisTransitor:
 {
 private:
 	int width_ = 100;
-	int handleForMaskScreen_;
-	int maskH_;
-	float diagonalLength_;
-	bool irisOut_=false;
+	int handleForMaskScreen_;//マスク転送用グラフィックハンドル
+	int maskH_;//マスクハンドル
+	float diagonalLength_;//対角線の長さ
+	bool irisOut_=false;//アイリスアウトフラグ(falseならアイリスイン)
 	int gHandle_=-1;
 	bool isTiled_ = false;
 public:

diff --git a/JsonToBinary/jikki/PauseMenu/Transition/PushTransitor.cpp b/JsonToBinary/jikki/PauseMenu/Transition/PushTransitor.cpp
@@ -2,7 +2,7 @@
 #include<DxLib.h>
 #include"../Application.h"
 
-PushTransitor::PushTransitor(PushDirection dir, int interval):direction_(dir),Transitor(interval)
+PushTransitor::PushTransitor(TransitDirection dir, int interval):direction_(dir),Transitor(interval)
 {
 }
 
@@ -31,16 +31,16 @@ void PushTransitor::Draw()
 	int endX=0;
 	int endY=0;
 	switch (direction_) {
-	case PushDirection::left:
+	case TransitDirection::left:
 		endX = -wsize.w;
 		break;
-	case PushDirection::right:
+	case TransitDirection::right:
 		endX = wsize.w;
 		break;
-	case PushDirection::up:
+	case TransitDirection::up:
 		endY = -wsize.h;
 		break;
-	case PushDirection::down:
+	case TransitDirection::down:
 		endY = wsize.h;
 		break;
 

diff --git a/JsonToBinary/jikki/PauseMenu/Transition/PushTransitor.h b/JsonToBinary/jikki/PauseMenu/Transition/PushTransitor.h
@@ -3,17 +3,11 @@
 class PushTransitor :
     public Transitor
 {
-public:
-	enum class PushDirection {
-		up,
-		down,
-		right,
-		left
-	};
+
 private:
-	PushDirection direction_;//ƒvƒbƒVƒ…•ûŒü
+	TransitDirection direction_;//ˆÚ“®•ûŒü
 public:
-	PushTransitor(PushDirection dir=PushDirection::up, int interval = 60);
+	PushTransitor(TransitDirection dir=TransitDirection::up, int interval = 60);
 	virtual void Update() override;
 	virtual void Draw() override;
 };

diff --git a/JsonToBinary/jikki/PauseMenu/Transition/StripTransitor.h b/JsonToBinary/jikki/PauseMenu/Transition/StripTransitor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Transitor.h"
-//’Zûƒgƒ‰ƒ“ƒWƒVƒ‡ƒ“
+//短冊トランジション(縦縞)
 class StripTransitor :
     public Transitor
 {

diff --git a/JsonToBinary/jikki/PauseMenu/Transition/TileTransitor.cpp b/JsonToBinary/jikki/PauseMenu/Transition/TileTransitor.cpp
@@ -20,7 +20,6 @@ Transitor(interval)
 			tiles_.push_back({xidx,yidx});
 		}
 	}
-
 }
 
 void TileTransitor::Update()
@@ -35,7 +34,6 @@ void TileTransitor::Update()
 	if (IsEnd()) {
 		return;
 	}
-	//std::uniform_int_distribution<int> uid(0, tiles_.size() - 1);
 	std::shuffle(tiles_.begin(), tiles_.end(),mt_);
 	const auto& wsize = Application::GetInstance().GetWindowSize();
 	int xnum = (wsize.w / cellSize_) + 1;
@@ -47,8 +45,6 @@ void TileTransitor::Update()
 	else {
 		tiles_.clear();
 	}
-
-
 }
 
 void TileTransitor::Draw()

diff --git a/JsonToBinary/jikki/PauseMenu/Transition/TileTransitor.h b/JsonToBinary/jikki/PauseMenu/Transition/TileTransitor.h
@@ -2,6 +2,9 @@
 #include "Transitor.h"
 #include<vector>
 #include<random>
+/// <summary>
+/// タイル状切り替え(ディゾルヴトランジションとも)
+/// </summary>
 class TileTransitor :
     public Transitor
 {
@@ -12,12 +15,9 @@ class TileTransitor :
     };
     std::mt19937 mt_;
     std::vector<XYIdx> tiles_;
-    //float g_;
-    //std::vector<float> vys_;
 public:
     TileTransitor(int cellSize = 50, int interval = 60);
     virtual void Update() override;
     virtual void Draw() override;
-
 };
 
diff --git a/JsonToBinary/jikki/PauseMenu/Transition/Transitor.h b/JsonToBinary/jikki/PauseMenu/Transition/Transitor.h
@@ -1,4 +1,12 @@
 #pragma once
+
+enum class TransitDirection {
+	up,
+	down,
+	right,
+	left
+};
+
 /// <summary>
 /// シーン遷移時演出基底クラス
 /// </summary>