feat(intro): Add short Intro Logo for The Super Hackers team

Author: xezon

Core/GameEngine/Include/GameClient/Intro.h

@@ -18,22 +18,48 @@
 
 #pragma once
 
+#include <vector>
+
+class DisplayString;
+class Image;
+
 class Intro
 {
 	enum IntroState
 	{
 		IntroState_Start,
 		IntroState_EALogoMovie,
+		IntroState_TheSuperHackersWait,
+		IntroState_TheSuperHackers,
 		IntroState_SizzleMovieWait,
 		IntroState_SizzleMovie,
 		IntroState_Done,
 	};
 
+	struct DisplayEntity
+	{
+		DisplayEntity()
+			: displayString(nullptr)
+			, image(nullptr)
+			, sizeX(10)
+			, sizeY(10)
+			, screenHeightFactor(0.5f)
+		{}
+		~DisplayEntity();
+
+		DisplayString* displayString;
+		const Image* image;
+		Int sizeX;
+		Int sizeY;
+		Real screenHeightFactor; // 0..1
+	};
+
 public:
 
 	Intro();
 
 	void update();
+	void draw();
 
 	void enterNextState();
 
@@ -42,11 +68,18 @@ class Intro
 private:
 
 	void doEALogoMovie();
+	void doTheSuperHackers();
 	void doSizzleMovie();
 	void doPostIntro();
 	void doAsyncWait(UnsignedInt milliseconds);
 
+	void drawDisplayEntities();
+
+private:
+
 	IntroState m_currentState;
 	UnsignedInt m_allowedStateFlags;
 	UnsignedInt m_waitUntilMs;
+	std::vector<DisplayEntity> m_displayEntities;
+	Real m_fadeValue;
 };

Core/GameEngine/Source/GameClient/Intro.cpp

@@ -19,20 +19,34 @@
 #include "PreRTS.h"
 #include "GameClient/Intro.h"
 
+#include "Common/FramePacer.h"
 #include "Common/GameLOD.h"
 
 #include "GameClient/Display.h"
+#include "GameClient/DisplayStringManager.h"
 #include "GameClient/GameWindowManager.h"
+#include "GameClient/GlobalLanguage.h"
+#include "GameClient/Image.h"
 
 
+Intro::DisplayEntity::~DisplayEntity()
+{
+	TheDisplayStringManager->freeDisplayString(displayString);
+}
+
 Intro::Intro()
 	: m_currentState(IntroState_Start)
 	, m_allowedStateFlags(0)
 	, m_waitUntilMs(0)
+	, m_fadeValue(0.0f)
 {
 	if (TheGlobalData->m_playIntro)
 	{
+		// Please be kind and do not remove the EA logo movie. This game was built by EA. It lasts just 3 seconds.
 		m_allowedStateFlags |= 1u << IntroState_EALogoMovie;
+		// Please be kind and do not remove the custom logo screen when building on top of the work of The Super Hackers.
+		m_allowedStateFlags |= 1u << IntroState_TheSuperHackersWait;
+		m_allowedStateFlags |= 1u << IntroState_TheSuperHackers;
 	}
 
 	if (TheGlobalData->m_playSizzle)
@@ -69,13 +83,23 @@ void Intro::update()
 		switch (m_currentState)
 		{
 		case IntroState_EALogoMovie: doEALogoMovie(); break;
+		case IntroState_TheSuperHackersWait: doAsyncWait(800); break;
+		case IntroState_TheSuperHackers: doTheSuperHackers(); break;
 		case IntroState_SizzleMovieWait: doAsyncWait(1000); break;
 		case IntroState_SizzleMovie: doSizzleMovie(); break;
 		case IntroState_Done: doPostIntro(); break;
 		}
 	}
 }
 
+void Intro::draw()
+{
+	switch (m_currentState)
+	{
+		case IntroState_TheSuperHackers: drawDisplayEntities(); break;
+	}
+}
+
 void Intro::doEALogoMovie()
 {
 	TheWritableGlobalData->m_allowExitOutOfMovies = FALSE;
@@ -85,6 +109,110 @@ void Intro::doEALogoMovie()
 		TheDisplay->playMovie("EALogoMovie640");
 }
 
