Removed for SGX

2026-09-06 16:04:31 -05:00 · 2022-05-02 16:37:53 -05:00
parent 167a9e8a2e
commit 372a9ac2f7
33 changed files with 9 additions and 131 deletions
--- a/Debug/Songs/B/charts/1/L1.txt
+++ b/Debug/Songs/B/charts/1/L1.txt
@@ -1,6 +0,0 @@
-15876:0:0:1
-19809:0:0:1
-31551:1:5800:40
-77079:1:5300:40 
-110103:1:1400:20
-125484:1:7750:60
--- a/Debug/Songs/B/charts/1/L2.txt
+++ b/Debug/Songs/B/charts/1/L2.txt
@@ -1,5 +0,0 @@
-12001:0:0:1
-13909:0:0:1
-39418:1:1790:5
-82451:1:1900:10
-94222:1:3870:15
--- a/Debug/Songs/B/charts/1/L3.txt
+++ b/Debug/Songs/B/charts/1/L3.txt
@@ -1,9 +0,0 @@
-8067:0:0:1
-10005:0:0:1
-41355:1:1870:10
-47285:1:1600:10
-49163:1:1800:10
-51130:1:4160:20
-86384:1:3750:20
-98126:1:10770:20
-113742:1:1080:10
--- a/Debug/Songs/B/charts/1/L4.txt
+++ b/Debug/Songs/B/charts/1/L4.txt
@@ -1,2 +0,0 @@
-43292:1:1790:3
-90288:1:2900:5
--- a/Debug/Songs/B/charts/1/L5.txt
+++ b/Debug/Songs/B/charts/1/L5.txt
@@ -1,2 +0,0 @@
-45288:1:1790:20
-119613:1:4800:40
--- a/Debug/Songs/B/charts/1/Wheel.txt
+++ b/Debug/Songs/B/charts/1/Wheel.txt
@@ -1,7 +0,0 @@
-23478:0:-1:2:1:7800:20
-62872:0:1:1:2:11860:40
-74760:0:1:2:5:1800:20
-109513:0:-1:3:1:590:5
-111600:0:1:1:3:2100:20
-114858:0:1:3:5:2780:20
-124427:0:-1:5:1:1050:10
--- a/Debug/Songs/B/info.json
+++ b/Debug/Songs/B/info.json
@@ -1,15 +0,0 @@
-{
-    "songId": 7,
-	"title": "B",
-	"author": "t+pazolite",
-	"bpm": 245.25,
-	"diffs": {
-		"easyDiff": 1,
-		"mediumDiff": 0,
-		"hardDiff": 0,
-		"extremeDiff": 0
-	},
-	"jacketArt": "jacket.png",
-	"roundArt": "round.png",
-	"audioFile": "beep.wav"
-}
--- a/Debug/Songs/B/jacket.png
+++ b/Debug/Songs/B/jacket.png
--- a/Debug/Songs/Glow/charts/1/L1.txt
+++ b/Debug/Songs/Glow/charts/1/L1.txt
@@ -1,2 +0,0 @@
-5000:1:2000:4
-9000:0:0:1
--- a/Debug/Songs/Glow/charts/1/L2.txt
+++ b/Debug/Songs/Glow/charts/1/L2.txt
@@ -1,2 +0,0 @@
-3000:0:0:1
-7000:0:0:1
--- a/Debug/Songs/Glow/charts/1/L3.txt
+++ b/Debug/Songs/Glow/charts/1/L3.txt
@@ -1,3 +0,0 @@
-11000:0:0:1
-12500:0:0:1
-14000:0:0:1
--- a/Debug/Songs/Glow/charts/1/L4.txt
+++ b/Debug/Songs/Glow/charts/1/L4.txt
@@ -1,2 +0,0 @@
-6000:0:0:1
-7500:0:0:1
--- a/Debug/Songs/Glow/charts/1/L5.txt
+++ b/Debug/Songs/Glow/charts/1/L5.txt
@@ -1,3 +0,0 @@
-10000:0:0:1
-12000:0:0:1
-15000:0:0:1
--- a/Debug/Songs/Glow/charts/1/Wheel.txt
+++ b/Debug/Songs/Glow/charts/1/Wheel.txt
@@ -1,4 +0,0 @@
-3000:1:1:0:0:0:1
-6500:1:-1:0:0:0:1
-8000:0:1:1:5:2000:5
-11000:0:-1:5:1:2000:5
--- a/Debug/Songs/Glow/info.json
+++ b/Debug/Songs/Glow/info.json
@@ -1,15 +0,0 @@
-{
-    "songId": 1,
-	"title": "Glow",
-	"author": "Sean Barry and Julia Butenhoff",
-	"bpm": 160,
-	"diffs": {
-		"easyDiff": 1,
-		"mediumDiff": 0,
-		"hardDiff": 0,
-		"extremeDiff": 0
-	},
-	"jacketArt": "jacket.png",
-	"roundArt": "round.png",
-	"audioFile": "GlowALMOSTFINAL.wav"
-}
--- a/Debug/Songs/Glow/jacket.png
+++ b/Debug/Songs/Glow/jacket.png
--- a/Fevereiro/charts/1/L1.txt
+++ b/Fevereiro/charts/1/L1.txt
--- a/Fevereiro/charts/1/L2.txt
+++ b/Fevereiro/charts/1/L2.txt
--- a/Fevereiro/charts/1/L3.txt
+++ b/Fevereiro/charts/1/L3.txt
--- a/Fevereiro/charts/1/L4.txt
+++ b/Fevereiro/charts/1/L4.txt
--- a/Fevereiro/charts/1/L5.txt
+++ b/Fevereiro/charts/1/L5.txt
--- a/Fevereiro/charts/1/Wheel.txt
+++ b/Fevereiro/charts/1/Wheel.txt
--- a/Fevereiro/info.json
+++ b/Fevereiro/info.json
@@ -1,15 +0,0 @@
-{
-    "songId": 6,
-	"title": "Psyched Fevereiro",
-	"author": "t+pazolite",
-	"bpm": 150,
-	"diffs": {
-		"easyDiff": 1,
-		"mediumDiff": 0,
-		"hardDiff": 0,
-		"extremeDiff": 0
-	},
-	"jacketArt": "jacket.png",
-	"roundArt": "round.png",
-	"audioFile": "PsychedFevereiro.flac"
-}
--- a/Fevereiro/jacket.png
+++ b/Fevereiro/jacket.png
--- a/Parade/charts/1/L1.txt
+++ b/Parade/charts/1/L1.txt
@@ -1,2 +0,0 @@
-5000:1:2000:4
-9000:0:0:1
--- a/Parade/charts/1/L2.txt
+++ b/Parade/charts/1/L2.txt
@@ -1,2 +0,0 @@
-3000:0:0:1
-7000:0:0:1
--- a/Parade/charts/1/L3.txt
+++ b/Parade/charts/1/L3.txt
@@ -1,3 +0,0 @@
-11000:0:0:1
-12500:0:0:1
-14000:0:0:1
--- a/Parade/charts/1/L4.txt
+++ b/Parade/charts/1/L4.txt
@@ -1,2 +0,0 @@
-6000:0:0:1
-7500:0:0:1
--- a/Parade/charts/1/L5.txt
+++ b/Parade/charts/1/L5.txt
@@ -1,3 +0,0 @@
-10000:0:0:1
-12000:0:0:1
-15000:0:0:1
--- a/Parade/charts/1/Wheel.txt
+++ b/Parade/charts/1/Wheel.txt
@@ -1,4 +0,0 @@
-3000:1:1:0:0:0:1
-6500:1:-1:0:0:0:1
-8000:0:1:1:5:2000:5
-11000:0:-1:5:1:2000:5
--- a/Parade/info.json
+++ b/Parade/info.json
@@ -1,14 +0,0 @@
-{
-    "songId": 2,
-	"title": "The Great Parade",
-	"author": "Azu Crystal",
-	"bpm": 150,
-	"diffs": {
-		"easyDiff": 1,
-		"mediumDiff": 0,
-		"hardDiff": 0,
-		"extremeDiff": 0
-	},
-	"jacketArt": "jacket.png",
-	"audioFile": "The_Great_Parade.wav"
-}
--- a/Parade/jacket.png
+++ b/Parade/jacket.png
--- a/Sonataria/ScreenRenderer.cpp
+++ b/Sonataria/ScreenRenderer.cpp
@@ -506,18 +506,18 @@ void ScreenRenderer::render(sf::RenderWindow* gameWindow) {
 		}

 		// Initialize Videos