+void Intro::doTheSuperHackers()
+{
+	struct Setting
+	{
+		Setting()
+			: imageName(nullptr)
+			, text(nullptr)
+			, screenHeightFactor(0.5f)
+			, sizeX(10)
+			, sizeY(10)
+			, bold(false)
+			, centered(false)
+		{}
+
+		const Char* imageName;
+		const WideChar* text;
+		Real screenHeightFactor;
+		Int sizeX;
+		Int sizeY;
+		Bool bold;
+		Bool centered;
+	};
+
+	std::vector<Setting> settings;
+
+	{
+		// China Hacker image
+		Setting setting;
+		setting.imageName = "SNHacker2_L";
+		setting.screenHeightFactor = 0.15f;
+		setting.sizeX = (Int)(122 * 0.70f);
+		setting.sizeY = (Int)(98 * 0.70f);
+		settings.push_back(setting);
+	}
+	{
+		// Team name
+		Setting setting;
+		setting.text = L"The Super Hackers";
+		setting.screenHeightFactor = 0.35f;
+		setting.sizeY = 30;
+		setting.bold = true;
+		setting.centered = true;
+		settings.push_back(setting);
+	}
+	{
+		// Website
+		Setting setting;
+		setting.text = L"www.github.com/TheSuperHackers";
+		setting.screenHeightFactor = 0.45f;
+		setting.sizeY = 15;
+		setting.bold = false;
+		setting.centered = true;
+		settings.push_back(setting);
+	}
+	{
+		// Code contributors with 10 or more commits to main branch.
+		// Sort by alphabet or commit count.
+		Setting setting;
+		setting.text =
+			L"bobtista "
+			L"Caball009 "
+			L"feliwir "
+			L"helmutbuhler\n"
+			L"JohnsterID "
+			L"Mauller "
+			L"OmniBlade "
+			L"SkyAero\n"
+			L"slurmlord "
+			L"Stubbjax "
+			L"tomsons26 "
+			L"xezon\n";
+		setting.screenHeightFactor = 0.55f;
+		setting.sizeY = 12;
+		setting.bold = false;
+		setting.centered = true;
+		settings.push_back(setting);
+	}
+
+	m_displayEntities.resize(settings.size());
+
+	for (size_t i = 0; i < m_displayEntities.size(); ++i)
+	{
+		Setting& s = settings[i];
+		DisplayEntity& e = m_displayEntities[i];
+		e.sizeX = TheGlobalLanguageData->adjustFontSize(s.sizeX);
+		e.sizeY = TheGlobalLanguageData->adjustFontSize(s.sizeY);
+		if (s.text != nullptr)
+		{
+			e.displayString = TheDisplayStringManager->newDisplayString();
+			e.displayString->setText(s.text);
+			e.displayString->setFont(TheFontLibrary->getFont("Cascadia Code", e.sizeY, s.bold));
+			e.displayString->setWordWrapCentered(s.centered);
+		}
+		if (s.imageName != nullptr)
+		{
+			e.image = TheMappedImageCollection->findImageByName(s.imageName);
+		}
+		e.screenHeightFactor = s.screenHeightFactor;
+	}
+
+	doAsyncWait(3000);
+	m_fadeValue = 0.0f;
+}
+
 void Intro::doSizzleMovie()
 {
 	TheWritableGlobalData->m_allowExitOutOfMovies = TRUE;
@@ -104,3 +232,56 @@ void Intro::doAsyncWait(UnsignedInt milliseconds)
 {
 	m_waitUntilMs = timeGetTime() + milliseconds;
 }
+
+void Intro::drawDisplayEntities()
+{
+	const Real alpha = 255.0f * clamp(0.0f, m_fadeValue, 1.0f);
+	const Color color = GameMakeColor(255, 255, 255, (Int)alpha);
+	const Color dropColor = GameMakeColor(255, 255, 255, 0);
+	const Int screenWidth = TheDisplay->getWidth();
+	const Int screenHeight = TheDisplay->getHeight();
+
+	for (size_t i = 0; i < m_displayEntities.size(); ++i)
+	{
+		DisplayEntity& e = m_displayEntities[i];
+		if (e.displayString != nullptr)
+		{
+			ICoord2D pos;
+			e.displayString->getSize(&pos.x, &pos.y);
+			pos.x = (screenWidth / 2) - (pos.x / 2);
+			pos.y = (Int)(e.screenHeightFactor * screenHeight);
+			e.displayString->setWordWrap(screenWidth);
+			e.displayString->draw(pos.x, pos.y, color, dropColor);
+		}
+		if (e.image != nullptr)
+		{
+			IRegion2D region;
+			region.lo.x = (screenWidth / 2) - (e.sizeX / 2);
+			region.hi.x = (screenWidth / 2) + (e.sizeX / 2);
+			region.lo.y = (Int)(e.screenHeightFactor * screenHeight);
+			region.hi.y = region.lo.y + e.sizeY;
+			TheDisplay->drawImage(e.image, region.lo.x, region.lo.y, region.hi.x, region.hi.y, color);
+		}
+	}
+
+	constexpr const Real fadeInMs = 500.f;
+	constexpr const Real fadeOutMs = 125.f;
+
+	if (timeGetTime() + fadeOutMs > m_waitUntilMs)
+	{
+		if (m_fadeValue > 0.0f)
+		{
+			// Fade out
+			m_fadeValue -= TheFramePacer->getUpdateTime() * (1000.f / fadeOutMs);
+			if (m_fadeValue < 0.0f)
+				m_fadeValue = 0.0f;
+		}
+	}
+	else if (m_fadeValue < 1.0f)
+	{
+		// Fade in
+		m_fadeValue += TheFramePacer->getUpdateTime() * (1000.f / fadeInMs);
+		if (m_fadeValue > 1.0f)
+			m_fadeValue = 1.0f;
+	}
+}

GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h

@@ -92,6 +92,7 @@ class GameClient : public SubsystemInterface,
 	// subsystem methods
 	virtual void init( void );																					///< Initialize resources
 	virtual void update( void );																				///< Updates the GUI, display, audio, etc
+	virtual void draw();
 	virtual void reset( void );																					///< reset system
 
 	virtual void setFrame( UnsignedInt frame ) { m_frame = frame; }			///< Set the GameClient's internal frame number

GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp

@@ -730,6 +730,14 @@ void GameClient::update( void )
 	}
 }
 
+void GameClient::draw()
+{
+	if (m_intro != nullptr)
+	{
+		m_intro->draw();
+	}
+}
+
 void GameClient::step()
 {
 	TheDisplay->step();

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp

@@ -1859,7 +1859,7 @@ void W3DDisplay::draw( void )
 				// draw the user interface
 				TheInGameUI->DRAW();
 
-				// end of video example code
+				TheGameClient->DRAW();
 
 				// draw the mouse
 				if( TheMouse )