-		/*if (!AttractTitleScreen->loadVideo("Videos/AttractTitleScreen.mp4")) {
+		if (!AttractTitleScreen->loadVideo("Videos/AttractTitleScreen.mp4")) {
 			logger.logError("Failed to load video: Videos/AttractTitleScreen.mp4");
 			exit(1);
-		}*/
+		}

 		// Link video sprite and shader
-		//AttractTitleScreen->initSprite(videoShader.getProgram());
-		//AttractTitleScreen->enableLooping(true);
+		AttractTitleScreen->initSprite(videoShader.getProgram());
+		AttractTitleScreen->enableLooping(true);

 		// Load the first frame
-		//AttractTitleScreen->scale(2.f * aspect, -2.f, 1.f);
-		//AttractTitleScreen->update(0);
+		AttractTitleScreen->scale(2.f * aspect, -2.f, 1.f);
+		AttractTitleScreen->update(0);

 		logger.log(L"OpenGL initialized.");
 	}
@@ -705,13 +705,13 @@ void ScreenRenderer::render(sf::RenderWindow* gameWindow) {
 			}
 			else if (gameState.getGameState() == GameState::CurrentState::TITLE_SCREEN) {
 				// Swap to the video shader program
-				//glUseProgram(videoShader.getProgram());
+				glUseProgram(videoShader.getProgram());

 				// Update the current frame
-				//AttractTitleScreen->update((double)fs.count());
+				AttractTitleScreen->update((double)fs.count());

 				// Render that frame
-				//AttractTitleScreen->render(PROJECTION::ORTHOGRAPHIC);
+				AttractTitleScreen->render(PROJECTION::ORTHOGRAPHIC);
 			}
 			else if (gameState.getGameState() == GameState::CurrentState::THANKS_FOR_PLAYING) {
 				Thanks->render(PROJECTION::ORTHOGRAPHIC);